diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index 6e34961..eae47f0 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -152,6 +152,12 @@ namespace AppData answ = tabStack.Count > 0; break; + case tipoDocumento.docCartSpecialPart: + int.TryParse(keyParam, out intIdx); + var tabSpecPart = taRepSpecPart.GetData(intIdx,"",""); + answ = tabSpecPart.Count > 0; + break; + case tipoDocumento.docND: break; diff --git a/AppData/reportPrinter.cs b/AppData/reportPrinter.cs index 72604c6..3eb0340 100644 --- a/AppData/reportPrinter.cs +++ b/AppData/reportPrinter.cs @@ -124,6 +124,11 @@ namespace AppData tab = (DataTable)DLMan.taRepIRK.GetData(intIdx, qrCodeBaseUrl); break; + case reportRichiesto.cartSpecParts: + int.TryParse(keyParam, out intIdx); + tab = (DataTable)DLMan.taRepSpecPart.GetData(intIdx, imagePath, qrCodeBaseUrl); + break; + default: break; } @@ -362,6 +367,11 @@ namespace AppData report.ReportPath = string.Format(@"{0}\OtherPart.rdlc", repoBasePath); report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDS_DocOtherPart"), caricaDati(tipoReport, keyParam))); break; + + case reportRichiesto.cartSpecParts: + report.ReportPath = string.Format(@"{0}\SpecialParts.rdlc", repoBasePath); + report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDS_DocCartSpecPart"), caricaDati(tipoReport, keyParam))); + break; } deviceInfo = deviceInfoParam.xmlParam; doEmfPrint(printerName, report, deviceInfo); @@ -550,6 +560,11 @@ namespace AppData report = reportRichiesto.otherPart; break; + case tipoDocumento.docCartSpecialPart: + tipo = "docCartSpecialPart"; + report = reportRichiesto.cartSpecParts; + break; + case tipoDocumento.docStack: tipo = "docStack"; report = reportRichiesto.bunkGroup; diff --git a/NKC_SDK/Enums.cs b/NKC_SDK/Enums.cs index 8153ce5..af0189b 100644 --- a/NKC_SDK/Enums.cs +++ b/NKC_SDK/Enums.cs @@ -319,7 +319,8 @@ otherPart, cartIRKList, cartIRKGroup, - remnants + remnants, + cartSpecParts } /// diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs index 8b5455b..8e08876 100644 --- a/NKC_WF/Controllers/PrintQueueController.cs +++ b/NKC_WF/Controllers/PrintQueueController.cs @@ -118,12 +118,15 @@ namespace NKC_WF.Controllers answ.Add(memLayer.ML.cdv("ReportDS_DocIRKList"), tab); break; + case reportRichiesto.cartSpecParts: + int.TryParse(keyParam, out intIdx); + tab = (DataTable)DLMan.taRepSpecPart.GetData(intIdx, imagePath, qrCodeBaseUrl); + answ.Add(memLayer.ML.cdv("ReportDS_DocCartSpecPart"), tab); + break; case reportRichiesto.remnants: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DLMan.taRepIRK.GetData(intIdx, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocIRKList"), tab); - break; default: break; @@ -177,6 +180,9 @@ namespace NKC_WF.Controllers case "docOffline": report = reportRichiesto.offline; break; + case "docCartSpecialPart": + report = reportRichiesto.cartSpecParts; + break; default: break; } diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 78b0fb9..64925ff 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -351,6 +351,9 @@ + + Always +