From b8387940b4232e7e69e022c23c356a95e251e4e0 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 17 Oct 2020 16:25:33 +0200
Subject: [PATCH] update x gestione corretta splitODL (1 solo metodo)

---
 Jenkinsfile                        | 2 +-
 MP-IO/Controllers/IOBController.cs | 6 ++++--
 MapoDb/DataLayer.cs                | 9 ++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a28a6d29..f6560d0a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=1312']) {
+        withEnv(['NEXT_BUILD_NUMBER=1313']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO'
diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs
index 6bc166c3..770f69c2 100644
--- a/MP-IO/Controllers/IOBController.cs
+++ b/MP-IO/Controllers/IOBController.cs
@@ -316,7 +316,7 @@ namespace MP_IO.Controllers
         ///
         /// </summary>
         /// <param name="id"></param>
-        /// <returns>Json contenente la riga di stato macchina</returns>
+        /// <returns>Esito chiamata (OK/vuoto)</returns>
         public string forceSplitOdl(string id)
         {
             // attenzione! poiché nell'URL il carattere "#" fiene filtrato ci aspettiamo il carattere "|" che poi trasformiamo ora in "#"
@@ -325,10 +325,11 @@ namespace MP_IO.Controllers
             return DataLayerObj.forceSplitOdl(id, true, true, 100);
         }
 
+#if false
         /// <summary>
         /// Chiude ODL precedente ed avvia uno nuovo (duplicandolo e sitemando quantità RIMANENTE), e CONFERMA produzione...
         ///
-        /// GET: IOB/forceSplitOdl/SIMUL_03?newQty=999
+        /// GET: IOB/forceSplitOdl/SIMUL_03?doConfirm=true&qtyFromLast=true&roundStep=200
         ///
         /// </summary>
         /// <param name="id">macchina</param>
@@ -343,6 +344,7 @@ namespace MP_IO.Controllers
             DataLayer DataLayerObj = new DataLayer();
             return DataLayerObj.forceSplitOdl(id, doConfirm, qtyFromLast, roundStep);
         }
+#endif
 
         /// <summary>
         /// Recupera COUNTER x macchina:
diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs
index 76ecde31..cafa624a 100644
--- a/MapoDb/DataLayer.cs
+++ b/MapoDb/DataLayer.cs
@@ -1496,7 +1496,14 @@ namespace MapoDb
                             Thread.Sleep(1000);
                             adesso = DateTime.Now;
                             // chiamo conferma produzione...
-                            taPzProd2conf.stp_ConfermaProduzCompleta(currData[0].IdxMacchina, MatrOpr, DateTime.Now.AddDays(-10), DateTime.Now, qtyConf, 0, 1, DateTime.Now, false);
+                            try
+                            {
+                                taPzProd2conf.stp_ConfermaProduzCompleta(currData[0].IdxMacchina, MatrOpr, DateTime.Now.AddDays(-10), DateTime.Now, qtyConf, 0, 1, DateTime.Now, false);
+                            }
+                            catch (Exception exc)
+                            {
+                                logger.lg.scriviLog($"Eccezione in stp_ConfermaProduzCompleta{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
+                            }
                         }
                         // attendo 500 msec
                         Thread.Sleep(500);