diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs
index ff8bca9..0b001a5 100644
--- a/AppData/DataLayer.cs
+++ b/AppData/DataLayer.cs
@@ -47,6 +47,8 @@ namespace AppData
public DS_ReportTableAdapters.stp_prt_CartTableAdapter taRepCart;
public DS_ReportTableAdapters.stp_prt_PartTableAdapter taRepPart;
public DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter taRepOtherPart;
+ public DS_ReportTableAdapters.stp_prt_IRKTableAdapter taRepIRK;
+ public DS_ReportTableAdapters.stp_prt_IRK_SumTableAdapter taRepIRKSum;
public DataLayer()
{
@@ -97,6 +99,8 @@ namespace AppData
taRepCart.Connection.ConnectionString = connString;
taRepPart.Connection.ConnectionString = connString;
taRepOtherPart.Connection.ConnectionString = connString;
+ taRepIRK.Connection.ConnectionString = connString;
+ taRepIRKSum.Connection.ConnectionString = connString;
}
private void initTA()
{
@@ -139,6 +143,8 @@ namespace AppData
taRepCart = new DS_ReportTableAdapters.stp_prt_CartTableAdapter();
taRepPart = new DS_ReportTableAdapters.stp_prt_PartTableAdapter();
taRepOtherPart = new DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter();
+ taRepIRK = new DS_ReportTableAdapters.stp_prt_IRKTableAdapter();
+ taRepIRKSum = new DS_ReportTableAdapters.stp_prt_IRK_SumTableAdapter();
}
#endregion
@@ -303,6 +309,8 @@ namespace AppData
answ = tabBinPre.Count > 0;
break;
case tipoDocumento.docCart:
+ case tipoDocumento.docCartIRK:
+ case tipoDocumento.docCartIRKSum:
int.TryParse(keyParam, out intIdx);
var tabCarts = taCR.getByKey(intIdx);
answ = tabCarts.Count > 0;
diff --git a/AppData/app.config b/AppData/app.config
index f309742..9a88160 100644
--- a/AppData/app.config
+++ b/AppData/app.config
@@ -3,7 +3,7 @@
-
+
diff --git a/AppData/reportPrinter.cs b/AppData/reportPrinter.cs
index 75a13d8..f71dcf1 100644
--- a/AppData/reportPrinter.cs
+++ b/AppData/reportPrinter.cs
@@ -181,6 +181,14 @@ namespace AppData
int.TryParse(keyParam, out intIdx);
tab = (DataTable)DLMan.taRepPart.GetData(intIdx, qrCodeBaseUrl);
break;
+ case reportRichiesto.cartIRKGroup:
+ int.TryParse(keyParam, out intIdx);
+ tab = (DataTable)DLMan.taRepIRKSum.GetData(intIdx, qrCodeBaseUrl);
+ break;
+ case reportRichiesto.cartIRKList:
+ int.TryParse(keyParam, out intIdx);
+ tab = (DataTable)DLMan.taRepIRK.GetData(intIdx, qrCodeBaseUrl);
+ break;
default:
break;
}
@@ -223,6 +231,14 @@ namespace AppData
report.ReportPath = string.Format(@"{0}\Cart.rdlc", repoBasePath);
report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDS_DocCart"), caricaDati(tipoReport, keyParam)));
break;
+ case reportRichiesto.cartIRKGroup:
+ report.ReportPath = string.Format(@"{0}\IRK_Kitting_Group.rdlc", repoBasePath);
+ report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDS_DocIRKGroup"), caricaDati(tipoReport, keyParam)));
+ break;
+ case reportRichiesto.cartIRKList:
+ report.ReportPath = string.Format(@"{0}\IRK_Kitting_List.rdlc", repoBasePath);
+ report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDS_DocIRKList"), caricaDati(tipoReport, keyParam)));
+ break;
case reportRichiesto.offline:
case reportRichiesto.part:
report.ReportPath = string.Format(@"{0}\Part.rdlc", repoBasePath);
@@ -383,27 +399,35 @@ namespace AppData
switch (documento)
{
case tipoDocumento.docBinPre:
- tipo = "DocPaint";
+ tipo = "docPaint";
report = reportRichiesto.binPre;
break;
case tipoDocumento.docBinPost:
- tipo = "DocPaintPost";
+ tipo = "docPaintPost";
report = reportRichiesto.binPost;
break;
case tipoDocumento.docCart:
- tipo = "DocCart";
+ tipo = "docCart";
report = reportRichiesto.cart;
break;
+ case tipoDocumento.docCartIRK:
+ tipo = "docCartIRK";
+ report = reportRichiesto.cartIRKList;
+ break;
+ case tipoDocumento.docCartIRKSum:
+ tipo = "docCartIRKSum";
+ report = reportRichiesto.cartIRKGroup;
+ break;
case tipoDocumento.docPart:
- tipo = "DocPart";
+ tipo = "docPart";
report = reportRichiesto.part;
break;
case tipoDocumento.docOtherPart:
- tipo = "DocOtherPart";
+ tipo = "docOtherPart";
report = reportRichiesto.otherPart;
break;
case tipoDocumento.docStack:
- tipo = "DocStack";
+ tipo = "docStack";
report = reportRichiesto.bunkGroup;
break;
default:
diff --git a/NKC_SDK/Enums.cs b/NKC_SDK/Enums.cs
index 83bdf8d..46b7fda 100644
--- a/NKC_SDK/Enums.cs
+++ b/NKC_SDK/Enums.cs
@@ -244,7 +244,9 @@
cart,
offline,
part,
- otherPart
+ otherPart,
+ cartIRKList,
+ cartIRKGroup
}
///
/// tipologia di DOCUMENTO gestito in stampa...
@@ -285,7 +287,15 @@
///
/// NON DEFINITO
///
- docND
+ docND,
+ ///
+ /// Dettaglio massimo CART --> Item Requested Kitting
+ ///
+ docCartIRK,
+ ///
+ /// Dettaglio aggregato CART --> Item Requested Kitting
+ ///
+ docCartIRKSum
}
///
diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs
index 21b9058..3587559 100644
--- a/NKC_WF/Controllers/PrintQueueController.cs
+++ b/NKC_WF/Controllers/PrintQueueController.cs
@@ -107,6 +107,16 @@ namespace NKC_WF.Controllers
tab = (DataTable)DLMan.taRepOtherPart.GetData(intIdx, qrCodeBaseUrl);
answ.Add(memLayer.ML.cdv("ReportDS_DocOtherPart"), tab);
break;
+ case reportRichiesto.cartIRKGroup:
+ int.TryParse(keyParam, out intIdx);
+ tab = (DataTable)DLMan.taRepIRKSum.GetData(intIdx, qrCodeBaseUrl);
+ answ.Add(memLayer.ML.cdv("ReportDS_DocIRKGroup"), tab);
+ break;
+ case reportRichiesto.cartIRKList:
+ int.TryParse(keyParam, out intIdx);
+ tab = (DataTable)DLMan.taRepIRK.GetData(intIdx, qrCodeBaseUrl);
+ answ.Add(memLayer.ML.cdv("ReportDS_DocIRKList"), tab);
+ break;
default:
break;
}
@@ -144,6 +154,12 @@ namespace NKC_WF.Controllers
case "docCart":
report = reportRichiesto.cart;
break;
+ case "docCartIRKSum":
+ report = reportRichiesto.cartIRKGroup;
+ break;
+ case "docCartIRK":
+ report = reportRichiesto.cartIRKList;
+ break;
case "docPart":
report = reportRichiesto.part;
break;
diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj
index b7fd25e..076d477 100644
--- a/NKC_WF/NKC_WF.csproj
+++ b/NKC_WF/NKC_WF.csproj
@@ -1679,6 +1679,10 @@
+
+
+
+
10.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
diff --git a/NKC_WF/Reports/queueConf.json b/NKC_WF/Reports/queueConf.json
index d033070..2b633f9 100644
--- a/NKC_WF/Reports/queueConf.json
+++ b/NKC_WF/Reports/queueConf.json
@@ -118,5 +118,35 @@
"MarginBottom": "0in",
"xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in"
}
+ },
+ {
+ "name": "queueIRKGroup",
+ "template": "IRK_Kitting_Group.rdlc",
+ "printerName": "Microsoft Print to PDF",
+ "deviceInfoParam": {
+ "OutputFormat": "EMF",
+ "PageHeight": "11in",
+ "PageWidth": "8.5in",
+ "MarginLeft": "0.5in",
+ "MarginRight": "0.5in",
+ "MarginTop": "0.5in",
+ "MarginBottom": "0.5in",
+ "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in"
+ }
+ },
+ {
+ "name": "queueIRKList",
+ "template": "IRK_Kitting_List.rdlc",
+ "printerName": "Microsoft Print to PDF",
+ "deviceInfoParam": {
+ "OutputFormat": "EMF",
+ "PageHeight": "11in",
+ "PageWidth": "8.5in",
+ "MarginLeft": "0.5in",
+ "MarginRight": "0.5in",
+ "MarginTop": "0.5in",
+ "MarginBottom": "0.5in",
+ "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in"
+ }
}
]
\ No newline at end of file