diff --git a/AppData/reportPrinter.cs b/AppData/reportPrinter.cs
index e393fef..d842498 100644
--- a/AppData/reportPrinter.cs
+++ b/AppData/reportPrinter.cs
@@ -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:
diff --git a/Jenkinsfile b/Jenkinsfile
index 7e9a4ad..603f514 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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}')
diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs
index f920b82..80fc8e8 100644
--- a/NKC_WF/Controllers/PrintQueueController.cs
+++ b/NKC_WF/Controllers/PrintQueueController.cs
@@ -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)
+ ///
+ /// Calcola report da tipo + nome coda...
+ ///
+ ///
+ ///
+ ///
+ 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()
{
diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj
index 41e66f4..74ce879 100644
--- a/NKC_WF/NKC_WF.csproj
+++ b/NKC_WF/NKC_WF.csproj
@@ -535,7 +535,9 @@
Always
-
+
+ Always
+
diff --git a/NKC_WF/Reports/Bin.rdlc b/NKC_WF/Reports/Bin.rdlc
index a60bc3a..5cca71a 100644
--- a/NKC_WF/Reports/Bin.rdlc
+++ b/NKC_WF/Reports/Bin.rdlc
@@ -19,9 +19,9 @@
External
- =Fields!PathImageFull.Value
+ =Fields!PathImageFull.Value & First(Fields!ItemExtCode.Value, "stp_prt_Bin") & ".png"
FitProportional
- 3.38528in
+ 3.59532in
0.36334in
3.35417in
6.71875in
@@ -218,15 +218,13 @@
External
- =Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!BinDtmxRich.Value.ToString())
+ =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() & ":['" & Fields!StackID.Value.ToString() & "']}"
-
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}
FitProportional
0.41131cm
@@ -330,7 +328,7 @@
0.5in
- v. 1.0.1
+ v. 1.1.1
0
@@ -353,6 +351,9 @@
=Parameters!PathImage.Value
+
+ =Parameters!QRCodeBaseUrl.Value
+
StoredProcedure
prt.stp_prt_Bin
@@ -403,17 +404,23 @@
PathImageFull
System.String
+
+ QRCodeBaseUrl
+ System.String
+
-
+
String
+ true
- https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
+
+ true
QRCodeBaseURL:
@@ -436,11 +443,13 @@
String
+ true
- C:\Test\
+ file:\C:\PROGETTI\REPORTING_2008_SSTD_2010\Sauder\Sauder\
+ true
Path Image
diff --git a/NKC_WF/Reports/BunkGroup.rdlc b/NKC_WF/Reports/BunkGroup.rdlc
index d1c19ca..e18cc16 100644
--- a/NKC_WF/Reports/BunkGroup.rdlc
+++ b/NKC_WF/Reports/BunkGroup.rdlc
@@ -721,15 +721,13 @@
External
- =Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!StackDtmx.Value.ToString())
+ =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() & ":['" & Fields!StackID.Value.ToString() & "']}"
-
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}
FitProportional
0.41097cm
@@ -840,7 +838,7 @@
0.5in
- v. 2.0.1
+ v. 2.1.1
0
@@ -857,6 +855,9 @@
=Parameters!StackID.Value
+
+ =Parameters!QRCodeBaseUrl.Value
+
StoredProcedure
prt.stp_prt_BunkGroup
@@ -899,6 +900,10 @@
SheetTot
System.String
+
+ QRCodeBaseUrl
+ System.String
+
@@ -912,13 +917,15 @@
Stack ID:
-
+
String
+ true
- https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
+
+ true
QRCodeBaseURL:
diff --git a/NKC_WF/Reports/BunkList.rdlc b/NKC_WF/Reports/BunkList.rdlc
index b143531..a2d8117 100644
--- a/NKC_WF/Reports/BunkList.rdlc
+++ b/NKC_WF/Reports/BunkList.rdlc
@@ -633,15 +633,13 @@
External
- =Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!StackDtmx.Value.ToString())
+ =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() & ":['" & Fields!StackID.Value.ToString() & "']}"
-
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}
FitProportional
0.41097cm
@@ -752,7 +750,7 @@
0.5in
- v 1.0.1
+ v 1.1.1
0
@@ -769,6 +767,9 @@
=Parameters!StackID.Value
+
+ =Parameters!QRCodeBaseUrl.Value
+
StoredProcedure
prt.stp_prt_BunkList
@@ -803,6 +804,10 @@
MatDesc
System.String
+
+ QRCodeBaseUrl
+ System.String
+
@@ -816,13 +821,15 @@
Stack ID:
-
+
String
+ true
- https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
+
+ true
QRCodeBaseURL:
diff --git a/NKC_WF/Reports/Cart.rdlc b/NKC_WF/Reports/Cart.rdlc
index f77fc5e..4106f59 100644
--- a/NKC_WF/Reports/Cart.rdlc
+++ b/NKC_WF/Reports/Cart.rdlc
@@ -19,15 +19,13 @@
External
- =Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!CartDtmx.Value.ToString())
+ =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() & ":['" & Fields!StackID.Value.ToString() & "']}"
-
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}
FitProportional
0.78139cm
@@ -469,7 +467,7 @@
0.5in
- v. 1.0.1
+ v. 1.1.1
0
@@ -486,6 +484,9 @@
=Parameters!CartID.Value
+
+ =Parameters!QRCodeBaseUrl.Value
+
StoredProcedure
prt.stp_prt_Cart
@@ -520,17 +521,23 @@
TotKit
System.Int32
+
+ QRCodeBaseUrl
+ System.String
+
-
+
String
+ true
https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
+ true
QRCodeBaseURL:
diff --git a/NKC_WF/Reports/Part.rdlc b/NKC_WF/Reports/Part.rdlc
index 6d8e767..643fb85 100644
--- a/NKC_WF/Reports/Part.rdlc
+++ b/NKC_WF/Reports/Part.rdlc
@@ -55,15 +55,13 @@
External
- =Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!ItemDtmx.Value.ToString())
+ =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() & ":['" & Fields!StackID.Value.ToString() & "']}"
-
'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']}
FitProportional
0.1in
@@ -153,7 +151,7 @@
2in
- v. 1.0.1
+ v. 1.1.1
0
@@ -170,6 +168,9 @@
=Parameters!ItemID.Value
+
+ =Parameters!QRCodeBaseUrl.Value
+
StoredProcedure
prt.stp_prt_Part
@@ -188,17 +189,23 @@
Destination
System.String
+
+ QRCodeBaseUrl
+ System.String
+
-
+
String
+ true
https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
+ true
QRCodeBaseURL: