From e17be036855b1569bfc6b33629a1867268d73148 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 14 Jun 2021 12:25:09 +0200
Subject: [PATCH 1/2] new rel num

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5b99fb5..4c2b8c8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=397']) {
+        withEnv(['NEXT_BUILD_NUMBER=398']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '1.3.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')

From ecc7f71d107e1707f5e1fa26135e76d071991c00 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 14 Jun 2021 12:56:59 +0200
Subject: [PATCH 2/2] fix condizione reset errato x split request

---
 NKC_WF/Controllers/BatchProcController.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs
index b471023..60fe37a 100644
--- a/NKC_WF/Controllers/BatchProcController.cs
+++ b/NKC_WF/Controllers/BatchProcController.cs
@@ -96,6 +96,7 @@ namespace NKC_WF.Controllers
         public string Post()
         {
             string answ = "";
+            bool isSplitReq = false;
             // questa classe è derivata da Controller.Response... x cui recupero lo stream in altro modo...
             string content = "";
             System.Web.HttpContext.Current.Request.InputStream.Position = 0;
@@ -493,6 +494,7 @@ namespace NKC_WF.Controllers
                                                 ComLib.sendBatchReq(item.BatchID, "Nesting", 2, false);
                                                 // registro su DB nesting iniziato...
                                                 DLMan.taBL.updateStatus(item.BatchID, (int)BatchStatus.NestRequested, "", -1);
+                                                isSplitReq = true;
                                                 // esco
                                                 break;
                                             }
@@ -563,12 +565,16 @@ namespace NKC_WF.Controllers
             // se tutto OK --> tolgo ultimo batch
             if (answ == "OK")
             {
-                // invio notifica che c'è una busta da processare
-                bool resetOk = ComLib.resetBatchReq();
-                // se tutto ok e ci sono da validare parts --> procedo!
-                if (resetOk)
+                // se è una split req --> NON resetto...
+                if (!isSplitReq)
                 {
-                    bool nextValidSent = ComLib.sendFirstValidationBatch();
+                    // invio notifica che c'è una busta da processare
+                    bool resetOk = ComLib.resetBatchReq();
+                    // se tutto ok e ci sono da validare parts --> procedo!
+                    if (resetOk)
+                    {
+                        bool nextValidSent = ComLib.sendFirstValidationBatch();
+                    }
                 }
             }
             // restituisco risposta