update x gestione corretta splitODL (1 solo metodo)

Jenkinsfile

@@ -12,7 +12,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=1311']) {
+        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'

MP-IO/Controllers/IOBController.cs

@@ -310,21 +310,42 @@ namespace MP_IO.Controllers
         }
 
         /// <summary>
-        /// Chiude ODL precedente ed avvia uno nuovo (duplicandolo), e CONFERMA produzione...
+        /// Chiude ODL precedente ed avvia uno nuovo (duplicandolo e sitemando quantità RIMANENTE), e CONFERMA produzione...
         ///
         /// GET: IOB/forceSplitOdl/SIMUL_03
         ///
         /// </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 "#"
             id = id.Replace("|", "#");
             DataLayer DataLayerObj = new DataLayer();
-            return DataLayerObj.forceSplitOdl(id);
+            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?doConfirm=true&qtyFromLast=true&roundStep=200
+        ///
+        /// </summary>
+        /// <param name="id">macchina</param>
+        /// <param name="doConfirm">Conferma tutti i pezzi prodotti</param>
+        /// <param name="qtyFromLast">DUPLICA la quantità nel nuovo ODL da quanto PRODOTTO nel vecchio</param>
+        /// <param name="roundStep">Valore per arrotondamento quantità richeista (eccesso)</param>
+        /// <returns>Json contenente la riga di stato macchina</returns>
+        public string forceSplitOdl(string id, bool doConfirm, bool qtyFromLast, int roundStep = 100)
+        {
+            // attenzione! poiché nell'URL il carattere "#" fiene filtrato ci aspettiamo il carattere "|" che poi trasformiamo ora in "#"
+            id = id.Replace("|", "#");
+            DataLayer DataLayerObj = new DataLayer();
+            return DataLayerObj.forceSplitOdl(id, doConfirm, qtyFromLast, roundStep);
+        }
+#endif
+
         /// <summary>
         /// Recupera COUNTER x macchina:
         ///

MP-TAB/WebUserControls/mod_ODL.ascx.cs

@@ -819,7 +819,7 @@ namespace MoonProTablet.WebUserControls
                 try
                 {
                     // effettuo split su nuovo ODL
-                    DataLayerObj.taODL.splitODL(idxODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODL), PzPallet, string.Format("Fine Produzione, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODL, TCAssegnato(idxODL)), false);
+                    DataLayerObj.taODL.splitODL(idxODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODL), PzPallet, string.Format("Fine Produzione, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODL, TCAssegnato(idxODL)), false, 0);
                     // processo chiusura setup
                     processaEvento(idxMacchinaFix, idxEvento, String.Format("Registrata fine produzione per ODL {0}, nuovo ODL per quantità residua", idxODL), idxODL);
 
@@ -830,7 +830,7 @@ namespace MoonProTablet.WebUserControls
                         string _idxOdl = idxOdlAltraMacc;
                         int.TryParse(_idxOdl, out idxOdlAltra);
                         // effettuo split su nuovo ODL
-                        DataLayerObj.taODL.splitODL(idxOdlAltra, DataLayerObj.MatrOpr, idxMaccAltraTav, TCAssegnato(idxOdlAltra), PzPallet, string.Format("Fine Produzione, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxOdlAltra, TCAssegnato(idxOdlAltra)), false);
+                        DataLayerObj.taODL.splitODL(idxOdlAltra, DataLayerObj.MatrOpr, idxMaccAltraTav, TCAssegnato(idxOdlAltra), PzPallet, string.Format("Fine Produzione, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxOdlAltra, TCAssegnato(idxOdlAltra)), false, 0);
                         // processo chiusura setup
                         processaEvento(idxMaccAltraTav, idxEvento, String.Format("Registrata fine produzione per ODL {0}, nuovo ODL per quantità residua", idxOdlAltra), idxOdlAltra);
                     }
@@ -941,7 +941,7 @@ namespace MoonProTablet.WebUserControls
             confermaProdOdl(false);
 
             // effettuo split su nuovo ODL
-            DataLayerObj.taODL.splitODL(currODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCRichAttr, PzPallet, txtNote.Text, true);
+            DataLayerObj.taODL.splitODL(currODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCRichAttr, PzPallet, txtNote.Text, true, 0);
 
             // resetto ODL su redis...
             DataLayerObj.emptyCurrODL(idxMacchinaFix);
@@ -1037,12 +1037,12 @@ namespace MoonProTablet.WebUserControls
                     try
                     {
                         idxODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
-                        DataLayerObj.taODL.splitODL(idxODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODL), PzPallet, string.Format("inizio attrezzaggio, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODL, TCAssegnato(idxODL)), false);
+                        DataLayerObj.taODL.splitODL(idxODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODL), PzPallet, string.Format("inizio attrezzaggio, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODL, TCAssegnato(idxODL)), false, 0);
                         // se è multi processo ANCHE x altra tavola...
                         if (isMulti)
                         {
                             int _idxOdl = DataLayerObj.taODL.getByMacchina(idxMaccAltraTav)[0].IdxODL;
-                            DataLayerObj.taODL.splitODL(_idxOdl, DataLayerObj.MatrOpr, idxMaccAltraTav, TCAssegnato(_idxOdl), PzPallet, string.Format("inizio attrezzaggio, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", _idxOdl, TCAssegnato(_idxOdl)), false);
+                            DataLayerObj.taODL.splitODL(_idxOdl, DataLayerObj.MatrOpr, idxMaccAltraTav, TCAssegnato(_idxOdl), PzPallet, string.Format("inizio attrezzaggio, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", _idxOdl, TCAssegnato(_idxOdl)), false, 0);
                         }
                     }
                     catch

MapoDb/DS_ProdTempi.xsd

@@ -290,7 +290,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_fixMachineSlave" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fixMachineSlave" Modifier="Public" Name="fixMachineSlave" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy14" UserSourceName="fixMachineSlave">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_fixMachineSlave" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fixMachineSlave" Modifier="Public" Name="fixMachineSlave" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy4" UserSourceName="fixMachineSlave">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_fixMachineSlave</CommandText>
@@ -396,7 +396,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_inizioSetup" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="inizioSetup" Modifier="Public" Name="inizioSetup" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy4" UserSourceName="inizioSetup">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_inizioSetup" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="inizioSetup" Modifier="Public" Name="inizioSetup" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy5" UserSourceName="inizioSetup">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_inizioSetup</CommandText>
@@ -412,7 +412,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_inizioSetupPromessa" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="inizioSetupPromessa" Modifier="Public" Name="inizioSetupPromessa" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy5" UserSourceName="inizioSetupPromessa">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_inizioSetupPromessa" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="inizioSetupPromessa" Modifier="Public" Name="inizioSetupPromessa" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy6" UserSourceName="inizioSetupPromessa">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_inizioSetupPromessa</CommandText>
@@ -428,7 +428,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_inizioSetupPromessaPostuma" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="inizioSetupPromessaPostuma" Modifier="Public" Name="inizioSetupPromessaPostuma" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy6" UserSourceName="inizioSetupPromessaPostuma">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_inizioSetupPromessaPostuma" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="inizioSetupPromessaPostuma" Modifier="Public" Name="inizioSetupPromessaPostuma" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="inizioSetupPromessaPostuma">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_inizioSetupPromessaPostuma</CommandText>
@@ -441,7 +441,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_insertProvv" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertProvv" Modifier="Public" Name="insertProvv" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="insertProvv">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_insertProvv" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertProvv" Modifier="Public" Name="insertProvv" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy8" UserSourceName="insertProvv">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_insertProvv</CommandText>
@@ -457,7 +457,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="InsertQuery" Modifier="Public" Name="InsertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy8" UserSourceName="InsertQuery">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="InsertQuery" Modifier="Public" Name="InsertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy9" UserSourceName="InsertQuery">
                 <InsertCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_insertQuery</CommandText>
@@ -475,7 +475,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </InsertCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_insPostumo" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insPostumo" Modifier="Public" Name="insPostumo" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy9" UserSourceName="insPostumo">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_insPostumo" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insPostumo" Modifier="Public" Name="insPostumo" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy10" UserSourceName="insPostumo">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_insPostumo</CommandText>
@@ -498,7 +498,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_split" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="splitODL" Modifier="Public" Name="splitODL" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy10" UserSourceName="splitODL">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_split" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="splitODL" Modifier="Public" Name="splitODL" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy11" UserSourceName="splitODL">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_split</CommandText>
@@ -511,11 +511,12 @@ ORDER BY idxODL DESC</CommandText>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PzPallet" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="2500" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@StartNewOdl" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@QtyRich" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_updateQta" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateQta" Modifier="Public" Name="updateQta" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy11" UserSourceName="updateQta">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_updateQta" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateQta" Modifier="Public" Name="updateQta" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy12" UserSourceName="updateQta">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_updateQta</CommandText>
@@ -528,7 +529,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="UpdateQuery" Modifier="Public" Name="UpdateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy12" UserSourceName="UpdateQuery">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="UpdateQuery" Modifier="Public" Name="UpdateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy13" UserSourceName="UpdateQuery">
                 <UpdateCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_update</CommandText>
@@ -548,7 +549,7 @@ ORDER BY idxODL DESC</CommandText>
                   </DbCommand>
                 </UpdateCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_updateSetup" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateSetup" Modifier="Public" Name="updateSetup" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy13" UserSourceName="updateSetup">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ODL_updateSetup" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateSetup" Modifier="Public" Name="updateSetup" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy14" UserSourceName="updateSetup">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_ODL_updateSetup</CommandText>
@@ -2886,7 +2887,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="MappaStatoExpl" msprop:Generator_TableClassName="MappaStatoExplDataTable" msprop:Generator_TableVarName="tableMappaStatoExpl" msprop:Generator_TablePropName="MappaStatoExpl" msprop:Generator_RowDeletingName="MappaStatoExplRowDeleting" msprop:Generator_RowChangingName="MappaStatoExplRowChanging" msprop:Generator_RowEvHandlerName="MappaStatoExplRowChangeEventHandler" msprop:Generator_RowDeletedName="MappaStatoExplRowDeleted" msprop:Generator_UserTableName="MappaStatoExpl" msprop:Generator_RowChangedName="MappaStatoExplRowChanged" msprop:Generator_RowEvArgName="MappaStatoExplRowChangeEvent" msprop:Generator_RowClassName="MappaStatoExplRow">
+        <xs:element name="MappaStatoExpl" msprop:Generator_TableClassName="MappaStatoExplDataTable" msprop:Generator_TableVarName="tableMappaStatoExpl" msprop:Generator_RowChangedName="MappaStatoExplRowChanged" msprop:Generator_TablePropName="MappaStatoExpl" msprop:Generator_RowDeletingName="MappaStatoExplRowDeleting" msprop:Generator_RowChangingName="MappaStatoExplRowChanging" msprop:Generator_RowEvHandlerName="MappaStatoExplRowChangeEventHandler" msprop:Generator_RowDeletedName="MappaStatoExplRowDeleted" msprop:Generator_RowClassName="MappaStatoExplRow" msprop:Generator_UserTableName="MappaStatoExpl" msprop:Generator_RowEvArgName="MappaStatoExplRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="RowNum" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnRowNum" msprop:Generator_ColumnPropNameInRow="RowNum" msprop:Generator_ColumnPropNameInTable="RowNumColumn" msprop:Generator_UserColumnName="RowNum" type="xs:int" />
@@ -2967,7 +2968,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ResProdDett_splitODL" msprop:Generator_TableClassName="ResProdDett_splitODLDataTable" msprop:Generator_TableVarName="tableResProdDett_splitODL" msprop:Generator_TablePropName="ResProdDett_splitODL" msprop:Generator_RowDeletingName="ResProdDett_splitODLRowDeleting" msprop:Generator_RowChangingName="ResProdDett_splitODLRowChanging" msprop:Generator_RowEvHandlerName="ResProdDett_splitODLRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdDett_splitODLRowDeleted" msprop:Generator_UserTableName="ResProdDett_splitODL" msprop:Generator_RowChangedName="ResProdDett_splitODLRowChanged" msprop:Generator_RowEvArgName="ResProdDett_splitODLRowChangeEvent" msprop:Generator_RowClassName="ResProdDett_splitODLRow">
+        <xs:element name="ResProdDett_splitODL" msprop:Generator_TableClassName="ResProdDett_splitODLDataTable" msprop:Generator_TableVarName="tableResProdDett_splitODL" msprop:Generator_RowChangedName="ResProdDett_splitODLRowChanged" msprop:Generator_TablePropName="ResProdDett_splitODL" msprop:Generator_RowDeletingName="ResProdDett_splitODLRowDeleting" msprop:Generator_RowChangingName="ResProdDett_splitODLRowChanging" msprop:Generator_RowEvHandlerName="ResProdDett_splitODLRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdDett_splitODLRowDeleted" msprop:Generator_RowClassName="ResProdDett_splitODLRow" msprop:Generator_UserTableName="ResProdDett_splitODL" msprop:Generator_RowEvArgName="ResProdDett_splitODLRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxODL" msprop:Generator_ColumnVarNameInTable="columnIdxODL" msprop:Generator_ColumnPropNameInRow="IdxODL" msprop:Generator_ColumnPropNameInTable="IdxODLColumn" msprop:Generator_UserColumnName="IdxODL" type="xs:int" minOccurs="0" />
@@ -2979,7 +2980,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ResProdDett_splitGG" msprop:Generator_TableClassName="ResProdDett_splitGGDataTable" msprop:Generator_TableVarName="tableResProdDett_splitGG" msprop:Generator_TablePropName="ResProdDett_splitGG" msprop:Generator_RowDeletingName="ResProdDett_splitGGRowDeleting" msprop:Generator_RowChangingName="ResProdDett_splitGGRowChanging" msprop:Generator_RowEvHandlerName="ResProdDett_splitGGRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdDett_splitGGRowDeleted" msprop:Generator_UserTableName="ResProdDett_splitGG" msprop:Generator_RowChangedName="ResProdDett_splitGGRowChanged" msprop:Generator_RowEvArgName="ResProdDett_splitGGRowChangeEvent" msprop:Generator_RowClassName="ResProdDett_splitGGRow">
+        <xs:element name="ResProdDett_splitGG" msprop:Generator_TableClassName="ResProdDett_splitGGDataTable" msprop:Generator_TableVarName="tableResProdDett_splitGG" msprop:Generator_RowChangedName="ResProdDett_splitGGRowChanged" msprop:Generator_TablePropName="ResProdDett_splitGG" msprop:Generator_RowDeletingName="ResProdDett_splitGGRowDeleting" msprop:Generator_RowChangingName="ResProdDett_splitGGRowChanging" msprop:Generator_RowEvHandlerName="ResProdDett_splitGGRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdDett_splitGGRowDeleted" msprop:Generator_RowClassName="ResProdDett_splitGGRow" msprop:Generator_UserTableName="ResProdDett_splitGG" msprop:Generator_RowEvArgName="ResProdDett_splitGGRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Data" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnData" msprop:Generator_ColumnPropNameInRow="Data" msprop:Generator_ColumnPropNameInTable="DataColumn" msprop:Generator_UserColumnName="Data" type="xs:dateTime" minOccurs="0" />
@@ -3004,7 +3005,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ResProdTot" msprop:Generator_TableClassName="ResProdTotDataTable" msprop:Generator_TableVarName="tableResProdTot" msprop:Generator_RowChangedName="ResProdTotRowChanged" msprop:Generator_TablePropName="ResProdTot" msprop:Generator_RowDeletingName="ResProdTotRowDeleting" msprop:Generator_RowChangingName="ResProdTotRowChanging" msprop:Generator_RowEvHandlerName="ResProdTotRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdTotRowDeleted" msprop:Generator_RowClassName="ResProdTotRow" msprop:Generator_UserTableName="ResProdTot" msprop:Generator_RowEvArgName="ResProdTotRowChangeEvent">
+        <xs:element name="ResProdTot" msprop:Generator_TableClassName="ResProdTotDataTable" msprop:Generator_TableVarName="tableResProdTot" msprop:Generator_TablePropName="ResProdTot" msprop:Generator_RowDeletingName="ResProdTotRowDeleting" msprop:Generator_RowChangingName="ResProdTotRowChanging" msprop:Generator_RowEvHandlerName="ResProdTotRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdTotRowDeleted" msprop:Generator_UserTableName="ResProdTot" msprop:Generator_RowChangedName="ResProdTotRowChanged" msprop:Generator_RowEvArgName="ResProdTotRowChangeEvent" msprop:Generator_RowClassName="ResProdTotRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Nome" msprop:Generator_ColumnVarNameInTable="columnNome" msprop:Generator_ColumnPropNameInRow="Nome" msprop:Generator_ColumnPropNameInTable="NomeColumn" msprop:Generator_UserColumnName="Nome">
@@ -3042,7 +3043,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="RegistroControlli" msprop:Generator_TableClassName="RegistroControlliDataTable" msprop:Generator_TableVarName="tableRegistroControlli" msprop:Generator_TablePropName="RegistroControlli" msprop:Generator_RowDeletingName="RegistroControlliRowDeleting" msprop:Generator_RowChangingName="RegistroControlliRowChanging" msprop:Generator_RowEvHandlerName="RegistroControlliRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroControlliRowDeleted" msprop:Generator_UserTableName="RegistroControlli" msprop:Generator_RowChangedName="RegistroControlliRowChanged" msprop:Generator_RowEvArgName="RegistroControlliRowChangeEvent" msprop:Generator_RowClassName="RegistroControlliRow">
+        <xs:element name="RegistroControlli" msprop:Generator_TableClassName="RegistroControlliDataTable" msprop:Generator_TableVarName="tableRegistroControlli" msprop:Generator_RowChangedName="RegistroControlliRowChanged" msprop:Generator_TablePropName="RegistroControlli" msprop:Generator_RowDeletingName="RegistroControlliRowDeleting" msprop:Generator_RowChangingName="RegistroControlliRowChanging" msprop:Generator_RowEvHandlerName="RegistroControlliRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroControlliRowDeleted" msprop:Generator_RowClassName="RegistroControlliRow" msprop:Generator_UserTableName="RegistroControlli" msprop:Generator_RowEvArgName="RegistroControlliRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxControllo" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxControllo" msprop:Generator_ColumnPropNameInRow="IdxControllo" msprop:Generator_ColumnPropNameInTable="IdxControlloColumn" msprop:Generator_UserColumnName="IdxControllo" type="xs:int" />
@@ -3081,7 +3082,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="RegistroScarti" msprop:Generator_TableClassName="RegistroScartiDataTable" msprop:Generator_TableVarName="tableRegistroScarti" msprop:Generator_TablePropName="RegistroScarti" msprop:Generator_RowDeletingName="RegistroScartiRowDeleting" msprop:Generator_RowChangingName="RegistroScartiRowChanging" msprop:Generator_RowEvHandlerName="RegistroScartiRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroScartiRowDeleted" msprop:Generator_UserTableName="RegistroScarti" msprop:Generator_RowChangedName="RegistroScartiRowChanged" msprop:Generator_RowEvArgName="RegistroScartiRowChangeEvent" msprop:Generator_RowClassName="RegistroScartiRow">
+        <xs:element name="RegistroScarti" msprop:Generator_TableClassName="RegistroScartiDataTable" msprop:Generator_TableVarName="tableRegistroScarti" msprop:Generator_RowChangedName="RegistroScartiRowChanged" msprop:Generator_TablePropName="RegistroScarti" msprop:Generator_RowDeletingName="RegistroScartiRowDeleting" msprop:Generator_RowChangingName="RegistroScartiRowChanging" msprop:Generator_RowEvHandlerName="RegistroScartiRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroScartiRowDeleted" msprop:Generator_RowClassName="RegistroScartiRow" msprop:Generator_UserTableName="RegistroScarti" msprop:Generator_RowEvArgName="RegistroScartiRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -3147,7 +3148,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PromesseODL" msprop:Generator_TableClassName="PromesseODLDataTable" msprop:Generator_TableVarName="tablePromesseODL" msprop:Generator_RowChangedName="PromesseODLRowChanged" msprop:Generator_TablePropName="PromesseODL" msprop:Generator_RowDeletingName="PromesseODLRowDeleting" msprop:Generator_RowChangingName="PromesseODLRowChanging" msprop:Generator_RowEvHandlerName="PromesseODLRowChangeEventHandler" msprop:Generator_RowDeletedName="PromesseODLRowDeleted" msprop:Generator_RowClassName="PromesseODLRow" msprop:Generator_UserTableName="PromesseODL" msprop:Generator_RowEvArgName="PromesseODLRowChangeEvent">
+        <xs:element name="PromesseODL" msprop:Generator_TableClassName="PromesseODLDataTable" msprop:Generator_TableVarName="tablePromesseODL" msprop:Generator_TablePropName="PromesseODL" msprop:Generator_RowDeletingName="PromesseODLRowDeleting" msprop:Generator_RowChangingName="PromesseODLRowChanging" msprop:Generator_RowEvHandlerName="PromesseODLRowChangeEventHandler" msprop:Generator_RowDeletedName="PromesseODLRowDeleted" msprop:Generator_UserTableName="PromesseODL" msprop:Generator_RowChangedName="PromesseODLRowChanged" msprop:Generator_RowEvArgName="PromesseODLRowChangeEvent" msprop:Generator_RowClassName="PromesseODLRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxPromessa" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxPromessa" msprop:Generator_ColumnPropNameInRow="idxPromessa" msprop:Generator_ColumnPropNameInTable="idxPromessaColumn" msprop:Generator_UserColumnName="idxPromessa" type="xs:int" />
@@ -3224,7 +3225,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ElencoConfermeProd" msprop:Generator_TableClassName="ElencoConfermeProdDataTable" msprop:Generator_TableVarName="tableElencoConfermeProd" msprop:Generator_RowChangedName="ElencoConfermeProdRowChanged" msprop:Generator_TablePropName="ElencoConfermeProd" msprop:Generator_RowDeletingName="ElencoConfermeProdRowDeleting" msprop:Generator_RowChangingName="ElencoConfermeProdRowChanging" msprop:Generator_RowEvHandlerName="ElencoConfermeProdRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoConfermeProdRowDeleted" msprop:Generator_RowClassName="ElencoConfermeProdRow" msprop:Generator_UserTableName="ElencoConfermeProd" msprop:Generator_RowEvArgName="ElencoConfermeProdRowChangeEvent">
+        <xs:element name="ElencoConfermeProd" msprop:Generator_TableClassName="ElencoConfermeProdDataTable" msprop:Generator_TableVarName="tableElencoConfermeProd" msprop:Generator_TablePropName="ElencoConfermeProd" msprop:Generator_RowDeletingName="ElencoConfermeProdRowDeleting" msprop:Generator_RowChangingName="ElencoConfermeProdRowChanging" msprop:Generator_RowEvHandlerName="ElencoConfermeProdRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoConfermeProdRowDeleted" msprop:Generator_UserTableName="ElencoConfermeProd" msprop:Generator_RowChangedName="ElencoConfermeProdRowChanged" msprop:Generator_RowEvArgName="ElencoConfermeProdRowChangeEvent" msprop:Generator_RowClassName="ElencoConfermeProdRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="DataOraConf" msprop:Generator_ColumnVarNameInTable="columnDataOraConf" msprop:Generator_ColumnPropNameInRow="DataOraConf" msprop:Generator_ColumnPropNameInTable="DataOraConfColumn" msprop:Generator_UserColumnName="DataOraConf" type="xs:dateTime" />
@@ -3259,7 +3260,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="StatoProd" msprop:Generator_TableClassName="StatoProdDataTable" msprop:Generator_TableVarName="tableStatoProd" msprop:Generator_TablePropName="StatoProd" msprop:Generator_RowDeletingName="StatoProdRowDeleting" msprop:Generator_RowChangingName="StatoProdRowChanging" msprop:Generator_RowEvHandlerName="StatoProdRowChangeEventHandler" msprop:Generator_RowDeletedName="StatoProdRowDeleted" msprop:Generator_UserTableName="StatoProd" msprop:Generator_RowChangedName="StatoProdRowChanged" msprop:Generator_RowEvArgName="StatoProdRowChangeEvent" msprop:Generator_RowClassName="StatoProdRow">
+        <xs:element name="StatoProd" msprop:Generator_TableClassName="StatoProdDataTable" msprop:Generator_TableVarName="tableStatoProd" msprop:Generator_RowChangedName="StatoProdRowChanged" msprop:Generator_TablePropName="StatoProd" msprop:Generator_RowDeletingName="StatoProdRowDeleting" msprop:Generator_RowChangingName="StatoProdRowChanging" msprop:Generator_RowEvHandlerName="StatoProdRowChangeEventHandler" msprop:Generator_RowDeletedName="StatoProdRowDeleted" msprop:Generator_RowClassName="StatoProdRow" msprop:Generator_UserTableName="StatoProd" msprop:Generator_RowEvArgName="StatoProdRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxMacchina" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidxMacchina" msprop:Generator_ColumnPropNameInRow="idxMacchina" msprop:Generator_ColumnPropNameInTable="idxMacchinaColumn" msprop:Generator_UserColumnName="idxMacchina" minOccurs="0">
@@ -3281,7 +3282,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Macchine2Slave" msprop:Generator_TableClassName="Macchine2SlaveDataTable" msprop:Generator_TableVarName="tableMacchine2Slave" msprop:Generator_TablePropName="Macchine2Slave" msprop:Generator_RowDeletingName="Macchine2SlaveRowDeleting" msprop:Generator_RowChangingName="Macchine2SlaveRowChanging" msprop:Generator_RowEvHandlerName="Macchine2SlaveRowChangeEventHandler" msprop:Generator_RowDeletedName="Macchine2SlaveRowDeleted" msprop:Generator_UserTableName="Macchine2Slave" msprop:Generator_RowChangedName="Macchine2SlaveRowChanged" msprop:Generator_RowEvArgName="Macchine2SlaveRowChangeEvent" msprop:Generator_RowClassName="Macchine2SlaveRow">
+        <xs:element name="Macchine2Slave" msprop:Generator_TableClassName="Macchine2SlaveDataTable" msprop:Generator_TableVarName="tableMacchine2Slave" msprop:Generator_RowChangedName="Macchine2SlaveRowChanged" msprop:Generator_TablePropName="Macchine2Slave" msprop:Generator_RowDeletingName="Macchine2SlaveRowDeleting" msprop:Generator_RowChangingName="Macchine2SlaveRowChanging" msprop:Generator_RowEvHandlerName="Macchine2SlaveRowChangeEventHandler" msprop:Generator_RowDeletedName="Macchine2SlaveRowDeleted" msprop:Generator_RowClassName="Macchine2SlaveRow" msprop:Generator_UserTableName="Macchine2Slave" msprop:Generator_RowEvArgName="Macchine2SlaveRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">

MapoDb/DS_ProdTempi.xss

@@ -4,32 +4,32 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="29" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-5" ViewPortY="29" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:TempiCicloRilevati" ZOrder="15" X="20" Y="81" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:ODL" ZOrder="2" X="588" Y="452" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:AnagArticoli" ZOrder="14" X="20" Y="388" Height="342" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
+    <Shape ID="DesignTable:TempiCicloRilevati" ZOrder="15" X="20" Y="81" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:ODL" ZOrder="1" X="588" Y="452" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagArticoli" ZOrder="14" X="20" Y="388" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:DatiMacchine" ZOrder="21" X="949" Y="353" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:PostazioniMapo" ZOrder="24" X="950" Y="39" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
-    <Shape ID="DesignTable:stp_PzProd_getByMacchina" ZOrder="4" X="23" Y="754" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
-    <Shape ID="DesignTable:DatiConfermati" ZOrder="23" X="585" Y="50" Height="411" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="10" X="346" Y="364" Height="135" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
-    <Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="9" X="25" Y="997" Height="113" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="54" />
-    <Shape ID="DesignTable:DatiProduzione" ZOrder="20" X="554" Y="922" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchina" ZOrder="7" X="949" Y="688" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:stp_repDonati_getLastStatoDurataMacchina" ZOrder="22" X="957" Y="1072" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
-    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchinaPeriodo" ZOrder="8" X="26" Y="1152" Height="204" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:TurniMacchina" ZOrder="16" X="363" Y="94" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
-    <Shape ID="DesignTable:MappaStatoExpl" ZOrder="6" X="946" Y="1217" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:ResProdDett_splitODL" ZOrder="3" X="940" Y="2192" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
-    <Shape ID="DesignTable:ResProdDett_splitGG" ZOrder="17" X="27" Y="2218" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
-    <Shape ID="DesignTable:ResProdTot" ZOrder="18" X="544" Y="2122" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
-    <Shape ID="DesignTable:RegistroControlli" ZOrder="12" X="536" Y="1403" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
-    <Shape ID="DesignTable:RegistroScarti" ZOrder="11" X="25" Y="1371" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:PromesseODL" ZOrder="5" X="946" Y="1728" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:ElencoConfermeProd" ZOrder="19" X="26" Y="1839" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="283" />
-    <Shape ID="DesignTable:StatoProd" ZOrder="13" X="541" Y="1777" Height="319" Width="295" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
-    <Shape ID="DesignTable:Macchine2Slave" ZOrder="1" X="333" Y="559" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:PostazioniMapo" ZOrder="24" X="950" Y="39" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:stp_PzProd_getByMacchina" ZOrder="4" X="23" Y="754" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:DatiConfermati" ZOrder="23" X="585" Y="50" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="10" X="346" Y="364" Height="115" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="9" X="25" Y="994" Height="97" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:DatiProduzione" ZOrder="20" X="554" Y="922" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchina" ZOrder="7" X="949" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:stp_repDonati_getLastStatoDurataMacchina" ZOrder="22" X="957" Y="1072" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchinaPeriodo" ZOrder="8" X="26" Y="1152" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:TurniMacchina" ZOrder="16" X="363" Y="94" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:MappaStatoExpl" ZOrder="6" X="946" Y="1217" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ResProdDett_splitODL" ZOrder="3" X="940" Y="2192" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:ResProdDett_splitGG" ZOrder="17" X="27" Y="2218" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:ResProdTot" ZOrder="18" X="544" Y="2122" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:RegistroControlli" ZOrder="12" X="536" Y="1403" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:RegistroScarti" ZOrder="11" X="25" Y="1371" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PromesseODL" ZOrder="5" X="946" Y="1728" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ElencoConfermeProd" ZOrder="19" X="26" Y="1839" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:StatoProd" ZOrder="13" X="541" Y="1777" Height="267" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:Macchine2Slave" ZOrder="2" X="333" Y="559" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

MapoDb/DS_ProdTempi1.Designer.cs

@@ -17619,6 +17619,7 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile
             this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PzPallet", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StartNewOdl", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtyRich", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[22] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[22].Connection = this.Connection;
             this._commandCollection[22].CommandText = "dbo.stp_ODL_updateQta";
@@ -18372,7 +18373,7 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int splitODL(global::System.Nullable<int> idxODL, global::System.Nullable<int> MatrOpr, string IdxMacchina, global::System.Nullable<decimal> TCRichAttr, global::System.Nullable<int> PzPallet, string Note, global::System.Nullable<bool> StartNewOdl) {
+        public virtual int splitODL(global::System.Nullable<int> idxODL, global::System.Nullable<int> MatrOpr, string IdxMacchina, global::System.Nullable<decimal> TCRichAttr, global::System.Nullable<int> PzPallet, string Note, global::System.Nullable<bool> StartNewOdl, global::System.Nullable<int> QtyRich) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[21];
             if ((idxODL.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(idxODL.Value));
@@ -18416,6 +18417,12 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile
             else {
                 command.Parameters[7].Value = global::System.DBNull.Value;
             }
+            if ((QtyRich.HasValue == true)) {
+                command.Parameters[8].Value = ((int)(QtyRich.Value));
+            }
+            else {
+                command.Parameters[8].Value = global::System.DBNull.Value;
+            }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {

MapoDb/DataLayer.cs

@@ -1441,7 +1441,7 @@ namespace MapoDb
         /// </summary>
         /// <param name="idxMacchina"></param>
         /// <returns></returns>
-        public string forceSplitOdl(string idxMacchina)
+        public string forceSplitOdl(string idxMacchina, bool doConfirm, bool qtyFromLast, int roundStep = 100)
         {
             string answ = "KO";
             // verifico NON CI SIA un veto a NUOVI split... 2 min di default...
@@ -1451,6 +1451,30 @@ namespace MapoDb
             {
                 // registro VETO x altri split... 2 minuti
                 memLayer.ML.setRSV(redKey, $"Inizio SPLIT-ODL {DateTime.Now}", 300);
+                // calcolo la qta da gestire
+                int qtyConf = 0;
+                int qtyNew = 0;
+                if (doConfirm)
+                {
+                    DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd;
+                    try
+                    {
+                        rigaProd = taPzProd2conf.GetData(idxMacchina)[0];
+                        qtyConf = rigaProd.pezziNonConfermati;
+                        // calcolo nuovi pezzi da confermare
+                        if (qtyFromLast)
+                        {
+                            roundStep = roundStep == 0 ? 1 : roundStep;
+                            double ratio = (double)qtyConf / roundStep;
+                            qtyNew = (int)Math.Round(Math.Ceiling(ratio) * roundStep, 0);
+                        }
+                    }
+                    catch (Exception exc)
+                    {
+                        logger.lg.scriviLog(string.Format("Errore recupero pezzi da confermare per la macchina {0}{1}{2}", idxMacchina, Environment.NewLine, exc), tipoLog.ERROR);
+                    }
+                }
+
                 // proseguo
                 DS_ProdTempi.ODLDataTable currData = null;
                 DateTime adesso = DateTime.Now;
@@ -1463,17 +1487,28 @@ namespace MapoDb
                     {
                         // registro un evento di inizio attrezzaggio (idxTipoEv = 2)
                         int idxEvento = 2;
-                        logger.lg.scriviLog($"Invio evento ODL-SPLIT per macchina {idxMacchina}, evento {idxEvento}, articolo {currData[0].CodArticolo}", tipoLog.INFO);
+                        logger.lg.scriviLog($"Invio evento ODL-SPLIT per macchina {idxMacchina}, evento {idxEvento}, articolo {currData[0].CodArticolo}, qty confermata {qtyConf}, nuova qty {qtyNew}", tipoLog.INFO);
+
                         inputComandoMapo resCmd = scriviRigaEventoBarcode(idxMacchina, idxEvento, currData[0].CodArticolo, "ODL-SPLIT", 0, "", adesso, adesso);
-                        // attendo 1 sec
-                        Thread.Sleep(1000);
-                        adesso = DateTime.Now;
-                        // chiamo conferma produzione...
-                        taPzProd2conf.stp_ConfermaProduzCompleta(currData[0].IdxMacchina, MatrOpr, DateTime.Now.AddDays(-10), DateTime.Now, 0, 0, 1, DateTime.Now, false);
+                        if (doConfirm)
+                        {
+                            // attendo 1 sec
+                            Thread.Sleep(1000);
+                            adesso = DateTime.Now;
+                            // chiamo conferma produzione...
+                            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);
                         // chiamo splitOdl
-                        MapoDbObj.taODL.splitODL(currData[0].IdxODL, 0, idxMacchina, currData[0].TCRichAttr, currData[0].PzPallet, $"Nuovo ODL da forceSplitOdl", true);
+                        MapoDbObj.taODL.splitODL(currData[0].IdxODL, 0, idxMacchina, currData[0].TCRichAttr, currData[0].PzPallet, $"Nuovo ODL da forceSplitOdl", true, qtyNew);
                         // attendo 1000 msec
                         Thread.Sleep(1000);
                         adesso = DateTime.Now;