diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs
index 9684f40..fe63964 100644
--- a/AppData/DS_App.Designer.cs
+++ b/AppData/DS_App.Designer.cs
@@ -17599,24 +17599,24 @@ namespace AppData.DS_AppTableAdapters {
             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[9] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[9].Connection = this.Connection;
-            this._commandCollection[9].CommandText = "dbo.stp_Batch_getByMaxPosition";
+            this._commandCollection[9].CommandText = "dbo.stp_Batch_getByStatus";
             this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Position", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchVal", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[10].Connection = this.Connection;
-            this._commandCollection[10].CommandText = "dbo.stp_Batch_getByStatus";
+            this._commandCollection[10].CommandText = "dbo.stp_Batch_getCurrentByMachine";
             this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchVal", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodPosition", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[11].Connection = this.Connection;
-            this._commandCollection[11].CommandText = "dbo.stp_Batch_getCurrentByMachine";
+            this._commandCollection[11].CommandText = "dbo.stp_Batch_getForBunkMan";
             this._commandCollection[11].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodPosition", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MaxPosition", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[12] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[12].Connection = this.Connection;
             this._commandCollection[12].CommandText = "dbo.stp_Batch_getLastByTakt";
@@ -17725,29 +17725,12 @@ namespace AppData.DS_AppTableAdapters {
             return dataTable;
         }
         
-        [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")]
-        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_App.BatchListDataTable getByMaxPosition(global::System.Nullable<int> Position) {
-            this.Adapter.SelectCommand = this.CommandCollection[9];
-            if ((Position.HasValue == true)) {
-                this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Position.Value));
-            }
-            else {
-                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
-            }
-            DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
-            this.Adapter.Fill(dataTable);
-            return dataTable;
-        }
-        
         [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")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getByStatus(global::System.Nullable<int> Status, string SearchVal, global::System.Nullable<int> PartValid) {
-            this.Adapter.SelectCommand = this.CommandCollection[10];
+            this.Adapter.SelectCommand = this.CommandCollection[9];
             if ((Status.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Status.Value));
             }
@@ -17776,7 +17759,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getCurrentByMachine(string CodPosition) {
-            this.Adapter.SelectCommand = this.CommandCollection[11];
+            this.Adapter.SelectCommand = this.CommandCollection[10];
             if ((CodPosition == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -17788,6 +17771,23 @@ namespace AppData.DS_AppTableAdapters {
             return dataTable;
         }
         
+        [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")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_App.BatchListDataTable getForBunkMan(global::System.Nullable<int> MaxPosition) {
+            this.Adapter.SelectCommand = this.CommandCollection[11];
+            if ((MaxPosition.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((int)(MaxPosition.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
         [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")]
@@ -18432,10 +18432,9 @@ namespace AppData.DS_AppTableAdapters {
             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[6] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[6].Connection = this.Connection;
-            this._commandCollection[6].CommandText = "dbo.stp_Stacks_getNextByBatch";
+            this._commandCollection[6].CommandText = "dbo.stp_Stacks_getNext";
             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("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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_Stacks_insert";
@@ -18559,14 +18558,8 @@ 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.StackListDataTable getNextByBatch(global::System.Nullable<int> BatchID) {
+        public virtual DS_App.StackListDataTable getNext() {
             this.Adapter.SelectCommand = this.CommandCollection[6];
-            if ((BatchID.HasValue == true)) {
-                this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
-            }
-            else {
-                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
-            }
             DS_App.StackListDataTable dataTable = new DS_App.StackListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd
index 3feb59e..6bdf531 100644
--- a/AppData/DS_App.xsd
+++ b/AppData/DS_App.xsd
@@ -99,7 +99,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_fixRedoSheetOnEnd" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fixRedoSheetOnEnd" Modifier="Public" Name="fixRedoSheetOnEnd" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy13" UserSourceName="fixRedoSheetOnEnd">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_fixRedoSheetOnEnd" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fixRedoSheetOnEnd" Modifier="Public" Name="fixRedoSheetOnEnd" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy5" UserSourceName="fixRedoSheetOnEnd">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_fixRedoSheetOnEnd</CommandText>
@@ -110,7 +110,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_fixSched" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fixSched" Modifier="Public" Name="fixSched" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy5" UserSourceName="fixSched">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_fixSched" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fixSched" Modifier="Public" Name="fixSched" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy6" UserSourceName="fixSched">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_fixSched</CommandText>
@@ -131,17 +131,6 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getByMaxPosition" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByMaxPosition" GetMethodModifier="Public" GetMethodName="getByMaxPosition" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByMaxPosition" UserSourceName="getByMaxPosition">
-                <SelectCommand>
-                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
-                    <CommandText>dbo.stp_Batch_getByMaxPosition</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="@Position" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
-                    </Parameters>
-                  </DbCommand>
-                </SelectCommand>
-              </DbSource>
               <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getByStatus" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByStatus" GetMethodModifier="Public" GetMethodName="getByStatus" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByStatus" UserSourceName="getByStatus">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -166,6 +155,17 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getForBunkMan" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getForBunkMan" GetMethodModifier="Public" GetMethodName="getForBunkMan" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getForBunkMan" UserSourceName="getForBunkMan">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_Batch_getForBunkMan</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="@MaxPosition" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getLastByTakt" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getLastByTakt" GeneratorSourceName="FillBy" GetMethodModifier="Public" GetMethodName="getLastByTakt" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getLastByTakt" UserSourceName="getLastByTakt">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -207,7 +207,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_redoPartValid" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="redoPartValid" Modifier="Public" Name="redoPartValid" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy6" UserSourceName="redoPartValid">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_redoPartValid" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="redoPartValid" Modifier="Public" Name="redoPartValid" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="redoPartValid">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_redoPartValid</CommandText>
@@ -218,7 +218,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_resetAllNesting" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="resetNesting" Modifier="Public" Name="resetNesting" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="resetNesting">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_resetAllNesting" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="resetNesting" Modifier="Public" Name="resetNesting" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy8" UserSourceName="resetNesting">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_resetAllNesting</CommandText>
@@ -229,7 +229,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_resetPartUnValid" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="resetPartUnValid" Modifier="Public" Name="resetPartUnValid" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy8" UserSourceName="resetPartUnValid">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_resetPartUnValid" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="resetPartUnValid" Modifier="Public" Name="resetPartUnValid" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy9" UserSourceName="resetPartUnValid">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_resetPartUnValid</CommandText>
@@ -239,7 +239,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_zzz_resetProdCall" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="resetProdCall" Modifier="Public" Name="resetProdCall" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy9" UserSourceName="resetProdCall">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_zzz_resetProdCall" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="resetProdCall" Modifier="Public" Name="resetProdCall" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy10" UserSourceName="resetProdCall">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_zzz_resetProdCall</CommandText>
@@ -249,7 +249,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_resetTree" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="resetTree" Modifier="Public" Name="resetTree" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy10" UserSourceName="resetTree">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_resetTree" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="resetTree" Modifier="Public" Name="resetTree" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy11" UserSourceName="resetTree">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_resetTree</CommandText>
@@ -260,7 +260,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_updateSchedPrior" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateSchedPrior" Modifier="Public" Name="updateSchedPrior" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy11" UserSourceName="updateSchedPrior">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_updateSchedPrior" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateSchedPrior" Modifier="Public" Name="updateSchedPrior" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy12" UserSourceName="updateSchedPrior">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_updateSchedPrior</CommandText>
@@ -272,7 +272,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_updateStatus" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateStatus" Modifier="Public" Name="updateStatus" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy12" UserSourceName="updateStatus">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_updateStatus" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateStatus" Modifier="Public" Name="updateStatus" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy13" UserSourceName="updateStatus">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_updateStatus</CommandText>
@@ -370,13 +370,12 @@ FROM v_StackList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Stacks_getNextByBatch" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getNextByBatch" GetMethodModifier="Public" GetMethodName="getNextByBatch" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getNextByBatch" UserSourceName="getNextByBatch">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Stacks_getNext" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getNext" GetMethodModifier="Public" GetMethodName="getNext" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getNext" UserSourceName="getNext">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
-                    <CommandText>dbo.stp_Stacks_getNextByBatch</CommandText>
+                    <CommandText>dbo.stp_Stacks_getNext</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" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -2450,7 +2449,7 @@ FROM v_CartKitDetail</CommandText>
   <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" />
@@ -2500,7 +2499,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2525,7 +2524,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2580,7 +2579,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2653,7 +2652,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="BatchReqList" msprop:Generator_TableClassName="BatchReqListDataTable" msprop:Generator_TableVarName="tableBatchReqList" msprop:Generator_RowChangedName="BatchReqListRowChanged" msprop:Generator_TablePropName="BatchReqList" msprop:Generator_RowDeletingName="BatchReqListRowDeleting" msprop:Generator_RowChangingName="BatchReqListRowChanging" msprop:Generator_RowEvHandlerName="BatchReqListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchReqListRowDeleted" msprop:Generator_RowClassName="BatchReqListRow" msprop:Generator_UserTableName="BatchReqList" msprop:Generator_RowEvArgName="BatchReqListRowChangeEvent">
+        <xs:element name="BatchReqList" msprop:Generator_TableClassName="BatchReqListDataTable" msprop:Generator_TableVarName="tableBatchReqList" msprop:Generator_TablePropName="BatchReqList" msprop:Generator_RowDeletingName="BatchReqListRowDeleting" msprop:Generator_RowChangingName="BatchReqListRowChanging" msprop:Generator_RowEvHandlerName="BatchReqListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchReqListRowDeleted" msprop:Generator_UserTableName="BatchReqList" msprop:Generator_RowChangedName="BatchReqListRowChanged" msprop:Generator_RowEvArgName="BatchReqListRowChangeEvent" msprop:Generator_RowClassName="BatchReqListRow">
           <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" />
@@ -2661,7 +2660,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2730,7 +2729,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2763,7 +2762,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2804,7 +2803,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2823,7 +2822,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2847,7 +2846,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2855,7 +2854,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2872,7 +2871,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2881,7 +2880,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2912,7 +2911,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2920,7 +2919,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2936,7 +2935,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -2944,7 +2943,7 @@ FROM v_CartKitDetail</CommandText>
             </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">
@@ -2972,7 +2971,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -3008,7 +3007,7 @@ FROM v_CartKitDetail</CommandText>
             </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">
@@ -3024,7 +3023,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -3034,7 +3033,7 @@ FROM v_CartKitDetail</CommandText>
             </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">
@@ -3051,7 +3050,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -3064,7 +3063,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -3114,7 +3113,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -3140,7 +3139,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -3182,7 +3181,7 @@ FROM v_CartKitDetail</CommandText>
             </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" />
@@ -3399,18 +3398,18 @@ FROM v_CartKitDetail</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_BatchReqList_OrderList" msdata:parent="OrderList" msdata:child="BatchReqList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="BatchReqList" msprop:Generator_ChildPropName="GetBatchReqListRows" msprop:Generator_UserRelationName="FK_BatchReqList_OrderList" msprop:Generator_RelationVarName="relationFK_BatchReqList_OrderList" msprop:Generator_UserParentTable="OrderList" msprop:Generator_ParentPropName="OrderListRow" />
-      <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_BatchReqList_OrderList" msdata:parent="OrderList" msdata:child="BatchReqList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="BatchReqList" msprop:Generator_ChildPropName="GetBatchReqListRows" msprop:Generator_UserRelationName="FK_BatchReqList_OrderList" msprop:Generator_ParentPropName="OrderListRow" msprop:Generator_RelationVarName="relationFK_BatchReqList_OrderList" msprop:Generator_UserParentTable="OrderList" />
+      <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" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss
index 48081cf..53a9e36 100644
--- a/AppData/DS_App.xss
+++ b/AppData/DS_App.xss
@@ -4,10 +4,10 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-16" ViewPortY="247" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-16" ViewPortY="386" 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="291" Y="375" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:StackList" ZOrder="3" X="584" Y="890" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:BatchList" ZOrder="2" X="291" Y="375" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:StackList" ZOrder="1" X="584" Y="890" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:SheetList" ZOrder="8" X="254" Y="840" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:OrderList" ZOrder="30" X="352" Y="29" Height="324" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:BatchReqList" ZOrder="39" X="101" Y="100" Height="115" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -27,7 +27,7 @@
     <Shape ID="DesignTable:ErrorsLog" ZOrder="16" X="-6" Y="928" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:ItemValidation" ZOrder="7" X="-2" Y="1233" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:PartValidPareto" ZOrder="6" X="324" Y="1235" Height="153" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:UnloadStats" ZOrder="2" X="624" Y="1307" Height="172" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:UnloadStats" ZOrder="3" X="624" Y="1307" Height="172" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:Remnants" ZOrder="14" X="912" Y="1188" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:CartOnKit" ZOrder="11" X="1259" Y="925" Height="305" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:PackList" ZOrder="10" X="1264" Y="1256" Height="267" Width="280" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
diff --git a/Jenkinsfile b/Jenkinsfile
index c08ea6c..2f285d6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=277']) {
+        withEnv(['NEXT_BUILD_NUMBER=278']) {
           // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/NKC_WF/Controllers/SheetController.cs b/NKC_WF/Controllers/SheetController.cs
index f9fdebf..b16f1e1 100644
--- a/NKC_WF/Controllers/SheetController.cs
+++ b/NKC_WF/Controllers/SheetController.cs
@@ -78,7 +78,8 @@ namespace NKC_WF.Controllers
             // NB. decodifico direttamente come oggetto, vedere qui:
             // https://weblog.west-wind.com/posts/2013/dec/13/accepting-raw-request-body-content-with-aspnet-web-api
             // https://weblog.west-wind.com/posts/2017/sep/14/accepting-raw-request-body-content-in-aspnet-core-api-controllers
-
+            int BunkId = 0;
+            int BatchId = 0;
             if (sheetUpdated != null)
             {
                 // 2020.01.16 salvo su mongoDb la risposta...
@@ -104,9 +105,18 @@ namespace NKC_WF.Controllers
                             }
                             // segnalo avanzamento su redis x pagina unload
                             ComLib.advaceSheetRevByBunk(currSheet.BunkId);
+                            // calcolo Batch
+                            BunkId = currSheet.BunkId;
                         }
                     }
+                    var tabBunks = DataLayer.man.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();
             }
@@ -133,6 +143,7 @@ namespace NKC_WF.Controllers
             // procedo a deserializzare in blocco l'oggetto...
             try
             {
+                int BunkId = 0;
                 // deserializzo.
                 SheetWorkList sheetUpdated = JsonConvert.DeserializeObject<SheetWorkList>(content);
                 if (sheetUpdated != null)
@@ -150,16 +161,19 @@ namespace NKC_WF.Controllers
                                 DataLayer.man.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
                                     DataLayer.man.taIL.updateSheetStatus(currSheet.SheetId, 1, "WRK001");
                                 }
                                 // segnalo avanzamento su redis x pagina unload
                                 ComLib.advaceSheetRevByBunk(currSheet.BunkId);
+                                BunkId = currSheet.BunkId;
                                 answ = "OK";
                             }
                         }
                     }
+                    // ricalcolo stato BUNK
+                    ComLib.updateBatchPosition(BunkId);
                 }
             }
             catch (Exception exc)
diff --git a/NKC_WF/Site.Master b/NKC_WF/Site.Master
index 6adb7d0..0cd4987 100644
--- a/NKC_WF/Site.Master
+++ b/NKC_WF/Site.Master
@@ -52,8 +52,12 @@
         <uc1:cmp_menuTop runat="server" ID="cmp_menuTop" />
 
         <div class="container-flow body-content">
-            <asp:ContentPlaceHolder ID="MainContent" runat="server">
-            </asp:ContentPlaceHolder>
+            <asp:UpdatePanel runat="server" ID="uplBody">
+                <ContentTemplate>
+                    <asp:ContentPlaceHolder ID="MainContent" runat="server">
+                    </asp:ContentPlaceHolder>
+                </ContentTemplate>
+            </asp:UpdatePanel>
             <uc1:cmp_footer runat="server" ID="cmp_footer" />
         </div>
 
diff --git a/NKC_WF/Site.Master.designer.cs b/NKC_WF/Site.Master.designer.cs
index 6b14c6b..5106462 100644
--- a/NKC_WF/Site.Master.designer.cs
+++ b/NKC_WF/Site.Master.designer.cs
@@ -11,34 +11,43 @@ namespace NKC_WF
 {
 
 
-  public partial class SiteMaster
-  {
+    public partial class SiteMaster
+    {
 
-    /// <summary>
-    /// Controllo cmp_menuTop.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::NKC_WF.WebUserControls.cmp_menuTop cmp_menuTop;
+        /// <summary>
+        /// Controllo cmp_menuTop.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::NKC_WF.WebUserControls.cmp_menuTop cmp_menuTop;
 
-    /// <summary>
-    /// Controllo MainContent.
-    /// </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.ContentPlaceHolder MainContent;
+        /// <summary>
+        /// Controllo uplBody.
+        /// </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.UpdatePanel uplBody;
 
-    /// <summary>
-    /// Controllo cmp_footer.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::NKC_WF.WebUserControls.cmp_footer cmp_footer;
-  }
+        /// <summary>
+        /// Controllo MainContent.
+        /// </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.ContentPlaceHolder MainContent;
+
+        /// <summary>
+        /// Controllo cmp_footer.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::NKC_WF.WebUserControls.cmp_footer cmp_footer;
+    }
 }
diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx b/NKC_WF/WebUserControls/cmp_barcode.ascx
index c5663ef..dc5f8d2 100644
--- a/NKC_WF/WebUserControls/cmp_barcode.ascx
+++ b/NKC_WF/WebUserControls/cmp_barcode.ascx
@@ -2,4 +2,5 @@
 <div class="form-group bigText">
   <asp:TextBox runat="server" ID="txtBarcode" class="form-control" autofocus="true" AutoPostBack="True" OnTextChanged="txtBarcode_TextChanged"></asp:TextBox>
   <asp:Label ID="lblOutput" runat="server" for="txtBarcode" Width="100%" />
+    <asp:HiddenField ID="hfLastCmd" runat="server" />
 </div>
diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx.cs b/NKC_WF/WebUserControls/cmp_barcode.ascx.cs
index 0364ae2..17f0903 100644
--- a/NKC_WF/WebUserControls/cmp_barcode.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_barcode.ascx.cs
@@ -3,56 +3,99 @@ using System.Web.UI;
 
 namespace NKC_WF.WebUserControls
 {
-  public partial class cmp_barcode : BaseUserControl
-  {
-    protected void Page_Load(object sender, EventArgs e)
+    public partial class cmp_barcode : BaseUserControl
     {
-      if (!Page.IsPostBack)
-      {
-        resetMessage();
-      }
-      else if (inputAcquired == "")
-      {
-        raiseEvent();
-      }
-    }
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!Page.IsPostBack)
+            {
+                resetMessage();
+            }
+            else if (string.IsNullOrEmpty(inputAcquired))
+            {
+                checkRaiseEv();
+            }
+        }
 
-    public void resetMessage()
-    {
-      lblOutput.Visible = false;
-      lblOutput.Text = "";
-    }
+        protected string lastCmd
+        {
+            get
+            {
+                return hfLastCmd.Value;
+            }
+            set
+            {
+                hfLastCmd.Value = value;
+            }
+        }
 
-    protected void txtBarcode_TextChanged(object sender, EventArgs e)
-    {
-      raiseEvent();
+        public void resetMessage()
+        {
+            lblOutput.Visible = false;
+            lblOutput.Text = "";
+        }
+
+        protected void txtBarcode_TextChanged(object sender, EventArgs e)
+        {
+            checkRaiseEv();
+        }
+
+        private void checkRaiseEv()
+        {
+            if (lastCmd != inputAcquired)
+            {
+                // alzo evento SOLO SE il nuovo valore è diverso da null...
+                lastCmd = inputAcquired;
+                if (!string.IsNullOrEmpty(inputAcquired))
+                {
+                    raiseEvent();
+                }
+            }
+            else
+            {
+                if(string.IsNullOrEmpty(lastCmd))
+                {
+                    resetMessage();
+                }
+            }
+            txtBarcode.Focus();
+        }
+
+        /// <summary>
+        /// Valore acquisito in lettura barcode
+        /// </summary>
+        public string inputAcquired
+        {
+            get
+            {
+                return txtBarcode.Text.Trim();
+            }
+            set
+            {
+                txtBarcode.Text = "";
+            }
+        }
+        /// <summary>
+        /// Reset input del barcode SENZA generare evento...
+        /// </summary>
+        /// <returns></returns>
+        public void resetInput()
+        {
+            inputAcquired = "";
+            txtBarcode.Focus();
+        }
+        /// <summary>
+        /// Gestione output da mostrare (opzionale
+        /// </summary>
+        /// <param name="cssClass"></param>
+        /// <param name="messaggio"></param>
+        public void showOutput(string cssClass, string messaggio)
+        {
+            // In primis: mostro qualcosa SOLO SE ho del testo
+            lblOutput.Visible = (messaggio != "");
+            lblOutput.Text = messaggio;
+            lblOutput.Attributes.Remove("class");
+            lblOutput.Attributes.Add("class", cssClass);
+        }
     }
-    /// <summary>
-    /// Valore acquisito in lettura barcode
-    /// </summary>
-    public string inputAcquired
-    {
-      get
-      {
-        return txtBarcode.Text.Trim();
-      }
-      set
-      {
-        txtBarcode.Text = "";
-      }
-    }
-    /// <summary>
-    /// Gestione output da mostrare (opzionale
-    /// </summary>
-    /// <param name="cssClass"></param>
-    /// <param name="messaggio"></param>
-    public void showOutput(string cssClass, string messaggio)
-    {
-      // In primis: mostro qualcosa SOLO SE ho del testo
-      lblOutput.Visible = (messaggio != "");
-      lblOutput.Text = messaggio;
-      lblOutput.Attributes.Remove("class");
-      lblOutput.Attributes.Add("class", cssClass);
-    }
-  }
 }
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs
index 7acd04b..6f70ae0 100644
--- a/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs
@@ -7,11 +7,13 @@
 // </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace NKC_WF.WebUserControls {
-    
-    
-    public partial class cmp_barcode {
-        
+namespace NKC_WF.WebUserControls
+{
+
+
+    public partial class cmp_barcode
+    {
+
         /// <summary>
         /// Controllo txtBarcode.
         /// </summary>
@@ -20,7 +22,7 @@ namespace NKC_WF.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtBarcode;
-        
+
         /// <summary>
         /// Controllo lblOutput.
         /// </summary>
@@ -29,5 +31,14 @@ namespace NKC_WF.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblOutput;
+
+        /// <summary>
+        /// Controllo hfLastCmd.
+        /// </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 hfLastCmd;
     }
 }
diff --git a/NKC_WF/WebUserControls/cmp_orderRunning.ascx b/NKC_WF/WebUserControls/cmp_orderRunning.ascx
index 99edb21..3ad669b 100644
--- a/NKC_WF/WebUserControls/cmp_orderRunning.ascx
+++ b/NKC_WF/WebUserControls/cmp_orderRunning.ascx
@@ -1,6 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_orderRunning.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_orderRunning" %>
 
 
+<h3><%: traduci("RunningOrders") %></h3>
 <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="BatchID" DataSourceID="odsOrders" Width="100%" CssClass="table table-success table-striped table-sm">
     <HeaderStyle CssClass="default" />
     <PagerStyle CssClass="active GridPager" />
diff --git a/NKC_WF/WebUserControls/cmp_orderSched.ascx b/NKC_WF/WebUserControls/cmp_orderSched.ascx
index 4815d09..be87a9b 100644
--- a/NKC_WF/WebUserControls/cmp_orderSched.ascx
+++ b/NKC_WF/WebUserControls/cmp_orderSched.ascx
@@ -1,6 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_orderSched.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_orderSched" %>
 
 
+<h3><asp:label runat="server" ID="lblTitle"><%: traduci("ScheduledOrders") %></asp:label></h3>
 <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="BatchID" DataSourceID="odsOrders" Width="100%" CssClass="table table-striped table-sm">
     <HeaderStyle CssClass="default" />
     <PagerStyle CssClass="active GridPager" />
@@ -26,4 +27,4 @@
 
 <asp:ObjectDataSource ID="odsOrders" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getSched" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter"></asp:ObjectDataSource>
 
-<asp:HiddenField runat="server" ID ="hfNumRows" Value="0" />
\ No newline at end of file
+<asp:HiddenField runat="server" ID="hfNumRows" Value="0" />
diff --git a/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs b/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs
index 83ab54e..55093f0 100644
--- a/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs
@@ -1,4 +1,5 @@
 using AppData;
+using SteamWare;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -66,7 +67,9 @@ namespace NKC_WF.WebUserControls
             DataLayer.man.taBL.updateSchedPrior(BatchId, step);
             // ricalcolo
             fixSchedOrd();
+            grView.SelectedIndex = -1;
             grView.DataBind();
+            lblTitle.Focus();
         }
         /// <summary>
         /// Verifica visibilità da posizione
diff --git a/NKC_WF/WebUserControls/cmp_orderSched.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_orderSched.ascx.designer.cs
index 461ef53..484c969 100644
--- a/NKC_WF/WebUserControls/cmp_orderSched.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_orderSched.ascx.designer.cs
@@ -14,6 +14,15 @@ namespace NKC_WF.WebUserControls
     public partial class cmp_orderSched
     {
 
+        /// <summary>
+        /// Controllo lblTitle.
+        /// </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.Label lblTitle;
+
         /// <summary>
         /// Controllo grView.
         /// </summary>
diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs
index fe279e0..f685012 100644
--- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs
@@ -5,161 +5,161 @@ using System.Web.UI;
 
 namespace NKC_WF.WebUserControls
 {
-  public partial class cmp_stackBuilding : BaseUserControl
-  {
-    protected void Page_Load(object sender, EventArgs e)
+    public partial class cmp_stackBuilding : BaseUserControl
     {
-      if (!Page.IsPostBack)
-      {
-        // svuoto input barcode...
-        cmp_barcode.inputAcquired = "";
-        lastCmd = "";
-        // pulisco dir temp dai file dei cartellini stampati
-        reportPrinter.obj.pulisciDir();
-      }
-      cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh;
-    }
-    // se NON ci sono altri campi "next" allora posso msotrare stampa...
-    private void checkPrint()
-    {
-      DS_App.SheetListDataTable nextTbl = DataLayer.man.taSHL.getNextByStack(StackId);
-      // se tab vuota --> HO FINITO, mostro stampa...
-      divPrint.Visible = (nextTbl.Count == 0);
-    }
-
-    /// <summary>
-    /// Comando barcode letto
-    /// </summary>
-    protected string lastCmd
-    {
-      get
-      {
-        return hfBarcode.Value;
-      }
-      set
-      {
-        hfBarcode.Value = value;
-      }
-    }
-
-    private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e)
-    {
-      // processo evento..
-      lastCmd = cmp_barcode.inputAcquired.ToUpper();
-      // processiamo barcode letto
-      decodedData decoData = DataLayer.man.decodeBcode(lastCmd);
-      switch (decoData.codeType)
-      {
-        case codeType.UNK:
-          cmp_barcode.showOutput("text-danger", "Unknown Data");
-          break;
-        case codeType.Item:
-        case codeType.ItemGeneric:
-          cmp_barcode.showOutput("text-warning", "Item - ignored");
-          break;
-        case codeType.Material:
-          // verifico SE il materiale SIA quello dello sheet richiesto dallo stack/bunk corrente...
-          DS_App.SheetListDataTable nextTbl = DataLayer.man.taSHL.getNextByStack(StackId);
-          // se tab vuota --> HO FINITO!!!!
-          if (nextTbl.Count == 0)
-          {
-            cmp_barcode.showOutput("badge badge-warning", $"STACK IS COMPLETED, {decoData.description}");
-          }
-          // se ho valori --> controllo se corretto...
-          else
-          {
-            string codReq = nextTbl[0].MatExtCode.ToString();
-            if (codReq == decoData.codeInt.ToString())
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!Page.IsPostBack)
             {
-              cmp_barcode.showOutput("badge badge-success", $"SHEET RECORDED: {decoData.description}");
-              // chiamo stored x indicare preparato
-              DataLayer.man.taSHL.setPrepared(nextTbl[0].SheetID);
+                // svuoto input barcode...
+                cmp_barcode.inputAcquired = "";
+                lastCmd = "";
+                // pulisco dir temp dai file dei cartellini stampati
+                reportPrinter.obj.pulisciDir();
+            }
+            cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh;
+        }
+        // se NON ci sono altri campi "next" allora posso msotrare stampa...
+        private void checkPrint()
+        {
+            DS_App.SheetListDataTable nextTbl = DataLayer.man.taSHL.getNextByStack(StackId);
+            // se tab vuota --> HO FINITO, mostro stampa...
+            divPrint.Visible = (nextTbl.Count == 0);
+        }
+
+        /// <summary>
+        /// Comando barcode letto
+        /// </summary>
+        protected string lastCmd
+        {
+            get
+            {
+                return hfBarcode.Value;
+            }
+            set
+            {
+                hfBarcode.Value = value;
+            }
+        }
+
+        private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e)
+        {
+            // processo evento..
+            lastCmd = cmp_barcode.inputAcquired.ToUpper();
+            // processiamo barcode letto
+            decodedData decoData = DataLayer.man.decodeBcode(lastCmd);
+            switch (decoData.codeType)
+            {
+                case codeType.UNK:
+                    cmp_barcode.showOutput("text-danger", "Unknown Data");
+                    break;
+                case codeType.Item:
+                case codeType.ItemGeneric:
+                    cmp_barcode.showOutput("text-warning", "Item - ignored");
+                    break;
+                case codeType.Material:
+                    // verifico SE il materiale SIA quello dello sheet richiesto dallo stack/bunk corrente...
+                    DS_App.SheetListDataTable nextTbl = DataLayer.man.taSHL.getNextByStack(StackId);
+                    // se tab vuota --> HO FINITO!!!!
+                    if (nextTbl.Count == 0)
+                    {
+                        cmp_barcode.showOutput("badge badge-warning", $"STACK IS COMPLETED, {decoData.description}");
+                    }
+                    // se ho valori --> controllo se corretto...
+                    else
+                    {
+                        string codReq = nextTbl[0].MatExtCode.ToString();
+                        if (codReq == decoData.codeInt.ToString())
+                        {
+                            cmp_barcode.showOutput("badge badge-success", $"SHEET RECORDED: {decoData.description}");
+                            // chiamo stored x indicare preparato
+                            DataLayer.man.taSHL.setPrepared(nextTbl[0].SheetID);
+                        }
+                        else
+                        {
+                            cmp_barcode.showOutput("badge badge-danger", $"WRONG SHEET: {decoData.description}");
+                        }
+                    }
+                    break;
+                case codeType.Sheet:
+                    cmp_barcode.showOutput("badge badge-warning", "Sheet - ignored");
+                    break;
+                case codeType.Stack:
+                    cmp_barcode.showOutput("badge badge-warning", "Stack - ignored");
+                    break;
+                case codeType.Batch:
+                    cmp_barcode.showOutput("badge badge-warning", "Batch - ignored");
+                    break;
+                default:
+                    break;
+            }
+            // reset comando
+            cmp_barcode.resetInput();
+            // aggiorno...
+            doUpdate();
+        }
+
+        public void doUpdate()
+        {
+            repCtrl.DataBind();
+            checkPrint();
+        }
+
+        public int StackId
+        {
+            set
+            {
+                hfStackId.Value = value.ToString();
+                lastCmd = "";
+                cmp_barcode.resetMessage();
+                ComLib.updateBatchPositionByBunk(value);
+                doUpdate();
+            }
+            get
+            {
+                int answ = 0;
+                int.TryParse(hfStackId.Value, out answ);
+                return answ;
+            }
+        }
+
+        public string cssFlashNext(object _isNext)
+        {
+            string answ = "";
+            if (_isNext.ToString() == "1")
+            {
+                answ = " flashColor";
+            }
+            return answ;
+        }
+        public string cssByPrepared(object _prepared, object _isNext)
+        {
+            string answ = "table-secondary border border-secondary border-thick rounded";
+            if (_isNext.ToString() == "1")
+            {
+                answ = "table-primary flashColor rounded";
             }
             else
             {
-              cmp_barcode.showOutput("badge badge-danger", $"WRONG SHEET: {decoData.description}");
+                if (_prepared.ToString() != "")
+                {
+                    answ = "table-success border border-success border-thick rounded";
+                }
             }
-          }
-          break;
-        case codeType.Sheet:
-          cmp_barcode.showOutput("badge badge-warning", "Sheet - ignored");
-          break;
-        case codeType.Stack:
-          cmp_barcode.showOutput("badge badge-warning", "Stack - ignored");
-          break;
-        case codeType.Batch:
-          cmp_barcode.showOutput("badge badge-warning", "Batch - ignored");
-          break;
-        default:
-          break;
-      }
-      // reset comando
-      cmp_barcode.inputAcquired = "";
-      // aggiorno...
-      doUpdate();
-    }
-
-    public void doUpdate()
-    {
-      repCtrl.DataBind();
-      checkPrint();
-    }
-
-    public int StackId
-    {
-      set
-      {
-        hfStackId.Value = value.ToString();
-        lastCmd = "";
-        cmp_barcode.resetMessage();
-        ComLib.updateBatchPositionByBunk(value);
-        doUpdate();
-      }
-      get
-      {
-        int answ = 0;
-        int.TryParse(hfStackId.Value, out answ);
-        return answ;
-      }
-    }
-
-    public string cssFlashNext(object _isNext)
-    {
-      string answ = "";
-      if (_isNext.ToString() == "1")
-      {
-        answ = " flashColor";
-      }
-      return answ;
-    }
-    public string cssByPrepared(object _prepared, object _isNext)
-    {
-      string answ = "table-secondary border border-secondary border-thick rounded";
-      if (_isNext.ToString() == "1")
-      {
-        answ = "table-primary flashColor rounded";
-      }
-      else
-      {
-        if (_prepared.ToString() != "")
-        {
-          answ = "table-success border border-success border-thick rounded";
+            return answ;
+        }
+        /// <summary>
+        /// Chiesta stampa stack corrente
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtPrint_Click(object sender, EventArgs e)
+        {
+            // chiamo procedura stampa report x stack
+            string printer = DataLayer.man.getPrinter("PC-MACHINE-STACK-BUILD");
+            DataLayer.man.stampaDoc(StackId.ToString(), printer, tipoDocumento.docStack, Request.UserHostName);
+            // aggiorno stato BATCH
+            ComLib.updateBatchPositionByBunk(StackId);
         }
-      }
-      return answ;
     }
-    /// <summary>
-    /// Chiesta stampa stack corrente
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void lbtPrint_Click(object sender, EventArgs e)
-    {
-      // chiamo procedura stampa report x stack
-      string printer = DataLayer.man.getPrinter("PC-MACHINE-STACK-BUILD");
-      DataLayer.man.stampaDoc(StackId.ToString(), printer, tipoDocumento.docStack, Request.UserHostName);
-      // aggiorno stato BATCH
-      ComLib.updateBatchPositionByBunk(StackId);
-    }
-  }
 }
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx b/NKC_WF/WebUserControls/cmp_stackLoading.ascx
index d3caba1..7e8b620 100644
--- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx
+++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx
@@ -28,7 +28,7 @@
               <asp:Label ID="BatchIDLabel" runat="server" Text='<%# Eval("NumStacks") %>' /></b>
           </div>
           <div class="col-4 text-center">
-            <b><%: traduci("BunkReading") %></b>
+            <b><%: traduci("BatchCurrent") %></b>
             <br />
             TOT SHEETS: <b>
               <asp:Label ID="Label1" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
index 7908706..2610210 100644
--- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
@@ -76,7 +76,10 @@ namespace NKC_WF.WebUserControls
             bool doRaiseEv = false;
             // processo evento..
             lastCmd = cmp_barcode.inputAcquired.ToUpper();
-            if (lastCmd == "") doRaiseEv = true;
+            if (lastCmd == "")
+            {
+                doRaiseEv = true;
+            }
             // processiamo barcode letto
             decodedData decoData = DataLayer.man.decodeBcode(lastCmd);
             switch (decoData.codeType)
@@ -178,7 +181,7 @@ namespace NKC_WF.WebUserControls
                     break;
             }
             // reset comando
-            cmp_barcode.inputAcquired = "";
+            cmp_barcode.resetInput();
             // aggiorno...
             doUpdate();
             // se richiesto faccio raiseEvent
@@ -280,13 +283,11 @@ namespace NKC_WF.WebUserControls
                 cmp_stackNextloading.doUpdate();
                 // segnalo avanzamento su redis x pagina unload
                 ComLib.advaceSheetRevByBunk(BatchIdCurr);
+                // controllo update stato BATCH/BUNK
+                ComLib.updateBatchPosition(BatchIdCurr);
                 raiseEvent();
             }
         }
 
-        protected void lbtAdvanceBunk_Click(object sender, EventArgs e)
-        {
-            // simula invio barcode del PROSSIMO BUNK (SE necessario)
-        }
     }
 }
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
index 7a2088e..5dbbb7c 100644
--- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
+++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
@@ -20,12 +20,12 @@
                     <div class="col-4 text-left text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString()  %>'>
                         <b>PREVIOUS</b> BUNK: <b>
                             <asp:Label ID="Label1" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
-                        (<asp:Label ID="Label2" runat="server" Text='<%# Eval("StackIndex") %>' />/2)
+                        (<asp:Label ID="Label2" runat="server" Text='<%# Eval("StackIndex") %>' />)
                     </div>
                     <div class="col-4 text-left text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString()  %>'>
                         <b>CURRENT</b> BUNK: <b>
                             <asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
-                        (<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />/2)
+                        (<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />)
                     </div>
                     <div class="col-5 text-center px-0">
                         <div class="row">
@@ -61,7 +61,7 @@
 </asp:GridView>
 <div class="row">
     <div class="col-12">
-        <asp:LinkButton runat="server" ID="lbtCollectRedo" CssClass="btn btn-warning btn-block" OnClick="lbtCollectRedo_Click"><i class="fa fa-recycle" aria-hidden="true"></i> <%: traduci("CollectRedo") %> <i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
+        <asp:LinkButton runat="server" ID="lbtCollectRedo" CssClass="btn btn-warning btn-block" OnClick="lbtCollectRedo_Click"><i class="fa fa-recycle" aria-hidden="true"></i> <%: traduci("CollectRedo") %><i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
     </div>
 </div>
 <asp:FormView ID="frmViewNext" runat="server" DataKeyNames="StackID" DataSourceID="odsNext" Width="100%">
@@ -70,7 +70,7 @@
             <div class="col-4 text-left text-primary">
                 <b>NEXT</b> BUNK: <b>
                     <asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
-                (<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />/2)
+                (<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />)
             </div>
             <div class="col-4 text-center">
                 sheets:<b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b> | printed: <b>
@@ -99,14 +99,11 @@
         <asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
     </SelectParameters>
 </asp:ObjectDataSource>
-<asp:ObjectDataSource ID="odsNext" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getNextByBatch" TypeName="AppData.DS_AppTableAdapters.StackListTableAdapter">
-    <SelectParameters>
-        <asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
-    </SelectParameters>
+<asp:ObjectDataSource ID="odsNext" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getNext" TypeName="AppData.DS_AppTableAdapters.StackListTableAdapter">
 </asp:ObjectDataSource>
 <div class="row">
     <div class="col-12">
-        <asp:LinkButton runat="server" ID="lbtCollectRedoOnEnd" CssClass="btn btn-warning btn-block" OnClick="lbtCollectRedoOnEnd_Click"><i class="fa fa-recycle" aria-hidden="true"></i> <%: traduci("CollectRedoOnEnd") %> <i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
+        <asp:LinkButton runat="server" ID="lbtCollectRedoOnEnd" CssClass="btn btn-warning btn-block" OnClick="lbtCollectRedoOnEnd_Click"><i class="fa fa-recycle" aria-hidden="true"></i> <%: traduci("CollectRedoOnEnd") %><i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
     </div>
 </div>
 
diff --git a/NKC_WF/WebUserControls/cmp_taktList.ascx b/NKC_WF/WebUserControls/cmp_taktList.ascx
index 6947c24..36d8ba1 100644
--- a/NKC_WF/WebUserControls/cmp_taktList.ascx
+++ b/NKC_WF/WebUserControls/cmp_taktList.ascx
@@ -52,16 +52,11 @@
             </div>
           </ItemTemplate>
         </asp:TemplateField>
-        <%--<asp:TemplateField HeaderText="# Stacks" SortExpression="NumStacks">
-          <ItemTemplate>
-          </ItemTemplate>
-          <ItemStyle CssClass="text-right" />
-        </asp:TemplateField>--%>
       </Columns>
     </asp:GridView>
-    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMaxPosition" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter">
+    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getForBunkMan" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter">
       <SelectParameters>
-        <asp:Parameter DefaultValue="3" Name="Position" Type="Int32" />
+        <asp:Parameter DefaultValue="3" Name="MaxPosition" Type="Int32" />
       </SelectParameters>
     </asp:ObjectDataSource>
   </div>
diff --git a/NKC_WF/WebUserControls/cmp_taktList.ascx.cs b/NKC_WF/WebUserControls/cmp_taktList.ascx.cs
index 821e4c6..426ab4f 100644
--- a/NKC_WF/WebUserControls/cmp_taktList.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_taktList.ascx.cs
@@ -160,6 +160,12 @@ namespace NKC_WF.WebUserControls
                 case 2:
                     answ = "table-success border border-success border-thick rounded";
                     break;
+                case 3:
+                    answ = "table-warning border border-warning border-thick rounded";
+                    break;
+                case 4:
+                    answ = "table-dark border border-dark border-thick rounded";
+                    break;
                 default:
                     break;
             }
diff --git a/NKC_WF/site/MachineLoad.aspx.cs b/NKC_WF/site/MachineLoad.aspx.cs
index f290b92..1f5a2fe 100644
--- a/NKC_WF/site/MachineLoad.aspx.cs
+++ b/NKC_WF/site/MachineLoad.aspx.cs
@@ -2,28 +2,34 @@
 
 namespace NKC_WF
 {
-  public partial class MachineLoad : BasePage
-  {
-    protected void Page_Load(object sender, EventArgs e)
+    public partial class MachineLoad : BasePage
     {
-      if (!Page.IsPostBack)
-      {
-        ((SiteContent)this.Master).showSearch = false;
-      }
-      cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh;
-    }
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!Page.IsPostBack)
+            {
+                ((SiteContent)this.Master).showSearch = false;
+            }
+            forceRefresh();
+            cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh;
+        }
 
-    private void Cmp_stackLoading_eh_doRefresh(object sender, EventArgs e)
-    {
-      cmp_ML_ShDet.BatchId = cmp_stackLoading.BatchIdCurr;
-      cmp_ML_ShDet1.BatchId = cmp_stackLoading.BatchIdCurr;
-      cmp_ML_ShDet2.BatchId = cmp_stackLoading.BatchIdCurr;
-      cmp_ML_ShDet3.BatchId = cmp_stackLoading.BatchIdCurr;
-      // refresh vari!
-      cmp_ML_ShDet.doUpdate();
-      cmp_ML_ShDet1.doUpdate();
-      cmp_ML_ShDet2.doUpdate();
-      cmp_ML_ShDet3.doUpdate();
+        private void Cmp_stackLoading_eh_doRefresh(object sender, EventArgs e)
+        {
+            forceRefresh();
+        }
+
+        private void forceRefresh()
+        {
+            cmp_ML_ShDet.BatchId = cmp_stackLoading.BatchIdCurr;
+            cmp_ML_ShDet1.BatchId = cmp_stackLoading.BatchIdCurr;
+            cmp_ML_ShDet2.BatchId = cmp_stackLoading.BatchIdCurr;
+            cmp_ML_ShDet3.BatchId = cmp_stackLoading.BatchIdCurr;
+            // refresh vari!
+            cmp_ML_ShDet.doUpdate();
+            cmp_ML_ShDet1.doUpdate();
+            cmp_ML_ShDet2.doUpdate();
+            cmp_ML_ShDet3.doUpdate();
+        }
     }
-  }
 }
\ No newline at end of file
diff --git a/NKC_WF/site/OrderScheduler.aspx b/NKC_WF/site/OrderScheduler.aspx
index 8bff8b2..a039641 100644
--- a/NKC_WF/site/OrderScheduler.aspx
+++ b/NKC_WF/site/OrderScheduler.aspx
@@ -14,9 +14,7 @@
             <div class="card-body">
                 <div class="row">
                     <div class="col-12 mb-2">
-                        <h3><%: traduci("RunningOrders") %></h3>
                         <uc1:cmp_orderRunning runat="server" ID="cmp_orderRunning" />
-                        <h3><%: traduci("ScheduledOrders") %></h3>
                         <uc1:cmp_orderSched runat="server" ID="cmp_orderSched" />
                     </div>
                 </div>
diff --git a/NKC_WF/site/StackManager.aspx b/NKC_WF/site/StackManager.aspx
index f0f87cc..cb30b13 100644
--- a/NKC_WF/site/StackManager.aspx
+++ b/NKC_WF/site/StackManager.aspx
@@ -7,16 +7,20 @@
 
 
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
-    <div class="row">
-    <div class="col-lg-2"></div>
-    <div class="col-12 col-lg-8">
-      <h3 class="text-info text-uppercase text-center"><%: traduci("StackManager") %></h3>
-      <div class="textCondens">
-        <uc1:cmp_taktList runat="server" ID="cmp_taktList" />
-        <uc1:cmp_stackList runat="server" ID="cmp_stackList" />
-        <uc1:cmp_stackBuilding runat="server" ID="cmp_stackBuilding" />
-      </div>
+    <div class="container">
+        <div class="card" style="width: 100%;">
+            <div class="card-header">
+                <h3><%: traduci("StackManager") %></h3>
+            </div>
+            <div class="card-body">
+                <div class="row">
+                    <div class="col-12 mb-2 textCondens">
+                        <uc1:cmp_taktList runat="server" ID="cmp_taktList" />
+                        <uc1:cmp_stackList runat="server" ID="cmp_stackList" />
+                        <uc1:cmp_stackBuilding runat="server" ID="cmp_stackBuilding" />
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
-    <div class="col-lg-2"></div>
-  </div>
 </asp:Content>