diff --git a/Jenkinsfile b/Jenkinsfile
index 7d3ca04..80cf509 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=251']) {
+ withEnv(['NEXT_BUILD_NUMBER=252']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs
index d281887..5539821 100644
--- a/NKC_WF/Controllers/BatchProcController.cs
+++ b/NKC_WF/Controllers/BatchProcController.cs
@@ -256,7 +256,7 @@ namespace NKC_WF.Controllers
break;
}
// aggiorno il resto SOLO SE status == completo...
- if (rispNest.ProcessStatus == procStatus.completed)
+ if (rispNest.ProcessStatus == procStatus.completed || rispNest.ProcessStatus == procStatus.error)
{
// resetto le precedenti elaborazioni: elimino dati child MA NON il batch...
DataLayer.man.taBL.resetTree(rispNest.BatchID);
diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj
index 116c516..813cf1d 100644
--- a/NKC_WF/NKC_WF.csproj
+++ b/NKC_WF/NKC_WF.csproj
@@ -1145,6 +1145,11 @@
+
+
+ Always
+
+
10.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
diff --git a/NKC_WF/Reports/BinLabel.rdlc b/NKC_WF/Reports/BinLabel.rdlc
new file mode 100644
index 0000000..7f6b436
--- /dev/null
+++ b/NKC_WF/Reports/BinLabel.rdlc
@@ -0,0 +1,990 @@
+
+
+
+
+
+
+
+
+ 7.46875in
+
+
+
+
+ 4.01896in
+
+
+
+
+
+
+
+
+
+ 1.17708in
+
+
+ 1.36458in
+
+
+ 3.31771in
+
+
+ 1.60417in
+
+
+
+
+ 0.22in
+
+
+
+
+ true
+ true
+
+
+
+
+ SEQUENCE #
+
+
+
+
+
+
+ textbox4
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ MATERIAL ID #
+
+
+
+
+
+
+ textbox20
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ DESCRIPTION
+
+
+
+
+
+
+ textbox21
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ CONFIRMED BY
+
+
+
+
+
+
+ Textbox66
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.21in
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!SheetIndex.Value
+
+
+
+
+
+
+ SheetIndex
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!MatExtCode.Value
+
+
+
+
+
+
+ MatExtCode
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!MatDesc.Value
+
+
+
+
+
+
+ MatDesc
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox67
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ After
+ true
+ true
+
+
+
+ Detail
+
+
+
+
+ Detail_Collection
+ Output
+ true
+
+
+
+ stp_prt_StackLabel
+
+
+ =Fields!SheetIndex.Value
+
+
+ 3.44657in
+ 0.01322cm
+ 0.43in
+ 7.46354in
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+
+
+ true
+ true
+
+
+
+
+ MATERIAL LIST FROM
+
+
+
+
+
+
+
+
+ TOP OF BUNK TO BOTTOM
+
+
+
+
+
+
+ StackIndex
+ 7.24826cm
+ 0.01322cm
+ 0.59292in
+ 7.46354in
+ 1
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ External
+ =Replace(Parameters!QRCodeBaseURL.Value.ToString(),"QRCODEVALUE",Fields!StackDtmx.Value.ToString())
+
+'=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
+ 3.08698in
+ 1.3in
+ 1.3in
+ 2
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ BUNK ID NUMBER :
+
+
+
+ =Fields!StackIndex.Value
+
+
+
+
+
+
+ StackIndex
+ 0.33391cm
+ 0.31751cm
+ 0.27in
+ 3.58333in
+
+
+
+ true
+ true
+
+
+
+
+ RELEASE DATE :
+
+
+
+
+ =Fields!Prepared.Value
+
+
+
+
+
+
+ StackIndex
+ 1.12554cm
+ 0.3175cm
+ 0.27in
+ 6.60417in
+ 1
+
+
+
+ true
+ true
+
+
+
+
+ TO BE CUT DATE :
+
+
+
+
+ =Fields!DueDate.Value
+
+
+
+
+
+
+ StackIndex
+ 1.95245cm
+ 0.31751cm
+ 0.27in
+ 6.60417in
+ 2
+
+
+
+ true
+ true
+
+
+
+
+ MATERIAL SORTED BY
+
+
+
+
+
+
+ StackIndex
+ 0.29863cm
+ 9.72343cm
+ 0.27in
+ 2.90105in
+ 3
+
+
+
+ true
+ 1.43055in
+ 0.00522in
+ 1.15625in
+ 7.46353in
+ 3
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =Fields!StackIndex.Value
+
+
+ Between
+
+
+
+
+ =Fields!StackIndex.Value
+
+
+ Output
+ true
+
+
+
+ stp_prt_StackLabel
+
+ End
+
+ 0.63in
+ 0.00001cm
+ 4.01896in
+ 7.46875in
+
+
+
+ true
+ true
+
+
+
+
+ BUNK BUILD SHEET
+
+
+
+
+
+
+ textbox1
+ 0.56833in
+ 7.46875in
+ 1
+
+
+ Top
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ 4.68798in
+
+
+ 7.46875in
+
+ 0.5in
+ 0.5in
+ 0.5in
+ 0.5in
+
+
+ 0
+
+
+ Sauder_NKC
+ None
+ 7e875094-37e0-46d4-8db0-d51955773fb0
+
+
+
+
+
+ Sauder_NKC
+
+
+ =Parameters!StackID.Value
+
+
+ StoredProcedure
+ prt.stp_prt_StackLabel
+ true
+
+
+
+ SheetID
+ System.Int32
+
+
+ StackID
+ System.Int32
+
+
+ StackIndex
+ System.Int32
+
+
+ SheetIndex
+ System.Int32
+
+
+ MatID
+ System.Int32
+
+
+ StackDtmx
+ System.String
+
+
+ Prepared
+ System.DateTime
+
+
+ MatExtCode
+ System.Int32
+
+
+ DueDate
+ System.DateTime
+
+
+ MatDesc
+ System.String
+
+
+
+
+
+
+ Integer
+
+
+ 1
+
+
+ Stack ID:
+
+
+ String
+
+
+ https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']}
+
+
+ QRCodeBaseURL:
+
+
+ en-US
+ true
+ Inch
+ 42b91d77-5259-4b9b-b313-695cd28dd977
+
\ No newline at end of file