diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs
index 9b77ca5..91861b8 100644
--- a/AppData/ComLib.cs
+++ b/AppData/ComLib.cs
@@ -214,10 +214,10 @@ namespace AppData
                         answ = traduci("StackDone");
                         break;
                     case BatchPosition.Current:
-                        answ = traduci("StackCurrent");
+                        answ = traduci("BatchCurrent");
                         break;
                     case BatchPosition.Completed:
-                        answ = traduci("StackCompleted");
+                        answ = traduci("BatchCompleted");
                         break;
                     default:
                         break;
diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs
index 60c3540..9684f40 100644
--- a/AppData/DS_App.Designer.cs
+++ b/AppData/DS_App.Designer.cs
@@ -17543,7 +17543,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[22];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[23];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_BatchList";
@@ -17582,100 +17582,106 @@ namespace AppData.DS_AppTableAdapters {
             this._commandCollection[5].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[6] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[6].Connection = this.Connection;
-            this._commandCollection[6].CommandText = "dbo.stp_Batch_fixSched";
+            this._commandCollection[6].CommandText = "dbo.stp_Batch_fixRedoSheetOnEnd";
             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_Batch_getByKey";
+            this._commandCollection[7].CommandText = "dbo.stp_Batch_fixSched";
             this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[8].Connection = this.Connection;
-            this._commandCollection[8].CommandText = "dbo.stp_Batch_getByMaxPosition";
+            this._commandCollection[8].CommandText = "dbo.stp_Batch_getByKey";
             this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Position", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@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_getByStatus";
+            this._commandCollection[9].CommandText = "dbo.stp_Batch_getByMaxPosition";
             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("@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[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[10] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[10].Connection = this.Connection;
-            this._commandCollection[10].CommandText = "dbo.stp_Batch_getCurrentByMachine";
+            this._commandCollection[10].CommandText = "dbo.stp_Batch_getByStatus";
             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("@CodPosition", global::System.Data.SqlDbType.NVarChar, 50, 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("@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[11] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[11].Connection = this.Connection;
-            this._commandCollection[11].CommandText = "dbo.stp_Batch_getLastByTakt";
+            this._commandCollection[11].CommandText = "dbo.stp_Batch_getCurrentByMachine";
             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("@Takt", 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("@CodPosition", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_getNextAvailable";
+            this._commandCollection[12].CommandText = "dbo.stp_Batch_getLastByTakt";
             this._commandCollection[12].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[12].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[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[13] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[13].Connection = this.Connection;
-            this._commandCollection[13].CommandText = "dbo.stp_Batch_getRunning";
+            this._commandCollection[13].CommandText = "dbo.stp_Batch_getNextAvailable";
             this._commandCollection[13].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[13].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[14] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[14].Connection = this.Connection;
-            this._commandCollection[14].CommandText = "dbo.stp_Batch_getSched";
+            this._commandCollection[14].CommandText = "dbo.stp_Batch_getRunning";
             this._commandCollection[14].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[14].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[15] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[15].Connection = this.Connection;
-            this._commandCollection[15].CommandText = "dbo.stp_Batch_redoPartValid";
+            this._commandCollection[15].CommandText = "dbo.stp_Batch_getSched";
             this._commandCollection[15].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[15].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[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[16] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[16].Connection = this.Connection;
-            this._commandCollection[16].CommandText = "dbo.stp_Batch_resetAllNesting";
+            this._commandCollection[16].CommandText = "dbo.stp_Batch_redoPartValid";
             this._commandCollection[16].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[16].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[16].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[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[17] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[17].Connection = this.Connection;
-            this._commandCollection[17].CommandText = "dbo.stp_Batch_resetPartUnValid";
+            this._commandCollection[17].CommandText = "dbo.stp_Batch_resetAllNesting";
             this._commandCollection[17].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[18] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[18].Connection = this.Connection;
-            this._commandCollection[18].CommandText = "dbo.stp_zzz_resetProdCall";
+            this._commandCollection[18].CommandText = "dbo.stp_Batch_resetPartUnValid";
             this._commandCollection[18].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[19] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[19].Connection = this.Connection;
-            this._commandCollection[19].CommandText = "dbo.stp_Batch_resetTree";
+            this._commandCollection[19].CommandText = "dbo.stp_zzz_resetProdCall";
             this._commandCollection[19].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[20] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[20].Connection = this.Connection;
-            this._commandCollection[20].CommandText = "dbo.stp_Batch_updateSchedPrior";
+            this._commandCollection[20].CommandText = "dbo.stp_Batch_resetTree";
             this._commandCollection[20].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SchedPrio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[21] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[21].Connection = this.Connection;
-            this._commandCollection[21].CommandText = "dbo.stp_Batch_updateStatus";
+            this._commandCollection[21].CommandText = "dbo.stp_Batch_updateSchedPrior";
             this._commandCollection[21].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SchedPrio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[22] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[22].Connection = this.Connection;
+            this._commandCollection[22].CommandText = "dbo.stp_Batch_updateStatus";
+            this._commandCollection[22].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[22].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[22].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[22].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[22].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[22].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -17707,7 +17713,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 getByKey(global::System.Nullable<int> BatchID) {
-            this.Adapter.SelectCommand = this.CommandCollection[7];
+            this.Adapter.SelectCommand = this.CommandCollection[8];
             if ((BatchID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -17724,7 +17730,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 getByMaxPosition(global::System.Nullable<int> Position) {
-            this.Adapter.SelectCommand = this.CommandCollection[8];
+            this.Adapter.SelectCommand = this.CommandCollection[9];
             if ((Position.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Position.Value));
             }
@@ -17741,7 +17747,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 getByStatus(global::System.Nullable<int> Status, string SearchVal, global::System.Nullable<int> PartValid) {
-            this.Adapter.SelectCommand = this.CommandCollection[9];
+            this.Adapter.SelectCommand = this.CommandCollection[10];
             if ((Status.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Status.Value));
             }
@@ -17770,7 +17776,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[10];
+            this.Adapter.SelectCommand = this.CommandCollection[11];
             if ((CodPosition == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -17787,7 +17793,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 getLastByTakt(string Takt) {
-            this.Adapter.SelectCommand = this.CommandCollection[11];
+            this.Adapter.SelectCommand = this.CommandCollection[12];
             if ((Takt == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -17804,17 +17810,6 @@ 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 getNextAvailable() {
-            this.Adapter.SelectCommand = this.CommandCollection[12];
-            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 getRunning() {
             this.Adapter.SelectCommand = this.CommandCollection[13];
             DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
             this.Adapter.Fill(dataTable);
@@ -17825,13 +17820,24 @@ 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.BatchListDataTable getSched() {
+        public virtual DS_App.BatchListDataTable getRunning() {
             this.Adapter.SelectCommand = this.CommandCollection[14];
             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 getSched() {
+            this.Adapter.SelectCommand = this.CommandCollection[15];
+            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")]
@@ -17987,8 +17993,36 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int fixSched() {
+        public virtual int fixRedoSheetOnEnd(global::System.Nullable<int> BatchID) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
+            if ((BatchID.HasValue == true)) {
+                command.Parameters[1].Value = ((int)(BatchID.Value));
+            }
+            else {
+                command.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
+                        != global::System.Data.ConnectionState.Open)) {
+                command.Connection.Open();
+            }
+            int returnValue;
+            try {
+                returnValue = command.ExecuteNonQuery();
+            }
+            finally {
+                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+                    command.Connection.Close();
+                }
+            }
+            return returnValue;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        public virtual int fixSched() {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7];
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -18010,7 +18044,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int redoPartValid(string Takt) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[15];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[16];
             if ((Takt == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -18038,7 +18072,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int resetNesting(global::System.Nullable<int> BatchID) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[16];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[17];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -18066,28 +18100,6 @@ 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")]
         public virtual int resetPartUnValid() {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[17];
-            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
-            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
-                        != global::System.Data.ConnectionState.Open)) {
-                command.Connection.Open();
-            }
-            int returnValue;
-            try {
-                returnValue = command.ExecuteNonQuery();
-            }
-            finally {
-                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
-                    command.Connection.Close();
-                }
-            }
-            return returnValue;
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int resetProdCall() {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[18];
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
@@ -18109,8 +18121,30 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int resetTree(global::System.Nullable<int> Original_BatchID) {
+        public virtual int resetProdCall() {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[19];
+            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
+                        != global::System.Data.ConnectionState.Open)) {
+                command.Connection.Open();
+            }
+            int returnValue;
+            try {
+                returnValue = command.ExecuteNonQuery();
+            }
+            finally {
+                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+                    command.Connection.Close();
+                }
+            }
+            return returnValue;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        public virtual int resetTree(global::System.Nullable<int> Original_BatchID) {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[20];
             if ((Original_BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(Original_BatchID.Value));
             }
@@ -18138,7 +18172,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateSchedPrior(global::System.Nullable<int> BatchID, global::System.Nullable<int> SchedPrio) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[20];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[21];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -18172,7 +18206,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateStatus(global::System.Nullable<int> BatchID, global::System.Nullable<int> Status, string EnvNum, global::System.Nullable<decimal> TotalTime) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[21];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[22];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }
diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd
index e1363e1..3feb59e 100644
--- a/AppData/DS_App.xsd
+++ b/AppData/DS_App.xsd
@@ -88,7 +88,7 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_fixRedoSheet" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fixRedoSheet" Modifier="Public" Name="fixRedoSheet" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy12" UserSourceName="fixRedoSheet">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_fixRedoSheet" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fixRedoSheet" Modifier="Public" Name="fixRedoSheet" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy4" UserSourceName="fixRedoSheet">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_fixRedoSheet</CommandText>
@@ -99,7 +99,18 @@ 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="GetDataBy4" UserSourceName="fixSched">
+              <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">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_Batch_fixRedoSheetOnEnd</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>
+              </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">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_fixSched</CommandText>
@@ -196,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="GetDataBy5" 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="GetDataBy6" UserSourceName="redoPartValid">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_redoPartValid</CommandText>
@@ -207,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="GetDataBy6" 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="GetDataBy7" UserSourceName="resetNesting">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_resetAllNesting</CommandText>
@@ -218,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="GetDataBy7" 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="GetDataBy8" UserSourceName="resetPartUnValid">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_resetPartUnValid</CommandText>
@@ -228,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="GetDataBy8" 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="GetDataBy9" UserSourceName="resetProdCall">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_zzz_resetProdCall</CommandText>
@@ -238,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="GetDataBy9" 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="GetDataBy10" UserSourceName="resetTree">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_resetTree</CommandText>
@@ -249,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="GetDataBy10" 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="GetDataBy11" UserSourceName="updateSchedPrior">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_updateSchedPrior</CommandText>
@@ -261,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="GetDataBy11" 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="GetDataBy12" UserSourceName="updateStatus">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_Batch_updateStatus</CommandText>
@@ -2439,7 +2450,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_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: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: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" />
@@ -2489,7 +2500,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_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: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: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" />
@@ -2514,7 +2525,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_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: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: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" />
@@ -2569,7 +2580,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_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: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: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" />
@@ -2642,7 +2653,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_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: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: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" />
@@ -2650,7 +2661,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_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: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: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" />
@@ -2719,7 +2730,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_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: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: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" />
@@ -2752,7 +2763,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_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: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: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" />
@@ -2793,7 +2804,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_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: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: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" />
@@ -2812,7 +2823,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_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: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: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" />
@@ -2836,7 +2847,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_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: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: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" />
@@ -2844,7 +2855,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_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: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: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" />
@@ -2861,7 +2872,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_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: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: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" />
@@ -2870,7 +2881,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_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: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: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" />
@@ -2901,7 +2912,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_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: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: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" />
@@ -2909,7 +2920,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_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: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: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" />
@@ -2925,7 +2936,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_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: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: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" />
@@ -2933,7 +2944,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_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: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:complexType>
             <xs:sequence>
               <xs:element name="CountType" msprop:Generator_ColumnVarNameInTable="columnCountType" msprop:Generator_ColumnPropNameInRow="CountType" msprop:Generator_ColumnPropNameInTable="CountTypeColumn" msprop:Generator_UserColumnName="CountType">
@@ -2961,7 +2972,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_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: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: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" />
@@ -2997,7 +3008,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_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: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:complexType>
             <xs:sequence>
               <xs:element name="ItemExtCode" msprop:Generator_ColumnVarNameInTable="columnItemExtCode" msprop:Generator_ColumnPropNameInRow="ItemExtCode" msprop:Generator_ColumnPropNameInTable="ItemExtCodeColumn" msprop:Generator_UserColumnName="ItemExtCode">
@@ -3013,7 +3024,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_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: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: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" />
@@ -3023,7 +3034,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_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: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: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">
@@ -3040,7 +3051,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_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: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: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" />
@@ -3053,7 +3064,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_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: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: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" />
@@ -3103,7 +3114,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_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: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: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" />
@@ -3129,7 +3140,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_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: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: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" />
@@ -3171,7 +3182,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_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: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: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" />
@@ -3388,18 +3399,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_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" />
+      <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" />
     </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 babefcc..48081cf 100644
--- a/AppData/DS_App.xss
+++ b/AppData/DS_App.xss
@@ -4,7 +4,7 @@
      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="-47" 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="247" 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" />
diff --git a/Jenkinsfile b/Jenkinsfile
index 9be3301..c08ea6c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=276']) {
+        withEnv(['NEXT_BUILD_NUMBER=277']) {
           // 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 7297223..f9fdebf 100644
--- a/NKC_WF/Controllers/SheetController.cs
+++ b/NKC_WF/Controllers/SheetController.cs
@@ -71,7 +71,7 @@ namespace NKC_WF.Controllers
         /// Effettua la chiamata di update x SINGOLO foglio
         /// </summary>
         /// <param name="sheetUpdated">Oggetto con Elenco fogli da aggiornare</param>
-        // PUT: api/Bunk/5
+        // PUT: api/Sheet/5
         [HttpPut]
         public void Put(SheetWorkList sheetUpdated)
         {
diff --git a/NKC_WF/WebUserControls/cmp_orderRunning.ascx b/NKC_WF/WebUserControls/cmp_orderRunning.ascx
index a90cc15..99edb21 100644
--- a/NKC_WF/WebUserControls/cmp_orderRunning.ascx
+++ b/NKC_WF/WebUserControls/cmp_orderRunning.ascx
@@ -7,7 +7,7 @@
     <PagerSettings Mode="NumericFirstLast" />
     <SelectedRowStyle CssClass="table-info" />
     <EmptyDataTemplate>
-        <%# traduci("NoRunnningOrders") %>
+        <%# traduci("NoRunningOrders") %>
     </EmptyDataTemplate>
     <Columns>
         <asp:BoundField DataField="Takt" HeaderText="#" InsertVisible="False" ReadOnly="True" SortExpression="Takt" />
diff --git a/NKC_WF/WebUserControls/cmp_stackList.ascx.cs b/NKC_WF/WebUserControls/cmp_stackList.ascx.cs
index aa0848f..1e21d0d 100644
--- a/NKC_WF/WebUserControls/cmp_stackList.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_stackList.ascx.cs
@@ -7,120 +7,123 @@ using System.Web.UI.WebControls;
 
 namespace NKC_WF.WebUserControls
 {
-  public partial class cmp_stackList : BaseUserControl
-  {
-    protected void Page_Load(object sender, EventArgs e)
+    public partial class cmp_stackList : BaseUserControl
     {
-      if (!Page.IsPostBack)
-      {
-        checkVisibility();
-      }
-    }
-
-    private void checkVisibility()
-    {
-      divSelected.Visible = StackIdSel > 0;
-      grView.Visible = !divSelected.Visible;
-      // imposto css titolo...
-      string titleClass = "row";
-      if (divSelected.Visible)
-      {
-        titleClass += " table-info";
-      }
-      divTitle.Attributes.Remove("class");
-      divTitle.Attributes.Add("class", titleClass);
-    }
-    public int BatchId
-    {
-      set
-      {
-        hfBatchId.Value = value.ToString();
-        grView.DataBind();
-      }
-      get
-      {
-        int answ = 0;
-        int.TryParse(hfBatchId.Value, out answ);
-        return answ;
-      }
-    }
-    protected void grView_SelectedIndexChanged(object sender, EventArgs e)
-    {
-      checkVisibility();
-      raiseEvent();
-    }
-    /// <summary>
-    /// comando reset
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void lbtReset_Click(object sender, EventArgs e)
-    {
-      resetSelezione();
-    }
-
-    public void resetSelezione()
-    {
-      lblStack.Text = "";
-      grView.SelectedIndex = -1;
-      grView.DataBind();
-      checkVisibility();
-      raiseEvent();
-    }
-    /// <summary>
-    /// StackId selezionato
-    /// </summary>
-    public int StackIdSel
-    {
-      get
-      {
-        int answ = 0;
-        try
+        protected void Page_Load(object sender, EventArgs e)
         {
-          int.TryParse(grView.SelectedValue.ToString(), out answ);
+            if (!Page.IsPostBack)
+            {
+                checkVisibility();
+            }
         }
-        catch
-        { }
-        return answ;
-      }
-    }
 
-    protected void grView_RowCommand(object sender, GridViewCommandEventArgs e)
-    {
-      // recupero argomento = Takt...
-      try
-      {
-        string stack = e.CommandArgument.ToString();
-        lblStack.Text = stack;
-      }
-      catch
-      { }
-    }
-    /// <summary>
-    /// Calcola il css x il blocco dato la condizione del num di sheets totali e preparati
-    /// </summary>
-    /// <param name="_numSheets"></param>
-    /// <param name="_numPrepared"></param>
-    /// <returns></returns>
-    public string cssByPrepared(object _numSheets, object _numPrepared)
-    {
-      string answ = "table-secondary border border-secondary border-thick rounded";
-      int numSheets = 0;
-      int numPrepared = 0;
-      int.TryParse(_numSheets.ToString(), out numSheets);
-      int.TryParse(_numPrepared.ToString(), out numPrepared);
-      if (numPrepared > 0)
-      {
-        if (numPrepared == numSheets)
+        private void checkVisibility()
         {
-          answ = "table-success border border-success border-thick rounded";
+            divSelected.Visible = StackIdSel > 0;
+            grView.Visible = !divSelected.Visible;
+            // imposto css titolo...
+            string titleClass = "row";
+            if (divSelected.Visible)
+            {
+                titleClass += " table-info";
+            }
+            divTitle.Attributes.Remove("class");
+            divTitle.Attributes.Add("class", titleClass);
         }
-        else
+        public int BatchId
         {
-          answ = "table-primary flashColor rounded";
+            set
+            {
+                hfBatchId.Value = value.ToString();
+                grView.DataBind();
+            }
+            get
+            {
+                int answ = 0;
+                int.TryParse(hfBatchId.Value, out answ);
+                return answ;
+            }
+        }
+        protected void grView_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            checkVisibility();
+            raiseEvent();
+        }
+        /// <summary>
+        /// comando reset
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtReset_Click(object sender, EventArgs e)
+        {
+            resetSelezione();
+        }
+
+        public void resetSelezione()
+        {
+            lblStack.Text = "";
+            grView.SelectedIndex = -1;
+            grView.DataBind();
+            checkVisibility();
+            raiseEvent();
+        }
+        /// <summary>
+        /// StackId selezionato
+        /// </summary>
+        public int StackIdSel
+        {
+            get
+            {
+                int answ = 0;
+                try
+                {
+                    if (grView.SelectedValue != null)
+                    {
+                        int.TryParse(grView.SelectedValue.ToString(), out answ);
+                    }
+                }
+                catch
+                { }
+                return answ;
+            }
+        }
+
+        protected void grView_RowCommand(object sender, GridViewCommandEventArgs e)
+        {
+            // recupero argomento = Takt...
+            try
+            {
+                string stack = e.CommandArgument.ToString();
+                lblStack.Text = stack;
+            }
+            catch
+            { }
+        }
+        /// <summary>
+        /// Calcola il css x il blocco dato la condizione del num di sheets totali e preparati
+        /// </summary>
+        /// <param name="_numSheets"></param>
+        /// <param name="_numPrepared"></param>
+        /// <returns></returns>
+        public string cssByPrepared(object _numSheets, object _numPrepared)
+        {
+            string answ = "table-secondary border border-secondary border-thick rounded";
+            int numSheets = 0;
+            int numPrepared = 0;
+            int.TryParse(_numSheets.ToString(), out numSheets);
+            int.TryParse(_numPrepared.ToString(), out numPrepared);
+            if (numPrepared > 0)
+            {
+                if (numPrepared == numSheets)
+                {
+                    answ = "table-success border border-success border-thick rounded";
+                }
+                else
+                {
+                    answ = "table-primary flashColor rounded";
+                }
+            }
+            return answ;
         }
-      }
-      return answ;
     }
-  }
 }
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
index 11545d7..7908706 100644
--- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
@@ -119,37 +119,46 @@ namespace NKC_WF.WebUserControls
                             // controllo sia quello RICHIESTO
                             if (decoData.codeInt == cmp_stackNextloading.StackIdReq)
                             {
-                                // verifico SE i BUNKS correnti siano tutti stati completati (NumSheet == NumWorking)
-                                if (currentBunkPrinted)
+                                // controllo se il bunk richiesto sia stato caricato coi materiali...
+                                if (!isBunkFilled(decoData.codeInt))
                                 {
-                                    cmp_barcode.showOutput("badge badge-success", $"BUNK OK, {decoData.rawData}");
-                                    ComLib.taktMLCurrStack = decoData.code;
-                                    // processo DB e salvo che lo stack è stato caricato in MACHINE LOAD
-                                    int stackId = 0;
-                                    try
-                                    {
-                                        var tabStacks = DataLayer.man.taSTL.getByDtmx(decoData.rawData);
-                                        if (tabStack.Count == 1)
-                                        {
-                                            stackId = tabStack[0].StackID;
-                                        }
-                                    }
-                                    catch
-                                    { }
-                                    // SE HO uno stackId valido (>0)...
-                                    if (stackId > 0)
-                                    {
-                                        DataLayer.man.taSTL.updatePos(stackId, 5);
-                                        // controllo status del bunk nel suo insieme...
-                                        ComLib.updateBatchPositionByBunk(stackId);
-                                        doRaiseEv = true;
-                                    }
+                                    cmp_barcode.showOutput("badge badge-danger", $"NEXT BUNK NOT PREPARED, {decoData.rawData}");
+                                    doRaiseEv = true;
                                 }
-                                // altrimenti segnalo NON pronto x caricare prossimo
                                 else
                                 {
-                                    cmp_barcode.showOutput("badge badge-danger", $"PREV BUNK NOT COMPLETED, {decoData.rawData}");
-                                    doRaiseEv = true;
+                                    // verifico SE i BUNKS correnti siano tutti stati completati (NumSheet == NumWorking)
+                                    if (currentBunkPrinted)
+                                    {
+                                        cmp_barcode.showOutput("badge badge-success", $"BUNK OK, {decoData.rawData}");
+                                        ComLib.taktMLCurrStack = decoData.code;
+                                        // processo DB e salvo che lo stack è stato caricato in MACHINE LOAD
+                                        int stackId = 0;
+                                        try
+                                        {
+                                            var tabStacks = DataLayer.man.taSTL.getByDtmx(decoData.rawData);
+                                            if (tabStack.Count == 1)
+                                            {
+                                                stackId = tabStack[0].StackID;
+                                            }
+                                        }
+                                        catch
+                                        { }
+                                        // SE HO uno stackId valido (>0)...
+                                        if (stackId > 0)
+                                        {
+                                            DataLayer.man.taSTL.updatePos(stackId, 5);
+                                            // controllo status del bunk nel suo insieme...
+                                            ComLib.updateBatchPositionByBunk(stackId);
+                                            doRaiseEv = true;
+                                        }
+                                    }
+                                    // altrimenti segnalo NON pronto x caricare prossimo
+                                    else
+                                    {
+                                        cmp_barcode.showOutput("badge badge-danger", $"PREV BUNK NOT COMPLETED, {decoData.rawData}");
+                                        doRaiseEv = true;
+                                    }
                                 }
                             }
                             else
@@ -220,6 +229,20 @@ namespace NKC_WF.WebUserControls
                 return answ;
             }
         }
+        /// <summary>
+        /// verifica se il bunk sia stato completato come caricamento dei fogli richiesti)
+        /// </summary>
+        protected bool isBunkFilled(int BunkId)
+        {
+            bool answ = false;
+            // leggo i dati del bunk...
+            var currBunk = DataLayer.man.taSTL.getByKey(BunkId);
+            if (currBunk.Count == 1)
+            {
+                answ = currBunk[0].Position == 4;
+            }
+            return answ;
+        }
 
         protected void checkVisibility()
         {
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
index 4d60c40..7a2088e 100644
--- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
+++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
@@ -3,97 +3,110 @@
 <asp:HiddenField ID="hfBatchID" runat="server" />
 
 <asp:GridView ID="grViewCurrent" runat="server" DataSourceID="odsCurr" AllowPaging="false" AllowSorting="false" Width="100%" AutoGenerateColumns="false" ShowHeader="false" GridLines="None">
-  <EmptyDataTemplate>
-    <div class="row border border-success rounded">
-      <div class="col-6 text-left text-success">
-        <b>NO CURRENT BUNK</b>
-      </div>
-      <div class="col-6 text-right text-secondary">
-        ...waiting
-      </div>
-    </div>
-  </EmptyDataTemplate>
-  <Columns>
-    <asp:TemplateField>
-      <ItemTemplate>
+    <EmptyDataTemplate>
         <div class="row border border-success rounded">
-          <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)
-          </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)
-          </div>
-          <div class="col-5 text-center px-0">
-              <div class="row">
-                  <div class="col">
-                      sheets:<b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
-                  </div>
-                  <div class="col">
-                      printed: <b><asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b>
-                  </div>
-                  <div class="col">
-                      worked: <b><asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
-                  </div>
-                  <div class="col text-danger">
-                      To Redo: <b><asp:Label ID="NumSheetsToRedoLabel" runat="server" Text='<%# Eval("NumSheetsToRedo") %>' /></b>
-                  </div>
-              </div>
-          </div>
-          <div class="col-3 text-right text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString()  %>'>
-            Items: <b>
-              <asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
-          </div>
-          <div class="col-3 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString()  %>'>
-            Items: <b>
-              <asp:Label ID="Label3" runat="server" Text='<%# Eval("NumItems") %>' /></b>
-          </div>
+            <div class="col-6 text-left text-success">
+                <b>NO CURRENT BUNK</b>
+            </div>
+            <div class="col-6 text-right text-secondary">
+                ...waiting
+            </div>
         </div>
-      </ItemTemplate>
-    </asp:TemplateField>
-  </Columns>
+    </EmptyDataTemplate>
+    <Columns>
+        <asp:TemplateField>
+            <ItemTemplate>
+                <div class="row border border-success rounded">
+                    <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)
+                    </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)
+                    </div>
+                    <div class="col-5 text-center px-0">
+                        <div class="row">
+                            <div class="col">
+                                sheets:<b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
+                            </div>
+                            <div class="col">
+                                printed: <b>
+                                    <asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b>
+                            </div>
+                            <div class="col">
+                                worked: <b>
+                                    <asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
+                            </div>
+                            <div class="col text-danger">
+                                To Redo: <b>
+                                    <asp:Label ID="NumSheetsToRedoLabel" runat="server" Text='<%# Eval("NumSheetsToRedo") %>' /></b>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-3 text-right text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString()  %>'>
+                        Items: <b>
+                            <asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
+                    </div>
+                    <div class="col-3 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString()  %>'>
+                        Items: <b>
+                            <asp:Label ID="Label3" runat="server" Text='<%# Eval("NumItems") %>' /></b>
+                    </div>
+                </div>
+            </ItemTemplate>
+        </asp:TemplateField>
+    </Columns>
 </asp:GridView>
-<asp:LinkButton runat="server" ID="lbtCollectRedo" CssClass="btn btn-danger btn-block" OnClick="lbtCollectRedo_Click"><%: traduci("CollectRedo") %> <i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
+<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>
+    </div>
+</div>
 <asp:FormView ID="frmViewNext" runat="server" DataKeyNames="StackID" DataSourceID="odsNext" Width="100%">
-  <ItemTemplate>
-    <div class="row border border-primary rounded">
-      <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)
-      </div>
-      <div class="col-4 text-center">
-        sheets:<b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b> | printed: <b>
-          <asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b> | worked: <b>
-            <asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
-      </div>
-      <div class="col-4 text-right text-primary">
-        Items: <b>
-          <asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
-      </div>
-    </div>
-  </ItemTemplate>
-  <EmptyDataTemplate>
-    <div class="row border border-primary rounded">
-      <div class="col-6 text-left text-secondary">
-        <b>NO NEXT BUNK</b>
-      </div>
-      <div class="col-6 text-right text-secondary">
-        BATCH complete
-      </div>
-    </div>
-  </EmptyDataTemplate>
+    <ItemTemplate>
+        <div class="row border border-primary rounded">
+            <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)
+            </div>
+            <div class="col-4 text-center">
+                sheets:<b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b> | printed: <b>
+                    <asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b> | worked: <b>
+                        <asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
+            </div>
+            <div class="col-4 text-right text-primary">
+                Items: <b>
+                    <asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
+            </div>
+        </div>
+    </ItemTemplate>
+    <EmptyDataTemplate>
+        <div class="row border border-primary rounded">
+            <div class="col-6 text-left text-secondary">
+                <b>NO NEXT BUNK</b>
+            </div>
+            <div class="col-6 text-right text-secondary">
+                BATCH complete
+            </div>
+        </div>
+    </EmptyDataTemplate>
 </asp:FormView>
 <asp:ObjectDataSource ID="odsCurr" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getCurrByBatch" TypeName="AppData.DS_AppTableAdapters.StackListTableAdapter">
-  <SelectParameters>
-    <asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
-  </SelectParameters>
+    <SelectParameters>
+        <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>
+    <SelectParameters>
+        <asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
+    </SelectParameters>
 </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>
+    </div>
+</div>
+
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.cs
index 4a5a446..0fc2712 100644
--- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.cs
@@ -20,6 +20,7 @@ namespace NKC_WF.WebUserControls
                 numRedo += item.NumSheetsToRedo;
             }
             lbtCollectRedo.Visible = numRedo > 0;
+            lbtCollectRedoOnEnd.Visible = numRedo > 0;
         }
 
         public int BatchId
@@ -54,7 +55,7 @@ namespace NKC_WF.WebUserControls
             }
         }
         /// <summary>
-        /// Effettua steps x gestire Redo Sheets
+        /// Effettua steps x gestire Redo Sheets PRIMA POSSIBILE
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -62,6 +63,21 @@ namespace NKC_WF.WebUserControls
         {
             // chiamo stored x sistemare
             DataLayer.man.taBL.fixRedoSheet(BatchId);
+            doUpdate();
         }
+
+        /// <summary>
+        /// Effettua steps x gestire Redo Sheets ALLA FINE
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtCollectRedoOnEnd_Click(object sender, EventArgs e)
+        {
+            // chiamo stored x sistemare
+            DataLayer.man.taBL.fixRedoSheetOnEnd(BatchId);
+            doUpdate();
+        }
+
+        
     }
 }
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs
index 3c75949..444cd3a 100644
--- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs
@@ -67,5 +67,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.ObjectDataSource odsNext;
+
+        /// <summary>
+        /// Controllo lbtCollectRedoOnEnd.
+        /// </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.LinkButton lbtCollectRedoOnEnd;
     }
 }
diff --git a/NKC_WF/WebUserControls/cmp_taktList.ascx b/NKC_WF/WebUserControls/cmp_taktList.ascx
index a79a4ee..6947c24 100644
--- a/NKC_WF/WebUserControls/cmp_taktList.ascx
+++ b/NKC_WF/WebUserControls/cmp_taktList.ascx
@@ -61,7 +61,7 @@
     </asp:GridView>
     <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMaxPosition" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter">
       <SelectParameters>
-        <asp:Parameter DefaultValue="2" Name="Position" Type="Int32" />
+        <asp:Parameter DefaultValue="3" Name="Position" 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 2f0da53..821e4c6 100644
--- a/NKC_WF/WebUserControls/cmp_taktList.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_taktList.ascx.cs
@@ -8,159 +8,162 @@ using System.Web.UI.WebControls;
 
 namespace NKC_WF.WebUserControls
 {
-  public partial class cmp_taktList : BaseUserControl
-  {
-    protected void Page_Load(object sender, EventArgs e)
+    public partial class cmp_taktList : BaseUserControl
     {
-      if (!Page.IsPostBack)
-      {
-        checkVisibility();
-      }
-    }
-
-    private void checkVisibility()
-    {
-      divSelected.Visible = BatchIdSel > 0;
-      grView.Visible = !divSelected.Visible;
-      // imposto css titolo...
-      string titleClass = "row";
-      if (divSelected.Visible)
-      {
-        titleClass += " table-primary";
-      }
-      divTitle.Attributes.Remove("class");
-      divTitle.Attributes.Add("class", titleClass);
-    }
-
-    /// <summary>
-    /// Codice CSS in base a status...
-    /// </summary>
-    /// <param name="_status"></param>
-    /// <returns></returns>
-    public string cssByStatus(object _status)
-    {
-      string answ = "text-muted";
-      int status = -1;
-      int.TryParse(_status.ToString(), out status);
-      switch (status)
-      {
-        case 1:
-          answ = "font-weight-bold text-info";
-          break;
-        case 2:
-          answ = "font-weight-bold text-primary";
-          break;
-        case 3:
-          answ = "font-weight-bold text-warning";
-          break;
-        case 4:
-          answ = "font-weight-bold text-danger";
-          break;
-        case 5:
-          answ = "font-weight-bold text-success";
-          break;
-        case 6:
-          answ = "font-weight-bold text-secondary";
-          break;
-        default:
-          break;
-      }
-      return answ;
-    }
-    /// <summary>
-    /// Converte il codice stato in effettivo campo
-    /// </summary>
-    /// <param name="_status"></param>
-    /// <returns></returns>
-    public string BStatus(object _status)
-    {
-      string answ = ComLib.BatchStatusDescr(_status);
-      return answ;
-    }
-    /// <summary>
-    /// Converte il codice POSITION di un BATCH in traduzione
-    /// </summary>
-    /// <param name="_status"></param>
-    /// <returns></returns>
-    public string BatchPositionStatus(object _status)
-    {
-      string answ = ComLib.PositionStatusDescr(_status);
-      return answ;
-    }
-    /// <summary>
-    /// comando reset
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void lbtReset_Click(object sender, EventArgs e)
-    {
-      resetSelezione();
-    }
-
-    private void resetSelezione()
-    {
-      lblTakt.Text = "";
-      grView.SelectedIndex = -1;
-      grView.DataBind();
-      checkVisibility();
-      raiseReset();
-    }
-    /// <summary>
-    /// BatchId selezionato
-    /// </summary>
-    public int BatchIdSel
-    {
-      get
-      {
-        int answ = 0;
-        try
+        protected void Page_Load(object sender, EventArgs e)
         {
-          int.TryParse(grView.SelectedValue.ToString(), out answ);
+            if (!Page.IsPostBack)
+            {
+                checkVisibility();
+            }
         }
-        catch
-        { }
-        return answ;
-      }
-    }
-    protected void grView_SelectedIndexChanged(object sender, EventArgs e)
-    {
-      checkVisibility();
-      raiseEvent();
-    }
 
-    protected void grView_RowCommand(object sender, GridViewCommandEventArgs e)
-    {
-      // recupero argomento = Takt...
-      try
-      {
-        string takt = e.CommandArgument.ToString();
-        lblTakt.Text = takt;
-      }
-      catch
-      { }
+        private void checkVisibility()
+        {
+            divSelected.Visible = BatchIdSel > 0;
+            grView.Visible = !divSelected.Visible;
+            // imposto css titolo...
+            string titleClass = "row";
+            if (divSelected.Visible)
+            {
+                titleClass += " table-primary";
+            }
+            divTitle.Attributes.Remove("class");
+            divTitle.Attributes.Add("class", titleClass);
+        }
+
+        /// <summary>
+        /// Codice CSS in base a status...
+        /// </summary>
+        /// <param name="_status"></param>
+        /// <returns></returns>
+        public string cssByStatus(object _status)
+        {
+            string answ = "text-muted";
+            int status = -1;
+            int.TryParse(_status.ToString(), out status);
+            switch (status)
+            {
+                case 1:
+                    answ = "font-weight-bold text-info";
+                    break;
+                case 2:
+                    answ = "font-weight-bold text-primary";
+                    break;
+                case 3:
+                    answ = "font-weight-bold text-warning";
+                    break;
+                case 4:
+                    answ = "font-weight-bold text-danger";
+                    break;
+                case 5:
+                    answ = "font-weight-bold text-success";
+                    break;
+                case 6:
+                    answ = "font-weight-bold text-secondary";
+                    break;
+                default:
+                    break;
+            }
+            return answ;
+        }
+        /// <summary>
+        /// Converte il codice stato in effettivo campo
+        /// </summary>
+        /// <param name="_status"></param>
+        /// <returns></returns>
+        public string BStatus(object _status)
+        {
+            string answ = ComLib.BatchStatusDescr(_status);
+            return answ;
+        }
+        /// <summary>
+        /// Converte il codice POSITION di un BATCH in traduzione
+        /// </summary>
+        /// <param name="_status"></param>
+        /// <returns></returns>
+        public string BatchPositionStatus(object _status)
+        {
+            string answ = ComLib.PositionStatusDescr(_status);
+            return answ;
+        }
+        /// <summary>
+        /// comando reset
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtReset_Click(object sender, EventArgs e)
+        {
+            resetSelezione();
+        }
+
+        private void resetSelezione()
+        {
+            lblTakt.Text = "";
+            grView.SelectedIndex = -1;
+            grView.DataBind();
+            checkVisibility();
+            raiseReset();
+        }
+        /// <summary>
+        /// BatchId selezionato
+        /// </summary>
+        public int BatchIdSel
+        {
+            get
+            {
+                int answ = 0;
+                try
+                {
+                    if (grView.SelectedValue != null)
+                    {
+                        int.TryParse(grView.SelectedValue.ToString(), out answ);
+                    }
+                }
+                catch
+                { }
+                return answ;
+            }
+        }
+        protected void grView_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            checkVisibility();
+            raiseEvent();
+        }
+
+        protected void grView_RowCommand(object sender, GridViewCommandEventArgs e)
+        {
+            // recupero argomento = Takt...
+            try
+            {
+                string takt = e.CommandArgument.ToString();
+                lblTakt.Text = takt;
+            }
+            catch
+            { }
+        }
+        /// <summary>
+        /// Calcola il css x il blocco dato la positioj (logica) del TAKT
+        /// </summary>
+        /// <param name="_Position"></param>
+        /// <returns></returns>
+        public string cssByPosition(object _Position)
+        {
+            string answ = "table-secondary border border-secondary border-thick rounded";
+            int Position = 0;
+            int.TryParse(_Position.ToString(), out Position);
+            switch (Position)
+            {
+                case 1:
+                    answ = "table-primary flashColor rounded";
+                    break;
+                case 2:
+                    answ = "table-success border border-success border-thick rounded";
+                    break;
+                default:
+                    break;
+            }
+            return answ;
+        }
     }
-    /// <summary>
-    /// Calcola il css x il blocco dato la positioj (logica) del TAKT
-    /// </summary>
-    /// <param name="_Position"></param>
-    /// <returns></returns>
-    public string cssByPosition(object _Position)
-    {
-      string answ = "table-secondary border border-secondary border-thick rounded";
-      int Position = 0;
-      int.TryParse(_Position.ToString(), out Position);
-      switch (Position)
-      {
-        case 1:
-          answ = "table-primary flashColor rounded";
-          break;
-        case 2:
-          answ = "table-success border border-success border-thick rounded";
-          break;
-        default:
-          break;
-      }
-      return answ;
-    }
-  }
 }
\ No newline at end of file