Merge tag 'ReloadConfFix' into develop

Fix corretto lettura CRS --> ConfReadString

AppData/AppData.csproj

@@ -51,8 +51,8 @@
     <Reference Include="Crc32C.NET, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll</HintPath>
     </Reference>
-    <Reference Include="DnsClient, Version=1.4.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
-      <HintPath>..\packages\DnsClient.1.4.0\lib\net45\DnsClient.dll</HintPath>
+    <Reference Include="DnsClient, Version=1.5.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
+      <HintPath>..\packages\DnsClient.1.5.0\lib\net45\DnsClient.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
@@ -72,17 +72,17 @@
     <Reference Include="Microsoft.ReportViewer.WinForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.ReportViewer.Runtime.WinForms.12.0.2402.15\lib\Microsoft.ReportViewer.WinForms.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Bson, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Bson.2.12.4\lib\net452\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.13.1\lib\net452\MongoDB.Bson.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.2.12.4\lib\net452\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.13.1\lib\net452\MongoDB.Driver.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.Core.2.12.4\lib\net452\MongoDB.Driver.Core.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Core, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.13.1\lib\net452\MongoDB.Driver.Core.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
+    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.2\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -106,13 +106,15 @@
       <HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
     </Reference>
     <Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
-      <HintPath>..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll</HintPath>
+      <HintPath>..\packages\StackExchange.Redis.2.2.62\lib\net461\StackExchange.Redis.dll</HintPath>
     </Reference>
-    <Reference Include="SteamWare, Version=5.1.2107.759, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.5.1.2107.759\lib\net462\SteamWare.dll</HintPath>
+    <Reference Include="SteamWare, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.5.1.2108.1115\lib\net462\SteamWare.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="SteamWare.Logger, Version=5.1.2107.759, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.Logger.5.1.2107.759\lib\net462\SteamWare.Logger.dll</HintPath>
+    <Reference Include="SteamWare.Logger, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.Logger.5.1.2108.1115\lib\net462\SteamWare.Logger.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -184,6 +186,9 @@
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -278,10 +283,10 @@
       <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
-    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets'))" />
-    <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets'))" />
+    <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets'))" />
   </Target>
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
-  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" />
-  <Import Project="..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets')" />
+  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" />
+  <Import Project="..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" />
 </Project>

AppData/ComLib.cs

@@ -66,6 +66,7 @@ namespace AppData
         public static string redProdMachClock = "NKC:PROD:MACH:CLOCK";
         public static string redProdMachList = "NKC:PROD:MACH:LIST";
         public static string redProdMachStateData = "NKC:PROD:MACH:STATE";
+        public static string redProdMachStateLive = "NKC:PROD:MACH:LIVE";
         public static string redProdReq = "NKC:SERV:BUNKS";
         public static string redProdStatDec = "NKC:PROD:MACH:STATDEC";
 
@@ -356,7 +357,7 @@ namespace AppData
         /// </summary>
         /// <param name="currBunk"></param>
         /// <returns></returns>
-        private static ProdBunk getBunkFromDb(DS_App.StackListRow currBunk)
+        private static ProdBunk getBunkFromDb(DS_App.StackListRow currBunk, string machine)
         {
             DataLayer DLMan = new DataLayer();
             ProdBunk answ;
@@ -372,7 +373,7 @@ namespace AppData
             }
             List<ProdSheet> elSheet = new List<ProdSheet>();
             // recupero gli sheets di questo stack...
-            DS_App.SheetListDataTable tabSheets = DLMan.taSHL.getByStack(currBunk.StackID);
+            DS_App.SheetListDataTable tabSheets = DLMan.taSHL.getByStack(currBunk.StackID, machine);
             DateTime dataStart = DateTime.Now;
             ProdSheet currPanel;
             string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
@@ -455,38 +456,67 @@ namespace AppData
             return answ;
         }
 
-        private static List<MachineStatData> saveStatus(string machine, List<MachineStatRecord> lastRecord)
+        /// <summary>
+        /// Aggiorno il record della station x la machine indicata
+        /// </summary>
+        /// <param name="machine"></param>
+        /// <param name="station"></param>
+        /// <param name="lastRecord"></param>
+        /// <returns></returns>
+        private static MachineStatData saveStatus(string machine, string station, MachineStatRecord lastRecord)
         {
-            List<MachineStatData> currData = new List<MachineStatData>();
+            MachineStatData currData = new MachineStatData() { Machine = machine };
+            string redKey = $"{redProdMachStateData}:{machine}";
             // ora processo lo status attuale x salvare MAPPA ULTIMO status in Redis...
-            string redVal = memLayer.ML.getRSV(redProdMachStateData);
+            string redVal = memLayer.ML.getRSV(redKey);
             if (!string.IsNullOrEmpty(redVal))
             {
-                currData = JsonConvert.DeserializeObject<List<MachineStatData>>(redVal);
-
-                // certo info x macchina corrente
-                var machRecord = currData.Where(x => x.Machine == machine).FirstOrDefault();
-                // recupero ultimo stato
-
-                if (machRecord != null)
-                {
-                    machRecord.Records = lastRecord;
-                }
-                // aggiungo
-                else
-                {
-                    currData.Add(new MachineStatData() { Machine = machine, Records = lastRecord });
-                }
+                currData = JsonConvert.DeserializeObject<MachineStatData>(redVal);
             }
 
+            // recupero ultimo stato x la station corrente
+            var stationRecord = currData.Records.Where(x => x.Station == station).FirstOrDefault();
+            if (stationRecord != null)
+            {
+                // lo rimuovo
+                currData.Records.Remove(stationRecord);
+
+                stationRecord = lastRecord;
+            }
+            // aggiungo...
+            currData.Records.Add(lastRecord);
+
             // serializzo
             string rawData = JsonConvert.SerializeObject(currData);
 
             // salvo!
-            memLayer.ML.setRSV(redProdMachStateData, rawData);
+            memLayer.ML.setRSV(redKey, rawData);
             return currData;
         }
 
+        public static bool setMachLiveStatus(string machine, bool isLive)
+        {
+            string redKey = $"{redProdMachStateLive}:{machine}";
+            string redVal = $"{isLive}";
+            // salvo x 90 sec
+            bool done = memLayer.ML.setRSV(redKey, redVal, 90);
+            return done;
+        }
+
+        public static bool getMachLiveStatus(string machine)
+        {
+            bool isLive = false;
+            /// cerco in redis...
+            string redKey = $"{redProdMachStateLive}:{machine}";
+            string redVal = memLayer.ML.getRSV(redKey);
+            if (!string.IsNullOrEmpty(redVal))
+            {
+                bool.TryParse(redVal, out isLive);
+            }
+            return isLive;
+        }
+
+
         /// <summary>
         /// Salvo in Redis il SUCCESSIVO bunk da lavorare
         /// </summary>
@@ -706,14 +736,15 @@ namespace AppData
         /// <param name="BatchID"></param>
         /// <param name="minVal"></param>
         /// <param name="maxVal"></param>
+        /// <param name="machine"></param>
         /// <returns></returns>
-        protected int getSheetIdByBatch(int BatchID, int minVal, int maxVal)
+        protected int getSheetIdByBatch(int BatchID, int minVal, int maxVal, string machine)
         {
             int answ = 0;
             try
             {
                 DataLayer DLMan = new DataLayer();
-                var tabSheet = DLMan.taSHL.getByMLStatus(BatchID, minVal, maxVal);
+                var tabSheet = DLMan.taSHL.getByMLStatus(BatchID, minVal, maxVal, machine);
                 if (tabSheet.Count > 0)
                 {
                     answ = tabSheet[0].SheetID;
@@ -1044,9 +1075,9 @@ namespace AppData
                 // forzo (ri)lettura...
                 currTab = DLMan.taStatDec.GetData();
                 TabStatusDec = currTab;
+                // cerco di nuovo item
+                foundItem = currTab.Where(x => x.Station == station && x.Code == code).FirstOrDefault();
             }
-            // cerco di nuovoitem
-            foundItem = currTab.Where(x => x.Station == station && x.Code == code).FirstOrDefault();
             if (foundItem == null)
             {
                 // se non ci fosse --> creo
@@ -1282,7 +1313,7 @@ namespace AppData
                     {
                         // recupero sheet corrente da Bunk...
                         DataLayer DLMan = new DataLayer();
-                        tabSheets = DLMan.taSHL.getByMLStatus(BatchID, 5, 5);
+                        tabSheets = DLMan.taSHL.getByMLStatus(BatchID, 5, 5, machine);
                         // salvo in redis
                         setCurrSheetTab(machine, tabSheets);
                     }
@@ -1571,42 +1602,6 @@ namespace AppData
             return answ;
         }
 
-#if false
-        /// <summary>
-        /// Elenco degli orders dato Batch
-        /// </summary>
-        public static DS_App.OrderListDataTable OrdersByBatch(int BatchId)
-        {
-            DataLayer DLMan = new DataLayer();
-            string redKey = $"{redOrders}:BYBATCH:{BatchId}";
-            string rawData = "";
-            DS_App.OrderListDataTable answ = new DS_App.OrderListDataTable();
-            // cerco in redis
-            if (memLayer.ML.redKeyPresent(redKey))
-            {
-                rawData = memLayer.ML.getRSV(redKey);
-                if (!string.IsNullOrEmpty(rawData))
-                {
-                    try
-                    {
-                        answ = JsonConvert.DeserializeObject<DS_App.OrderListDataTable>(rawData);
-                    }
-                    catch
-                    { }
-                }
-                // se vuoto rileggo
-                if (answ.Count == 0)
-                {
-                    answ = DLMan.taOL.getByBatch(BatchId);
-                    // salvo in cache
-                    rawData = JsonConvert.SerializeObject(answ);
-                    memLayer.ML.setRSV(redKey, rawData, 5 * 60);
-                }
-            }
-            return answ;
-        }
-#endif
-
         /// <summary>
         /// Elenco degli orders dato Batch (Ancestor/Principale)
         /// </summary>
@@ -1706,8 +1701,9 @@ namespace AppData
         /// Recupera e transcodifica DA DB i dati di UN SINGOLO bunk
         /// </summary>
         /// <param name="currBunk"></param>
+        /// <param name="machine"></param>
         /// <returns></returns>
-        public static ProdBunk prodGetBunk(int StackID)
+        public static ProdBunk prodGetBunk(int StackID, string machine)
         {
             DataLayer DLMan = new DataLayer();
             ProdBunk answ = null;
@@ -1727,7 +1723,7 @@ namespace AppData
                     currSt = CStatus.Done;
                 }
                 // recupero gli sheets di questo stack...
-                DS_App.SheetListDataTable tabSheets = DLMan.taSHL.getByStack(StackID);
+                DS_App.SheetListDataTable tabSheets = DLMan.taSHL.getByStack(StackID, machine);
                 DateTime dataStart = DateTime.Now;
                 ProdSheet currPanel;
                 string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
@@ -1810,7 +1806,7 @@ namespace AppData
                 if (tabBunks.Count > 0)
                 {
                     DS_App.StackListRow currBunk = tabBunks[0];
-                    answ = getBunkFromDb(currBunk);
+                    answ = getBunkFromDb(currBunk, machine);
                     // se ho qualcosa salvo su REDIS
                     redisFirstBunk = answ;
                 }
@@ -1857,7 +1853,7 @@ namespace AppData
                     // se c'è un bunk trovato --> carico
                     if (currBunk != null)
                     {
-                        answ = getBunkFromDb(currBunk);
+                        answ = getBunkFromDb(currBunk, machine);
                         // salvo su redis
                         setRedisNextBunk(BunkID, answ);
                     }
@@ -1888,7 +1884,7 @@ namespace AppData
                     // come batch DOVREI averne solo 1 in corso...
                     DS_App.BatchListRow batchRow = currBatch[0];
                     // recupero i vari SHEETS del batch...
-                    DS_App.SheetListDataTable sheetTable = DLMan.taSHL.getCurrentByBatch(batchRow.BatchID);
+                    DS_App.SheetListDataTable sheetTable = DLMan.taSHL.getCurrentByBatch(batchRow.BatchID, codPost);
                     List<DS_App.SheetListRow> sheetList = new List<DS_App.SheetListRow>();
                     // controllo che SIA NULL la data di unload --> NON ancora scaricato
                     foreach (var item in sheetTable)
@@ -1911,14 +1907,13 @@ namespace AppData
         /// Restituisce stato macchina (da Redis)
         /// </summary>
         /// <returns></returns>
-        public static List<MachineStatData> prodMachStateDataGet()
+        public static MachineStatData prodMachStateDataGet(string machine)
         {
-            List<MachineStatData> answ = new List<MachineStatData>();
-
-            string redVal = memLayer.ML.getRSV(redProdMachStateData);
+            MachineStatData answ = new MachineStatData();
+            string redVal = memLayer.ML.getRSV($"{redProdMachStateData}:{machine}");
             if (!string.IsNullOrEmpty(redVal))
             {
-                answ = JsonConvert.DeserializeObject<List<MachineStatData>>(redVal);
+                answ = JsonConvert.DeserializeObject<MachineStatData>(redVal);
             }
             return answ;
         }
@@ -1936,7 +1931,6 @@ namespace AppData
              *   Public Const STATION_PRINTER As String = "PRINTER"
              *   Public Const STATION_NC_MACHINE As String = "NC_MACHINE"
              *   Public Const STATION_UNLOADER As String = "UNLOADER"
-             //*   Public Const STATION_NC_MACHINE As String = "NC MACHINE"
              *
              *
              *
@@ -1987,7 +1981,8 @@ namespace AppData
                         break;
 
                     case "01":
-                        // x ora lo ignoro ma so che ora la macchina è ALIVE...
+                        // savo status alive
+                        ComLib.setMachLiveStatus(updateRecords.Machine, true);
                         break;
 
                     default:
@@ -2002,8 +1997,24 @@ namespace AppData
             // recupero ultimo record ricevuto
             try
             {
-                var lastRecord = updateRecords.Records.OrderByDescending(x => x.DtRecord).Take(1).ToList();
-                saveStatus(updateRecords.Machine, lastRecord);
+                string station = "";
+                MachineStatRecord lastRecord = new MachineStatRecord();
+
+                station = "PRINTER";
+                lastRecord = updateRecords.Records.Where(x => x.Station == station).OrderByDescending(x => x.DtRecord).FirstOrDefault();
+                if (lastRecord != null)
+                    saveStatus(updateRecords.Machine, station, lastRecord);
+
+                station = "NC_MACHINE";
+                lastRecord = updateRecords.Records.Where(x => x.Station == station).OrderByDescending(x => x.DtRecord).FirstOrDefault();
+                if (lastRecord != null)
+                    saveStatus(updateRecords.Machine, station, lastRecord);
+
+                station = "UNLOADER";
+                lastRecord = updateRecords.Records.Where(x => x.Station == station).OrderByDescending(x => x.DtRecord).FirstOrDefault();
+                if (lastRecord != null)
+                    saveStatus(updateRecords.Machine, station, lastRecord);
+
                 answ = true;
             }
             catch
@@ -2243,7 +2254,7 @@ namespace AppData
         /// <returns></returns>
         public static bool checkSendBatchSplit(int BatchID)
         {
-            int nextIndex = 1;
+            int nextIndex = 10;
             bool batchSent = false;
             bool batchProcessed = false;
             DataLayer DLMan = new DataLayer();
@@ -2252,7 +2263,6 @@ namespace AppData
             // NKC2: controllo SE sia un batch tipo ancestor (1° invio)
             if (currType == BatchType.Ancestor)
             {
-                nextIndex = 10;
                 // recupero batch descendant
                 var tabDesc = ComLib.BatchDescendant(BatchID);
                 if (tabDesc != null && tabDesc.Count > 0)
@@ -2261,7 +2271,7 @@ namespace AppData
                     // ciclo fino a trovare un batch VALIDO (= contiene ordini)
                     foreach (var item in tabDesc)
                     {
-                         batchProcessed = false;
+                        batchProcessed = false;
                         // 2021.07.19 FIX x caso batch vuoto: se non ho pezzi --> approvo direttamente e passo al successivo...
                         var tabItems = DLMan.taIL.getByBatch(item.BatchID);
                         if (tabItems != null)
@@ -2289,12 +2299,6 @@ namespace AppData
                         if (batchSent)
                             break;
                     }
-#if false
-                    int BatchDescId = tabDesc[0].BatchID;
-                    ComLib.sendBatchReq(BatchDescId, "Nesting", 2, false);
-                    // registro su DB nesting iniziato...
-                    DLMan.taBL.updateStatus(BatchDescId, (int)BatchStatus.NestRequested, "", -1);
-#endif
                 }
             }
             // NKC2: se è un batch ti dipo descendant (invii successivi)
@@ -2304,15 +2308,15 @@ namespace AppData
                 var tabDesc = ComLib.BatchOtherDescendant(BatchID);
                 if (tabDesc != null && tabDesc.Count > 0)
                 {
-                     batchSent = false;
+                    batchSent = false;
                     // ciclo x tutte le righe che NON fossero con nesting effettuato
                     foreach (var item in tabDesc)
                     {
-                        nextIndex += 50;
-                         batchProcessed = false;
+                        batchProcessed = false;
                         // se c'è qualcosa da processare lo richiede
                         if (item.STATUS == 2)
                         {
+                            nextIndex += 50;
                             // 2021.07.19 FIX x caso batch vuoto: se non ho pezzi --> approvo direttamente e passo al successivo...
                             var tabItems = DLMan.taIL.getByBatch(item.BatchID);
                             if (tabItems != null)
@@ -2365,6 +2369,11 @@ namespace AppData
             // preparo il contenuto della busta ed invio i messaggi...
             try
             {
+                // preliminare: se è stima EXT --> riporto pezzi su ordine ORIGINALE...
+                if (pType == 3)
+                {
+                    DLMan.taOLT.setBatchSplit(BatchID, false);
+                }
                 // in base allo stato del BATCH corrente determino il tempo e le opzioni da inviare...
                 var batch = DLMan.taBL.getByKey(BatchID);
                 int mTime = 1;
@@ -2826,6 +2835,7 @@ namespace AppData
         /// <param name="CartList"></param>
         public static void updateCartsFromNesting(int BatchID, List<NestCart> CartList)
         {
+            Dictionary<string, int> part2update = new Dictionary<string, int>();
             DataLayer DLMan = new DataLayer();
             // inizio a processare... bunks!
             if (CartList != null)
@@ -2845,13 +2855,50 @@ namespace AppData
                             {
                                 // creo lo sheet...
                                 var updKit = DLMan.taKL.updateCart(kit.KitId, currCart.CartID);
+                                // verifico x update PartExtCode
+                                addPart2Upd(ref part2update, kit.PartList);
                             }
                         }
                     }
                 }
             }
+            // verifico se ho part da aggiornare
+            if (part2update.Count > 0)
+            {
+                // recupero tabella parts in blocco da batch
+                var item4batch = DLMan.taIL.getByBatch(BatchID);
+                // chiamo stored x ogni esempio di part
+                foreach (var item in part2update)
+                {
+                    var currItem = item4batch.Where(x => x.ItemID == item.Value).FirstOrDefault();
+                    // verifico SE sia da processare...
+                    if (currItem != null && currItem.ItemExtCode != item.Key)
+                    {
+                        DLMan.taIL.updateExtCodeFromNesting(BatchID, item.Value, item.Key);
+                    }
+                }
+            }
         }
 
+        /// <summary>
+        /// Verifica ed eventualmente aggiunge part da aggiornare all'elenco
+        /// </summary>
+        /// <param name="part2update"></param>
+        /// <param name="partList"></param>
+        private static void addPart2Upd(ref Dictionary<string, int> part2update, List<Part> partList)
+        {
+            foreach (var item in partList)
+            {
+                if (!part2update.ContainsKey(item.PartRev))
+                {
+                    part2update.Add(item.PartRev, item.PartId);
+                }
+            }
+        }
+
+
+
+
         /// <summary>
         /// Processa elenco items e salva in redis valori x css, elenchi, ...
         /// </summary>
@@ -2976,10 +3023,10 @@ namespace AppData
                 int batchId = getNextBatch(machineCod);
                 // se non trovo creo un oggetto NUOVO e vuoto x ogni oggetto... e salvo...
                 answ.Add("BatchID", batchId.ToString());
-                answ.Add("SheetID_load", getSheetIdByBatch(batchId, 0, 1).ToString());
-                answ.Add("SheetID_print", getSheetIdByBatch(batchId, 1, 2).ToString());
-                answ.Add("SheetID_work", getSheetIdByBatch(batchId, 2, 3).ToString());
-                answ.Add("SheetID_unload", getSheetIdByBatch(batchId, 3, 5).ToString());
+                answ.Add("SheetID_load", getSheetIdByBatch(batchId, 0, 1, machineCod).ToString());
+                answ.Add("SheetID_print", getSheetIdByBatch(batchId, 1, 2, machineCod).ToString());
+                answ.Add("SheetID_work", getSheetIdByBatch(batchId, 2, 3, machineCod).ToString());
+                answ.Add("SheetID_unload", getSheetIdByBatch(batchId, 3, 5, machineCod).ToString());
                 // serializzo e salvo!
                 saveMachineData(machineCod, answ);
             }

AppData/DS_App.Designer.cs

@@ -29849,12 +29849,14 @@ namespace AppData.DS_AppTableAdapters {
             this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Machine", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[3].Connection = this.Connection;
             this._commandCollection[3].CommandText = "dbo.stp_Sheets_getByItemID";
             this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Machine", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[4].Connection = this.Connection;
             this._commandCollection[4].CommandText = "dbo.stp_Sheets_getByMLStatus";
@@ -29863,18 +29865,21 @@ namespace AppData.DS_AppTableAdapters {
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShStatusStart", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShStatusEnd", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Machine", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[5].Connection = this.Connection;
             this._commandCollection[5].CommandText = "dbo.stp_Sheets_getBySheetID";
             this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Machine", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[6].Connection = this.Connection;
             this._commandCollection[6].CommandText = "dbo.stp_Sheets_getByStack";
             this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StackID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Machine", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[7].Connection = this.Connection;
             this._commandCollection[7].CommandText = "dbo.stp_Sheets_getByStackRedux";
@@ -29888,6 +29893,7 @@ namespace AppData.DS_AppTableAdapters {
             this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Machine", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[9].Connection = this.Connection;
             this._commandCollection[9].CommandText = "dbo.stp_Sheets_getNextByStack";
@@ -29961,7 +29967,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_App.SheetListDataTable getByBatch(global::System.Nullable<int> BatchID) {
+        public virtual DS_App.SheetListDataTable getByBatch(global::System.Nullable<int> BatchID, string Machine) {
             this.Adapter.SelectCommand = this.CommandCollection[2];
             if ((BatchID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
@@ -29969,6 +29975,12 @@ namespace AppData.DS_AppTableAdapters {
             else {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
+            if ((Machine == null)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Machine));
+            }
             DS_App.SheetListDataTable dataTable = new DS_App.SheetListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -29978,7 +29990,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_App.SheetListDataTable getByItemID(global::System.Nullable<int> ItemID) {
+        public virtual DS_App.SheetListDataTable getByItemID(global::System.Nullable<int> ItemID, string Machine) {
             this.Adapter.SelectCommand = this.CommandCollection[3];
             if ((ItemID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(ItemID.Value));
@@ -29986,6 +29998,12 @@ namespace AppData.DS_AppTableAdapters {
             else {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
+            if ((Machine == null)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Machine));
+            }
             DS_App.SheetListDataTable dataTable = new DS_App.SheetListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -29995,7 +30013,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_App.SheetListDataTable getByMLStatus(global::System.Nullable<int> BatchID, global::System.Nullable<int> ShStatusStart, global::System.Nullable<int> ShStatusEnd) {
+        public virtual DS_App.SheetListDataTable getByMLStatus(global::System.Nullable<int> BatchID, global::System.Nullable<int> ShStatusStart, global::System.Nullable<int> ShStatusEnd, string Machine) {
             this.Adapter.SelectCommand = this.CommandCollection[4];
             if ((BatchID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
@@ -30015,6 +30033,12 @@ namespace AppData.DS_AppTableAdapters {
             else {
                 this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
             }
+            if ((Machine == null)) {
+                this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Machine));
+            }
             DS_App.SheetListDataTable dataTable = new DS_App.SheetListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -30024,7 +30048,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_App.SheetListDataTable getBySheetId(global::System.Nullable<int> SheetID) {
+        public virtual DS_App.SheetListDataTable getBySheetId(global::System.Nullable<int> SheetID, string Machine) {
             this.Adapter.SelectCommand = this.CommandCollection[5];
             if ((SheetID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(SheetID.Value));
@@ -30032,6 +30056,12 @@ namespace AppData.DS_AppTableAdapters {
             else {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
+            if ((Machine == null)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Machine));
+            }
             DS_App.SheetListDataTable dataTable = new DS_App.SheetListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -30041,7 +30071,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_App.SheetListDataTable getByStack(global::System.Nullable<int> StackID) {
+        public virtual DS_App.SheetListDataTable getByStack(global::System.Nullable<int> StackID, string Machine) {
             this.Adapter.SelectCommand = this.CommandCollection[6];
             if ((StackID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(StackID.Value));
@@ -30049,6 +30079,12 @@ namespace AppData.DS_AppTableAdapters {
             else {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
+            if ((Machine == null)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Machine));
+            }
             DS_App.SheetListDataTable dataTable = new DS_App.SheetListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -30081,7 +30117,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_App.SheetListDataTable getCurrentByBatch(global::System.Nullable<int> BatchID) {
+        public virtual DS_App.SheetListDataTable getCurrentByBatch(global::System.Nullable<int> BatchID, string Machine) {
             this.Adapter.SelectCommand = this.CommandCollection[8];
             if ((BatchID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
@@ -30089,6 +30125,12 @@ namespace AppData.DS_AppTableAdapters {
             else {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
+            if ((Machine == null)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Machine));
+            }
             DS_App.SheetListDataTable dataTable = new DS_App.SheetListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -30774,7 +30816,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[21];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[22];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT *\r\n FROM dbo.ItemList";
@@ -30883,37 +30925,45 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ
             this._commandCollection[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ForceAll", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[17] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[17].Connection = this.Connection;
-            this._commandCollection[17].CommandText = "dbo.stp_IL_updateFromNesting";
+            this._commandCollection[17].CommandText = "dbo.stp_IL_updateExtCodeFromNesting";
             this._commandCollection[17].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PostProcList", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProcessesReq", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PdfFilePath", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartExtCode", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[18] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[18].Connection = this.Connection;
-            this._commandCollection[18].CommandText = "dbo.stp_IL_updateSheetStatus";
+            this._commandCollection[18].CommandText = "dbo.stp_IL_updateFromNesting";
             this._commandCollection[18].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StatusID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PostProcList", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProcessesReq", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PdfFilePath", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[19] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[19].Connection = this.Connection;
-            this._commandCollection[19].CommandText = "dbo.stp_IL_updateSheetStatusPU";
+            this._commandCollection[19].CommandText = "dbo.stp_IL_updateSheetStatus";
             this._commandCollection[19].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StatusID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[20] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[20].Connection = this.Connection;
-            this._commandCollection[20].CommandText = "dbo.stp_IL_updateStatus";
+            this._commandCollection[20].CommandText = "dbo.stp_IL_updateSheetStatusPU";
             this._commandCollection[20].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StatusID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[21] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[21].Connection = this.Connection;
+            this._commandCollection[21].CommandText = "dbo.stp_IL_updateStatus";
+            this._commandCollection[21].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", 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("@StatusID", 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("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -31714,8 +31764,48 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ
         [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 updateFromNesting(global::System.Nullable<int> ItemID, global::System.Nullable<int> MatID, string PostProcList, string ProcessesReq, string PdfFilePath) {
+        public virtual int updateExtCodeFromNesting(global::System.Nullable<int> BatchID, global::System.Nullable<int> ItemID, string PartExtCode) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[17];
+            if ((BatchID.HasValue == true)) {
+                command.Parameters[1].Value = ((int)(BatchID.Value));
+            }
+            else {
+                command.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            if ((ItemID.HasValue == true)) {
+                command.Parameters[2].Value = ((int)(ItemID.Value));
+            }
+            else {
+                command.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            if ((PartExtCode == null)) {
+                command.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[3].Value = ((string)(PartExtCode));
+            }
+            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
+                        != global::System.Data.ConnectionState.Open)) {
+                command.Connection.Open();
+            }
+            int returnValue;
+            try {
+                returnValue = command.ExecuteNonQuery();
+            }
+            finally {
+                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+                    command.Connection.Close();
+                }
+            }
+            return returnValue;
+        }
+        
+        [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 updateFromNesting(global::System.Nullable<int> ItemID, global::System.Nullable<int> MatID, string PostProcList, string ProcessesReq, string PdfFilePath) {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[18];
             if ((ItemID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(ItemID.Value));
             }
@@ -31767,7 +31857,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateSheetStatus(global::System.Nullable<int> SheetID, global::System.Nullable<int> StatusID, string PlaceCod) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[18];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[19];
             if ((SheetID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(SheetID.Value));
             }
@@ -31807,7 +31897,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateSheetStatusPU(global::System.Nullable<int> SheetID, string PlaceCod) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[19];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[20];
             if ((SheetID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(SheetID.Value));
             }
@@ -31841,7 +31931,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateStatus(global::System.Nullable<int> ItemID, global::System.Nullable<int> StatusID, string PlaceCod) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[20];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[21];
             if ((ItemID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(ItemID.Value));
             }

AppData/DS_App.xsd

@@ -540,6 +540,7 @@ FROM v_SheetList</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@BatchID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Machine" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -551,6 +552,7 @@ FROM v_SheetList</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ItemID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Machine" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -564,6 +566,7 @@ FROM v_SheetList</CommandText>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@BatchID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ShStatusStart" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ShStatusEnd" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Machine" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -575,6 +578,7 @@ FROM v_SheetList</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SheetID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Machine" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -586,6 +590,7 @@ FROM v_SheetList</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@StackID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Machine" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -609,6 +614,7 @@ FROM v_SheetList</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@BatchID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Machine" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -1034,6 +1040,19 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_IL_updateExtCodeFromNesting" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateExtCodeFromNesting" Modifier="Public" Name="updateExtCodeFromNesting" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="updateExtCodeFromNesting">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_IL_updateExtCodeFromNesting</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@BatchID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ItemID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@PartExtCode" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_IL_updateFromNesting" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateFromNesting" Modifier="Public" Name="updateFromNesting" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="updateFromNesting">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -3633,7 +3652,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
   <xs:element name="DS_App" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_App" msprop:Generator_UserDSName="DS_App">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="BatchList" msprop:Generator_TableClassName="BatchListDataTable" msprop:Generator_TableVarName="tableBatchList" msprop:Generator_RowChangedName="BatchListRowChanged" msprop:Generator_TablePropName="BatchList" msprop:Generator_RowDeletingName="BatchListRowDeleting" msprop:Generator_RowChangingName="BatchListRowChanging" msprop:Generator_RowEvHandlerName="BatchListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchListRowDeleted" msprop:Generator_RowClassName="BatchListRow" msprop:Generator_UserTableName="BatchList" msprop:Generator_RowEvArgName="BatchListRowChangeEvent">
+        <xs:element name="BatchList" msprop:Generator_TableClassName="BatchListDataTable" msprop:Generator_TableVarName="tableBatchList" msprop:Generator_TablePropName="BatchList" msprop:Generator_RowDeletingName="BatchListRowDeleting" msprop:Generator_RowChangingName="BatchListRowChanging" msprop:Generator_RowEvHandlerName="BatchListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchListRowDeleted" msprop:Generator_UserTableName="BatchList" msprop:Generator_RowChangedName="BatchListRowChanged" msprop:Generator_RowEvArgName="BatchListRowChangeEvent" msprop:Generator_RowClassName="BatchListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BatchID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" />
@@ -3691,7 +3710,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="StackList" msprop:Generator_TableClassName="StackListDataTable" msprop:Generator_TableVarName="tableStackList" msprop:Generator_RowChangedName="StackListRowChanged" msprop:Generator_TablePropName="StackList" msprop:Generator_RowDeletingName="StackListRowDeleting" msprop:Generator_RowChangingName="StackListRowChanging" msprop:Generator_RowEvHandlerName="StackListRowChangeEventHandler" msprop:Generator_RowDeletedName="StackListRowDeleted" msprop:Generator_RowClassName="StackListRow" msprop:Generator_UserTableName="StackList" msprop:Generator_RowEvArgName="StackListRowChangeEvent">
+        <xs:element name="StackList" msprop:Generator_TableClassName="StackListDataTable" msprop:Generator_TableVarName="tableStackList" msprop:Generator_TablePropName="StackList" msprop:Generator_RowDeletingName="StackListRowDeleting" msprop:Generator_RowChangingName="StackListRowChanging" msprop:Generator_RowEvHandlerName="StackListRowChangeEventHandler" msprop:Generator_RowDeletedName="StackListRowDeleted" msprop:Generator_UserTableName="StackList" msprop:Generator_RowChangedName="StackListRowChanged" msprop:Generator_RowEvArgName="StackListRowChangeEvent" msprop:Generator_RowClassName="StackListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="StackID" msprop:Generator_ColumnVarNameInTable="columnStackID" msprop:Generator_ColumnPropNameInRow="StackID" msprop:Generator_ColumnPropNameInTable="StackIDColumn" msprop:Generator_UserColumnName="StackID" type="xs:int" />
@@ -3716,7 +3735,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SheetList" msprop:Generator_TableClassName="SheetListDataTable" msprop:Generator_TableVarName="tableSheetList" msprop:Generator_RowChangedName="SheetListRowChanged" msprop:Generator_TablePropName="SheetList" msprop:Generator_RowDeletingName="SheetListRowDeleting" msprop:Generator_RowChangingName="SheetListRowChanging" msprop:Generator_RowEvHandlerName="SheetListRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetListRowDeleted" msprop:Generator_RowClassName="SheetListRow" msprop:Generator_UserTableName="SheetList" msprop:Generator_RowEvArgName="SheetListRowChangeEvent">
+        <xs:element name="SheetList" msprop:Generator_TableClassName="SheetListDataTable" msprop:Generator_TableVarName="tableSheetList" msprop:Generator_TablePropName="SheetList" msprop:Generator_RowDeletingName="SheetListRowDeleting" msprop:Generator_RowChangingName="SheetListRowChanging" msprop:Generator_RowEvHandlerName="SheetListRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetListRowDeleted" msprop:Generator_UserTableName="SheetList" msprop:Generator_RowChangedName="SheetListRowChanged" msprop:Generator_RowEvArgName="SheetListRowChangeEvent" msprop:Generator_RowClassName="SheetListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="SheetID" msprop:Generator_ColumnVarNameInTable="columnSheetID" msprop:Generator_ColumnPropNameInRow="SheetID" msprop:Generator_ColumnPropNameInTable="SheetIDColumn" msprop:Generator_UserColumnName="SheetID" type="xs:int" />
@@ -3771,7 +3790,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OrderList" msprop:Generator_TableClassName="OrderListDataTable" msprop:Generator_TableVarName="tableOrderList" msprop:Generator_RowChangedName="OrderListRowChanged" msprop:Generator_TablePropName="OrderList" msprop:Generator_RowDeletingName="OrderListRowDeleting" msprop:Generator_RowChangingName="OrderListRowChanging" msprop:Generator_RowEvHandlerName="OrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListRowDeleted" msprop:Generator_RowClassName="OrderListRow" msprop:Generator_UserTableName="OrderList" msprop:Generator_RowEvArgName="OrderListRowChangeEvent">
+        <xs:element name="OrderList" msprop:Generator_TableClassName="OrderListDataTable" msprop:Generator_TableVarName="tableOrderList" msprop:Generator_TablePropName="OrderList" msprop:Generator_RowDeletingName="OrderListRowDeleting" msprop:Generator_RowChangingName="OrderListRowChanging" msprop:Generator_RowEvHandlerName="OrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListRowDeleted" msprop:Generator_UserTableName="OrderList" msprop:Generator_RowChangedName="OrderListRowChanged" msprop:Generator_RowEvArgName="OrderListRowChangeEvent" msprop:Generator_RowClassName="OrderListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OrdID" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" />
@@ -3844,7 +3863,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ItemList" msprop:Generator_TableClassName="ItemListDataTable" msprop:Generator_TableVarName="tableItemList" msprop:Generator_RowChangedName="ItemListRowChanged" msprop:Generator_TablePropName="ItemList" msprop:Generator_RowDeletingName="ItemListRowDeleting" msprop:Generator_RowChangingName="ItemListRowChanging" msprop:Generator_RowEvHandlerName="ItemListRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemListRowDeleted" msprop:Generator_RowClassName="ItemListRow" msprop:Generator_UserTableName="ItemList" msprop:Generator_RowEvArgName="ItemListRowChangeEvent">
+        <xs:element name="ItemList" msprop:Generator_TableClassName="ItemListDataTable" msprop:Generator_TableVarName="tableItemList" msprop:Generator_TablePropName="ItemList" msprop:Generator_RowDeletingName="ItemListRowDeleting" msprop:Generator_RowChangingName="ItemListRowChanging" msprop:Generator_RowEvHandlerName="ItemListRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemListRowDeleted" msprop:Generator_UserTableName="ItemList" msprop:Generator_RowChangedName="ItemListRowChanged" msprop:Generator_RowEvArgName="ItemListRowChangeEvent" msprop:Generator_RowClassName="ItemListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnItemID" msprop:Generator_ColumnPropNameInRow="ItemID" msprop:Generator_ColumnPropNameInTable="ItemIDColumn" msprop:Generator_UserColumnName="ItemID" type="xs:int" />
@@ -3913,7 +3932,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Materials" msprop:Generator_TableClassName="MaterialsDataTable" msprop:Generator_TableVarName="tableMaterials" msprop:Generator_TablePropName="Materials" msprop:Generator_RowDeletingName="MaterialsRowDeleting" msprop:Generator_RowChangingName="MaterialsRowChanging" msprop:Generator_RowEvHandlerName="MaterialsRowChangeEventHandler" msprop:Generator_RowDeletedName="MaterialsRowDeleted" msprop:Generator_UserTableName="Materials" msprop:Generator_RowChangedName="MaterialsRowChanged" msprop:Generator_RowEvArgName="MaterialsRowChangeEvent" msprop:Generator_RowClassName="MaterialsRow">
+        <xs:element name="Materials" msprop:Generator_TableClassName="MaterialsDataTable" msprop:Generator_TableVarName="tableMaterials" msprop:Generator_RowChangedName="MaterialsRowChanged" msprop:Generator_TablePropName="Materials" msprop:Generator_RowDeletingName="MaterialsRowDeleting" msprop:Generator_RowChangingName="MaterialsRowChanging" msprop:Generator_RowEvHandlerName="MaterialsRowChangeEventHandler" msprop:Generator_RowDeletedName="MaterialsRowDeleted" msprop:Generator_RowClassName="MaterialsRow" msprop:Generator_UserTableName="Materials" msprop:Generator_RowEvArgName="MaterialsRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="MatID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnMatID" msprop:Generator_ColumnPropNameInRow="MatID" msprop:Generator_ColumnPropNameInTable="MatIDColumn" msprop:Generator_UserColumnName="MatID" type="xs:int" />
@@ -3946,7 +3965,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Bins" msprop:Generator_TableClassName="BinsDataTable" msprop:Generator_TableVarName="tableBins" msprop:Generator_TablePropName="Bins" msprop:Generator_RowDeletingName="BinsRowDeleting" msprop:Generator_RowChangingName="BinsRowChanging" msprop:Generator_RowEvHandlerName="BinsRowChangeEventHandler" msprop:Generator_RowDeletedName="BinsRowDeleted" msprop:Generator_UserTableName="Bins" msprop:Generator_RowChangedName="BinsRowChanged" msprop:Generator_RowEvArgName="BinsRowChangeEvent" msprop:Generator_RowClassName="BinsRow">
+        <xs:element name="Bins" msprop:Generator_TableClassName="BinsDataTable" msprop:Generator_TableVarName="tableBins" msprop:Generator_RowChangedName="BinsRowChanged" msprop:Generator_TablePropName="Bins" msprop:Generator_RowDeletingName="BinsRowDeleting" msprop:Generator_RowChangingName="BinsRowChanging" msprop:Generator_RowEvHandlerName="BinsRowChangeEventHandler" msprop:Generator_RowDeletedName="BinsRowDeleted" msprop:Generator_RowClassName="BinsRow" msprop:Generator_UserTableName="Bins" msprop:Generator_RowEvArgName="BinsRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BinID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnBinID" msprop:Generator_ColumnPropNameInRow="BinID" msprop:Generator_ColumnPropNameInTable="BinIDColumn" msprop:Generator_UserColumnName="BinID" type="xs:int" />
@@ -4018,7 +4037,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Carts" msprop:Generator_TableClassName="CartsDataTable" msprop:Generator_TableVarName="tableCarts" msprop:Generator_TablePropName="Carts" msprop:Generator_RowDeletingName="CartsRowDeleting" msprop:Generator_RowChangingName="CartsRowChanging" msprop:Generator_RowEvHandlerName="CartsRowChangeEventHandler" msprop:Generator_RowDeletedName="CartsRowDeleted" msprop:Generator_UserTableName="Carts" msprop:Generator_RowChangedName="CartsRowChanged" msprop:Generator_RowEvArgName="CartsRowChangeEvent" msprop:Generator_RowClassName="CartsRow">
+        <xs:element name="Carts" msprop:Generator_TableClassName="CartsDataTable" msprop:Generator_TableVarName="tableCarts" msprop:Generator_RowChangedName="CartsRowChanged" msprop:Generator_TablePropName="Carts" msprop:Generator_RowDeletingName="CartsRowDeleting" msprop:Generator_RowChangingName="CartsRowChanging" msprop:Generator_RowEvHandlerName="CartsRowChangeEventHandler" msprop:Generator_RowDeletedName="CartsRowDeleted" msprop:Generator_RowClassName="CartsRow" msprop:Generator_UserTableName="Carts" msprop:Generator_RowEvArgName="CartsRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CartID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" />
@@ -4037,7 +4056,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OfflineOrderList" msprop:Generator_TableClassName="OfflineOrderListDataTable" msprop:Generator_TableVarName="tableOfflineOrderList" msprop:Generator_RowChangedName="OfflineOrderListRowChanged" msprop:Generator_TablePropName="OfflineOrderList" msprop:Generator_RowDeletingName="OfflineOrderListRowDeleting" msprop:Generator_RowChangingName="OfflineOrderListRowChanging" msprop:Generator_RowEvHandlerName="OfflineOrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OfflineOrderListRowDeleted" msprop:Generator_RowClassName="OfflineOrderListRow" msprop:Generator_UserTableName="OfflineOrderList" msprop:Generator_RowEvArgName="OfflineOrderListRowChangeEvent">
+        <xs:element name="OfflineOrderList" msprop:Generator_TableClassName="OfflineOrderListDataTable" msprop:Generator_TableVarName="tableOfflineOrderList" msprop:Generator_TablePropName="OfflineOrderList" msprop:Generator_RowDeletingName="OfflineOrderListRowDeleting" msprop:Generator_RowChangingName="OfflineOrderListRowChanging" msprop:Generator_RowEvHandlerName="OfflineOrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OfflineOrderListRowDeleted" msprop:Generator_UserTableName="OfflineOrderList" msprop:Generator_RowChangedName="OfflineOrderListRowChanged" msprop:Generator_RowEvArgName="OfflineOrderListRowChangeEvent" msprop:Generator_RowClassName="OfflineOrderListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OrdID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" />
@@ -4068,7 +4087,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OffOrd2Item" msprop:Generator_TableClassName="OffOrd2ItemDataTable" msprop:Generator_TableVarName="tableOffOrd2Item" msprop:Generator_RowChangedName="OffOrd2ItemRowChanged" msprop:Generator_TablePropName="OffOrd2Item" msprop:Generator_RowDeletingName="OffOrd2ItemRowDeleting" msprop:Generator_RowChangingName="OffOrd2ItemRowChanging" msprop:Generator_RowEvHandlerName="OffOrd2ItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OffOrd2ItemRowDeleted" msprop:Generator_RowClassName="OffOrd2ItemRow" msprop:Generator_UserTableName="OffOrd2Item" msprop:Generator_RowEvArgName="OffOrd2ItemRowChangeEvent">
+        <xs:element name="OffOrd2Item" msprop:Generator_TableClassName="OffOrd2ItemDataTable" msprop:Generator_TableVarName="tableOffOrd2Item" msprop:Generator_TablePropName="OffOrd2Item" msprop:Generator_RowDeletingName="OffOrd2ItemRowDeleting" msprop:Generator_RowChangingName="OffOrd2ItemRowChanging" msprop:Generator_RowEvHandlerName="OffOrd2ItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OffOrd2ItemRowDeleted" msprop:Generator_UserTableName="OffOrd2Item" msprop:Generator_RowChangedName="OffOrd2ItemRowChanged" msprop:Generator_RowEvArgName="OffOrd2ItemRowChangeEvent" msprop:Generator_RowClassName="OffOrd2ItemRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OrdID" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" />
@@ -4076,7 +4095,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="KitList" msprop:Generator_TableClassName="KitListDataTable" msprop:Generator_TableVarName="tableKitList" msprop:Generator_TablePropName="KitList" msprop:Generator_RowDeletingName="KitListRowDeleting" msprop:Generator_RowChangingName="KitListRowChanging" msprop:Generator_RowEvHandlerName="KitListRowChangeEventHandler" msprop:Generator_RowDeletedName="KitListRowDeleted" msprop:Generator_UserTableName="KitList" msprop:Generator_RowChangedName="KitListRowChanged" msprop:Generator_RowEvArgName="KitListRowChangeEvent" msprop:Generator_RowClassName="KitListRow">
+        <xs:element name="KitList" msprop:Generator_TableClassName="KitListDataTable" msprop:Generator_TableVarName="tableKitList" msprop:Generator_RowChangedName="KitListRowChanged" msprop:Generator_TablePropName="KitList" msprop:Generator_RowDeletingName="KitListRowDeleting" msprop:Generator_RowChangingName="KitListRowChanging" msprop:Generator_RowEvHandlerName="KitListRowChangeEventHandler" msprop:Generator_RowDeletedName="KitListRowDeleted" msprop:Generator_RowClassName="KitListRow" msprop:Generator_UserTableName="KitList" msprop:Generator_RowEvArgName="KitListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="KitID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnKitID" msprop:Generator_ColumnPropNameInRow="KitID" msprop:Generator_ColumnPropNameInTable="KitIDColumn" msprop:Generator_UserColumnName="KitID" type="xs:int" />
@@ -4093,7 +4112,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Nesting" msprop:Generator_TableClassName="NestingDataTable" msprop:Generator_TableVarName="tableNesting" msprop:Generator_RowChangedName="NestingRowChanged" msprop:Generator_TablePropName="Nesting" msprop:Generator_RowDeletingName="NestingRowDeleting" msprop:Generator_RowChangingName="NestingRowChanging" msprop:Generator_RowEvHandlerName="NestingRowChangeEventHandler" msprop:Generator_RowDeletedName="NestingRowDeleted" msprop:Generator_RowClassName="NestingRow" msprop:Generator_UserTableName="Nesting" msprop:Generator_RowEvArgName="NestingRowChangeEvent">
+        <xs:element name="Nesting" msprop:Generator_TableClassName="NestingDataTable" msprop:Generator_TableVarName="tableNesting" msprop:Generator_TablePropName="Nesting" msprop:Generator_RowDeletingName="NestingRowDeleting" msprop:Generator_RowChangingName="NestingRowChanging" msprop:Generator_RowEvHandlerName="NestingRowChangeEventHandler" msprop:Generator_RowDeletedName="NestingRowDeleted" msprop:Generator_UserTableName="Nesting" msprop:Generator_RowChangedName="NestingRowChanged" msprop:Generator_RowEvArgName="NestingRowChangeEvent" msprop:Generator_RowClassName="NestingRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="SheetID" msprop:Generator_ColumnVarNameInTable="columnSheetID" msprop:Generator_ColumnPropNameInRow="SheetID" msprop:Generator_ColumnPropNameInTable="SheetIDColumn" msprop:Generator_UserColumnName="SheetID" type="xs:int" />
@@ -4102,7 +4121,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ImportLog" msprop:Generator_TableClassName="ImportLogDataTable" msprop:Generator_TableVarName="tableImportLog" msprop:Generator_RowChangedName="ImportLogRowChanged" msprop:Generator_TablePropName="ImportLog" msprop:Generator_RowDeletingName="ImportLogRowDeleting" msprop:Generator_RowChangingName="ImportLogRowChanging" msprop:Generator_RowEvHandlerName="ImportLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ImportLogRowDeleted" msprop:Generator_RowClassName="ImportLogRow" msprop:Generator_UserTableName="ImportLog" msprop:Generator_RowEvArgName="ImportLogRowChangeEvent">
+        <xs:element name="ImportLog" msprop:Generator_TableClassName="ImportLogDataTable" msprop:Generator_TableVarName="tableImportLog" msprop:Generator_TablePropName="ImportLog" msprop:Generator_RowDeletingName="ImportLogRowDeleting" msprop:Generator_RowChangingName="ImportLogRowChanging" msprop:Generator_RowEvHandlerName="ImportLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ImportLogRowDeleted" msprop:Generator_UserTableName="ImportLog" msprop:Generator_RowChangedName="ImportLogRowChanged" msprop:Generator_RowEvArgName="ImportLogRowChangeEvent" msprop:Generator_RowClassName="ImportLogRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="NumLog" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnNumLog" msprop:Generator_ColumnPropNameInRow="NumLog" msprop:Generator_ColumnPropNameInTable="NumLogColumn" msprop:Generator_UserColumnName="NumLog" type="xs:int" />
@@ -4133,7 +4152,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="BinList" msprop:Generator_TableClassName="BinListDataTable" msprop:Generator_TableVarName="tableBinList" msprop:Generator_RowChangedName="BinListRowChanged" msprop:Generator_TablePropName="BinList" msprop:Generator_RowDeletingName="BinListRowDeleting" msprop:Generator_RowChangingName="BinListRowChanging" msprop:Generator_RowEvHandlerName="BinListRowChangeEventHandler" msprop:Generator_RowDeletedName="BinListRowDeleted" msprop:Generator_RowClassName="BinListRow" msprop:Generator_UserTableName="BinList" msprop:Generator_RowEvArgName="BinListRowChangeEvent">
+        <xs:element name="BinList" msprop:Generator_TableClassName="BinListDataTable" msprop:Generator_TableVarName="tableBinList" msprop:Generator_TablePropName="BinList" msprop:Generator_RowDeletingName="BinListRowDeleting" msprop:Generator_RowChangingName="BinListRowChanging" msprop:Generator_RowEvHandlerName="BinListRowChangeEventHandler" msprop:Generator_RowDeletedName="BinListRowDeleted" msprop:Generator_UserTableName="BinList" msprop:Generator_RowChangedName="BinListRowChanged" msprop:Generator_RowEvArgName="BinListRowChangeEvent" msprop:Generator_RowClassName="BinListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BinID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnBinID" msprop:Generator_ColumnPropNameInRow="BinID" msprop:Generator_ColumnPropNameInTable="BinIDColumn" msprop:Generator_UserColumnName="BinID" type="xs:int" />
@@ -4141,7 +4160,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="FinalKit" msprop:Generator_TableClassName="FinalKitDataTable" msprop:Generator_TableVarName="tableFinalKit" msprop:Generator_TablePropName="FinalKit" msprop:Generator_RowDeletingName="FinalKitRowDeleting" msprop:Generator_RowChangingName="FinalKitRowChanging" msprop:Generator_RowEvHandlerName="FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="FinalKitRowDeleted" msprop:Generator_UserTableName="FinalKit" msprop:Generator_RowChangedName="FinalKitRowChanged" msprop:Generator_RowEvArgName="FinalKitRowChangeEvent" msprop:Generator_RowClassName="FinalKitRow">
+        <xs:element name="FinalKit" msprop:Generator_TableClassName="FinalKitDataTable" msprop:Generator_TableVarName="tableFinalKit" msprop:Generator_RowChangedName="FinalKitRowChanged" msprop:Generator_TablePropName="FinalKit" msprop:Generator_RowDeletingName="FinalKitRowDeleting" msprop:Generator_RowChangingName="FinalKitRowChanging" msprop:Generator_RowEvHandlerName="FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="FinalKitRowDeleted" msprop:Generator_RowClassName="FinalKitRow" msprop:Generator_UserTableName="FinalKit" msprop:Generator_RowEvArgName="FinalKitRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="FinalKitID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnFinalKitID" msprop:Generator_ColumnPropNameInRow="FinalKitID" msprop:Generator_ColumnPropNameInTable="FinalKitIDColumn" msprop:Generator_UserColumnName="FinalKitID" type="xs:int" />
@@ -4157,7 +4176,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Order2FinalKit" msprop:Generator_TableClassName="Order2FinalKitDataTable" msprop:Generator_TableVarName="tableOrder2FinalKit" msprop:Generator_TablePropName="Order2FinalKit" msprop:Generator_RowDeletingName="Order2FinalKitRowDeleting" msprop:Generator_RowChangingName="Order2FinalKitRowChanging" msprop:Generator_RowEvHandlerName="Order2FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="Order2FinalKitRowDeleted" msprop:Generator_UserTableName="Order2FinalKit" msprop:Generator_RowChangedName="Order2FinalKitRowChanged" msprop:Generator_RowEvArgName="Order2FinalKitRowChangeEvent" msprop:Generator_RowClassName="Order2FinalKitRow">
+        <xs:element name="Order2FinalKit" msprop:Generator_TableClassName="Order2FinalKitDataTable" msprop:Generator_TableVarName="tableOrder2FinalKit" msprop:Generator_RowChangedName="Order2FinalKitRowChanged" msprop:Generator_TablePropName="Order2FinalKit" msprop:Generator_RowDeletingName="Order2FinalKitRowDeleting" msprop:Generator_RowChangingName="Order2FinalKitRowChanging" msprop:Generator_RowEvHandlerName="Order2FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="Order2FinalKitRowDeleted" msprop:Generator_RowClassName="Order2FinalKitRow" msprop:Generator_UserTableName="Order2FinalKit" msprop:Generator_RowEvArgName="Order2FinalKitRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="FinalKitID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnFinalKitID" msprop:Generator_ColumnPropNameInRow="FinalKitID" msprop:Generator_ColumnPropNameInTable="FinalKitIDColumn" msprop:Generator_UserColumnName="FinalKitID" type="xs:int" />
@@ -4165,7 +4184,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Counters" msprop:Generator_TableClassName="CountersDataTable" msprop:Generator_TableVarName="tableCounters" msprop:Generator_RowChangedName="CountersRowChanged" msprop:Generator_TablePropName="Counters" msprop:Generator_RowDeletingName="CountersRowDeleting" msprop:Generator_RowChangingName="CountersRowChanging" msprop:Generator_RowEvHandlerName="CountersRowChangeEventHandler" msprop:Generator_RowDeletedName="CountersRowDeleted" msprop:Generator_RowClassName="CountersRow" msprop:Generator_UserTableName="Counters" msprop:Generator_RowEvArgName="CountersRowChangeEvent">
+        <xs:element name="Counters" msprop:Generator_TableClassName="CountersDataTable" msprop:Generator_TableVarName="tableCounters" msprop:Generator_TablePropName="Counters" msprop:Generator_RowDeletingName="CountersRowDeleting" msprop:Generator_RowChangingName="CountersRowChanging" msprop:Generator_RowEvHandlerName="CountersRowChangeEventHandler" msprop:Generator_RowDeletedName="CountersRowDeleted" msprop:Generator_UserTableName="Counters" msprop:Generator_RowChangedName="CountersRowChanged" msprop:Generator_RowEvArgName="CountersRowChangeEvent" msprop:Generator_RowClassName="CountersRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CountType" msprop:Generator_ColumnVarNameInTable="columnCountType" msprop:Generator_ColumnPropNameInRow="CountType" msprop:Generator_ColumnPropNameInTable="CountTypeColumn" msprop:Generator_UserColumnName="CountType">
@@ -4193,7 +4212,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ErrorsLog" msprop:Generator_TableClassName="ErrorsLogDataTable" msprop:Generator_TableVarName="tableErrorsLog" msprop:Generator_TablePropName="ErrorsLog" msprop:Generator_RowDeletingName="ErrorsLogRowDeleting" msprop:Generator_RowChangingName="ErrorsLogRowChanging" msprop:Generator_RowEvHandlerName="ErrorsLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ErrorsLogRowDeleted" msprop:Generator_UserTableName="ErrorsLog" msprop:Generator_RowChangedName="ErrorsLogRowChanged" msprop:Generator_RowEvArgName="ErrorsLogRowChangeEvent" msprop:Generator_RowClassName="ErrorsLogRow">
+        <xs:element name="ErrorsLog" msprop:Generator_TableClassName="ErrorsLogDataTable" msprop:Generator_TableVarName="tableErrorsLog" msprop:Generator_RowChangedName="ErrorsLogRowChanged" msprop:Generator_TablePropName="ErrorsLog" msprop:Generator_RowDeletingName="ErrorsLogRowDeleting" msprop:Generator_RowChangingName="ErrorsLogRowChanging" msprop:Generator_RowEvHandlerName="ErrorsLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ErrorsLogRowDeleted" msprop:Generator_RowClassName="ErrorsLogRow" msprop:Generator_UserTableName="ErrorsLog" msprop:Generator_RowEvArgName="ErrorsLogRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ErrID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnErrID" msprop:Generator_ColumnPropNameInRow="ErrID" msprop:Generator_ColumnPropNameInTable="ErrIDColumn" msprop:Generator_UserColumnName="ErrID" type="xs:int" />
@@ -4229,7 +4248,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ItemValidation" msprop:Generator_TableClassName="ItemValidationDataTable" msprop:Generator_TableVarName="tableItemValidation" msprop:Generator_TablePropName="ItemValidation" msprop:Generator_RowDeletingName="ItemValidationRowDeleting" msprop:Generator_RowChangingName="ItemValidationRowChanging" msprop:Generator_RowEvHandlerName="ItemValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemValidationRowDeleted" msprop:Generator_UserTableName="ItemValidation" msprop:Generator_RowChangedName="ItemValidationRowChanged" msprop:Generator_RowEvArgName="ItemValidationRowChangeEvent" msprop:Generator_RowClassName="ItemValidationRow">
+        <xs:element name="ItemValidation" msprop:Generator_TableClassName="ItemValidationDataTable" msprop:Generator_TableVarName="tableItemValidation" msprop:Generator_RowChangedName="ItemValidationRowChanged" msprop:Generator_TablePropName="ItemValidation" msprop:Generator_RowDeletingName="ItemValidationRowDeleting" msprop:Generator_RowChangingName="ItemValidationRowChanging" msprop:Generator_RowEvHandlerName="ItemValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemValidationRowDeleted" msprop:Generator_RowClassName="ItemValidationRow" msprop:Generator_UserTableName="ItemValidation" msprop:Generator_RowEvArgName="ItemValidationRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemExtCode" msprop:Generator_ColumnVarNameInTable="columnItemExtCode" msprop:Generator_ColumnPropNameInRow="ItemExtCode" msprop:Generator_ColumnPropNameInTable="ItemExtCodeColumn" msprop:Generator_UserColumnName="ItemExtCode">
@@ -4245,7 +4264,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PartValidPareto" msprop:Generator_TableClassName="PartValidParetoDataTable" msprop:Generator_TableVarName="tablePartValidPareto" msprop:Generator_RowChangedName="PartValidParetoRowChanged" msprop:Generator_TablePropName="PartValidPareto" msprop:Generator_RowDeletingName="PartValidParetoRowDeleting" msprop:Generator_RowChangingName="PartValidParetoRowChanging" msprop:Generator_RowEvHandlerName="PartValidParetoRowChangeEventHandler" msprop:Generator_RowDeletedName="PartValidParetoRowDeleted" msprop:Generator_RowClassName="PartValidParetoRow" msprop:Generator_UserTableName="PartValidPareto" msprop:Generator_RowEvArgName="PartValidParetoRowChangeEvent">
+        <xs:element name="PartValidPareto" msprop:Generator_TableClassName="PartValidParetoDataTable" msprop:Generator_TableVarName="tablePartValidPareto" msprop:Generator_TablePropName="PartValidPareto" msprop:Generator_RowDeletingName="PartValidParetoRowDeleting" msprop:Generator_RowChangingName="PartValidParetoRowChanging" msprop:Generator_RowEvHandlerName="PartValidParetoRowChangeEventHandler" msprop:Generator_RowDeletedName="PartValidParetoRowDeleted" msprop:Generator_UserTableName="PartValidPareto" msprop:Generator_RowChangedName="PartValidParetoRowChanged" msprop:Generator_RowEvArgName="PartValidParetoRowChangeEvent" msprop:Generator_RowClassName="PartValidParetoRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="TotParts" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnTotParts" msprop:Generator_ColumnPropNameInRow="TotParts" msprop:Generator_ColumnPropNameInTable="TotPartsColumn" msprop:Generator_UserColumnName="TotParts" type="xs:int" minOccurs="0" />
@@ -4255,7 +4274,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="UnloadStats" msprop:Generator_TableClassName="UnloadStatsDataTable" msprop:Generator_TableVarName="tableUnloadStats" msprop:Generator_RowChangedName="UnloadStatsRowChanged" msprop:Generator_TablePropName="UnloadStats" msprop:Generator_RowDeletingName="UnloadStatsRowDeleting" msprop:Generator_RowChangingName="UnloadStatsRowChanging" msprop:Generator_RowEvHandlerName="UnloadStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="UnloadStatsRowDeleted" msprop:Generator_RowClassName="UnloadStatsRow" msprop:Generator_UserTableName="UnloadStats" msprop:Generator_RowEvArgName="UnloadStatsRowChangeEvent">
+        <xs:element name="UnloadStats" msprop:Generator_TableClassName="UnloadStatsDataTable" msprop:Generator_TableVarName="tableUnloadStats" msprop:Generator_TablePropName="UnloadStats" msprop:Generator_RowDeletingName="UnloadStatsRowDeleting" msprop:Generator_RowChangingName="UnloadStatsRowChanging" msprop:Generator_RowEvHandlerName="UnloadStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="UnloadStatsRowDeleted" msprop:Generator_UserTableName="UnloadStats" msprop:Generator_RowChangedName="UnloadStatsRowChanged" msprop:Generator_RowEvArgName="UnloadStatsRowChangeEvent" msprop:Generator_RowClassName="UnloadStatsRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Stat" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnStat" msprop:Generator_ColumnPropNameInRow="Stat" msprop:Generator_ColumnPropNameInTable="StatColumn" msprop:Generator_UserColumnName="Stat" minOccurs="0">
@@ -4272,7 +4291,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Remnants" msprop:Generator_TableClassName="RemnantsDataTable" msprop:Generator_TableVarName="tableRemnants" msprop:Generator_TablePropName="Remnants" msprop:Generator_RowDeletingName="RemnantsRowDeleting" msprop:Generator_RowChangingName="RemnantsRowChanging" msprop:Generator_RowEvHandlerName="RemnantsRowChangeEventHandler" msprop:Generator_RowDeletedName="RemnantsRowDeleted" msprop:Generator_UserTableName="Remnants" msprop:Generator_RowChangedName="RemnantsRowChanged" msprop:Generator_RowEvArgName="RemnantsRowChangeEvent" msprop:Generator_RowClassName="RemnantsRow">
+        <xs:element name="Remnants" msprop:Generator_TableClassName="RemnantsDataTable" msprop:Generator_TableVarName="tableRemnants" msprop:Generator_RowChangedName="RemnantsRowChanged" msprop:Generator_TablePropName="Remnants" msprop:Generator_RowDeletingName="RemnantsRowDeleting" msprop:Generator_RowChangingName="RemnantsRowChanging" msprop:Generator_RowEvHandlerName="RemnantsRowChangeEventHandler" msprop:Generator_RowDeletedName="RemnantsRowDeleted" msprop:Generator_RowClassName="RemnantsRow" msprop:Generator_UserTableName="Remnants" msprop:Generator_RowEvArgName="RemnantsRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="RemnantID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnRemnantID" msprop:Generator_ColumnPropNameInRow="RemnantID" msprop:Generator_ColumnPropNameInTable="RemnantIDColumn" msprop:Generator_UserColumnName="RemnantID" type="xs:int" />
@@ -4285,7 +4304,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="CartOnKit" msprop:Generator_TableClassName="CartOnKitDataTable" msprop:Generator_TableVarName="tableCartOnKit" msprop:Generator_TablePropName="CartOnKit" msprop:Generator_RowDeletingName="CartOnKitRowDeleting" msprop:Generator_RowChangingName="CartOnKitRowChanging" msprop:Generator_RowEvHandlerName="CartOnKitRowChangeEventHandler" msprop:Generator_RowDeletedName="CartOnKitRowDeleted" msprop:Generator_UserTableName="CartOnKit" msprop:Generator_RowChangedName="CartOnKitRowChanged" msprop:Generator_RowEvArgName="CartOnKitRowChangeEvent" msprop:Generator_RowClassName="CartOnKitRow">
+        <xs:element name="CartOnKit" msprop:Generator_TableClassName="CartOnKitDataTable" msprop:Generator_TableVarName="tableCartOnKit" msprop:Generator_RowChangedName="CartOnKitRowChanged" msprop:Generator_TablePropName="CartOnKit" msprop:Generator_RowDeletingName="CartOnKitRowDeleting" msprop:Generator_RowChangingName="CartOnKitRowChanging" msprop:Generator_RowEvHandlerName="CartOnKitRowChangeEventHandler" msprop:Generator_RowDeletedName="CartOnKitRowDeleted" msprop:Generator_RowClassName="CartOnKitRow" msprop:Generator_UserTableName="CartOnKit" msprop:Generator_RowEvArgName="CartOnKitRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CartID" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" />
@@ -4334,7 +4353,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PackList" msprop:Generator_TableClassName="PackListDataTable" msprop:Generator_TableVarName="tablePackList" msprop:Generator_TablePropName="PackList" msprop:Generator_RowDeletingName="PackListRowDeleting" msprop:Generator_RowChangingName="PackListRowChanging" msprop:Generator_RowEvHandlerName="PackListRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListRowDeleted" msprop:Generator_UserTableName="PackList" msprop:Generator_RowChangedName="PackListRowChanged" msprop:Generator_RowEvArgName="PackListRowChangeEvent" msprop:Generator_RowClassName="PackListRow">
+        <xs:element name="PackList" msprop:Generator_TableClassName="PackListDataTable" msprop:Generator_TableVarName="tablePackList" msprop:Generator_RowChangedName="PackListRowChanged" msprop:Generator_TablePropName="PackList" msprop:Generator_RowDeletingName="PackListRowDeleting" msprop:Generator_RowChangingName="PackListRowChanging" msprop:Generator_RowEvHandlerName="PackListRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListRowDeleted" msprop:Generator_RowClassName="PackListRow" msprop:Generator_UserTableName="PackList" msprop:Generator_RowEvArgName="PackListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PackListID" msprop:Generator_ColumnVarNameInTable="columnPackListID" msprop:Generator_ColumnPropNameInRow="PackListID" msprop:Generator_ColumnPropNameInTable="PackListIDColumn" msprop:Generator_UserColumnName="PackListID" type="xs:int" />
@@ -4363,7 +4382,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OtherItem" msprop:Generator_TableClassName="OtherItemDataTable" msprop:Generator_TableVarName="tableOtherItem" msprop:Generator_TablePropName="OtherItem" msprop:Generator_RowDeletingName="OtherItemRowDeleting" msprop:Generator_RowChangingName="OtherItemRowChanging" msprop:Generator_RowEvHandlerName="OtherItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OtherItemRowDeleted" msprop:Generator_UserTableName="OtherItem" msprop:Generator_RowChangedName="OtherItemRowChanged" msprop:Generator_RowEvArgName="OtherItemRowChangeEvent" msprop:Generator_RowClassName="OtherItemRow">
+        <xs:element name="OtherItem" msprop:Generator_TableClassName="OtherItemDataTable" msprop:Generator_TableVarName="tableOtherItem" msprop:Generator_RowChangedName="OtherItemRowChanged" msprop:Generator_TablePropName="OtherItem" msprop:Generator_RowDeletingName="OtherItemRowDeleting" msprop:Generator_RowChangingName="OtherItemRowChanging" msprop:Generator_RowEvHandlerName="OtherItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OtherItemRowDeleted" msprop:Generator_RowClassName="OtherItemRow" msprop:Generator_UserTableName="OtherItem" msprop:Generator_RowEvArgName="OtherItemRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OtherItemID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnOtherItemID" msprop:Generator_ColumnPropNameInRow="OtherItemID" msprop:Generator_ColumnPropNameInTable="OtherItemIDColumn" msprop:Generator_UserColumnName="OtherItemID" type="xs:int" />
@@ -4405,7 +4424,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ItemSearchDetail" msprop:Generator_TableClassName="ItemSearchDetailDataTable" msprop:Generator_TableVarName="tableItemSearchDetail" msprop:Generator_RowChangedName="ItemSearchDetailRowChanged" msprop:Generator_TablePropName="ItemSearchDetail" msprop:Generator_RowDeletingName="ItemSearchDetailRowDeleting" msprop:Generator_RowChangingName="ItemSearchDetailRowChanging" msprop:Generator_RowEvHandlerName="ItemSearchDetailRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemSearchDetailRowDeleted" msprop:Generator_RowClassName="ItemSearchDetailRow" msprop:Generator_UserTableName="ItemSearchDetail" msprop:Generator_RowEvArgName="ItemSearchDetailRowChangeEvent">
+        <xs:element name="ItemSearchDetail" msprop:Generator_TableClassName="ItemSearchDetailDataTable" msprop:Generator_TableVarName="tableItemSearchDetail" msprop:Generator_TablePropName="ItemSearchDetail" msprop:Generator_RowDeletingName="ItemSearchDetailRowDeleting" msprop:Generator_RowChangingName="ItemSearchDetailRowChanging" msprop:Generator_RowEvHandlerName="ItemSearchDetailRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemSearchDetailRowDeleted" msprop:Generator_UserTableName="ItemSearchDetail" msprop:Generator_RowChangedName="ItemSearchDetailRowChanged" msprop:Generator_RowEvArgName="ItemSearchDetailRowChangeEvent" msprop:Generator_RowClassName="ItemSearchDetailRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemID" msprop:Generator_ColumnVarNameInTable="columnItemID" msprop:Generator_ColumnPropNameInRow="ItemID" msprop:Generator_ColumnPropNameInTable="ItemIDColumn" msprop:Generator_UserColumnName="ItemID" type="xs:int" />
@@ -4516,7 +4535,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PackListDet" msprop:Generator_TableClassName="PackListDetDataTable" msprop:Generator_TableVarName="tablePackListDet" msprop:Generator_RowChangedName="PackListDetRowChanged" msprop:Generator_TablePropName="PackListDet" msprop:Generator_RowDeletingName="PackListDetRowDeleting" msprop:Generator_RowChangingName="PackListDetRowChanging" msprop:Generator_RowEvHandlerName="PackListDetRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListDetRowDeleted" msprop:Generator_RowClassName="PackListDetRow" msprop:Generator_UserTableName="PackListDet" msprop:Generator_RowEvArgName="PackListDetRowChangeEvent">
+        <xs:element name="PackListDet" msprop:Generator_TableClassName="PackListDetDataTable" msprop:Generator_TableVarName="tablePackListDet" msprop:Generator_TablePropName="PackListDet" msprop:Generator_RowDeletingName="PackListDetRowDeleting" msprop:Generator_RowChangingName="PackListDetRowChanging" msprop:Generator_RowEvHandlerName="PackListDetRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListDetRowDeleted" msprop:Generator_UserTableName="PackListDet" msprop:Generator_RowChangedName="PackListDetRowChanged" msprop:Generator_RowEvArgName="PackListDetRowChangeEvent" msprop:Generator_RowClassName="PackListDetRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PackListID" msprop:Generator_ColumnVarNameInTable="columnPackListID" msprop:Generator_ColumnPropNameInRow="PackListID" msprop:Generator_ColumnPropNameInTable="PackListIDColumn" msprop:Generator_UserColumnName="PackListID" type="xs:int" />
@@ -4579,7 +4598,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PackLog" msprop:Generator_TableClassName="PackLogDataTable" msprop:Generator_TableVarName="tablePackLog" msprop:Generator_RowChangedName="PackLogRowChanged" msprop:Generator_TablePropName="PackLog" msprop:Generator_RowDeletingName="PackLogRowDeleting" msprop:Generator_RowChangingName="PackLogRowChanging" msprop:Generator_RowEvHandlerName="PackLogRowChangeEventHandler" msprop:Generator_RowDeletedName="PackLogRowDeleted" msprop:Generator_RowClassName="PackLogRow" msprop:Generator_UserTableName="PackLog" msprop:Generator_RowEvArgName="PackLogRowChangeEvent">
+        <xs:element name="PackLog" msprop:Generator_TableClassName="PackLogDataTable" msprop:Generator_TableVarName="tablePackLog" msprop:Generator_TablePropName="PackLog" msprop:Generator_RowDeletingName="PackLogRowDeleting" msprop:Generator_RowChangingName="PackLogRowChanging" msprop:Generator_RowEvHandlerName="PackLogRowChangeEventHandler" msprop:Generator_RowDeletedName="PackLogRowDeleted" msprop:Generator_UserTableName="PackLog" msprop:Generator_RowChangedName="PackLogRowChanged" msprop:Generator_RowEvArgName="PackLogRowChangeEvent" msprop:Generator_RowClassName="PackLogRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PLogID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnPLogID" msprop:Generator_ColumnPropNameInRow="PLogID" msprop:Generator_ColumnPropNameInTable="PLogIDColumn" msprop:Generator_UserColumnName="PLogID" type="xs:int" />
@@ -4624,7 +4643,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PackCheck" msprop:Generator_TableClassName="PackCheckDataTable" msprop:Generator_TableVarName="tablePackCheck" msprop:Generator_RowChangedName="PackCheckRowChanged" msprop:Generator_TablePropName="PackCheck" msprop:Generator_RowDeletingName="PackCheckRowDeleting" msprop:Generator_RowChangingName="PackCheckRowChanging" msprop:Generator_RowEvHandlerName="PackCheckRowChangeEventHandler" msprop:Generator_RowDeletedName="PackCheckRowDeleted" msprop:Generator_RowClassName="PackCheckRow" msprop:Generator_UserTableName="PackCheck" msprop:Generator_RowEvArgName="PackCheckRowChangeEvent">
+        <xs:element name="PackCheck" msprop:Generator_TableClassName="PackCheckDataTable" msprop:Generator_TableVarName="tablePackCheck" msprop:Generator_TablePropName="PackCheck" msprop:Generator_RowDeletingName="PackCheckRowDeleting" msprop:Generator_RowChangingName="PackCheckRowChanging" msprop:Generator_RowEvHandlerName="PackCheckRowChangeEventHandler" msprop:Generator_RowDeletedName="PackCheckRowDeleted" msprop:Generator_UserTableName="PackCheck" msprop:Generator_RowChangedName="PackCheckRowChanged" msprop:Generator_RowEvArgName="PackCheckRowChangeEvent" msprop:Generator_RowClassName="PackCheckRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CartID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" minOccurs="0" />
@@ -4650,7 +4669,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OKIB" msprop:Generator_TableClassName="OKIBDataTable" msprop:Generator_TableVarName="tableOKIB" msprop:Generator_TablePropName="OKIB" msprop:Generator_RowDeletingName="OKIBRowDeleting" msprop:Generator_RowChangingName="OKIBRowChanging" msprop:Generator_RowEvHandlerName="OKIBRowChangeEventHandler" msprop:Generator_RowDeletedName="OKIBRowDeleted" msprop:Generator_UserTableName="OKIB" msprop:Generator_RowChangedName="OKIBRowChanged" msprop:Generator_RowEvArgName="OKIBRowChangeEvent" msprop:Generator_RowClassName="OKIBRow">
+        <xs:element name="OKIB" msprop:Generator_TableClassName="OKIBDataTable" msprop:Generator_TableVarName="tableOKIB" msprop:Generator_RowChangedName="OKIBRowChanged" msprop:Generator_TablePropName="OKIB" msprop:Generator_RowDeletingName="OKIBRowDeleting" msprop:Generator_RowChangingName="OKIBRowChanging" msprop:Generator_RowEvHandlerName="OKIBRowChangeEventHandler" msprop:Generator_RowDeletedName="OKIBRowDeleted" msprop:Generator_RowClassName="OKIBRow" msprop:Generator_UserTableName="OKIB" msprop:Generator_RowEvArgName="OKIBRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemID" msprop:Generator_ColumnVarNameInTable="columnItemID" msprop:Generator_ColumnPropNameInRow="ItemID" msprop:Generator_ColumnPropNameInTable="ItemIDColumn" msprop:Generator_UserColumnName="ItemID" type="xs:int" />
@@ -4743,7 +4762,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OKIB_Sum" msprop:Generator_TableClassName="OKIB_SumDataTable" msprop:Generator_TableVarName="tableOKIB_Sum" msprop:Generator_RowChangedName="OKIB_SumRowChanged" msprop:Generator_TablePropName="OKIB_Sum" msprop:Generator_RowDeletingName="OKIB_SumRowDeleting" msprop:Generator_RowChangingName="OKIB_SumRowChanging" msprop:Generator_RowEvHandlerName="OKIB_SumRowChangeEventHandler" msprop:Generator_RowDeletedName="OKIB_SumRowDeleted" msprop:Generator_RowClassName="OKIB_SumRow" msprop:Generator_UserTableName="OKIB_Sum" msprop:Generator_RowEvArgName="OKIB_SumRowChangeEvent">
+        <xs:element name="OKIB_Sum" msprop:Generator_TableClassName="OKIB_SumDataTable" msprop:Generator_TableVarName="tableOKIB_Sum" msprop:Generator_TablePropName="OKIB_Sum" msprop:Generator_RowDeletingName="OKIB_SumRowDeleting" msprop:Generator_RowChangingName="OKIB_SumRowChanging" msprop:Generator_RowEvHandlerName="OKIB_SumRowChangeEventHandler" msprop:Generator_RowDeletedName="OKIB_SumRowDeleted" msprop:Generator_UserTableName="OKIB_Sum" msprop:Generator_RowChangedName="OKIB_SumRowChanged" msprop:Generator_RowEvArgName="OKIB_SumRowChangeEvent" msprop:Generator_RowClassName="OKIB_SumRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BinID" msprop:Generator_ColumnVarNameInTable="columnBinID" msprop:Generator_ColumnPropNameInRow="BinID" msprop:Generator_ColumnPropNameInTable="BinIDColumn" msprop:Generator_UserColumnName="BinID" type="xs:int" />
@@ -4806,7 +4825,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OKOI" msprop:Generator_TableClassName="OKOIDataTable" msprop:Generator_TableVarName="tableOKOI" msprop:Generator_RowChangedName="OKOIRowChanged" msprop:Generator_TablePropName="OKOI" msprop:Generator_RowDeletingName="OKOIRowDeleting" msprop:Generator_RowChangingName="OKOIRowChanging" msprop:Generator_RowEvHandlerName="OKOIRowChangeEventHandler" msprop:Generator_RowDeletedName="OKOIRowDeleted" msprop:Generator_RowClassName="OKOIRow" msprop:Generator_UserTableName="OKOI" msprop:Generator_RowEvArgName="OKOIRowChangeEvent">
+        <xs:element name="OKOI" msprop:Generator_TableClassName="OKOIDataTable" msprop:Generator_TableVarName="tableOKOI" msprop:Generator_TablePropName="OKOI" msprop:Generator_RowDeletingName="OKOIRowDeleting" msprop:Generator_RowChangingName="OKOIRowChanging" msprop:Generator_RowEvHandlerName="OKOIRowChangeEventHandler" msprop:Generator_RowDeletedName="OKOIRowDeleted" msprop:Generator_UserTableName="OKOI" msprop:Generator_RowChangedName="OKOIRowChanged" msprop:Generator_RowEvArgName="OKOIRowChangeEvent" msprop:Generator_RowClassName="OKOIRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OtherItemID" msprop:Generator_ColumnVarNameInTable="columnOtherItemID" msprop:Generator_ColumnPropNameInRow="OtherItemID" msprop:Generator_ColumnPropNameInTable="OtherItemIDColumn" msprop:Generator_UserColumnName="OtherItemID" type="xs:int" />
@@ -4865,7 +4884,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OKOI_sum" msprop:Generator_TableClassName="OKOI_sumDataTable" msprop:Generator_TableVarName="tableOKOI_sum" msprop:Generator_RowChangedName="OKOI_sumRowChanged" msprop:Generator_TablePropName="OKOI_sum" msprop:Generator_RowDeletingName="OKOI_sumRowDeleting" msprop:Generator_RowChangingName="OKOI_sumRowChanging" msprop:Generator_RowEvHandlerName="OKOI_sumRowChangeEventHandler" msprop:Generator_RowDeletedName="OKOI_sumRowDeleted" msprop:Generator_RowClassName="OKOI_sumRow" msprop:Generator_UserTableName="OKOI_sum" msprop:Generator_RowEvArgName="OKOI_sumRowChangeEvent">
+        <xs:element name="OKOI_sum" msprop:Generator_TableClassName="OKOI_sumDataTable" msprop:Generator_TableVarName="tableOKOI_sum" msprop:Generator_TablePropName="OKOI_sum" msprop:Generator_RowDeletingName="OKOI_sumRowDeleting" msprop:Generator_RowChangingName="OKOI_sumRowChanging" msprop:Generator_RowEvHandlerName="OKOI_sumRowChangeEventHandler" msprop:Generator_RowDeletedName="OKOI_sumRowDeleted" msprop:Generator_UserTableName="OKOI_sum" msprop:Generator_RowChangedName="OKOI_sumRowChanged" msprop:Generator_RowEvArgName="OKOI_sumRowChangeEvent" msprop:Generator_RowClassName="OKOI_sumRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OtherItemID" msprop:Generator_ColumnVarNameInTable="columnOtherItemID" msprop:Generator_ColumnPropNameInRow="OtherItemID" msprop:Generator_ColumnPropNameInTable="OtherItemIDColumn" msprop:Generator_UserColumnName="OtherItemID" type="xs:int" />
@@ -4914,7 +4933,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Pack2Cart" msprop:Generator_TableClassName="Pack2CartDataTable" msprop:Generator_TableVarName="tablePack2Cart" msprop:Generator_TablePropName="Pack2Cart" msprop:Generator_RowDeletingName="Pack2CartRowDeleting" msprop:Generator_RowChangingName="Pack2CartRowChanging" msprop:Generator_RowEvHandlerName="Pack2CartRowChangeEventHandler" msprop:Generator_RowDeletedName="Pack2CartRowDeleted" msprop:Generator_UserTableName="Pack2Cart" msprop:Generator_RowChangedName="Pack2CartRowChanged" msprop:Generator_RowEvArgName="Pack2CartRowChangeEvent" msprop:Generator_RowClassName="Pack2CartRow">
+        <xs:element name="Pack2Cart" msprop:Generator_TableClassName="Pack2CartDataTable" msprop:Generator_TableVarName="tablePack2Cart" msprop:Generator_RowChangedName="Pack2CartRowChanged" msprop:Generator_TablePropName="Pack2Cart" msprop:Generator_RowDeletingName="Pack2CartRowDeleting" msprop:Generator_RowChangingName="Pack2CartRowChanging" msprop:Generator_RowEvHandlerName="Pack2CartRowChangeEventHandler" msprop:Generator_RowDeletedName="Pack2CartRowDeleted" msprop:Generator_RowClassName="Pack2CartRow" msprop:Generator_UserTableName="Pack2Cart" msprop:Generator_RowEvArgName="Pack2CartRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PackListID" msprop:Generator_ColumnVarNameInTable="columnPackListID" msprop:Generator_ColumnPropNameInRow="PackListID" msprop:Generator_ColumnPropNameInTable="PackListIDColumn" msprop:Generator_UserColumnName="PackListID" type="xs:int" />
@@ -4953,7 +4972,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="CartIRK" msprop:Generator_TableClassName="CartIRKDataTable" msprop:Generator_TableVarName="tableCartIRK" msprop:Generator_RowChangedName="CartIRKRowChanged" msprop:Generator_TablePropName="CartIRK" msprop:Generator_RowDeletingName="CartIRKRowDeleting" msprop:Generator_RowChangingName="CartIRKRowChanging" msprop:Generator_RowEvHandlerName="CartIRKRowChangeEventHandler" msprop:Generator_RowDeletedName="CartIRKRowDeleted" msprop:Generator_RowClassName="CartIRKRow" msprop:Generator_UserTableName="CartIRK" msprop:Generator_RowEvArgName="CartIRKRowChangeEvent">
+        <xs:element name="CartIRK" msprop:Generator_TableClassName="CartIRKDataTable" msprop:Generator_TableVarName="tableCartIRK" msprop:Generator_TablePropName="CartIRK" msprop:Generator_RowDeletingName="CartIRKRowDeleting" msprop:Generator_RowChangingName="CartIRKRowChanging" msprop:Generator_RowEvHandlerName="CartIRKRowChangeEventHandler" msprop:Generator_RowDeletedName="CartIRKRowDeleted" msprop:Generator_UserTableName="CartIRK" msprop:Generator_RowChangedName="CartIRKRowChanged" msprop:Generator_RowEvArgName="CartIRKRowChangeEvent" msprop:Generator_RowClassName="CartIRKRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OrderExtCode" msprop:Generator_ColumnVarNameInTable="columnOrderExtCode" msprop:Generator_ColumnPropNameInRow="OrderExtCode" msprop:Generator_ColumnPropNameInTable="OrderExtCodeColumn" msprop:Generator_UserColumnName="OrderExtCode" minOccurs="0">
@@ -5006,7 +5025,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="FileValidation" msprop:Generator_TableClassName="FileValidationDataTable" msprop:Generator_TableVarName="tableFileValidation" msprop:Generator_RowChangedName="FileValidationRowChanged" msprop:Generator_TablePropName="FileValidation" msprop:Generator_RowDeletingName="FileValidationRowDeleting" msprop:Generator_RowChangingName="FileValidationRowChanging" msprop:Generator_RowEvHandlerName="FileValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="FileValidationRowDeleted" msprop:Generator_RowClassName="FileValidationRow" msprop:Generator_UserTableName="FileValidation" msprop:Generator_RowEvArgName="FileValidationRowChangeEvent">
+        <xs:element name="FileValidation" msprop:Generator_TableClassName="FileValidationDataTable" msprop:Generator_TableVarName="tableFileValidation" msprop:Generator_TablePropName="FileValidation" msprop:Generator_RowDeletingName="FileValidationRowDeleting" msprop:Generator_RowChangingName="FileValidationRowChanging" msprop:Generator_RowEvHandlerName="FileValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="FileValidationRowDeleted" msprop:Generator_UserTableName="FileValidation" msprop:Generator_RowChangedName="FileValidationRowChanged" msprop:Generator_RowEvArgName="FileValidationRowChangeEvent" msprop:Generator_RowClassName="FileValidationRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemExtCode" msprop:Generator_ColumnVarNameInTable="columnItemExtCode" msprop:Generator_ColumnPropNameInRow="ItemExtCode" msprop:Generator_ColumnPropNameInTable="ItemExtCodeColumn" msprop:Generator_UserColumnName="ItemExtCode">
@@ -5023,7 +5042,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SheetsPreview" msprop:Generator_TableClassName="SheetsPreviewDataTable" msprop:Generator_TableVarName="tableSheetsPreview" msprop:Generator_TablePropName="SheetsPreview" msprop:Generator_RowDeletingName="SheetsPreviewRowDeleting" msprop:Generator_RowChangingName="SheetsPreviewRowChanging" msprop:Generator_RowEvHandlerName="SheetsPreviewRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetsPreviewRowDeleted" msprop:Generator_UserTableName="SheetsPreview" msprop:Generator_RowChangedName="SheetsPreviewRowChanged" msprop:Generator_RowEvArgName="SheetsPreviewRowChangeEvent" msprop:Generator_RowClassName="SheetsPreviewRow">
+        <xs:element name="SheetsPreview" msprop:Generator_TableClassName="SheetsPreviewDataTable" msprop:Generator_TableVarName="tableSheetsPreview" msprop:Generator_RowChangedName="SheetsPreviewRowChanged" msprop:Generator_TablePropName="SheetsPreview" msprop:Generator_RowDeletingName="SheetsPreviewRowDeleting" msprop:Generator_RowChangingName="SheetsPreviewRowChanging" msprop:Generator_RowEvHandlerName="SheetsPreviewRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetsPreviewRowDeleted" msprop:Generator_RowClassName="SheetsPreviewRow" msprop:Generator_UserTableName="SheetsPreview" msprop:Generator_RowEvArgName="SheetsPreviewRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="SheetID" msprop:Generator_ColumnVarNameInTable="columnSheetID" msprop:Generator_ColumnPropNameInRow="SheetID" msprop:Generator_ColumnPropNameInTable="SheetIDColumn" msprop:Generator_UserColumnName="SheetID" type="xs:int" />
@@ -5036,7 +5055,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OrderListTree" msprop:Generator_TableClassName="OrderListTreeDataTable" msprop:Generator_TableVarName="tableOrderListTree" msprop:Generator_TablePropName="OrderListTree" msprop:Generator_RowDeletingName="OrderListTreeRowDeleting" msprop:Generator_RowChangingName="OrderListTreeRowChanging" msprop:Generator_RowEvHandlerName="OrderListTreeRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListTreeRowDeleted" msprop:Generator_UserTableName="OrderListTree" msprop:Generator_RowChangedName="OrderListTreeRowChanged" msprop:Generator_RowEvArgName="OrderListTreeRowChangeEvent" msprop:Generator_RowClassName="OrderListTreeRow">
+        <xs:element name="OrderListTree" msprop:Generator_TableClassName="OrderListTreeDataTable" msprop:Generator_TableVarName="tableOrderListTree" msprop:Generator_RowChangedName="OrderListTreeRowChanged" msprop:Generator_TablePropName="OrderListTree" msprop:Generator_RowDeletingName="OrderListTreeRowDeleting" msprop:Generator_RowChangingName="OrderListTreeRowChanging" msprop:Generator_RowEvHandlerName="OrderListTreeRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListTreeRowDeleted" msprop:Generator_RowClassName="OrderListTreeRow" msprop:Generator_UserTableName="OrderListTree" msprop:Generator_RowEvArgName="OrderListTreeRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BatchID" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" />
@@ -5058,7 +5077,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Places" msprop:Generator_TableClassName="PlacesDataTable" msprop:Generator_TableVarName="tablePlaces" msprop:Generator_TablePropName="Places" msprop:Generator_RowDeletingName="PlacesRowDeleting" msprop:Generator_RowChangingName="PlacesRowChanging" msprop:Generator_RowEvHandlerName="PlacesRowChangeEventHandler" msprop:Generator_RowDeletedName="PlacesRowDeleted" msprop:Generator_UserTableName="Places" msprop:Generator_RowChangedName="PlacesRowChanged" msprop:Generator_RowEvArgName="PlacesRowChangeEvent" msprop:Generator_RowClassName="PlacesRow">
+        <xs:element name="Places" msprop:Generator_TableClassName="PlacesDataTable" msprop:Generator_TableVarName="tablePlaces" msprop:Generator_RowChangedName="PlacesRowChanged" msprop:Generator_TablePropName="Places" msprop:Generator_RowDeletingName="PlacesRowDeleting" msprop:Generator_RowChangingName="PlacesRowChanging" msprop:Generator_RowEvHandlerName="PlacesRowChangeEventHandler" msprop:Generator_RowDeletedName="PlacesRowDeleted" msprop:Generator_RowClassName="PlacesRow" msprop:Generator_UserTableName="Places" msprop:Generator_RowEvArgName="PlacesRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PlaceCod" msprop:Generator_ColumnVarNameInTable="columnPlaceCod" msprop:Generator_ColumnPropNameInRow="PlaceCod" msprop:Generator_ColumnPropNameInTable="PlaceCodColumn" msprop:Generator_UserColumnName="PlaceCod">
@@ -5086,7 +5105,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="StatusLog" msprop:Generator_TableClassName="StatusLogDataTable" msprop:Generator_TableVarName="tableStatusLog" msprop:Generator_TablePropName="StatusLog" msprop:Generator_RowDeletingName="StatusLogRowDeleting" msprop:Generator_RowChangingName="StatusLogRowChanging" msprop:Generator_RowEvHandlerName="StatusLogRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusLogRowDeleted" msprop:Generator_UserTableName="StatusLog" msprop:Generator_RowChangedName="StatusLogRowChanged" msprop:Generator_RowEvArgName="StatusLogRowChangeEvent" msprop:Generator_RowClassName="StatusLogRow">
+        <xs:element name="StatusLog" msprop:Generator_TableClassName="StatusLogDataTable" msprop:Generator_TableVarName="tableStatusLog" msprop:Generator_RowChangedName="StatusLogRowChanged" msprop:Generator_TablePropName="StatusLog" msprop:Generator_RowDeletingName="StatusLogRowDeleting" msprop:Generator_RowChangingName="StatusLogRowChanging" msprop:Generator_RowEvHandlerName="StatusLogRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusLogRowDeleted" msprop:Generator_RowClassName="StatusLogRow" msprop:Generator_UserTableName="StatusLog" msprop:Generator_RowEvArgName="StatusLogRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PlaceCod" msprop:Generator_ColumnVarNameInTable="columnPlaceCod" msprop:Generator_ColumnPropNameInRow="PlaceCod" msprop:Generator_ColumnPropNameInTable="PlaceCodColumn" msprop:Generator_UserColumnName="PlaceCod">
@@ -5123,7 +5142,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="StatusDecode" msprop:Generator_TableClassName="StatusDecodeDataTable" msprop:Generator_TableVarName="tableStatusDecode" msprop:Generator_RowChangedName="StatusDecodeRowChanged" msprop:Generator_TablePropName="StatusDecode" msprop:Generator_RowDeletingName="StatusDecodeRowDeleting" msprop:Generator_RowChangingName="StatusDecodeRowChanging" msprop:Generator_RowEvHandlerName="StatusDecodeRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusDecodeRowDeleted" msprop:Generator_RowClassName="StatusDecodeRow" msprop:Generator_UserTableName="StatusDecode" msprop:Generator_RowEvArgName="StatusDecodeRowChangeEvent">
+        <xs:element name="StatusDecode" msprop:Generator_TableClassName="StatusDecodeDataTable" msprop:Generator_TableVarName="tableStatusDecode" msprop:Generator_TablePropName="StatusDecode" msprop:Generator_RowDeletingName="StatusDecodeRowDeleting" msprop:Generator_RowChangingName="StatusDecodeRowChanging" msprop:Generator_RowEvHandlerName="StatusDecodeRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusDecodeRowDeleted" msprop:Generator_UserTableName="StatusDecode" msprop:Generator_RowChangedName="StatusDecodeRowChanged" msprop:Generator_RowEvArgName="StatusDecodeRowChangeEvent" msprop:Generator_RowClassName="StatusDecodeRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Station" msprop:Generator_ColumnVarNameInTable="columnStation" msprop:Generator_ColumnPropNameInRow="Station" msprop:Generator_ColumnPropNameInTable="StationColumn" msprop:Generator_UserColumnName="Station">
@@ -5157,7 +5176,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="UpdMan" msprop:Generator_TableClassName="UpdManDataTable" msprop:Generator_TableVarName="tableUpdMan" msprop:Generator_RowChangedName="UpdManRowChanged" msprop:Generator_TablePropName="UpdMan" msprop:Generator_RowDeletingName="UpdManRowDeleting" msprop:Generator_RowChangingName="UpdManRowChanging" msprop:Generator_RowEvHandlerName="UpdManRowChangeEventHandler" msprop:Generator_RowDeletedName="UpdManRowDeleted" msprop:Generator_RowClassName="UpdManRow" msprop:Generator_UserTableName="UpdMan" msprop:Generator_RowEvArgName="UpdManRowChangeEvent">
+        <xs:element name="UpdMan" msprop:Generator_TableClassName="UpdManDataTable" msprop:Generator_TableVarName="tableUpdMan" msprop:Generator_TablePropName="UpdMan" msprop:Generator_RowDeletingName="UpdManRowDeleting" msprop:Generator_RowChangingName="UpdManRowChanging" msprop:Generator_RowEvHandlerName="UpdManRowChangeEventHandler" msprop:Generator_RowDeletedName="UpdManRowDeleted" msprop:Generator_UserTableName="UpdMan" msprop:Generator_RowChangedName="UpdManRowChanged" msprop:Generator_RowEvArgName="UpdManRowChangeEvent" msprop:Generator_RowClassName="UpdManRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="AppName" msprop:Generator_ColumnVarNameInTable="columnAppName" msprop:Generator_ColumnPropNameInRow="AppName" msprop:Generator_ColumnPropNameInTable="AppNameColumn" msprop:Generator_UserColumnName="AppName">
@@ -5369,18 +5388,18 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_ItemList_Materials1" msdata:parent="Materials" msdata:child="ItemList" msdata:parentkey="MatID" msdata:childkey="MatID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_Materials1" msprop:Generator_RelationVarName="relationFK_ItemList_Materials1" msprop:Generator_UserParentTable="Materials" msprop:Generator_ParentPropName="MaterialsRow" />
-      <msdata:Relationship name="FK_OffOrd2Item_OfflineOrderList" msdata:parent="OfflineOrderList" msdata:child="OffOrd2Item" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_OfflineOrderList" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_OfflineOrderList" msprop:Generator_UserParentTable="OfflineOrderList" msprop:Generator_ParentPropName="OfflineOrderListRow" />
-      <msdata:Relationship name="FK_ItemList_KitList" msdata:parent="KitList" msdata:child="ItemList" msdata:parentkey="KitID" msdata:childkey="KitID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_KitList" msprop:Generator_RelationVarName="relationFK_ItemList_KitList" msprop:Generator_UserParentTable="KitList" msprop:Generator_ParentPropName="KitListRow" />
-      <msdata:Relationship name="FK_Nesting_ItemList" msdata:parent="ItemList" msdata:child="Nesting" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="Nesting" msprop:Generator_ChildPropName="GetNestingRows" msprop:Generator_UserRelationName="FK_Nesting_ItemList" msprop:Generator_RelationVarName="relationFK_Nesting_ItemList" msprop:Generator_UserParentTable="ItemList" msprop:Generator_ParentPropName="ItemListRow" />
-      <msdata:Relationship name="FK_KitList_Carts" msdata:parent="Carts" msdata:child="KitList" msdata:parentkey="CartID" msdata:childkey="CartID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_Carts" msprop:Generator_RelationVarName="relationFK_KitList_Carts" msprop:Generator_UserParentTable="Carts" msprop:Generator_ParentPropName="CartsRow" />
-      <msdata:Relationship name="FK_KitList_OrderList" msdata:parent="OrderList" msdata:child="KitList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_OrderList" msprop:Generator_RelationVarName="relationFK_KitList_OrderList" msprop:Generator_UserParentTable="OrderList" msprop:Generator_ParentPropName="OrderListRow" />
-      <msdata:Relationship name="FK_OffOrd2Item_ItemList" msdata:parent="ItemList" msdata:child="OffOrd2Item" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_ItemList" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_ItemList" msprop:Generator_UserParentTable="ItemList" msprop:Generator_ParentPropName="ItemListRow" />
-      <msdata:Relationship name="FK_BinList_Bins" msdata:parent="Bins" msdata:child="BinList" msdata:parentkey="BinID" msdata:childkey="BinID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_Bins" msprop:Generator_RelationVarName="relationFK_BinList_Bins" msprop:Generator_UserParentTable="Bins" msprop:Generator_ParentPropName="BinsRow" />
-      <msdata:Relationship name="FK_BinList_ItemList" msdata:parent="ItemList" msdata:child="BinList" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_ItemList" msprop:Generator_RelationVarName="relationFK_BinList_ItemList" msprop:Generator_UserParentTable="ItemList" msprop:Generator_ParentPropName="ItemListRow" />
-      <msdata:Relationship name="FK_Order2FinalKit_FinalKit" msdata:parent="FinalKit" msdata:child="Order2FinalKit" msdata:parentkey="FinalKitID" msdata:childkey="FinalKitID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_FinalKit" msprop:Generator_ParentPropName="FinalKitRow" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_FinalKit" msprop:Generator_UserParentTable="FinalKit" />
-      <msdata:Relationship name="FK_Order2FinalKit_OrderList" msdata:parent="OrderList" msdata:child="Order2FinalKit" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_OrderList" msprop:Generator_ParentPropName="OrderListRow" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_OrderList" msprop:Generator_UserParentTable="OrderList" />
-      <msdata:Relationship name="FK_StatusLog_Places" msdata:parent="Places" msdata:child="StatusLog" msdata:parentkey="PlaceCod" msdata:childkey="PlaceCod" msprop:Generator_UserChildTable="StatusLog" msprop:Generator_ChildPropName="GetStatusLogRows" msprop:Generator_UserRelationName="FK_StatusLog_Places" msprop:Generator_ParentPropName="PlacesRow" msprop:Generator_RelationVarName="relationFK_StatusLog_Places" msprop:Generator_UserParentTable="Places" />
+      <msdata:Relationship name="FK_ItemList_Materials1" msdata:parent="Materials" msdata:child="ItemList" msdata:parentkey="MatID" msdata:childkey="MatID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_Materials1" msprop:Generator_ParentPropName="MaterialsRow" msprop:Generator_RelationVarName="relationFK_ItemList_Materials1" msprop:Generator_UserParentTable="Materials" />
+      <msdata:Relationship name="FK_OffOrd2Item_OfflineOrderList" msdata:parent="OfflineOrderList" msdata:child="OffOrd2Item" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_OfflineOrderList" msprop:Generator_ParentPropName="OfflineOrderListRow" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_OfflineOrderList" msprop:Generator_UserParentTable="OfflineOrderList" />
+      <msdata:Relationship name="FK_ItemList_KitList" msdata:parent="KitList" msdata:child="ItemList" msdata:parentkey="KitID" msdata:childkey="KitID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_KitList" msprop:Generator_ParentPropName="KitListRow" msprop:Generator_RelationVarName="relationFK_ItemList_KitList" msprop:Generator_UserParentTable="KitList" />
+      <msdata:Relationship name="FK_Nesting_ItemList" msdata:parent="ItemList" msdata:child="Nesting" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="Nesting" msprop:Generator_ChildPropName="GetNestingRows" msprop:Generator_UserRelationName="FK_Nesting_ItemList" msprop:Generator_ParentPropName="ItemListRow" msprop:Generator_RelationVarName="relationFK_Nesting_ItemList" msprop:Generator_UserParentTable="ItemList" />
+      <msdata:Relationship name="FK_KitList_Carts" msdata:parent="Carts" msdata:child="KitList" msdata:parentkey="CartID" msdata:childkey="CartID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_Carts" msprop:Generator_ParentPropName="CartsRow" msprop:Generator_RelationVarName="relationFK_KitList_Carts" msprop:Generator_UserParentTable="Carts" />
+      <msdata:Relationship name="FK_KitList_OrderList" msdata:parent="OrderList" msdata:child="KitList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_OrderList" msprop:Generator_ParentPropName="OrderListRow" msprop:Generator_RelationVarName="relationFK_KitList_OrderList" msprop:Generator_UserParentTable="OrderList" />
+      <msdata:Relationship name="FK_OffOrd2Item_ItemList" msdata:parent="ItemList" msdata:child="OffOrd2Item" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_ItemList" msprop:Generator_ParentPropName="ItemListRow" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_ItemList" msprop:Generator_UserParentTable="ItemList" />
+      <msdata:Relationship name="FK_BinList_Bins" msdata:parent="Bins" msdata:child="BinList" msdata:parentkey="BinID" msdata:childkey="BinID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_Bins" msprop:Generator_ParentPropName="BinsRow" msprop:Generator_RelationVarName="relationFK_BinList_Bins" msprop:Generator_UserParentTable="Bins" />
+      <msdata:Relationship name="FK_BinList_ItemList" msdata:parent="ItemList" msdata:child="BinList" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_ItemList" msprop:Generator_ParentPropName="ItemListRow" msprop:Generator_RelationVarName="relationFK_BinList_ItemList" msprop:Generator_UserParentTable="ItemList" />
+      <msdata:Relationship name="FK_Order2FinalKit_FinalKit" msdata:parent="FinalKit" msdata:child="Order2FinalKit" msdata:parentkey="FinalKitID" msdata:childkey="FinalKitID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_FinalKit" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_FinalKit" msprop:Generator_UserParentTable="FinalKit" msprop:Generator_ParentPropName="FinalKitRow" />
+      <msdata:Relationship name="FK_Order2FinalKit_OrderList" msdata:parent="OrderList" msdata:child="Order2FinalKit" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_OrderList" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_OrderList" msprop:Generator_UserParentTable="OrderList" msprop:Generator_ParentPropName="OrderListRow" />
+      <msdata:Relationship name="FK_StatusLog_Places" msdata:parent="Places" msdata:child="StatusLog" msdata:parentkey="PlaceCod" msdata:childkey="PlaceCod" msprop:Generator_UserChildTable="StatusLog" msprop:Generator_ChildPropName="GetStatusLogRows" msprop:Generator_UserRelationName="FK_StatusLog_Places" msprop:Generator_RelationVarName="relationFK_StatusLog_Places" msprop:Generator_UserParentTable="Places" msprop:Generator_ParentPropName="PlacesRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

AppData/DS_App.xss

@@ -6,50 +6,51 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-24" ViewPortY="-53" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:BatchList" ZOrder="1" X="325" Y="437" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:StackList" ZOrder="2" X="576" Y="958" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:SheetList" ZOrder="42" X="246" Y="908" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:OrderList" ZOrder="12" X="284" Y="61" Height="343" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:ItemList" ZOrder="41" X="853" Y="87" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Materials" ZOrder="40" X="1189" Y="105" Height="248" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:Bins" ZOrder="10" X="1257" Y="597" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Carts" ZOrder="39" X="592" Y="408" Height="286" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:OfflineOrderList" ZOrder="38" X="921" Y="934" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:OffOrd2Item" ZOrder="37" X="1023" Y="728" Height="134" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:KitList" ZOrder="11" X="634" Y="129" Height="248" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:Nesting" ZOrder="36" X="863" Y="526" Height="153" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:ImportLog" ZOrder="35" X="593" Y="701" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:BinList" ZOrder="34" X="1256" Y="391" Height="134" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:FinalKit" ZOrder="33" X="15" Y="525" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:Order2FinalKit" ZOrder="32" X="5" Y="308" Height="134" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:Counters" ZOrder="31" X="-12" Y="716" Height="172" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:ErrorsLog" ZOrder="30" X="-14" Y="996" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:ItemValidation" ZOrder="29" X="-10" Y="1301" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:PartValidPareto" ZOrder="28" X="316" Y="1303" Height="153" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:UnloadStats" ZOrder="27" X="629" Y="1362" Height="172" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:Remnants" ZOrder="26" X="904" Y="1256" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:CartOnKit" ZOrder="25" X="1251" Y="993" Height="324" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:PackList" ZOrder="24" X="1248" Y="1319" Height="362" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:OtherItem" ZOrder="23" X="636" Y="1822" Height="210" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:ItemSearchDetail" ZOrder="22" X="1468" Y="105" Height="381" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:PackListDet" ZOrder="21" X="931" Y="1520" Height="343" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:PackLog" ZOrder="20" X="1224" Y="1751" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:PackCheck" ZOrder="19" X="636" Y="1560" Height="229" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:OKIB" ZOrder="18" X="33" Y="1493" Height="324" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:OKIB_Sum" ZOrder="17" X="42" Y="1891" Height="362" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:OKOI" ZOrder="16" X="334" Y="1485" Height="324" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:OKOI_sum" ZOrder="15" X="330" Y="1890" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Pack2Cart" ZOrder="5" X="911" Y="1873" Height="286" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:CartIRK" ZOrder="14" X="640" Y="2064" Height="305" Width="188" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:FileValidation" ZOrder="9" X="499" Y="-21" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:SheetsPreview" ZOrder="13" X="65" Y="839" Height="210" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:OrderListTree" ZOrder="8" X="3" Y="-43" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:Places" ZOrder="3" X="862" Y="2175" Height="172" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:StatusLog" ZOrder="6" X="1116" Y="2180" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:StatusDecode" ZOrder="4" X="849" Y="2353" Height="172" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:BatchList" ZOrder="3" X="325" Y="437" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:StackList" ZOrder="4" X="618" Y="961" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:SheetList" ZOrder="1" X="300" Y="824" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:OrderList" ZOrder="14" X="284" Y="61" Height="343" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ItemList" ZOrder="43" X="853" Y="87" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Materials" ZOrder="42" X="1189" Y="105" Height="248" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:Bins" ZOrder="12" X="1257" Y="597" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Carts" ZOrder="41" X="592" Y="408" Height="286" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:OfflineOrderList" ZOrder="40" X="921" Y="934" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:OffOrd2Item" ZOrder="39" X="1023" Y="728" Height="134" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:KitList" ZOrder="13" X="634" Y="129" Height="248" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Nesting" ZOrder="38" X="863" Y="526" Height="153" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:ImportLog" ZOrder="37" X="593" Y="701" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:BinList" ZOrder="36" X="1256" Y="391" Height="134" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:FinalKit" ZOrder="35" X="15" Y="525" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Order2FinalKit" ZOrder="34" X="5" Y="308" Height="134" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Counters" ZOrder="33" X="-12" Y="716" Height="172" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:ErrorsLog" ZOrder="32" X="-14" Y="996" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:ItemValidation" ZOrder="31" X="-10" Y="1301" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:PartValidPareto" ZOrder="30" X="316" Y="1303" Height="153" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:UnloadStats" ZOrder="29" X="629" Y="1362" Height="172" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Remnants" ZOrder="28" X="904" Y="1256" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:CartOnKit" ZOrder="27" X="1251" Y="993" Height="324" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PackList" ZOrder="26" X="1248" Y="1319" Height="362" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:OtherItem" ZOrder="25" X="636" Y="1822" Height="210" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:ItemSearchDetail" ZOrder="24" X="1468" Y="105" Height="381" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PackListDet" ZOrder="23" X="931" Y="1520" Height="343" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PackLog" ZOrder="22" X="1224" Y="1751" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:PackCheck" ZOrder="21" X="636" Y="1560" Height="229" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:OKIB" ZOrder="20" X="33" Y="1493" Height="324" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:OKIB_Sum" ZOrder="19" X="42" Y="1891" Height="362" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:OKOI" ZOrder="18" X="334" Y="1485" Height="324" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:OKOI_sum" ZOrder="17" X="330" Y="1890" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Pack2Cart" ZOrder="7" X="911" Y="1873" Height="286" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:CartIRK" ZOrder="16" X="640" Y="2064" Height="305" Width="188" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:FileValidation" ZOrder="11" X="499" Y="-21" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:SheetsPreview" ZOrder="15" X="65" Y="839" Height="210" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:OrderListTree" ZOrder="10" X="3" Y="-43" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:Places" ZOrder="5" X="862" Y="2175" Height="172" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:StatusLog" ZOrder="8" X="1116" Y="2180" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:StatusDecode" ZOrder="6" X="849" Y="2353" Height="172" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:UpdMan" ZOrder="2" X="345" Y="2309" Height="191" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_ItemList_Materials1" ZOrder="53" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ItemList_Materials1" ZOrder="54" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1189</X>
@@ -61,7 +62,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_OffOrd2Item_OfflineOrderList" ZOrder="52" LineWidth="11">
+    <Connector ID="DesignRelation:FK_OffOrd2Item_OfflineOrderList" ZOrder="53" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1028</X>
@@ -73,7 +74,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ItemList_KitList" ZOrder="51" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ItemList_KitList" ZOrder="52" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>828</X>
@@ -85,7 +86,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Nesting_ItemList" ZOrder="50" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Nesting_ItemList" ZOrder="51" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1116</X>
@@ -101,7 +102,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_KitList_Carts" ZOrder="48" LineWidth="11">
+    <Connector ID="DesignRelation:FK_KitList_Carts" ZOrder="49" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>721</X>
@@ -113,7 +114,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_KitList_OrderList" ZOrder="49" LineWidth="11">
+    <Connector ID="DesignRelation:FK_KitList_OrderList" ZOrder="50" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>482</X>
@@ -125,7 +126,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_OffOrd2Item_ItemList" ZOrder="45" LineWidth="11">
+    <Connector ID="DesignRelation:FK_OffOrd2Item_ItemList" ZOrder="46" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1113</X>
@@ -137,7 +138,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_BinList_Bins" ZOrder="47" LineWidth="11">
+    <Connector ID="DesignRelation:FK_BinList_Bins" ZOrder="48" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1364</X>
@@ -149,7 +150,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_BinList_ItemList" ZOrder="46" LineWidth="11">
+    <Connector ID="DesignRelation:FK_BinList_ItemList" ZOrder="47" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1153</X>
@@ -161,7 +162,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Order2FinalKit_FinalKit" ZOrder="44" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Order2FinalKit_FinalKit" ZOrder="45" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>115</X>
@@ -173,7 +174,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Order2FinalKit_OrderList" ZOrder="43" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Order2FinalKit_OrderList" ZOrder="44" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>284</X>
@@ -185,7 +186,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_StatusLog_Places" ZOrder="7" LineWidth="11">
+    <Connector ID="DesignRelation:FK_StatusLog_Places" ZOrder="9" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1042</X>

AppData/DataLayer.cs

@@ -56,8 +56,8 @@ namespace AppData
         public DS_AppTableAdapters.StatusDecodeTableAdapter taStatDec;
         public DS_AppTableAdapters.StatusLogTableAdapter taStatLog;
         public DS_AppTableAdapters.StackListTableAdapter taSTL;
-        public DS_AppTableAdapters.UnloadStatsTableAdapter taUS;
         public DS_AppTableAdapters.UpdManTableAdapter taUpdMan;
+        public DS_AppTableAdapters.UnloadStatsTableAdapter taUS;
 
         #endregion Public Fields
 
@@ -210,7 +210,7 @@ namespace AppData
 
         private void setupConnString()
         {
-            string connString = memLayer.ML.CRS("NKC_WFConnectionString");
+            string connString = memLayer.ML.confReadString("NKC_WFConnectionString");
             taBL.Connection.ConnectionString = connString;
             taBN.Connection.ConnectionString = connString;
             taBNLS.Connection.ConnectionString = connString;

AppData/app.config

@@ -45,7 +45,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="DnsClient" publicKeyToken="4574bb5573c51424" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.2.0" newVersion="1.3.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />

AppData/packages.config

@@ -3,15 +3,15 @@
   <package id="AIM" version="1.1.0" targetFramework="net462" />
   <package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
   <package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
-  <package id="DnsClient" version="1.4.0" targetFramework="net462" />
+  <package id="DnsClient" version="1.5.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net462" />
   <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net462" />
   <package id="Microsoft.ReportViewer.Runtime.Common" version="12.0.2402.15" targetFramework="net462" />
   <package id="Microsoft.ReportViewer.Runtime.WinForms" version="12.0.2402.15" targetFramework="net462" />
-  <package id="MongoDB.Bson" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Driver" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Driver.Core" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Libmongocrypt" version="1.2.1" targetFramework="net462" />
+  <package id="MongoDB.Bson" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Driver" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Driver.Core" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Libmongocrypt" version="1.2.2" targetFramework="net462" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
   <package id="NLog" version="4.7.10" targetFramework="net462" />
@@ -20,9 +20,9 @@
   <package id="SharpCompress" version="0.28.3" targetFramework="net462" />
   <package id="SharpZipLib" version="1.3.2" targetFramework="net462" />
   <package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
-  <package id="StackExchange.Redis" version="2.2.4" targetFramework="net462" />
-  <package id="SteamWare" version="5.1.2107.759" targetFramework="net462" />
-  <package id="SteamWare.Logger" version="5.1.2107.759" targetFramework="net462" />
+  <package id="StackExchange.Redis" version="2.2.62" targetFramework="net462" />
+  <package id="SteamWare" version="5.1.2108.1115" targetFramework="net462" />
+  <package id="SteamWare.Logger" version="5.1.2108.1115" targetFramework="net462" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
   <package id="System.Diagnostics.PerformanceCounter" version="5.0.1" targetFramework="net462" />
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
@@ -40,4 +40,5 @@
   <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net462" />
   <package id="System.Threading.Channels" version="5.0.0" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

NKC_SDK/Objects.cs

@@ -110,6 +110,7 @@ namespace NKC_SDK
         /// Tipo di processing richiesto
         /// 1 = stima
         /// 2 = nesting
+        /// 3 = stima extended
         /// </summary>
         public int ProcType { get; set; }
 
@@ -747,7 +748,12 @@ namespace NKC_SDK
         /// <summary>
         /// Codice ITEM esterno da cliente (HFA)
         /// </summary>
-        public string PartExtCode { get; set; }
+        public string PartExtCode { get; set; } = "";
+
+        /// <summary>
+        /// Revisione ITEM esterno da cliente (HFA)
+        /// </summary>
+        public string PartRev { get; set; } = "";
 
         /// <summary>
         /// Cod ITEM di NKC

NKC_WF/Controllers/BatchProcController.cs

@@ -135,6 +135,8 @@ namespace NKC_WF.Controllers
                      * - è BatchReq / OfflineOrder
                      * - è stima iniziale o NEST dettagliato
                      * - si tratta di una stima di validazione ITEM ...
+                     * 
+                     * 2021.07.21: aggiunto controllo coerenza risposta: accetto solo se sono in stato di richiesta (se ho annullato in precedenza scarto la risposta)
                      *
                      *************************************************/
                     if (batchProcAnsw.OrderType == oType.BatchRequest)
@@ -146,139 +148,151 @@ namespace NKC_WF.Controllers
                             // deserializzo come BatchreqIniziale (stima)
                             nestReplyBatchInitial rispStima = JsonConvert.DeserializeObject<nestReplyBatchInitial>(content);
 
-                            // 2020.01.16 salvo su mongoDb la risposta...
-                            ComLib.man.saveEstAnsw(rispStima);
-
-                            // recupero info sul batch / KIT specifico x capire se sia di tipo "validation"
-                            bool isValidation = false;
-                            bool isTesting = false;
-                            var tabOrd = DLMan.taOL.getByBatch(rispStima.BatchID);
-                            if (tabOrd.Count > 0)
+                            // verifica preliminare che il batch possa accettare la risposta
+                            var currBatchStatus = ComLib.BStatus(rispStima.BatchID);
+                            if (currBatchStatus != BatchStatus.EstimationRequested)
                             {
-                                isValidation = tabOrd[0].OrdType == "V";
-                                isTesting = tabOrd[0].OrdType == "T";
+                                string message = $"Impossibile processing risposta da EgtNest | ProcType: {batchProcAnsw.ProcType} | BatchID: {rispStima.BatchID} | stato: {currBatchStatus}";
+                                logger.lg.scriviLog(message, tipoLog.ERROR);
+                                // registro KO
+                                answ = "KO";
                             }
-                            // calcolo status del batch...
-                            switch (rispStima.ProcessStatus)
+                            else
                             {
-                                case procStatus.waiting:
-                                case procStatus.running:
-                                    bStatus = 1;
-                                    break;
+                                // 2020.01.16 salvo su mongoDb la risposta...
+                                ComLib.man.saveEstAnsw(rispStima);
 
-                                case procStatus.completed:
-                                    if (isValidation || isTesting)
-                                    {
-                                        bool pdfOk = true;
-                                        // se richiesto CheckPDF
-                                        if (memLayer.ML.CRB("checkPdfPathTV"))
+                                // recupero info sul batch / KIT specifico x capire se sia di tipo "validation"
+                                bool isValidation = false;
+                                bool isTesting = false;
+                                var tabOrd = DLMan.taOL.getByBatch(rispStima.BatchID);
+                                if (tabOrd.Count > 0)
+                                {
+                                    isValidation = tabOrd[0].OrdType == "V";
+                                    isTesting = tabOrd[0].OrdType == "T";
+                                }
+                                // calcolo status del batch...
+                                switch (rispStima.ProcessStatus)
+                                {
+                                    case procStatus.waiting:
+                                    case procStatus.running:
+                                        bStatus = 1;
+                                        break;
+
+                                    case procStatus.completed:
+                                        if (isValidation || isTesting)
                                         {
-                                            // verifico PDF, se NON OK --> errore
-                                            string pdfPath = "";
-                                            foreach (var item in rispStima.PartList)
+                                            bool pdfOk = true;
+                                            // se richiesto CheckPDF
+                                            if (memLayer.ML.CRB("checkPdfPathTV"))
                                             {
-                                                pdfOk = pdfOk && ComLib.checkPdfExistAccessible(item, out pdfPath);
-                                                if (!pdfOk)
+                                                // verifico PDF, se NON OK --> errore
+                                                string pdfPath = "";
+                                                foreach (var item in rispStima.PartList)
                                                 {
-                                                    // codice è B.xxx dove xxx = BatchID
-                                                    DLMan.taEL.insertQuery(DateTime.Now, "Check PDF path", $"B.{rispStima.BatchID}", $"{rispStima.BatchID}.{item.PartExtCode}", $"Error: PDF file not found: {pdfPath}");
+                                                    pdfOk = pdfOk && ComLib.checkPdfExistAccessible(item, out pdfPath);
+                                                    if (!pdfOk)
+                                                    {
+                                                        // codice è B.xxx dove xxx = BatchID
+                                                        DLMan.taEL.insertQuery(DateTime.Now, "Check PDF path", $"B.{rispStima.BatchID}", $"{rispStima.BatchID}.{item.PartExtCode}", $"Error: PDF file not found: {pdfPath}");
+                                                    }
                                                 }
                                             }
-                                        }
 
-                                        // se non OK --> registro errore...
-                                        if (!pdfOk)
-                                        {
-                                            bStatus = 9;
-                                        }
-                                        // verifico se il tempo di procesisng stimato sia > minimo...
-                                        else if (rispStima.EstimatedWorktime > memLayer.ML.CRI("minValidEstSec"))
-                                        {
-                                            bStatus = 10;
+                                            // se non OK --> registro errore...
+                                            if (!pdfOk)
+                                            {
+                                                bStatus = 9;
+                                            }
+                                            // verifico se il tempo di procesisng stimato sia > minimo...
+                                            else if (rispStima.EstimatedWorktime > memLayer.ML.CRI("minValidEstSec"))
+                                            {
+                                                bStatus = 10;
+                                            }
+                                            else
+                                            {
+                                                bStatus = 9;
+                                            }
                                         }
                                         else
+                                        {
+                                            bStatus = 2;
+                                        }
+                                        break;
+
+                                    case procStatus.accepted:
+                                        bStatus = 5;
+                                        break;
+
+                                    case procStatus.refused:
+                                        if (isValidation || isTesting)
                                         {
                                             bStatus = 9;
                                         }
-                                    }
-                                    else
-                                    {
-                                        bStatus = 2;
-                                    }
-                                    break;
+                                        else
+                                        {
+                                            bStatus = 6;
+                                        }
+                                        break;
 
-                                case procStatus.accepted:
-                                    bStatus = 5;
-                                    break;
+                                    case procStatus.error:
+                                        if (isValidation || isTesting)
+                                        {
+                                            bStatus = 9;
+                                        }
+                                        else
+                                        {
+                                            bStatus = 7;
+                                        }
+                                        break;
 
-                                case procStatus.refused:
-                                    if (isValidation || isTesting)
-                                    {
-                                        bStatus = 9;
-                                    }
-                                    else
-                                    {
-                                        bStatus = 6;
-                                    }
-                                    break;
-
-                                case procStatus.error:
-                                    if (isValidation || isTesting)
-                                    {
-                                        bStatus = 9;
-                                    }
-                                    else
-                                    {
-                                        bStatus = 7;
-                                    }
-                                    break;
-
-                                case procStatus.aborted:
-                                default:
-                                    if (isValidation || isTesting)
-                                    {
-                                        bStatus = 9;
-                                    }
-                                    else
-                                    {
-                                        bStatus = 0;
-                                    }
-                                    break;
-                            }
-                            // SALVO info riguardo al batch running
-                            DLMan.taBL.updateStatus(rispStima.BatchID, bStatus, rispStima.EnvNum, (decimal)rispStima.EstimatedWorktime / 60);
-                            // salvo update elenco ITEMS
-                            ComLib.updatePartsFromNesting(rispStima.PartList);
-                            // aggiorno cadPath x items che non abbiano valorizzato...
-                            string dxfFolder = memLayer.ML.CRS("drawingFolder");
-                            if (isTesting)
-                            {
-                                dxfFolder = memLayer.ML.CRS("fileTestFolder");
-                            }
-                            string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{dxfFolder}/";
-                            DLMan.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false);
-                            // verifico IN CASO di validazione andata a buon fine --> valorizzo tabella!
-                            if (bStatus > 7)
-                            {
-                                if (isValidation)
+                                    case procStatus.aborted:
+                                    default:
+                                        if (isValidation || isTesting)
+                                        {
+                                            bStatus = 9;
+                                        }
+                                        else
+                                        {
+                                            bStatus = 0;
+                                        }
+                                        break;
+                                }
+                                // SALVO info riguardo al batch running
+                                DLMan.taBL.updateStatus(rispStima.BatchID, bStatus, rispStima.EnvNum, (decimal)rispStima.EstimatedWorktime / 60);
+                                // salvo update elenco ITEMS
+                                ComLib.updatePartsFromNesting(rispStima.PartList);
+                                // aggiorno cadPath x items che non abbiano valorizzato...
+                                string dxfFolder = memLayer.ML.CRS("drawingFolder");
+                                if (isTesting)
                                 {
-                                    // recupero ordine da batch
-                                    if (tabOrd.Count > 0)
+                                    dxfFolder = memLayer.ML.CRS("fileTestFolder");
+                                }
+                                string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{dxfFolder}/";
+                                DLMan.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false);
+                                // verifico IN CASO di validazione andata a buon fine --> valorizzo tabella!
+                                if (bStatus > 7)
+                                {
+                                    if (isValidation)
                                     {
-                                        DLMan.taIV.upsertQuery(tabOrd[0].OrderExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime);
-                                    }
-                                }
-                                else if (isTesting)
-                                {
-                                    // recupero ordine da batch
-                                    if (tabOrd.Count > 0)
-                                    {
-                                        DLMan.taFV.upsertQuery(tabOrd[0].OrderExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime);
+                                        // recupero ordine da batch
+                                        if (tabOrd.Count > 0)
+                                        {
+                                            DLMan.taIV.upsertQuery(tabOrd[0].OrderExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime);
+                                        }
+                                    }
+                                    else if (isTesting)
+                                    {
+                                        // recupero ordine da batch
+                                        if (tabOrd.Count > 0)
+                                        {
+                                            DLMan.taFV.upsertQuery(tabOrd[0].OrderExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime);
+                                        }
                                     }
                                 }
+                                // registro OK
+                                answ = "OK";
                             }
-                            // registro OK
-                            answ = "OK";
                         }
                         // stima "extended" x splitting
                         else if (batchProcAnsw.ProcType == 3)
@@ -286,124 +300,141 @@ namespace NKC_WF.Controllers
                             int bStatus = 0;
                             // deserializzo come BatchreqIniziale (stima)
                             nestReplyBatchExtEst rispStima = JsonConvert.DeserializeObject<nestReplyBatchExtEst>(content);
-
-                            // salvo su mongoDb la risposta...
-                            ComLib.man.saveExtEstAnsw(rispStima);
-
-                            // recupero info sul batch / KIT specifico x capire se sia di tipo "validation"
-                            bool isValidation = false;
-                            bool isTesting = false;
-                            var tabOrd = DLMan.taOL.getByBatch(rispStima.BatchID);
-                            if (tabOrd.Count > 0)
+                            // verifica preliminare che il batch possa accettare la risposta
+                            var currBatchStatus = ComLib.BStatus(rispStima.BatchID);
+                            if (currBatchStatus != BatchStatus.EstimationRequested)
                             {
-                                isValidation = tabOrd[0].OrdType == "V";
-                                isTesting = tabOrd[0].OrdType == "T";
+                                string message = $"Impossibile processing risposta da EgtNest | ProcType: {batchProcAnsw.ProcType} | BatchID: {rispStima.BatchID} | stato: {currBatchStatus}";
+                                logger.lg.scriviLog(message, tipoLog.ERROR);
+                                // registro KO
+                                answ = "KO";
                             }
-                            // calcolo status del batch...
-                            switch (rispStima.ProcessStatus)
+                            else
                             {
-                                case procStatus.waiting:
-                                case procStatus.running:
-                                    bStatus = 1;
-                                    break;
+                                // salvo su mongoDb la risposta...
+                                ComLib.man.saveExtEstAnsw(rispStima);
 
-                                case procStatus.completed:
-                                    if (isValidation || isTesting)
-                                    {
-                                        bool pdfOk = true;
-                                        // se richiesto CheckPDF
-                                        if (memLayer.ML.CRB("checkPdfPathTV"))
+                                // recupero info sul batch / KIT specifico x capire se sia di tipo "validation"
+                                bool isValidation = false;
+                                bool isTesting = false;
+                                var tabOrd = DLMan.taOL.getByBatch(rispStima.BatchID);
+                                if (tabOrd.Count > 0)
+                                {
+                                    isValidation = tabOrd[0].OrdType == "V";
+                                    isTesting = tabOrd[0].OrdType == "T";
+                                }
+                                // calcolo status del batch...
+                                switch (rispStima.ProcessStatus)
+                                {
+                                    case procStatus.waiting:
+                                    case procStatus.running:
+                                        bStatus = 1;
+                                        break;
+
+                                    case procStatus.completed:
+                                        if (isValidation || isTesting)
                                         {
-                                            // verifico PDF, se NON OK --> errore
-                                            string pdfPath = "";
-                                            foreach (var item in rispStima.PartList)
+                                            bool pdfOk = true;
+                                            // se richiesto CheckPDF
+                                            if (memLayer.ML.CRB("checkPdfPathTV"))
                                             {
-                                                pdfOk = pdfOk && ComLib.checkPdfExistAccessible(item, out pdfPath);
-                                                if (!pdfOk)
+                                                // verifico PDF, se NON OK --> errore
+                                                string pdfPath = "";
+                                                foreach (var item in rispStima.PartList)
                                                 {
-                                                    // codice è B.xxx dove xxx = BatchID
-                                                    DLMan.taEL.insertQuery(DateTime.Now, "Check PDF path", $"B.{rispStima.BatchID}", $"{rispStima.BatchID}.{item.PartExtCode}", $"Error: PDF file not found: {pdfPath}");
+                                                    pdfOk = pdfOk && ComLib.checkPdfExistAccessible(item, out pdfPath);
+                                                    if (!pdfOk)
+                                                    {
+                                                        // codice è B.xxx dove xxx = BatchID
+                                                        DLMan.taEL.insertQuery(DateTime.Now, "Check PDF path", $"B.{rispStima.BatchID}", $"{rispStima.BatchID}.{item.PartExtCode}", $"Error: PDF file not found: {pdfPath}");
+                                                    }
                                                 }
                                             }
-                                        }
 
-                                        // se non OK --> registro errore...
-                                        if (!pdfOk)
-                                        {
-                                            bStatus = 9;
-                                        }
-                                        // verifico se il tempo di procesisng stimato sia > minimo...
-                                        else if (rispStima.EstimatedWorktime > memLayer.ML.CRI("minValidEstSec"))
-                                        {
-                                            bStatus = 10;
+                                            // se non OK --> registro errore...
+                                            if (!pdfOk)
+                                            {
+                                                bStatus = 9;
+                                            }
+                                            // verifico se il tempo di procesisng stimato sia > minimo...
+                                            else if (rispStima.EstimatedWorktime > memLayer.ML.CRI("minValidEstSec"))
+                                            {
+                                                bStatus = 10;
+                                            }
+                                            else
+                                            {
+                                                bStatus = 9;
+                                            }
                                         }
                                         else
+                                        {
+                                            bStatus = 2;
+                                        }
+                                        break;
+
+                                    case procStatus.accepted:
+                                        bStatus = 5;
+                                        break;
+
+                                    case procStatus.refused:
+                                        if (isValidation || isTesting)
                                         {
                                             bStatus = 9;
                                         }
-                                    }
-                                    else
-                                    {
-                                        bStatus = 2;
-                                    }
-                                    break;
+                                        else
+                                        {
+                                            bStatus = 6;
+                                        }
+                                        break;
 
-                                case procStatus.accepted:
-                                    bStatus = 5;
-                                    break;
+                                    case procStatus.error:
+                                        if (isValidation || isTesting)
+                                        {
+                                            bStatus = 9;
+                                        }
+                                        else
+                                        {
+                                            bStatus = 7;
+                                        }
+                                        break;
 
-                                case procStatus.refused:
-                                    if (isValidation || isTesting)
-                                    {
-                                        bStatus = 9;
-                                    }
-                                    else
-                                    {
-                                        bStatus = 6;
-                                    }
-                                    break;
+                                    case procStatus.aborted:
+                                    default:
+                                        if (isValidation || isTesting)
+                                        {
+                                            bStatus = 9;
+                                        }
+                                        else
+                                        {
+                                            bStatus = 0;
+                                        }
+                                        break;
+                                }
+                                // SALVO info riguardo al batch running
+                                DLMan.taBL.updateStatus(rispStima.BatchID, bStatus, rispStima.EnvNum, (decimal)rispStima.EstimatedWorktime / 60);
+                                // salvo update elenco ITEMS
+                                if (rispStima.PartList != null && rispStima.PartList.Count > 0)
+                                {
+                                    ComLib.updatePartsFromNesting(rispStima.PartList);
+                                }
 
-                                case procStatus.error:
-                                    if (isValidation || isTesting)
-                                    {
-                                        bStatus = 9;
-                                    }
-                                    else
-                                    {
-                                        bStatus = 7;
-                                    }
-                                    break;
+                                // aggiorno la risposta dei tempi di esecuzione (+ NUM cart/part) degli ordini x permettere aggiustamenti
+                                if (rispStima.EstOrderList != null && rispStima.EstOrderList.Count > 0)
+                                {
+                                    ComLib.updateExtEstimFromNesting(rispStima.BatchID, rispStima.EstOrderList);
+                                }
 
-                                case procStatus.aborted:
-                                default:
-                                    if (isValidation || isTesting)
-                                    {
-                                        bStatus = 9;
-                                    }
-                                    else
-                                    {
-                                        bStatus = 0;
-                                    }
-                                    break;
+                                // aggiorno cadPath x items che non abbiano valorizzato...
+                                string dxfFolder = memLayer.ML.CRS("drawingFolder");
+                                if (isTesting)
+                                {
+                                    dxfFolder = memLayer.ML.CRS("fileTestFolder");
+                                }
+                                string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{dxfFolder}/";
+                                DLMan.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false);
+                                // registro OK
+                                answ = "OK";
                             }
-                            // SALVO info riguardo al batch running
-                            DLMan.taBL.updateStatus(rispStima.BatchID, bStatus, rispStima.EnvNum, (decimal)rispStima.EstimatedWorktime / 60);
-                            // salvo update elenco ITEMS
-                            ComLib.updatePartsFromNesting(rispStima.PartList);
-
-                            // aggiorno la risposta dei tempi di esecuzione (+ NUM cart/part) degli ordini x permettere aggiustamenti
-                            ComLib.updateExtEstimFromNesting(rispStima.BatchID, rispStima.EstOrderList);
-
-                            // aggiorno cadPath x items che non abbiano valorizzato...
-                            string dxfFolder = memLayer.ML.CRS("drawingFolder");
-                            if (isTesting)
-                            {
-                                dxfFolder = memLayer.ML.CRS("fileTestFolder");
-                            }
-                            string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{dxfFolder}/";
-                            DLMan.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false);
-                            // registro OK
-                            answ = "OK";
                         }
                         // nesting
                         else if (batchProcAnsw.ProcType == 2)
@@ -411,84 +442,81 @@ namespace NKC_WF.Controllers
                             // deserializzo come BatchreqFinale
                             nestReplyBatchFinal rispNest = JsonConvert.DeserializeObject<nestReplyBatchFinal>(content);
 
-                            // 2020.01.16 salvo su mongoDb la risposta...
-                            ComLib.man.saveNestAnsw(rispNest);
-
-                            // calcolo status del batch...
-                            int bStatus = 2;
-                            switch (rispNest.ProcessStatus)
+                            // verifica preliminare che il batch possa accettare la risposta
+                            var currBatchStatus = ComLib.BStatus(rispNest.BatchID);
+                            if (currBatchStatus != BatchStatus.NestRequested)
                             {
-                                case procStatus.waiting:
-                                case procStatus.running:
-                                    bStatus = 3;
-                                    break;
-
-                                case procStatus.completed:
-                                    bStatus = 4;
-                                    break;
-
-                                case procStatus.accepted:
-                                    bStatus = 5;
-                                    break;
-
-                                case procStatus.refused:
-                                    bStatus = 6;
-                                    break;
-
-                                case procStatus.error:
-                                    bStatus = 7;
-                                    break;
-
-                                case procStatus.aborted:
-                                default:
-                                    bStatus = 2;
-                                    break;
+                                string message = $"Impossibile processing risposta da EgtNest | ProcType: {batchProcAnsw.ProcType} | BatchID: {rispNest.BatchID} | stato: {currBatchStatus}";
+                                logger.lg.scriviLog(message, tipoLog.ERROR);
+                                // registro KO
+                                answ = "KO";
                             }
-                            // aggiorno il resto SOLO SE status == completo...
-                            if (rispNest.ProcessStatus == procStatus.completed || rispNest.ProcessStatus == procStatus.error)
+                            else
                             {
-                                // resetto le precedenti elaborazioni: elimino dati child MA NON il batch...
-                                DLMan.taBL.resetTree(rispNest.BatchID);
-                                // SALVO info riguardo al batch completato
-                                DLMan.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60);
-                                // salvo info riguardo ai vari Bunk / Sheets / Items...
-                                ComLib.updateBunksFromNesting(rispNest.BatchID, rispNest.BunkList);
-                                // salvo info x CART & BINS previsti
-                                ComLib.updateBinsFromNesting(rispNest.BatchID, rispNest.BinList);
-                                ComLib.updateCartsFromNesting(rispNest.BatchID, rispNest.CartList);
 
-#if false
-                                // NKC2: se è un batch ti dipo descendant
-                                if (ComLib.BType(rispNest.BatchID) == BatchType.Descendant)
+
+                                // 2020.01.16 salvo su mongoDb la risposta...
+                                ComLib.man.saveNestAnsw(rispNest);
+
+                                // calcolo status del batch...
+                                int bStatus = 2;
+                                switch (rispNest.ProcessStatus)
                                 {
-                                    // verifico se ce ne siano altri NON validati (ma splitted)
-                                    var tabDesc = ComLib.BatchOtherDescendant(rispNest.BatchID);
-                                    if (tabDesc != null && tabDesc.Count > 0)
-                                    {
-                                        // ciclo x tutte le righe che NON fossero con nesting effettuato
-                                        foreach (var item in tabDesc)
-                                        {
-                                            // se c'è qualcosa da processare lo richiede
-                                            if (item.STATUS == 2)
-                                            {
-                                                // invio il PRIMO batch descendant
-                                                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;
-                                            }
-                                            // se non ha trovato nulla --> prova update Batch Ancestor...
-                                        }
-                                    }
-                                } 
-#endif
-                                isSplitReq = ComLib.checkSendBatchSplit(rispNest.BatchID);
-                            }
+                                    case procStatus.waiting:
+                                    case procStatus.running:
+                                        bStatus = 3;
+                                        break;
 
-                            // registro OK
-                            answ = "OK";
+                                    case procStatus.completed:
+                                        bStatus = 4;
+                                        break;
+
+                                    case procStatus.accepted:
+                                        bStatus = 5;
+                                        break;
+
+                                    case procStatus.refused:
+                                        bStatus = 6;
+                                        break;
+
+                                    case procStatus.error:
+                                        bStatus = 7;
+                                        break;
+
+                                    case procStatus.aborted:
+                                    default:
+                                        bStatus = 2;
+                                        break;
+                                }
+                                // aggiorno il resto SOLO SE status == completo...
+                                if (rispNest.ProcessStatus == procStatus.completed || rispNest.ProcessStatus == procStatus.error)
+                                {
+                                    // resetto le precedenti elaborazioni: elimino dati child MA NON il batch...
+                                    DLMan.taBL.resetTree(rispNest.BatchID);
+                                    // SALVO info riguardo al batch completato
+                                    DLMan.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60);
+
+                                    // salvo info riguardo ai vari Bunk / Sheets / Items...
+                                    if (rispNest.BunkList != null && rispNest.BunkList.Count > 0)
+                                    {
+                                        ComLib.updateBunksFromNesting(rispNest.BatchID, rispNest.BunkList);
+                                    }
+                                    // salvo info x CART & BINS previsti
+                                    if (rispNest.BinList != null && rispNest.BinList.Count > 0)
+                                    {
+                                        ComLib.updateBinsFromNesting(rispNest.BatchID, rispNest.BinList);
+                                    }
+                                    if (rispNest.CartList != null && rispNest.CartList.Count > 0)
+                                    {
+                                        ComLib.updateCartsFromNesting(rispNest.BatchID, rispNest.CartList);
+                                    }
+
+                                    isSplitReq = ComLib.checkSendBatchSplit(rispNest.BatchID);
+                                }
+
+                                // registro OK
+                                answ = "OK";
+                            }
                         }
                     }
                     else if (batchProcAnsw.OrderType == oType.OfflineOrder)

NKC_WF/Controllers/BunkController.cs

@@ -62,7 +62,7 @@ namespace NKC_WF.Controllers
                 }
                 else
                 {
-                    answ = ComLib.prodGetBunk(id);
+                    answ = ComLib.prodGetBunk(id, CodPost);
                 }
             }
             catch
@@ -154,14 +154,10 @@ namespace NKC_WF.Controllers
                 foreach (var item in currBunk.SheetList)
                 {
                     DLMan.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd, (int)item.Status);
-                    // verifico SE SIA AVVENUTO CON SUCCESSO lo step di lavorazione...
-                    if (item.Machining.Success)
+                    // SE machining completato --> status a LAVORATO!
+                    if (item.Machining.DtEnd != null)
                     {
-                        // SE machining completato --> status a LAVORATO!
-                        if (item.Machining.DtEnd != null)
-                        {
-                            DLMan.taIL.updateSheetStatus(item.SheetId, 1, "PROD");
-                        }
+                        DLMan.taIL.updateSheetStatus(item.SheetId, 1, "PROD");
                     }
                 }
             }

NKC_WF/Controllers/MachineStatController.cs

@@ -42,22 +42,20 @@ namespace NKC_WF.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public List<MachineStatData> Get()
+        public MachineStatData Get()
         {
-            List<MachineStatData> answ = new List<MachineStatData>();
+            MachineStatData answ = new MachineStatData();
             try
             {
-                answ = ComLib.prodMachStateDataGet();
+                answ = ComLib.prodMachStateDataGet(machine);
             }
             catch
             { }
 
             // se vuoto metto 1 finto...
-            if (answ.Count == 0)
+            if (answ == null)
             {
-                var demoItem = new MachineStatData();
-                demoItem.Records.Add(new MachineStatRecord());
-                answ.Add(demoItem);
+                answ = new MachineStatData() { Machine = machine };
             }
 
             return answ;
@@ -72,14 +70,10 @@ namespace NKC_WF.Controllers
         [HttpGet]
         public MachineStatData Get(string id)
         {
-            MachineStatData answ = new MachineStatData();
+            MachineStatData answ = new MachineStatData() { Machine = id };
             try
             {
-                var listState = ComLib.prodMachStateDataGet();
-                if (listState != null && listState.Count > 0)
-                {
-                    answ = listState.Where(x => x.Machine == id).FirstOrDefault();
-                }
+                answ = ComLib.prodMachStateDataGet(id);
             }
             catch
             { }
@@ -103,82 +97,12 @@ namespace NKC_WF.Controllers
          *
          **************************************/
 
-#if false
-        /// <summary>
-        /// Processa una chiamata POST per l'invio in blocco
-        /// POST: api/Bunk
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Post()
-        {
-            int BunkId = 0;
-            int BatchId = 0;
-            string answ = "";
-            // questa classe è derivata da Controller.Response... x cui recupero lo stream in altro modo...
-            string content = "";
-            System.Web.HttpContext.Current.Request.InputStream.Position = 0;
-            using (var reader = new StreamReader(System.Web.HttpContext.Current.Request.InputStream, System.Text.Encoding.UTF8, true, 4096, true))
-            {
-                content = reader.ReadToEnd();
-            }
-            //Rest
-            System.Web.HttpContext.Current.Request.InputStream.Position = 0;
-            // procedo a deserializzare in blocco l'oggetto...
-            try
-            {
-                // deserializzo.
-                SheetWorkList sheetUpdated = JsonConvert.DeserializeObject<SheetWorkList>(content);
-                if (sheetUpdated != null)
-                {
-                    // 2020.01.16 salvo su mongoDb la risposta...
-                    ComLib.man.saveProdAnsw(sheetUpdated);
-
-                    if (sheetUpdated.SheetList != null)
-                    {
-                        foreach (var currSheet in sheetUpdated.SheetList)
-                        {
-                            // se non nullo...
-                            if (currSheet != null)
-                            {
-                                DLMan.taSHL.updateDate(currSheet.SheetId, currSheet.Printing.DtStart, currSheet.Printing.DtEnd, currSheet.Machining.DtStart, currSheet.Machining.DtEnd, currSheet.Unloading.DtStart, currSheet.Unloading.DtEnd, (int)currSheet.Status);
-                                // SE machining completato --> status a LAVORATO x item!
-                                if (currSheet.Machining.DtEnd != null)
-                                {
-                                    // hard coded su multiax
-                                    DLMan.taIL.updateSheetStatus(currSheet.SheetId, 1, "WRK001");
-                                }
-                                // segnalo avanzamento su redis x pagina unload
-                                ComLib.advaceSheetRevByBunk(currSheet.BunkId);
-                                BunkId = currSheet.BunkId;
-                                answ = "OK";
-                            }
-                        }
-                    }
-                    var tabBunks = DLMan.taSTL.getByKey(BunkId);
-                    if (tabBunks.Count > 0)
-                    {
-                        BatchId = tabBunks[0].BatchID;
-                    }
-                    // ricalcolo stato BUNK
-                    ComLib.updateBatchPosition(BatchId);
-                    // INVALIDO eventuale valore BUNK in REDIS...
-                    ComLib.resetRedisBunkData(machine);
-                }
-            }
-            catch
-            {
-                answ = "NO";
-            }
-            return answ;
-        }
-#endif
 
         /// <summary>
         /// Effettua la chiamata di update x un set di dati delle macchine
         /// </summary>
-        /// <param name="MSDUpdated">Oggetto con macchina + Elenco record da aggiornare</param>
-        // PUT: api/Sheet/5
+        /// <param name="updatedInfo">Oggetto con macchina + Elenco record da aggiornare</param>
+        // PUT: api/Sheet
         [HttpPut]
         public void Put(MachineStatData updatedInfo)
         {

NKC_WF/Controllers/SheetController.cs

@@ -33,7 +33,7 @@ namespace NKC_WF.Controllers
         public SheetWorkList Get()
         {
             // fisso su machcina 1
-            string machineName = "WRK001";
+            string machineName = "NE02";
             SheetWorkList answ = null;
             try
             {
@@ -45,8 +45,8 @@ namespace NKC_WF.Controllers
         }
 
         /// <summary>
-        /// Ottengo elenco specifico dato cod MACCHINA
-        /// GET: api/Sheet/WRK001
+        /// Ottengo elenco specifico dato cod MACCHINA (es NE01)
+        /// GET: api/Sheet/NE01
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -121,7 +121,7 @@ namespace NKC_WF.Controllers
                                 if (currSheet.Machining.DtEnd != null)
                                 {
                                     // hard coded su multiax
-                                    DLMan.taIL.updateSheetStatus(currSheet.SheetId, 1, "WRK001");
+                                    DLMan.taIL.updateSheetStatus(currSheet.SheetId, 1, sheetUpdated.Machine);
                                 }
                                 // segnalo avanzamento su redis x pagina unload
                                 ComLib.advaceSheetRevByBunk(currSheet.BunkId);
@@ -152,7 +152,7 @@ namespace NKC_WF.Controllers
         /// Effettua la chiamata di update x SINGOLO foglio
         /// </summary>
         /// <param name="sheetUpdated">Oggetto con Elenco fogli da aggiornare</param>
-        // PUT: api/Sheet/machine_ID
+        /// PUT: api/Sheet/machine_ID
         [HttpPut]
         public void Put(SheetWorkList sheetUpdated)
         {
@@ -174,15 +174,11 @@ namespace NKC_WF.Controllers
                         if (currSheet != null)
                         {
                             DLMan.taSHL.updateDate(currSheet.SheetId, currSheet.Printing.DtStart, currSheet.Printing.DtEnd, currSheet.Machining.DtStart, currSheet.Machining.DtEnd, currSheet.Unloading.DtStart, currSheet.Unloading.DtEnd, (int)currSheet.Status);
-                            // verifico SE SIA AVVENUTO CON SUCCESSO lo step di lavorazione...
-                            if (currSheet.Machining.Success)
+                            // SE machining completato --> status a LAVORATO!
+                            if (currSheet.Machining.DtEnd != null)
                             {
-                                // SE machining completato --> status a LAVORATO!
-                                if (currSheet.Machining.DtEnd != null)
-                                {
-                                    // hard coded su multiax
-                                    DLMan.taIL.updateSheetStatus(currSheet.SheetId, 1, machine);
-                                }
+                                // hard coded su multiax
+                                DLMan.taIL.updateSheetStatus(currSheet.SheetId, 1, sheetUpdated.Machine);
                             }
                             // segnalo avanzamento su redis x pagina unload
                             ComLib.advaceSheetRevByBunk(currSheet.BunkId);
@@ -199,7 +195,7 @@ namespace NKC_WF.Controllers
                 // ricalcolo stato BUNK
                 ComLib.updateBatchPosition(BatchId);
                 // INVALIDO eventuale valore BUNK in REDIS...
-                ComLib.resetRedisBunkData(machine);
+                ComLib.resetRedisBunkData(sheetUpdated.Machine);
             }
         }
 

NKC_WF/Controllers/SheetStatsController.cs

@@ -103,7 +103,7 @@ namespace NKC_WF.Controllers
         /// GET api/SheetStats/5
         /// </summary>
         /// <param name="id">BatchID</param>
-        /// <param name="maxHour">num max ore da mostrare</param>
+        /// <param name="MaxHour">num max ore da mostrare</param>
         /// <returns></returns>
         public List<chartJsTSerie> Get(int id, int MaxHour)
         {

NKC_WF/NKC_WF.csproj

@@ -66,8 +66,8 @@
     <Reference Include="Crc32C.NET, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll</HintPath>
     </Reference>
-    <Reference Include="DnsClient, Version=1.4.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
-      <HintPath>..\packages\DnsClient.1.4.0\lib\net45\DnsClient.dll</HintPath>
+    <Reference Include="DnsClient, Version=1.5.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
+      <HintPath>..\packages\DnsClient.1.5.0\lib\net45\DnsClient.dll</HintPath>
     </Reference>
     <Reference Include="Elmah, Version=1.2.14706.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
@@ -91,17 +91,17 @@
     <Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Bson, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Bson.2.12.4\lib\net452\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.13.1\lib\net452\MongoDB.Bson.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.2.12.4\lib\net452\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.13.1\lib\net452\MongoDB.Driver.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.Core.2.12.4\lib\net452\MongoDB.Driver.Core.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Core, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.13.1\lib\net452\MongoDB.Driver.Core.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
+    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.2\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -125,13 +125,15 @@
       <HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
     </Reference>
     <Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
-      <HintPath>..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll</HintPath>
+      <HintPath>..\packages\StackExchange.Redis.2.2.62\lib\net461\StackExchange.Redis.dll</HintPath>
     </Reference>
-    <Reference Include="SteamWare, Version=5.1.2107.759, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.5.1.2107.759\lib\net462\SteamWare.dll</HintPath>
+    <Reference Include="SteamWare, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.5.1.2108.1115\lib\net462\SteamWare.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="SteamWare.Logger, Version=5.1.2107.759, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.Logger.5.1.2107.759\lib\net462\SteamWare.Logger.dll</HintPath>
+    <Reference Include="SteamWare.Logger, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.Logger.5.1.2108.1115\lib\net462\SteamWare.Logger.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -207,6 +209,9 @@
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
@@ -1919,8 +1924,8 @@
     <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets'))" />
-    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets'))" />
-    <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets'))" />
+    <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -1948,6 +1953,6 @@
   <Import Project="..\packages\Microsoft.NetCore.Analyzers.3.3.2\build\Microsoft.NetCore.Analyzers.targets" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.3.3.2\build\Microsoft.NetCore.Analyzers.targets')" />
   <Import Project="..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets')" />
   <Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets')" />
-  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" />
-  <Import Project="..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets')" />
+  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" />
+  <Import Project="..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" />
 </Project>

NKC_WF/Reports/queueConf.json

@@ -1,6 +1,6 @@
 [
     {
-        "name": "queueUnloadBin",
+        "name": "queueUnloadBinNE01",
         "template": "Bin.rdlc",
         "printerName": "Microsoft Print to PDF",
         "deviceInfoParam": {
@@ -15,7 +15,37 @@
         }
     },
     {
-        "name": "queueUnloadCart",
+        "name": "queueUnloadBinNE02",
+        "template": "Bin.rdlc",
+        "printerName": "Microsoft Print to PDF",
+        "deviceInfoParam": {
+            "OutputFormat": "EMF",
+            "PageHeight": "11in",
+            "PageWidth": "8.5in",
+            "MarginLeft": "0.5in",
+            "MarginRight": "0.5in",
+            "MarginTop": "0.5in",
+            "MarginBottom": "0.5in",
+            "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
+        }
+    },
+    {
+        "name": "queueUnloadCartNE01",
+        "template": "Cart.rdlc",
+        "printerName": "Microsoft Print to PDF",
+        "deviceInfoParam": {
+            "OutputFormat": "EMF",
+            "PageHeight": "11in",
+            "PageWidth": "8.5in",
+            "MarginLeft": "0.5in",
+            "MarginRight": "0.5in",
+            "MarginTop": "0.5in",
+            "MarginBottom": "0.5in",
+            "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
+        }
+    },
+    {
+        "name": "queueUnloadCartNE02",
         "template": "Cart.rdlc",
         "printerName": "Microsoft Print to PDF",
         "deviceInfoParam": {
@@ -75,7 +105,22 @@
         }
     },
     {
-        "name": "queuePart",
+        "name": "queuePartNE01",
+        "template": "Part.rdlc",
+        "printerName": "Microsoft Print to PDF",
+        "deviceInfoParam": {
+            "OutputFormat": "EMF",
+            "PageHeight": "2in",
+            "PageWidth": "4.09in",
+            "MarginLeft": "0in",
+            "MarginRight": "0in",
+            "MarginTop": "0in",
+            "MarginBottom": "0in",
+            "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>4.09in</PageWidth><PageHeight>2in</PageHeight><MarginTop>0in</MarginTop><MarginLeft>0in</MarginLeft><MarginRight>0in</MarginRight><MarginBottom>0in</MarginBottom></DeviceInfo>"
+        }
+    },
+    {
+        "name": "queuePartNE02",
         "template": "Part.rdlc",
         "printerName": "Microsoft Print to PDF",
         "deviceInfoParam": {

NKC_WF/Web.config

@@ -28,7 +28,7 @@
         <sessionState mode="Custom" customProvider="MySessionStateStore">
             <providers>
                 <add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false"
-                    applicationName="NKC" databaseId="0" timeout="120"/>
+                    applicationName="NKC" databaseId="2" timeout="480"/>
             </providers>
         </sessionState>
         <httpModules>
@@ -59,6 +59,7 @@
         <add key="copyRight" value="Egaltech &amp; Steamware "/>
         <add key="authSenzaDominio" value="true"/>
         <add key="_safePages" value="Test#Home#Default"/>
+        <add key="_righeDataGridAnagr" value="20"/>
         <add key="BaseUrl" value="http://IIS02/NKC"/>
         <!--Updater area-->
         <add key="downloadPath" value="c:\Steamware\installers\"/>
@@ -79,7 +80,7 @@
         <!--Configurazioni Redis-->
         <add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password"/>
         <add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true"/>
-        <add key="redisDb" value="0"/>
+        <add key="redisDb" value="2"/>
         <!--MongoDB-->
         <add key="mdbConnString" value="mongodb://W2019-MONGODB:27017"/>
         <add key="enableMongo" value="true"/>
@@ -392,7 +393,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="DnsClient" publicKeyToken="4574bb5573c51424" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.3.2.0" newVersion="1.3.2.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
@@ -469,11 +470,11 @@
     </location>
     <system.codedom>
         <compilers>
-      <compiler extension=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:7.0 /nowarn:1659;1699;1701;612;618"
-          type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-      <compiler extension=".vb" language="vb;vbs;visualbasic;vbscript" warningLevel="4"
-          compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
-          type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-    </compilers>
+            <compiler extension=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:7.0 /nowarn:1659;1699;1701;612;618"
+                type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+            <compiler extension=".vb" language="vb;vbs;visualbasic;vbscript" warningLevel="4"
+                compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
+                type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+        </compilers>
     </system.codedom>
 </configuration>

NKC_WF/WebUserControls/cmp_BP_sheetList.ascx

@@ -44,5 +44,6 @@
 <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStack" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
   <SelectParameters>
     <asp:ControlParameter ControlID="hfStackID" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
+      <asp:Parameter Name="Machine" DefaultValue="" />
   </SelectParameters>
 </asp:ObjectDataSource>

NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.designer.cs

@@ -1,44 +1,44 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF.WebUserControls
 {
 
 
-  public partial class cmp_BP_sheetList
-  {
+    public partial class cmp_BP_sheetList
+    {
 
-    /// <summary>
-    /// Controllo hfStackID.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.HiddenField hfStackID;
+        /// <summary>
+        /// hfStackID control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfStackID;
 
-    /// <summary>
-    /// Controllo grView.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.GridView grView;
+        /// <summary>
+        /// grView control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView grView;
 
-    /// <summary>
-    /// Controllo ods.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.ObjectDataSource ods;
-  }
+        /// <summary>
+        /// ods control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+    }
 }

NKC_WF/WebUserControls/cmp_ML_ShDet.ascx

@@ -5,6 +5,7 @@
 <asp:HiddenField runat="server" ID="hfStatus" />
 <asp:HiddenField runat="server" ID="hfStatusEnd" />
 <asp:HiddenField ID="hfBatchID" runat="server" />
+<asp:HiddenField ID="hfMachine" runat="server" />
 <asp:FormView ID="frmView" runat="server" Width="100%" DataKeyNames="SheetID" DataSourceID="ods">
     <ItemTemplate>
         <div runat="server" id="divBlock" class='<%# "row small alert border-thick px-0 " + getCss(Eval("ShStatus")) %>' role="alert">
@@ -83,5 +84,6 @@
         <asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
         <asp:ControlParameter ControlID="hfStatus" DefaultValue="-1" Name="ShStatusStart" PropertyName="Value" Type="Int32" />
         <asp:ControlParameter ControlID="hfStatusEnd" DefaultValue="-1" Name="ShStatusEnd" PropertyName="Value" Type="Int32" />
+        <asp:ControlParameter ControlID="hfMachine" DefaultValue="" Name="Machine" PropertyName="Value" Type="String" />
     </SelectParameters>
 </asp:ObjectDataSource>

NKC_WF/WebUserControls/cmp_ML_ShDet.ascx.cs

@@ -54,6 +54,18 @@ namespace NKC_WF.WebUserControls
             }
         }
 
+        public string MachineSel
+        {
+            get
+            {
+                return hfMachine.Value;
+            }
+            set
+            {
+                hfMachine.Value = value;
+            }
+        }
+
         public string getCss(object _status)
         {
             string answ = "";

NKC_WF/WebUserControls/cmp_ML_ShDet.ascx.designer.cs

@@ -1,59 +1,70 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace NKC_WF.WebUserControls {
-    
-    
-    public partial class cmp_ML_ShDet {
-        
+namespace NKC_WF.WebUserControls
+{
+
+
+    public partial class cmp_ML_ShDet
+    {
+
         /// <summary>
-        /// Controllo hfStatus.
+        /// hfStatus control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfStatus;
-        
+
         /// <summary>
-        /// Controllo hfStatusEnd.
+        /// hfStatusEnd control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfStatusEnd;
-        
+
         /// <summary>
-        /// Controllo hfBatchID.
+        /// hfBatchID control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfBatchID;
-        
+
         /// <summary>
-        /// Controllo frmView.
+        /// hfMachine control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfMachine;
+
+        /// <summary>
+        /// frmView control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.FormView frmView;
-        
+
         /// <summary>
-        /// Controllo ods.
+        /// ods control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource ods;
     }

NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs

@@ -69,7 +69,7 @@ namespace NKC_WF.WebUserControls
             string baseCurr = memLayer.ML.CRS("servBasePath").ToLower();
             try
             {
-                var tabSheets = DLMan.taSHL.getBySheetId(SheetId);
+                var tabSheets = DLMan.taSHL.getBySheetId(SheetId, "");
                 if (tabSheets.Count > 0)
                 {
                     filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);

NKC_WF/WebUserControls/cmp_MachSem.ascx

@@ -1,6 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MachSem.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MachSem" %>
 
 <asp:HiddenField runat="server" ID="hfMachine" Value="NE00" />
+<asp:HiddenField runat="server" ID="hfShowSemap" Value="true" />
 <asp:HiddenField runat="server" ID="hfMachClass" Value="light" />
 <asp:HiddenField runat="server" ID="hfStat01" Value="N.A." />
 <asp:HiddenField runat="server" ID="hfStat02" Value="N.A." />
@@ -25,16 +26,16 @@
         <asp:Timer ID="timerLoad" runat="server" Interval="2000" OnTick="timerLoad_Tick"></asp:Timer>
         <div class="row small py-0" runat="server" id="divRuntime">
             <div class="col-2 pr-0">
-                <asp:LinkButton runat="server" ID="lbtReset" class="btn btn-info btn-block text-center" OnClick="lbtReset_Click"><i class="fa fa-refresh" aria-hidden="true"></i>&nbsp;<%: hfMachine.Value %></asp:LinkButton>
+                <asp:LinkButton runat="server" ID="lbtReset" class="btn btn-info btn-block text-center" OnClick="lbtReset_Click"><i class="fa fa-refresh" aria-hidden="true"></i>&nbsp;<%: hfMachine.Value %>&nbsp;<i class="fa fa-link text-success" aria-hidden="true" runat="server" id="icnLiveOk"></i> <i class="fa fa-chain-broken text-danger" aria-hidden="true" runat="server" id="icnLiveKo"></i></asp:LinkButton>
             </div>
             <div class="col-10">
                 <div class="d-flex text-center">
-                    <div class="py-1 px-2 table-<%: hfCss01.Value %> flex-fill">
+                    <div class="py-1 px-2 bg-<%: hfCss01.Value %> flex-fill">
                         <b><i class="fa fa-qrcode" aria-hidden="true"></i>&nbsp;<%: traduci("print") %>&nbsp;|&nbsp;<%: hfCode01.Value %></b><div class="small">
                             <%: hfStat01.Value %>
                         </div>
                     </div>
-                    <div class="py-1 px-2 table-<%: hfCss02.Value %> flex-fill">
+                    <div class="py-1 px-2 bg-<%: hfCss02.Value %> flex-fill mx-1">
                         <b><i class="fa fa-cogs" aria-hidden="true"></i>&nbsp;<%: traduci("CNC") %>&nbsp;|&nbsp;<%: hfCode02.Value %></b><div class="small">
                             <%: hfStat02.Value %>
                         </div>

NKC_WF/WebUserControls/cmp_MachSem.ascx.cs

@@ -52,6 +52,22 @@ namespace NKC_WF.WebUserControls
             }
         }
 
+        public bool showSemaphore
+        {
+            get
+            {
+                bool answ = false;
+                bool.TryParse(hfShowSemap.Value, out answ);
+                return answ;
+            }
+            set
+            {
+                hfShowSemap.Value = $"{value}";
+                upnlTitle.Visible = value;
+            }
+        }
+
+
         #endregion Public Properties
 
         #region Private Methods
@@ -65,16 +81,15 @@ namespace NKC_WF.WebUserControls
             lbtReset.Attributes.Add("class", $"btn btn-block text-center btn-{hfMachClass.Value}");
         }
 
-        private DS_App.StatusDecodeRow getState(List<NKC_SDK.MachineStatData> currState, string name)
+        private DS_App.StatusDecodeRow getState(NKC_SDK.MachineStatData currState, string station)
         {
             // recupero dati
             DS_App.StatusDecodeRow thisState = null;
             try
             {
-                var currInfo = currState.Where(x => x.Machine == currMachine).FirstOrDefault();
-                if (currInfo != null)
+                if (currState != null)
                 {
-                    var lastState = currInfo.Records.Where(x => x.Station == name).OrderByDescending(x => x.DtRecord).FirstOrDefault();
+                    var lastState = currState.Records.Where(x => x.Station == station).OrderByDescending(x => x.DtRecord).FirstOrDefault();
                     if (lastState == null)
                     {
                         // aggiungo ND
@@ -82,7 +97,7 @@ namespace NKC_WF.WebUserControls
                     else
                     {
                         // verifico la decodifica x ognuno
-                        thisState = ComLib.checkStationDecode(name, lastState.Code);
+                        thisState = ComLib.checkStationDecode(station, lastState.Code);
                     }
                 }
             }
@@ -111,6 +126,10 @@ namespace NKC_WF.WebUserControls
             hfMachine.Value = currMachine;
             checkVisibility();
             lbtReset.DataBind();
+            if (!Page.IsPostBack)
+            {
+                doUpdate();
+            }
         }
 
         protected void timerLoad_Tick(object sender, EventArgs e)
@@ -136,7 +155,7 @@ namespace NKC_WF.WebUserControls
             hfStat03.Value = "UNKNOWN";
 
             // leggo da redis lo status
-            var currState = ComLib.prodMachStateDataGet();
+            var currState = ComLib.prodMachStateDataGet(currMachine);
 
             // traduco!
             DS_App.StatusDecodeRow state01 = getState(currState, "PRINTER");
@@ -162,6 +181,17 @@ namespace NKC_WF.WebUserControls
                 hfCss03.Value = state03.Css;
                 hfStat03.Value = state03.Descript;
             }
+
+            icnLiveOk.Visible = false;
+            icnLiveKo.Visible = false;
+            if (ComLib.getMachLiveStatus(currMachine))
+            {
+                icnLiveOk.Visible = true;
+            }
+            else
+            {
+                icnLiveKo.Visible = true;
+            }
         }
 
         #endregion Public Methods

NKC_WF/WebUserControls/cmp_MachSem.ascx.designer.cs

@@ -23,6 +23,15 @@ namespace NKC_WF.WebUserControls
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfMachine;
 
+        /// <summary>
+        /// hfShowSemap control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfShowSemap;
+
         /// <summary>
         /// hfMachClass control.
         /// </summary>
@@ -166,5 +175,23 @@ namespace NKC_WF.WebUserControls
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtReset;
+
+        /// <summary>
+        /// icnLiveOk control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnLiveOk;
+
+        /// <summary>
+        /// icnLiveKo control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnLiveKo;
     }
 }

NKC_WF/WebUserControls/cmp_batchDetail.ascx

@@ -19,7 +19,7 @@
                 <asp:LinkButton runat="server" ID="lbtSendEstim" CssClass="btn btn-sm btn-block btn-info"
                     OnClick="lbtSendEstim_Click"
                     OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmStartEstim") %>'
-                    Visible='<%# (checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Errors) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Imported)) && canStartNew %>'><%# traduci("SendToEstim") %></asp:LinkButton>
+                    Visible='<%# (checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Imported) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Errors)) && canStartNew %>'><%# traduci("SendToEstim") %></asp:LinkButton>
                 <asp:LinkButton runat="server" ID="lbtStopEstim" CssClass="btn btn-sm btn-block btn-dark"
                     OnClick="lbtStopEstim_Click"
                     OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmStopEstim") %>'
@@ -27,7 +27,7 @@
                 <asp:LinkButton runat="server" ID="lbtSendNesting" CssClass="btn btn-sm btn-block btn-warning"
                     OnClick="lbtSendNesting_Click"
                     OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmStartNest") %>'
-                    Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.EstimationDone) && !checkType(Eval("BatchType"), NKC_SDK.BatchType.Descendant) && canStartNew %>'><%# traduci("SendToNest") %></asp:LinkButton>
+                    Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.EstimationDone) && !checkType(Eval("BatchType"), NKC_SDK.BatchType.Descendant) && canStartNew && isSplitted %>'><%# traduci("SendToNest") %></asp:LinkButton>
                 <asp:LinkButton runat="server" ID="lbtStopNesting" CssClass="btn btn-sm btn-block btn-dark"
                     OnClick="lbtStopNesting_Click"
                     OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmStopNest") %>'

NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs

@@ -87,6 +87,14 @@ namespace NKC_WF.WebUserControls
             raiseEvent();
         }
 
+        /// <summary>
+        /// Verifica se il batch sia stato splittato
+        /// </summary>
+        public bool isSplitted
+        {
+            get => cmp_batchDetailSplit.isSplitted;
+        }
+
         /// <summary>
         /// Riporta nesting a stato ESTIMATED
         /// </summary>
@@ -96,7 +104,7 @@ namespace NKC_WF.WebUserControls
         {
             // ri-assegnazione ordini/kit a batch ancestor
             DLMan.taOLT.setBatchSplit(BatchId, false);
-            // registro accettazione Nesting
+            // registro reset Nesting
             DLMan.taBL.refuseNesting(BatchId, DLMan.CodSoggCurrUser);
             raiseEvent();
         }
@@ -107,11 +115,38 @@ namespace NKC_WF.WebUserControls
             ComLib.sendMaterials();
             ComLib.sendBatchReq(BatchId, "Estimation", 3, false, 0);
 
+
+            // ri-assegnazione ordini/kit a batch ancestor
+            if (BatchIsAncestor)
+            {
+                DLMan.taOLT.setBatchSplit(BatchId, false);
+                // registro reset Nesting
+                DLMan.taBL.refuseNesting(BatchId, DLMan.CodSoggCurrUser);
+                // resetto i batch child a 0 se presenti
+                resetChildBatch();
+                // elimino gli orderExtTree
+                DLMan.taOLT.deleteByBatch(BatchId);
+            }
+
             // registro su DB nesting iniziato...
             DLMan.taBL.updateStatus(BatchId, (int)BatchStatus.EstimationRequested, "", 0);
             raiseEvent();
         }
 
+        private void resetChildBatch()
+        {
+            var tabDesc = ComLib.BatchDescendant(BatchId);
+            if (tabDesc != null && tabDesc.Count > 0)
+            {
+                foreach (var item in tabDesc)
+                {
+                    DLMan.taBL.updateStatus(item.BatchID, (int)BatchStatus.Imported, "", -1);
+                    // elimino order tree eventuale...
+                    DLMan.taOLT.deleteByBatch(item.BatchID);
+                }
+            }
+        }
+
         protected void lbtSendNesting_Click(object sender, EventArgs e)
         {
             // invia a redis a a richiesta...
@@ -121,40 +156,6 @@ namespace NKC_WF.WebUserControls
             {
                 // effettuo VERA ri-assegnazione ordini/kit a nuovi batch
                 DLMan.taOLT.setBatchSplit(BatchId, true);
-
-#if false
-                // invio il PRIMO batch descendant
-                var tabDesc = ComLib.BatchDescendant(BatchId);
-                if (tabDesc != null && tabDesc.Count > 0)
-                {
-                    bool batchSent = false;
-                    // ciclo fino a trovare un batch VALIDO (= contiene ordini)
-                    foreach (var item in tabDesc)
-                    {
-                        // 2021.07.19 FIX x caso batch vuoto: se non ho pezzi --> approvo direttamente e passo al successivo...
-                        var tabItems = DLMan.taIL.getByBatch(item.BatchID);
-                        if (tabItems != null)
-                        {
-                            //--> approvo direttamente e passo al successivo...
-                            if (tabItems.Count == 0)
-                            {
-                                // registro su DB batch DISCARDED (NON HA PEZZI...)
-                                DLMan.taBL.updateStatus(item.BatchID, (int)BatchStatus.Discarded, "", -1);
-                            }
-                            // --> invio batch
-                            else
-                            {
-                                ComLib.sendBatchReq(item.BatchID, "Nesting", 2, false);
-                                // registro su DB nesting iniziato...
-                                DLMan.taBL.updateStatus(item.BatchID, (int)BatchStatus.NestRequested, "", -1);
-                                batchSent = true;
-                            }
-                        }
-                        if (batchSent)
-                            break;
-                    }
-                } 
-#endif
                 bool fatto = ComLib.checkSendBatchSplit(BatchId);
             }
             else
@@ -174,6 +175,10 @@ namespace NKC_WF.WebUserControls
             ComLib.resetBatchReq();
             // registro su DB nesting iniziato...
             DLMan.taBL.updateStatus(BatchId, (int)BatchStatus.Imported, "", -1);
+            if (BatchIsAncestor)
+            {
+                resetChildBatch();
+            }
             raiseEvent();
         }
 
@@ -183,11 +188,29 @@ namespace NKC_WF.WebUserControls
             ComLib.resetBatchReq();
             // registro su DB nesting iniziato...
             DLMan.taBL.updateStatus(BatchId, (int)BatchStatus.EstimationDone, "", -1);
+            if (BatchIsAncestor)
+            {
+                var tabDesc = ComLib.BatchDescendant(BatchId);
+                if (tabDesc != null && tabDesc.Count > 0)
+                {
+                    foreach (var item in tabDesc)
+                    {
+                        DLMan.taBL.updateStatus(item.BatchID, (int)BatchStatus.EstimationDone, "", -1);
+                    }
+                }
+            }
             raiseEvent();
         }
 
         protected void Page_Load(object sender, EventArgs e)
         {
+            cmp_batchDetailSplit.eh_doReset += Cmp_batchDetailSplit_eh_doReset;
+        }
+
+        private void Cmp_batchDetailSplit_eh_doReset(object sender, EventArgs e)
+        {
+            frmView.DataBind();
+            fixDisplayDesc();
         }
 
         /// <summary>

NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs

@@ -188,8 +188,12 @@ namespace NKC_WF.WebUserControls
                     {
                         // ordino le medie
                         workRatio.Sort();
-                        // elimino le + basse quanti materiali ci sono...
-                        workRatio.RemoveRange(0, materialsList.Count);
+                        // controllo di averne + di 1...
+                        if (workRatio.Count > materialsList.Count * 2)
+                        {
+                            // elimino le + basse quanti materiali ci sono...
+                            workRatio.RemoveRange(0, materialsList.Count);
+                        }
                         double avgRatio = workRatio.Average();
                         double minRatio = workRatio.Min();
                         double maxRatio = workRatio.Max();

NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx

@@ -20,6 +20,7 @@
                 <asp:HiddenField runat="server" ID="hfNeedSave" />
                 <asp:HiddenField runat="server" ID="hfLastRatio" />
                 <asp:HiddenField runat="server" ID="hfFullTime" />
+                <asp:HiddenField runat="server" ID="hfIsSplit" Value="false" />
                 <asp:TextBox runat="server" ID="txtRatio" TextMode="Range" CssClass="form-control-range" AutoPostBack="true" OnTextChanged="txtRatio_TextChanged" />
             </div>
             <div class="col-1 font-weight-bold">

NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs

@@ -59,6 +59,20 @@ namespace NKC_WF.WebUserControls
             }
         }
 
+        public bool isSplitted
+        {
+            get
+            {
+                bool answ = false;
+                bool.TryParse(hfIsSplit.Value, out answ);
+                return answ;
+            }
+            set
+            {
+                hfIsSplit.Value = $"{value}";
+            }
+        }
+
         protected int lastValRatio
         {
             get
@@ -209,6 +223,11 @@ namespace NKC_WF.WebUserControls
             {
                 // imposto colore btn ROSSO...
                 baseCssClass = "btn btn-danger btn-block";
+                isSplitted = false;
+            }
+            else
+            {
+                isSplitted = true;
             }
             lbtBalance.CssClass = txtRatio.Visible ? baseCssClass : baseCssClass + " disabled";
             cmp_orderExtListNE01.Visible = txtRatio.Visible;
@@ -508,6 +527,7 @@ namespace NKC_WF.WebUserControls
             rebalanceOrder();
             fixChildBatch();
             checkDisplayMode();
+            raiseReset();
         }
 
         #endregion Public Methods

NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.designer.cs

@@ -68,6 +68,15 @@ namespace NKC_WF.WebUserControls
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfFullTime;
 
+        /// <summary>
+        /// hfIsSplit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfIsSplit;
+
         /// <summary>
         /// txtRatio control.
         /// </summary>

NKC_WF/WebUserControls/cmp_batchDetailSplitInfo.ascx

@@ -10,16 +10,15 @@
                 <asp:Label runat="server" ID="lblBatchType" ToolTip='<%# tooltipByType(Eval("BatchType")) %>'><span style="font-size: 1.3em;"><i class='<%# cssIconByType(Eval("BatchType")) %>'></i></span>&nbsp;&nbsp;<b><%# Eval("Takt") %></b></asp:Label>
             </div>
             <div class="col-3 text-right">
-                # KIT/Parts: <b><%# Eval("NumOrders") %>/<%# Eval("NumItems") %></b>
-            </div>
+                # KIT/Parts: <b><%# Eval("NumOrders") %>/<%# Eval("NumItems") %></b></div>
             <div class="col-3 text-right">
                 Estim.Time: <b><%# Eval("TotalTime","{0:N2}") %></b> min
             </div>
         </div>
         <div class="row ">
             <div class="col-4 text-right">
-                <asp:HyperLink runat="server" ID="hlShowErr" NavigateUrl='<%# $"../site/ErrorsLog?PUID=B.{Eval("BatchID")}" %>' CssClass="text-warning" Visible='<%# Eval("NumErrPre").ToString()!="0" %>' Target="_blank" ToolTip="Show errors"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <%# $"{Eval("Errors")} (tot: {Eval("NumErrPre")} err)" %></asp:HyperLink>
-                <asp:HyperLink runat="server" ID="HyperLink1" NavigateUrl='<%# $"../site/ErrorsLog?PUID={Eval("EnvNum")}" %>' CssClass="text-danger" Visible='<%# Eval("NumErr").ToString()!="0" %>' Target="_blank" ToolTip="Show errors"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <%# $"{Eval("Errors")} (tot: {Eval("NumErr")} err)" %></asp:HyperLink>
+                <asp:HyperLink runat="server" ID="hlShowErr01" NavigateUrl='<%# $"../site/ErrorsLog?PUID=B.{Eval("BatchID")}" %>' CssClass="text-warning" Visible='<%# Eval("NumErrPre").ToString()!="0" %>' Target="_blank" ToolTip="Show errors"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <%# $"{Eval("Errors")} (tot: {Eval("NumErrPre")} err)" %></asp:HyperLink>
+                <asp:HyperLink runat="server" ID="hlShowErr02" NavigateUrl='<%# $"../site/ErrorsLog?PUID={Eval("EnvNum")}" %>' CssClass="text-danger" Visible='<%# Eval("NumErr").ToString()!="0" %>' Target="_blank" ToolTip="Show errors"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <%# $"{Eval("Errors")} (tot: {Eval("NumErr")} err)" %></asp:HyperLink>
             </div>
             <div class="col-8 text-left">
                 <div class="d-flex">

NKC_WF/WebUserControls/cmp_batchList.ascx.cs

@@ -204,6 +204,19 @@ namespace NKC_WF.WebUserControls
 
         #region Protected Methods
 
+        public bool showSplit
+        {
+            get
+            {
+                return chkShowSplit.Checked;
+            }
+            set
+            {
+                chkShowSplit.Checked = value;
+            }
+        }
+
+
         protected void chkShowSplit_CheckedChanged(object sender, EventArgs e)
         {
             // deseleziono...

NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs

@@ -811,7 +811,7 @@ namespace NKC_WF.WebUserControls
 
         protected void lbtResetSel_Click(object sender, EventArgs e)
         {
-            var tabSheet = DLMan.taSHL.getByItemID(itemIdSelected);
+            var tabSheet = DLMan.taSHL.getByItemID(itemIdSelected, PlaceCod);
             if (tabSheet.Count == 1)
             {
                 resetShowData();
@@ -858,7 +858,7 @@ namespace NKC_WF.WebUserControls
         {
             // FORSE 5/5?!?
             DataLayer DLMan = new DataLayer();
-            var sheetList = DLMan.taSHL.getByMLStatus(PackListID, 3, 5);
+            var sheetList = DLMan.taSHL.getByMLStatus(PackListID, 3, 5, PlaceCod);
             if (sheetList.Count > 0)
             {
                 SheetID = sheetList[0].SheetID;

NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs

@@ -66,7 +66,7 @@ namespace NKC_WF.WebUserControls
         {
             // FORSE 5/5?!?
             DataLayer DLMan = new DataLayer();
-            var sheetList = DLMan.taSHL.getByMLStatus(PackListID, 3, 5);
+            var sheetList = DLMan.taSHL.getByMLStatus(PackListID, 3, 5, MachineSel);
             if (sheetList.Count > 0)
             {
                 SheetID = sheetList[0].SheetID;

NKC_WF/WebUserControls/cmp_orderPrint.ascx

@@ -6,6 +6,7 @@
 
 
 <asp:HiddenField runat="server" ID="hfBatchID" />
+<asp:HiddenField runat="server" ID="hfMachineSel" />
 <div class="row">
     <div class="col-12 col-lg-6">
         <uc1:cmp_MU_bins runat="server" ID="cmp_MU_bins" ShowQr="false" ShowPrint="true" />

NKC_WF/WebUserControls/cmp_orderPrint.ascx.cs

@@ -11,11 +11,26 @@ namespace NKC_WF.WebUserControls
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            if(!Page.IsPostBack)
+            if (!Page.IsPostBack)
             {
             }
         }
-
+        /// <summary>
+        /// Macchina selezionata
+        /// </summary>
+        public string MachineSel
+        {
+            get
+            {
+                return hfMachineSel.Value;
+            }
+            set
+            {
+                hfMachineSel.Value = value;
+                cmp_MU_bins.MachineSel = value;
+                cmp_MU_carts.MachineSel = value;
+            }
+        }
         /// <summary>
         /// BatchId corrente...
         /// </summary>
@@ -26,6 +41,13 @@ namespace NKC_WF.WebUserControls
                 hfBatchID.Value = value.ToString();
                 cmp_MU_bins.BatchId = value;
                 cmp_MU_carts.BatchId = value;
+                // calcolo macchina
+                var tabBL = DLMan.taBL.getByKey(value);
+                if (tabBL != null && tabBL.Count > 0)
+                {
+                    var rigaBL = tabBL[0];
+                    MachineSel = rigaBL.PlaceCod;
+                }
             }
             get
             {

NKC_WF/WebUserControls/cmp_orderPrint.ascx.designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF.WebUserControls
@@ -15,29 +15,38 @@ namespace NKC_WF.WebUserControls
     {
 
         /// <summary>
-        /// Controllo hfBatchID.
+        /// hfBatchID control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfBatchID;
 
         /// <summary>
-        /// Controllo cmp_MU_bins.
+        /// hfMachineSel control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfMachineSel;
+
+        /// <summary>
+        /// cmp_MU_bins control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_MU_bins cmp_MU_bins;
 
         /// <summary>
-        /// Controllo cmp_MU_carts.
+        /// cmp_MU_carts control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_MU_carts cmp_MU_carts;
     }

NKC_WF/WebUserControls/cmp_secScreen.ascx

@@ -2,10 +2,9 @@
 <%@ Register Src="~/WebUserControls/cmp_ItemDet.ascx" TagPrefix="uc1" TagName="cmp_ItemDet" %>
 
 
-
-
 <div class="card text-center border-primary" style="width: 100%;">
     <asp:HiddenField runat="server" ID="hfNum" />
+    <asp:HiddenField ID="hfMachine" runat="server" Value="0" />
     <asp:HiddenField ID="hfCountDown" runat="server" Value="0" />
     <asp:HiddenField ID="hfBatchId" runat="server" Value="0" />
     <asp:HiddenField ID="hfSheetId" runat="server" Value="0" />
@@ -35,57 +34,6 @@
             <div runat="server" id="divImg" class="col-12">
                 <asp:Image runat="server" ID="imgQrMain" CssClass="img-fluid" />
             </div>
-            <%--<div class="col-12">
-                <script src="//mozilla.github.io/pdf.js/build/pdf.js"></script>
-                <script>
-
-                    function loadPdf() {
-                        var url = '<%: lblPdf.Text %>';
-                        //var url = '../temp/119752.pdf';
-
-                        // Loaded via <script> tag, create shortcut to access PDF.js exports.
-                        var pdfjsLib = window['pdfjs-dist/build/pdf'];
-
-                        // The workerSrc property shall be specified.
-                        pdfjsLib.GlobalWorkerOptions.workerSrc = '//mozilla.github.io/pdf.js/build/pdf.worker.js';
-
-                        // Asynchronous download of PDF
-                        var loadingTask = pdfjsLib.getDocument(url);
-                        loadingTask.promise.then(function (pdf) {
-                            console.log('PDF loaded');
-
-                            // Fetch the first page
-                            var pageNumber = 1;
-                            pdf.getPage(pageNumber).then(function (page) {
-                                console.log('Page loaded');
-
-                                var scale = 1.5;
-                                var viewport = page.getViewport({ scale: scale });
-
-                                // Prepare canvas using PDF page dimensions
-                                var canvas = document.getElementById('<%: canvasPdf.ClientID %>');
-                                var context = canvas.getContext('2d');
-                                canvas.height = viewport.height;
-                                canvas.width = viewport.width;
-
-                                // Render PDF page into canvas context
-                                var renderContext = {
-                                    canvasContext: context,
-                                    viewport: viewport
-                                };
-                                var renderTask = page.render(renderContext);
-                                renderTask.promise.then(function () {
-                                    console.log('Page rendered');
-                                });
-                            });
-                        }, function (reason) {
-                            // PDF loading error
-                            console.error(reason);
-                        });
-                    };
-                </script>
-                <canvas runat="server" id="canvasPdf"></canvas>
-            </div>--%>
         </div>
     </div>
 </div>

NKC_WF/WebUserControls/cmp_secScreen.ascx.cs

@@ -17,9 +17,20 @@ namespace NKC_WF.WebUserControls
     public partial class cmp_secScreen : BaseUserControl
     {
         /// <summary>
-        /// Codice macchina (HARD CODED x ora)
+        /// Codice macchina
         /// </summary>
-        protected string machine = "WRK001";
+        public string machine
+        {
+            get
+            {
+                return hfMachine.Value;
+            }
+            set
+            {
+                hfMachine.Value = value;
+                setCurrData();
+            }
+        }
 
         public int countDown
         {
@@ -277,7 +288,7 @@ namespace NKC_WF.WebUserControls
         private void setCurrData()
         {
             // recupero bunk corrente...
-            DS_App.StackListRow currBunk = ComLib.getCurrBunk();
+            DS_App.StackListRow currBunk = ComLib.getCurrBunk(machine);
             if (currBunk != null)
             {
                 DS_App.SheetListRow currSheet = ComLib.getCurrSheet(currBunk.BatchID, machine);

NKC_WF/WebUserControls/cmp_secScreen.ascx.designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF.WebUserControls
@@ -15,137 +15,146 @@ namespace NKC_WF.WebUserControls
     {
 
         /// <summary>
-        /// Controllo hfNum.
+        /// hfNum control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfNum;
 
         /// <summary>
-        /// Controllo hfCountDown.
+        /// hfMachine control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfMachine;
+
+        /// <summary>
+        /// hfCountDown control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfCountDown;
 
         /// <summary>
-        /// Controllo hfBatchId.
+        /// hfBatchId control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfBatchId;
 
         /// <summary>
-        /// Controllo hfSheetId.
+        /// hfSheetId control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfSheetId;
 
         /// <summary>
-        /// Controllo hfItemPdf.
+        /// hfItemPdf control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfItemPdf;
 
         /// <summary>
-        /// Controllo hfItemDtmx.
+        /// hfItemDtmx control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfItemDtmx;
 
         /// <summary>
-        /// Controllo hfItemCode.
+        /// hfItemCode control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfItemCode;
 
         /// <summary>
-        /// Controllo timerRefresh.
+        /// timerRefresh control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.Timer timerRefresh;
 
         /// <summary>
-        /// Controllo hlShowCurrSheet.
+        /// hlShowCurrSheet control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hlShowCurrSheet;
 
         /// <summary>
-        /// Controllo lblNum.
+        /// lblNum control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNum;
 
         /// <summary>
-        /// Controllo lblMessage.
+        /// lblMessage control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblMessage;
 
         /// <summary>
-        /// Controllo cmp_ItemDet.
+        /// cmp_ItemDet control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_ItemDet cmp_ItemDet;
 
         /// <summary>
-        /// Controllo hlPdfOpener.
+        /// hlPdfOpener control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hlPdfOpener;
 
         /// <summary>
-        /// Controllo divImg.
+        /// divImg control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divImg;
 
         /// <summary>
-        /// Controllo imgQrMain.
+        /// imgQrMain control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Image imgQrMain;
     }

NKC_WF/WebUserControls/cmp_svgFull.ascx.cs

@@ -61,7 +61,7 @@ namespace NKC_WF.WebUserControls
             {
                 if (SheetId > 0)
                 {
-                    var tabSheets = DLMan.taSHL.getBySheetId(SheetId);
+                    var tabSheets = DLMan.taSHL.getBySheetId(SheetId, "");
                     if (tabSheets.Count > 0)
                     {
                         filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);

NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs

@@ -729,7 +729,7 @@ namespace NKC_WF.WebUserControls
 
         protected void lbtResetSel_Click(object sender, EventArgs e)
         {
-            var tabSheet = DLMan.taSHL.getByItemID(itemIdSelected);
+            var tabSheet = DLMan.taSHL.getByItemID(itemIdSelected, PlaceCod);
             if (tabSheet.Count == 1)
             {
                 resetShowData();
@@ -836,7 +836,7 @@ namespace NKC_WF.WebUserControls
         {
             // FORSE 5/5?!?
             DataLayer DLMan = new DataLayer();
-            var sheetList = DLMan.taSHL.getByMLStatus(BatchId, 3, 5);
+            var sheetList = DLMan.taSHL.getByMLStatus(BatchId, 3, 5, PlaceCod);
             if (sheetList.Count > 0)
             {
                 SheetID = sheetList[0].SheetID;

NKC_WF/WebUserControls/mod_lemmiVocab.ascx.cs

@@ -2,12 +2,11 @@ using SteamWare;
 using System;
 using System.Web.UI.WebControls;
 
-
 namespace NKC_WF.WebUserControls
 {
     public partial class mod_lemmiVocab : ApplicationUserControl
     {
-        #region protected
+        #region Protected Methods
 
         protected override void aggiornaControlliDataGL()
         {
@@ -20,7 +19,7 @@ namespace NKC_WF.WebUserControls
             if (grView.Rows.Count > 0)
             {
                 LinkButton lb;
-                // aggiorno gli headers        
+                // aggiorno gli headers
                 foreach (TableCell cella in grView.HeaderRow.Cells)
                 {
                     try
@@ -39,6 +38,11 @@ namespace NKC_WF.WebUserControls
                 lblNumRec.Text = "";
             }
         }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
         /// <summary>
         /// aggiorna i dati mostrati
         /// </summary>
@@ -48,6 +52,6 @@ namespace NKC_WF.WebUserControls
             grView.DataBind();
         }
 
-        #endregion
+        #endregion Public Methods
     }
 }

NKC_WF/export/BunkDetail.aspx

@@ -4,46 +4,47 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title></title>
 </head>
 <body>
-  <form id="form1" runat="server">
-    <div>
-      <asp:HiddenField ID="hfStackID" runat="server" />
-      <asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="SheetID" DataSourceID="ods" AllowSorting="false">
-        <EmptyDataTemplate>
-          No Record
-        </EmptyDataTemplate>
-        <Columns>
-          <asp:BoundField DataField="StackId" HeaderText="Bunk" ReadOnly="True" />
-          <asp:BoundField DataField="SheetIndex" HeaderText="Num" ReadOnly="True" />
-          <asp:BoundField DataField="SheetId" HeaderText="Id" ReadOnly="True" />
-          <asp:BoundField DataField="MatExtCode" HeaderText="MatExtCode" ReadOnly="True" />
-          <asp:BoundField DataField="MatDesc" HeaderText="MatDesc" ReadOnly="True" />
-          <asp:TemplateField HeaderText="Estim (min:sec)" SortExpression="WrkTimeEst">
-            <ItemTemplate>
-              <asp:Label ID="lblWrkTimeEst" runat="server" Text='<%# formatMinSec(Eval("WrkTimeEst", "{0:N0}")) %>'></asp:Label>
-            </ItemTemplate>
-          </asp:TemplateField>
-          <asp:TemplateField HeaderText="CNC File" SortExpression="WrkTimeEst">
-            <ItemTemplate>
-              <asp:Label ID="lblCncFilePath" runat="server" Text='<%# fixFilePath(Eval("CncFilePath")) %>'></asp:Label>
-            </ItemTemplate>
-          </asp:TemplateField>
-          <asp:TemplateField HeaderText="Draw File" SortExpression="WrkTimeEst">
-            <ItemTemplate>
-              <asp:Label ID="lblDrawFilePath" runat="server" Text='<%# fixFilePath(Eval("DrawFilePath")) %>'></asp:Label>
-            </ItemTemplate>
-          </asp:TemplateField>
-        </Columns>
-      </asp:GridView>
-      <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStack" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
-        <SelectParameters>
-          <asp:ControlParameter ControlID="hfStackID" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
-        </SelectParameters>
-      </asp:ObjectDataSource>
-    </div>
-  </form>
+    <form id="form1" runat="server">
+        <div>
+            <asp:HiddenField ID="hfStackID" runat="server" />
+            <asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="SheetID" DataSourceID="ods" AllowSorting="false">
+                <EmptyDataTemplate>
+                    No Record
+                </EmptyDataTemplate>
+                <Columns>
+                    <asp:BoundField DataField="StackId" HeaderText="Bunk" ReadOnly="True" />
+                    <asp:BoundField DataField="SheetIndex" HeaderText="Num" ReadOnly="True" />
+                    <asp:BoundField DataField="SheetId" HeaderText="Id" ReadOnly="True" />
+                    <asp:BoundField DataField="MatExtCode" HeaderText="MatExtCode" ReadOnly="True" />
+                    <asp:BoundField DataField="MatDesc" HeaderText="MatDesc" ReadOnly="True" />
+                    <asp:TemplateField HeaderText="Estim (min:sec)" SortExpression="WrkTimeEst">
+                        <ItemTemplate>
+                            <asp:Label ID="lblWrkTimeEst" runat="server" Text='<%# formatMinSec(Eval("WrkTimeEst", "{0:N0}")) %>'></asp:Label>
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                    <asp:TemplateField HeaderText="CNC File" SortExpression="WrkTimeEst">
+                        <ItemTemplate>
+                            <asp:Label ID="lblCncFilePath" runat="server" Text='<%# fixFilePath(Eval("CncFilePath")) %>'></asp:Label>
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                    <asp:TemplateField HeaderText="Draw File" SortExpression="WrkTimeEst">
+                        <ItemTemplate>
+                            <asp:Label ID="lblDrawFilePath" runat="server" Text='<%# fixFilePath(Eval("DrawFilePath")) %>'></asp:Label>
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                </Columns>
+            </asp:GridView>
+            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStack" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
+                <SelectParameters>
+                    <asp:ControlParameter ControlID="hfStackID" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
+                    <asp:Parameter Name="Machine" DefaultValue="" />
+                </SelectParameters>
+            </asp:ObjectDataSource>
+        </div>
+    </form>
 </body>
 </html>

NKC_WF/export/BunkDetail.aspx.designer.cs

@@ -1,53 +1,53 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF
 {
 
 
-  public partial class BunkDetail
-  {
+    public partial class BunkDetail
+    {
 
-    /// <summary>
-    /// Controllo form1.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
 
-    /// <summary>
-    /// Controllo hfStackID.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.HiddenField hfStackID;
+        /// <summary>
+        /// hfStackID control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfStackID;
 
-    /// <summary>
-    /// Controllo grView.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.GridView grView;
+        /// <summary>
+        /// grView control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView grView;
 
-    /// <summary>
-    /// Controllo ods.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.ObjectDataSource ods;
-  }
+        /// <summary>
+        /// ods control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+    }
 }

NKC_WF/packages.config

@@ -8,7 +8,7 @@
   <package id="bootstrap" version="4.6.0" targetFramework="net462" />
   <package id="Chart.js" version="2.9.3" targetFramework="net462" />
   <package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
-  <package id="DnsClient" version="1.4.0" targetFramework="net462" />
+  <package id="DnsClient" version="1.5.0" targetFramework="net462" />
   <package id="elmah" version="1.2.2" targetFramework="net462" />
   <package id="elmah.corelibrary" version="1.2.2" targetFramework="net462" />
   <package id="FontAwesome" version="4.7.0" targetFramework="net462" />
@@ -45,10 +45,10 @@
   <package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
   <package id="Modernizr" version="2.8.3" targetFramework="net462" />
   <package id="Moment.js" version="2.29.1" targetFramework="net462" />
-  <package id="MongoDB.Bson" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Driver" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Driver.Core" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Libmongocrypt" version="1.2.1" targetFramework="net462" />
+  <package id="MongoDB.Bson" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Driver" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Driver.Core" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Libmongocrypt" version="1.2.2" targetFramework="net462" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
   <package id="NLog" version="4.7.10" targetFramework="net462" />
@@ -58,9 +58,9 @@
   <package id="SharpCompress" version="0.28.3" targetFramework="net462" />
   <package id="SharpZipLib" version="1.3.2" targetFramework="net462" />
   <package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
-  <package id="StackExchange.Redis" version="2.2.4" targetFramework="net462" />
-  <package id="SteamWare" version="5.1.2107.759" targetFramework="net462" />
-  <package id="SteamWare.Logger" version="5.1.2107.759" targetFramework="net462" />
+  <package id="StackExchange.Redis" version="2.2.62" targetFramework="net462" />
+  <package id="SteamWare" version="5.1.2108.1115" targetFramework="net462" />
+  <package id="SteamWare.Logger" version="5.1.2108.1115" targetFramework="net462" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
   <package id="System.Diagnostics.PerformanceCounter" version="5.0.1" targetFramework="net462" />
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
@@ -78,5 +78,6 @@
   <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net462" />
   <package id="System.Threading.Channels" version="5.0.0" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
   <package id="WebGrease" version="1.6.0" targetFramework="net462" />
 </packages>

NKC_WF/site/BatchPreview.aspx.cs

@@ -97,7 +97,7 @@ namespace NKC_WF.site
                 string rawData = memLayer.ML.getRSV(tabSheetKey);
                 if (string.IsNullOrEmpty(rawData))
                 {
-                    answ = DLMan.taSHL.getByBatch(BatchId);
+                    answ = DLMan.taSHL.getByBatch(BatchId, "");
                     tabSheets = answ;
                 }
                 else

NKC_WF/site/CartDetIRK.aspx.designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF.site
@@ -15,56 +15,56 @@ namespace NKC_WF.site
     {
 
         /// <summary>
-        /// Controllo hfCartID.
+        /// hfCartID control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfCartID;
 
         /// <summary>
-        /// Controllo hlPartMIA.
+        /// hlPartMIA control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hlPartMIA;
 
         /// <summary>
-        /// Controllo lbtPrint.
+        /// lbtPrint control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtPrint;
 
         /// <summary>
-        /// Controllo upnlCartSummary.
+        /// upnlCartSummary control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel upnlCartSummary;
 
         /// <summary>
-        /// Controllo timerMain.
+        /// timerMain control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.Timer timerMain;
 
         /// <summary>
-        /// Controllo cmp_cartDetIRK.
+        /// cmp_cartDetIRK control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_cartDetIRK cmp_cartDetIRK;
     }

NKC_WF/site/MachineLoad.aspx.cs

@@ -25,10 +25,15 @@ namespace NKC_WF
                 cmp_stackLoading.doUpdate();
                 int currBatchId = cmp_stackLoading.BatchIdCurr;
                 hfBatchID.Value = $"{currBatchId}";
+                string machineSel = cmp_MachSem.currMachine;
                 cmp_ML_ShDet.BatchId = currBatchId;
                 cmp_ML_ShDet1.BatchId = currBatchId;
                 cmp_ML_ShDet2.BatchId = currBatchId;
                 cmp_ML_ShDet3.BatchId = currBatchId;
+                cmp_ML_ShDet.MachineSel = machineSel;
+                cmp_ML_ShDet1.MachineSel = machineSel;
+                cmp_ML_ShDet2.MachineSel = machineSel;
+                cmp_ML_ShDet3.MachineSel = machineSel;
                 cmp_ML_ShDet.doUpdate();
                 cmp_ML_ShDet1.doUpdate();
                 cmp_ML_ShDet2.doUpdate();

NKC_WF/site/MachineUnload.aspx.cs

@@ -104,12 +104,15 @@ namespace NKC_WF
             get
             {
                 bool answ = false;
-                try
+                if (BatchId > 0)
                 {
-                    answ = DLMan.taIL.getMissingByBatch(BatchId).Count > 0;
+                    try
+                    {
+                        answ = DLMan.taIL.getMissingByBatch(BatchId).Count > 0;
+                    }
+                    catch
+                    { }
                 }
-                catch
-                { }
                 return answ;
             }
         }

NKC_WF/site/OrderHistory.aspx

@@ -10,7 +10,7 @@
             <div class="card-body">
                 <div class="row">
                     <div class="col-12" runat="server" id="divFileList">
-                        <uc1:cmp_batchList runat="server" ID="cmp_batchList" listMode="FullHistory" />
+                        <uc1:cmp_batchList runat="server" ID="cmp_batchList" listMode="FullHistory" showSplit="true" />
                     </div>
                 </div>
             </div>

NKC_WF/site/OrderHistory.aspx.designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF.site
@@ -15,20 +15,20 @@ namespace NKC_WF.site
     {
 
         /// <summary>
-        /// Controllo divFileList.
+        /// divFileList control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFileList;
 
         /// <summary>
-        /// Controllo cmp_batchList.
+        /// cmp_batchList control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_batchList cmp_batchList;
     }

NKC_WF/site/SecondScreen.aspx

@@ -1,12 +1,24 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="SecondScreen.aspx.cs" Inherits="NKC_WF.SecondScreen" %>
 
 <%@ Register Src="~/WebUserControls/cmp_secScreen.ascx" TagPrefix="uc1" TagName="cmp_secScreen" %>
+<%@ Register Src="~/WebUserControls/cmp_MachSem.ascx" TagPrefix="uc1" TagName="cmp_MachSem" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
 
-    <asp:UpdatePanel runat="server" ID="updPanelSecScreen" UpdateMode="Conditional">
+<asp:Content ID="updMachSel" ContentPlaceHolderID="MainContent" runat="server">
+    <asp:UpdatePanel runat="server" ID="upnlCartSummary" UpdateMode="Conditional">
         <ContentTemplate>
-            <uc1:cmp_secScreen runat="server" ID="cmp_secScreen" />
+            <div class="row">
+                <div class="col-12">
+                    <uc1:cmp_MachSem runat="server" ID="cmp_MachSem" />
+                </div>
+            </div>
         </ContentTemplate>
     </asp:UpdatePanel>
+    <div runat="server" id="divMain">
+        <asp:UpdatePanel runat="server" ID="updPanelSecScreen" UpdateMode="Conditional">
+            <ContentTemplate>
+                <uc1:cmp_secScreen runat="server" ID="cmp_secScreen" />
+            </ContentTemplate>
+        </asp:UpdatePanel>
+    </div>
 </asp:Content>

NKC_WF/site/SecondScreen.aspx.cs

@@ -10,8 +10,21 @@ namespace NKC_WF
             if (!Page.IsPostBack)
             {
                 ((SiteContent)this.Master).showSearch = false;
+                forceRefresh();
+            }
+        }
+        private void forceRefresh()
+        {
+            // verifico CI SIA la macchina...
+            if (string.IsNullOrEmpty(cmp_MachSem.currMachine))
+            {
+                divMain.Visible = false;
+            }
+            else
+            {
+                divMain.Visible = true;
+                cmp_secScreen.machine = cmp_MachSem.currMachine;
             }
         }
-
     }
 }

NKC_WF/site/SecondScreen.aspx.designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF
@@ -15,20 +15,47 @@ namespace NKC_WF
     {
 
         /// <summary>
-        /// Controllo updPanelSecScreen.
+        /// upnlCartSummary control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel upnlCartSummary;
+
+        /// <summary>
+        /// cmp_MachSem control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::NKC_WF.WebUserControls.cmp_MachSem cmp_MachSem;
+
+        /// <summary>
+        /// divMain control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMain;
+
+        /// <summary>
+        /// updPanelSecScreen control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel updPanelSecScreen;
 
         /// <summary>
-        /// Controllo cmp_secScreen.
+        /// cmp_secScreen control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_secScreen cmp_secScreen;
     }

gitSpread.bat

@@ -11,7 +11,7 @@ set baseBranch=%1
 set pushRemote=%2
 
 git push . %baseBranch%:develop
-git push . %baseBranch%:master
+REM git push . %baseBranch%:master
 git push . %baseBranch%:SDK
 git push . %baseBranch%:report
 git push . %baseBranch%:stable
@@ -20,7 +20,7 @@ REM Faccio push remoto condizionale
 if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:%baseBranch% )
 if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:develop )
 if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:SDK )
-if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:master )
+REM if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:master )
 if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:stable )
 if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:report )