Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conf x nuovi rdlc

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-24 16:45:04 +02:00
parent 3aa5710a74
commit ed23dd36ad
7 changed files with 101 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/DataLayer.cs
+8
View File
@@ -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;
AppData/app.config
+1 -1
View File
@@ -3,7 +3,7 @@
<configSections>
</configSections>
<connectionStrings>
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString" connectionString="Data Source=10.74.82.14;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC" providerName="System.Data.SqlClient" />
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
AppData/reportPrinter.cs
+30 -6
View File
@@ -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:
NKC_SDK/Enums.cs
+12 -2
View File
@@ -244,7 +244,9 @@
cart,
offline,
part,
otherPart
otherPart,
cartIRKList,
cartIRKGroup
}
/// <summary>
/// tipologia di DOCUMENTO gestito in stampa...
@@ -285,7 +287,15 @@
/// <summary>
/// NON DEFINITO
/// </summary>
docND
docND,
/// <summary>
/// Dettaglio massimo CART --> Item Requested Kitting
/// </summary>
docCartIRK,
/// <summary>
/// Dettaglio aggregato CART --> Item Requested Kitting
/// </summary>
docCartIRKSum
}
/// <summary>
NKC_WF/Controllers/PrintQueueController.cs
+16
View File
@@ -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;
NKC_WF/NKC_WF.csproj
+4
View File
@@ -1679,6 +1679,10 @@
<Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetFramework.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetFramework.CSharp.Analyzers.dll" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Reports\IRK_Kitting_Group.rdlc" />
<EmbeddedResource Include="Reports\IRK_Kitting_List.rdlc" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
NKC_WF/Reports/queueConf.json
+30
View File
@@ -118,5 +118,35 @@
"MarginBottom": "0in",
"xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
}
},
{
"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": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
}
},
{
"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": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
}
}
]