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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-07-29 15:33:39 +02:00
parent 60eb8f978a bb1af7d218
commit a04dfb52b6
9 changed files with 94 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/reportPrinter.cs
+1 -1
View File
@@ -145,7 +145,7 @@ namespace AppData
DataTable tab = new DataTable();
// FIXME TODO...
string qrCodeBaseUrl = "";
string imagePath = "http://seriate.steamware.net:8083/NKC/PartsImg/";
string imagePath = "";
switch (tipoReport)
{
case reportRichiesto.binPost:
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=305']) {
withEnv(['NEXT_BUILD_NUMBER=306']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Controllers/PrintQueueController.cs
+18 -5
View File
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Web.Http;
using System.Web.Http.ModelBinding;
namespace NKC_WF.Controllers
{
@@ -47,7 +48,7 @@ namespace NKC_WF.Controllers
DataTable tab = new DataTable();
// FIXME TODO...
string qrCodeBaseUrl = "";
string imagePath = memLayer.ML.cdv("ReportImgBasePath"); //"http://seriate.steamware.net:8083/NKC/PartsImg/";
string imagePath = ""; //"http://seriate.steamware.net:8083/NKC/PartsImg/";
switch (tipoReport)
{
case reportRichiesto.binPost:
@@ -88,14 +89,26 @@ namespace NKC_WF.Controllers
return answ;
}
protected reportRichiesto reportByTipo(string tipo)
/// <summary>
/// Calcola report da tipo + nome coda...
/// </summary>
/// <param name="tipo"></param>
/// <param name="queueName"></param>
/// <returns></returns>
protected reportRichiesto reportByTipo(string tipo, string queueName)
{
reportRichiesto report = reportRichiesto.bunkGroup;
switch (tipo)
{
case "docStack":
report = reportRichiesto.bunkGroup;
if (queueName == "queueBunkDetail")
{
report = reportRichiesto.bunkList;
}
else
{
report = reportRichiesto.bunkGroup;
}
break;
case "docBinPre":
report = reportRichiesto.binPre;
@@ -165,7 +178,7 @@ namespace NKC_WF.Controllers
// ciclo!
foreach (var pjReq in tabPJQ)
{
currRdsData = caricaDati(reportByTipo(pjReq.TipoReport), pjReq.KeyParam);
currRdsData = caricaDati(reportByTipo(pjReq.TipoReport, pjReq.prtName), pjReq.KeyParam);
// in base alla coda --> recupero i dati
currReport = new reportData()
{
NKC_WF/NKC_WF.csproj
+3 -1
View File
@@ -535,7 +535,9 @@
<Content Include="Reports\Part.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="Reports\Bin.rdlc" />
<Content Include="Reports\Bin.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.min.js" />
NKC_WF/Reports/Bin.rdlc
+19 -10
View File
@@ -19,9 +19,9 @@
<ReportItems>
<Image Name="Image_ItemExtCode">
<Source>External</Source>
<Value>=Fields!PathImageFull.Value</Value>
<Value>=Fields!PathImageFull.Value &amp; First(Fields!ItemExtCode.Value, "stp_prt_Bin") &amp; ".png"</Value>
<Sizing>FitProportional</Sizing>
<Top>3.38528in</Top>
<Top>3.59532in</Top>
<Left>0.36334in</Left>
<Height>3.35417in</Height>
<Width>6.71875in</Width>
@@ -218,15 +218,13 @@
</Rectangle>
<Image Name="QRCode">
<Source>External</Source>
<Value>=Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!BinDtmxRich.Value.ToString())
<Value>=Replace(Fields!QRCodeBaseUrl.Value.ToString(),"QRCODEVALUE",Fields!BinDtmxRich.Value.ToString())
' la stringa nel parametro di default è https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':\['QRCODEVALUE'\]}
' la stringa nel Campo è https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':\['QRCODEVALUE'\]}
' dove la \ prima della [ serve perchè è una stringa quindi si trasforma poi in
' https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
'=Parameters!QRCodeBaseURL.Value.ToString() &amp; ":['" &amp; Fields!StackID.Value.ToString() &amp; "']}"
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}</Value>
<Sizing>FitProportional</Sizing>
<Top>0.41131cm</Top>
@@ -330,7 +328,7 @@
<BottomMargin>0.5in</BottomMargin>
<Style />
</Page>
<Author>v. 1.0.1</Author>
<Author>v. 1.1.1</Author>
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="Sauder_NKC">
@@ -353,6 +351,9 @@
<QueryParameter Name="@PathImage">
<Value>=Parameters!PathImage.Value</Value>
</QueryParameter>
<QueryParameter Name="@QRCodeBaseUrl">
<Value>=Parameters!QRCodeBaseUrl.Value</Value>
</QueryParameter>
</QueryParameters>
<CommandType>StoredProcedure</CommandType>
<CommandText>prt.stp_prt_Bin</CommandText>
@@ -403,17 +404,23 @@
<DataField>PathImageFull</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="QRCodeBaseUrl">
<DataField>QRCodeBaseUrl</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
</DataSet>
</DataSets>
<ReportParameters>
<ReportParameter Name="QRCodeBaseURL">
<ReportParameter Name="QRCodeBaseUrl">
<DataType>String</DataType>
<Nullable>true</Nullable>
<DefaultValue>
<Values>
<Value>https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}</Value>
<Value xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
</Values>
</DefaultValue>
<AllowBlank>true</AllowBlank>
<Prompt>QRCodeBaseURL:</Prompt>
</ReportParameter>
<ReportParameter Name="BinID">
@@ -436,11 +443,13 @@
</ReportParameter>
<ReportParameter Name="PathImage">
<DataType>String</DataType>
<Nullable>true</Nullable>
<DefaultValue>
<Values>
<Value>C:\Test\</Value>
<Value>file:\C:\PROGETTI\REPORTING_2008_SSTD_2010\Sauder\Sauder\</Value>
</Values>
</DefaultValue>
<AllowBlank>true</AllowBlank>
<Prompt>Path Image</Prompt>
</ReportParameter>
</ReportParameters>
NKC_WF/Reports/BunkGroup.rdlc
+14 -7
View File
@@ -721,15 +721,13 @@
</Rectangle>
<Image Name="QRCode">
<Source>External</Source>
<Value>=Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!StackDtmx.Value.ToString())
<Value>=Replace(Fields!QRCodeBaseUrl.Value.ToString(),"QRCODEVALUE",Fields!StackDtmx.Value.ToString())
' la stringa nel parametro di default è https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':\['QRCODEVALUE'\]}
' la stringa nel campo è https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':\['QRCODEVALUE'\]}
' dove la \ prima della [ serve perchè è una stringa quindi si trasforma poi in
' https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
'=Parameters!QRCodeBaseURL.Value.ToString() &amp; ":['" &amp; Fields!StackID.Value.ToString() &amp; "']}"
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}</Value>
<Sizing>FitProportional</Sizing>
<Top>0.41097cm</Top>
@@ -840,7 +838,7 @@
<BottomMargin>0.5in</BottomMargin>
<Style />
</Page>
<Author>v. 2.0.1</Author>
<Author>v. 2.1.1</Author>
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="Sauder_NKC">
@@ -857,6 +855,9 @@
<QueryParameter Name="@StackID">
<Value>=Parameters!StackID.Value</Value>
</QueryParameter>
<QueryParameter Name="@QRCodeBaseUrl">
<Value>=Parameters!QRCodeBaseUrl.Value</Value>
</QueryParameter>
</QueryParameters>
<CommandType>StoredProcedure</CommandType>
<CommandText>prt.stp_prt_BunkGroup</CommandText>
@@ -899,6 +900,10 @@
<DataField>SheetTot</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="QRCodeBaseUrl">
<DataField>QRCodeBaseUrl</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
</DataSet>
</DataSets>
@@ -912,13 +917,15 @@
</DefaultValue>
<Prompt>Stack ID:</Prompt>
</ReportParameter>
<ReportParameter Name="QRCodeBaseURL">
<ReportParameter Name="QRCodeBaseUrl">
<DataType>String</DataType>
<Nullable>true</Nullable>
<DefaultValue>
<Values>
<Value>https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}</Value>
<Value xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
</Values>
</DefaultValue>
<AllowBlank>true</AllowBlank>
<Prompt>QRCodeBaseURL:</Prompt>
</ReportParameter>
</ReportParameters>
NKC_WF/Reports/BunkList.rdlc
+13 -6
View File
@@ -633,15 +633,13 @@
</Rectangle>
<Image Name="QRCode">
<Source>External</Source>
<Value>=Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!StackDtmx.Value.ToString())
<Value>=Replace(Fields!QRCodeBaseUrl.Value.ToString(),"QRCODEVALUE",Fields!StackDtmx.Value.ToString())
' la stringa nel parametro di default è https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':\['QRCODEVALUE'\]}
' dove la \ prima della [ serve perchè è una stringa quindi si trasforma poi in
' https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
'=Parameters!QRCodeBaseURL.Value.ToString() &amp; ":['" &amp; Fields!StackID.Value.ToString() &amp; "']}"
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}</Value>
<Sizing>FitProportional</Sizing>
<Top>0.41097cm</Top>
@@ -752,7 +750,7 @@
<BottomMargin>0.5in</BottomMargin>
<Style />
</Page>
<Author>v 1.0.1</Author>
<Author>v 1.1.1</Author>
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="Sauder_NKC">
@@ -769,6 +767,9 @@
<QueryParameter Name="@StackID">
<Value>=Parameters!StackID.Value</Value>
</QueryParameter>
<QueryParameter Name="@QRCodeBaseUrl">
<Value>=Parameters!QRCodeBaseUrl.Value</Value>
</QueryParameter>
</QueryParameters>
<CommandType>StoredProcedure</CommandType>
<CommandText>prt.stp_prt_BunkList</CommandText>
@@ -803,6 +804,10 @@
<DataField>MatDesc</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="QRCodeBaseUrl">
<DataField>QRCodeBaseUrl</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
</DataSet>
</DataSets>
@@ -816,13 +821,15 @@
</DefaultValue>
<Prompt>Stack ID:</Prompt>
</ReportParameter>
<ReportParameter Name="QRCodeBaseURL">
<ReportParameter Name="QRCodeBaseUrl">
<DataType>String</DataType>
<Nullable>true</Nullable>
<DefaultValue>
<Values>
<Value>https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}</Value>
<Value xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
</Values>
</DefaultValue>
<AllowBlank>true</AllowBlank>
<Prompt>QRCodeBaseURL:</Prompt>
</ReportParameter>
</ReportParameters>
NKC_WF/Reports/Cart.rdlc
+12 -5
View File
@@ -19,15 +19,13 @@
<ReportItems>
<Image Name="QRCode">
<Source>External</Source>
<Value>=Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!CartDtmx.Value.ToString())
<Value>=Replace(Fields!QRCodeBaseUrl.Value.ToString(),"QRCODEVALUE",Fields!CartDtmx.Value.ToString())
' la stringa nel parametro di default è https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':\['QRCODEVALUE'\]}
' dove la \ prima della [ serve perchè è una stringa quindi si trasforma poi in
' https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
'=Parameters!QRCodeBaseURL.Value.ToString() &amp; ":['" &amp; Fields!StackID.Value.ToString() &amp; "']}"
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}</Value>
<Sizing>FitProportional</Sizing>
<Top>0.78139cm</Top>
@@ -469,7 +467,7 @@
<BottomMargin>0.5in</BottomMargin>
<Style />
</Page>
<Author>v. 1.0.1</Author>
<Author>v. 1.1.1</Author>
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="Sauder_NKC">
@@ -486,6 +484,9 @@
<QueryParameter Name="@CartID">
<Value>=Parameters!CartID.Value</Value>
</QueryParameter>
<QueryParameter Name="@QRCodeBaseUrl">
<Value>=Parameters!QRCodeBaseUrl.Value</Value>
</QueryParameter>
</QueryParameters>
<CommandType>StoredProcedure</CommandType>
<CommandText>prt.stp_prt_Cart</CommandText>
@@ -520,17 +521,23 @@
<DataField>TotKit</DataField>
<rd:TypeName>System.Int32</rd:TypeName>
</Field>
<Field Name="QRCodeBaseUrl">
<DataField>QRCodeBaseUrl</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
</DataSet>
</DataSets>
<ReportParameters>
<ReportParameter Name="QRCodeBaseURL">
<ReportParameter Name="QRCodeBaseUrl">
<DataType>String</DataType>
<Nullable>true</Nullable>
<DefaultValue>
<Values>
<Value>https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}</Value>
</Values>
</DefaultValue>
<AllowBlank>true</AllowBlank>
<Prompt>QRCodeBaseURL:</Prompt>
</ReportParameter>
<ReportParameter Name="CartID">
NKC_WF/Reports/Part.rdlc
+13 -6
View File
@@ -55,15 +55,13 @@
</Textbox>
<Image Name="QRCode">
<Source>External</Source>
<Value>=Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!ItemDtmx.Value.ToString())
<Value>=Replace(Fields!QRCodeBaseUrl.Value.ToString(),"QRCODEVALUE",Fields!ItemDtmx.Value.ToString())
' la stringa nel parametro di default è https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':\['QRCODEVALUE'\]}
' la stringa nel Campo è https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':\['QRCODEVALUE'\]}
' dove la \ prima della [ serve perchè è una stringa quindi si trasforma poi in
' https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
'=Parameters!QRCodeBaseURL.Value.ToString() &amp; ":['" &amp; Fields!StackID.Value.ToString() &amp; "']}"
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}</Value>
<Sizing>FitProportional</Sizing>
<Top>0.1in</Top>
@@ -153,7 +151,7 @@
<PageWidth>2in</PageWidth>
<Style />
</Page>
<Author>v. 1.0.1</Author>
<Author>v. 1.1.1</Author>
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="Sauder_NKC">
@@ -170,6 +168,9 @@
<QueryParameter Name="@ItemID">
<Value>=Parameters!ItemID.Value</Value>
</QueryParameter>
<QueryParameter Name="@QRCodeBaseUrl">
<Value>=Parameters!QRCodeBaseUrl.Value</Value>
</QueryParameter>
</QueryParameters>
<CommandType>StoredProcedure</CommandType>
<CommandText>prt.stp_prt_Part</CommandText>
@@ -188,17 +189,23 @@
<DataField>Destination</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="QRCodeBaseUrl">
<DataField>QRCodeBaseUrl</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
</DataSet>
</DataSets>
<ReportParameters>
<ReportParameter Name="QRCodeBaseURL">
<ReportParameter Name="QRCodeBaseUrl">
<DataType>String</DataType>
<Nullable>true</Nullable>
<DefaultValue>
<Values>
<Value>https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}</Value>
</Values>
</DefaultValue>
<AllowBlank>true</AllowBlank>
<Prompt>QRCodeBaseURL:</Prompt>
</ReportParameter>
<ReportParameter Name="ItemID">