From da40d8af6fcd86f0d65965815d07af089c999739 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sun, 29 Mar 2020 13:22:51 +0200
Subject: [PATCH] Inserite modifiche da DB e nuovo formato sheet (da testare!)

---
 AppData/ComLib.cs          | 92 +++++++++++++++++++++++++++++++++++---
 AppData/DS_App.Designer.cs | 69 ++++++++++++++++++----------
 AppData/DS_App.xsd         | 87 +++++++++++++++++++----------------
 AppData/DS_App.xss         | 26 +++++------
 4 files changed, 195 insertions(+), 79 deletions(-)

diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs
index 9d34a2d..e510077 100644
--- a/AppData/ComLib.cs
+++ b/AppData/ComLib.cs
@@ -1219,14 +1219,99 @@ namespace AppData
     /// - dal batch prende i BUNK attivi sulla macchina (posizione 3)
     /// - filtra i fogli già lavorati
     /// </summary>
-    /// <param name="machineName"></param>
+    /// <param name="codPost"></param>
     /// <returns></returns>
-    public static SheetWorkList prodGetSheetWorkList(string machineName)
+    public static SheetWorkList prodGetSheetWorkList(string codPost)
     {
+      // init out
       SheetWorkList answ = null;
+      // recupero batch corrente
+      DS_App.BatchListDataTable currBatch = DataLayer.man.taBL.getCurrentByMachine(codPost);
+      try
+      {
+        if (currBatch != null)
+        {
+          // coem batch DOVREI averne solo 1 in corso...
+          DS_App.BatchListRow batchRow = currBatch[0];
+          // recupero i vari SHEETS del batch...
+          DS_App.SheetListDataTable sheetList = DataLayer.man.taSHL.getByBatch(batchRow.BatchID);
+          answ = convertSheetWorkList(sheetList);
+        }
+      }
+      catch (Exception exc)
+      { }
       return answ;
     }
 
+
+    /// <summary>
+    /// Rranscodifica dati da format DB a formato PROD
+    /// </summary>
+    /// <param name="sheetList"></param>
+    /// <returns></returns>
+    private static SheetWorkList convertSheetWorkList(DS_App.SheetListDataTable sheetList)
+    {
+      SheetWorkList answ;
+      List<ProdSheetExt> elSheet = new List<ProdSheetExt>();
+      string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
+      string servBasePath = memLayer.ML.CRS("servBasePath").ToLower();
+      string prodBasePath = memLayer.ML.CRS("prodBasePath").ToLower();
+      DateTime dataStart = DateTime.Now;
+      ProdSheetExt currPanel;
+      // ciclo elenco fogli x escludere lavorati...
+      foreach (var item in sheetList)
+      {
+        // converto i workData con check null sul campo data
+        WorkData wdPrint = new WorkData()
+        {
+          DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart,
+          DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd,
+          ProgramPath = item.PrintFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath)
+        };
+        WorkData wdMachining = new WorkData()
+        {
+          DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart,
+          DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd,
+          ProgramPath = item.CncFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath)
+        };
+        WorkData wdUnload = new WorkData()
+        {
+          DtStart = item.IsUnlStartNull() ? null : (DateTime?)item.UnlStart,
+          DtEnd = item.IsUnlEndNull() ? null : (DateTime?)item.UnlEnd
+        };
+        MaterialData material = new MaterialData()
+        {
+          MaterialId = item.MatID,
+          MaterialDescription = item.MatDesc,
+          MaterialPN = item.MatExtCode.ToString()
+        };
+        PStatus currPnlStatus = PStatus.Programmed;
+        Enum.TryParse(item.ShStatus.ToString(), out currPnlStatus);
+        currPanel = new ProdSheetExt()
+        {
+          BunkId = item.StackID,
+          Printing = wdPrint,
+          Machining = wdMachining,
+          Unloading = wdUnload,
+          Material = material,
+          SheetId = item.SheetID,
+          Status = currPnlStatus
+        };
+        elSheet.Add(currPanel);
+        if (!item.IsPrntStartNull())
+        {
+          dataStart = item.PrntStart < dataStart ? item.PrntStart : dataStart;
+        }
+      }
+      // compongo il bunk...
+      answ = new SheetWorkList()
+      {
+        SheetList = elSheet
+      };
+      return answ;
+    }
+
+
     /// <summary>
     /// Restituisce il BUNK che è il primo della lista:
     /// - posizione = 3 (ho letto da webApp il BUNK e preso in carico)
@@ -1286,7 +1371,6 @@ namespace AppData
       }
       return answ;
     }
-
     /// <summary>
     /// Restituisce il PROSSIMO bunk secondo criterio:
     /// - posizione = 5 (ho letto da webApp il BUNK e preso in carico)
@@ -1412,7 +1496,6 @@ namespace AppData
       };
       return answ;
     }
-
     /// <summary>
     /// Recupera e transcodifica DA DB i dati di UN SINGOLO bunk
     /// </summary>
@@ -1498,7 +1581,6 @@ namespace AppData
       }
       return answ;
     }
-
     /// <summary>
     /// Valore dello Stack correntemente in processing per ML (MachineLoad)
     /// </summary>
diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs
index 0f5d5e4..736fe55 100644
--- a/AppData/DS_App.Designer.cs
+++ b/AppData/DS_App.Designer.cs
@@ -16162,7 +16162,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[15];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[16];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT * FROM v_BatchList";
@@ -16215,47 +16215,53 @@ namespace AppData.DS_AppTableAdapters {
             this._commandCollection[7].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[8] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[8].Connection = this.Connection;
-            this._commandCollection[8].CommandText = "dbo.stp_Batch_getLastByTakt";
+            this._commandCollection[8].CommandText = "dbo.stp_Batch_getCurrentByMachine";
             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("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[8].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[9] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[9].Connection = this.Connection;
-            this._commandCollection[9].CommandText = "dbo.stp_Batch_getNextAvailable";
+            this._commandCollection[9].CommandText = "dbo.stp_Batch_getLastByTakt";
             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("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_redoPartValid";
+            this._commandCollection[10].CommandText = "dbo.stp_Batch_getNextAvailable";
             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("@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] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[11].Connection = this.Connection;
-            this._commandCollection[11].CommandText = "dbo.stp_Batch_resetAllNesting";
+            this._commandCollection[11].CommandText = "dbo.stp_Batch_redoPartValid";
             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("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 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[12] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[12].Connection = this.Connection;
-            this._commandCollection[12].CommandText = "dbo.stp_Batch_resetPartUnValid";
+            this._commandCollection[12].CommandText = "dbo.stp_Batch_resetAllNesting";
             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("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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_resetTree";
+            this._commandCollection[13].CommandText = "dbo.stp_Batch_resetPartUnValid";
             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[13].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[14] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[14].Connection = this.Connection;
-            this._commandCollection[14].CommandText = "dbo.stp_Batch_updateStatus";
+            this._commandCollection[14].CommandText = "dbo.stp_Batch_resetTree";
             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[14].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[14].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[14].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[14].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[14].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[15] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[15].Connection = this.Connection;
+            this._commandCollection[15].CommandText = "dbo.stp_Batch_updateStatus";
+            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("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[15].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[15].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[15].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()]
@@ -16349,8 +16355,25 @@ 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 getLastByTakt(string Takt) {
+        public virtual DS_App.BatchListDataTable getCurrentByMachine(string CodPosition) {
             this.Adapter.SelectCommand = this.CommandCollection[8];
+            if ((CodPosition == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodPosition));
+            }
+            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 getLastByTakt(string Takt) {
+            this.Adapter.SelectCommand = this.CommandCollection[9];
             if ((Takt == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -16367,7 +16390,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 getNextAvailable() {
-            this.Adapter.SelectCommand = this.CommandCollection[9];
+            this.Adapter.SelectCommand = this.CommandCollection[10];
             DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -16501,7 +16524,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[10];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11];
             if ((Takt == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -16529,7 +16552,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[11];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -16557,7 +16580,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 resetPartUnValid() {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[13];
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -16579,7 +16602,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 resetTree(global::System.Nullable<int> Original_BatchID) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[13];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[14];
             if ((Original_BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(Original_BatchID.Value));
             }
@@ -16607,7 +16630,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[14];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[15];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }
diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd
index 1648273..88fea26 100644
--- a/AppData/DS_App.xsd
+++ b/AppData/DS_App.xsd
@@ -120,6 +120,17 @@
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getCurrentByMachine" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getCurrentByMachine" GetMethodModifier="Public" GetMethodName="getCurrentByMachine" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getCurrentByMachine" UserSourceName="getCurrentByMachine">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_Batch_getCurrentByMachine</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="nvarchar" DbType="String" Direction="Input" ParameterName="@CodPosition" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getLastByTakt" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getLastByTakt" GeneratorSourceName="FillBy" GetMethodModifier="Public" GetMethodName="getLastByTakt" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getLastByTakt" UserSourceName="getLastByTakt">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -2305,7 +2316,7 @@ FROM v_CartKitDetail</CommandText>
   <xs:element name="DS_App" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_App" msprop:Generator_UserDSName="DS_App">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="BatchList" msprop:Generator_TableClassName="BatchListDataTable" msprop:Generator_TableVarName="tableBatchList" msprop:Generator_RowChangedName="BatchListRowChanged" msprop:Generator_TablePropName="BatchList" msprop:Generator_RowDeletingName="BatchListRowDeleting" msprop:Generator_RowChangingName="BatchListRowChanging" msprop:Generator_RowEvHandlerName="BatchListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchListRowDeleted" msprop:Generator_RowClassName="BatchListRow" msprop:Generator_UserTableName="BatchList" msprop:Generator_RowEvArgName="BatchListRowChangeEvent">
+        <xs:element name="BatchList" msprop:Generator_TableClassName="BatchListDataTable" msprop:Generator_TableVarName="tableBatchList" msprop:Generator_TablePropName="BatchList" msprop:Generator_RowDeletingName="BatchListRowDeleting" msprop:Generator_RowChangingName="BatchListRowChanging" msprop:Generator_RowEvHandlerName="BatchListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchListRowDeleted" msprop:Generator_UserTableName="BatchList" msprop:Generator_RowChangedName="BatchListRowChanged" msprop:Generator_RowEvArgName="BatchListRowChangeEvent" msprop:Generator_RowClassName="BatchListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BatchID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" />
@@ -2353,7 +2364,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="StackList" msprop:Generator_TableClassName="StackListDataTable" msprop:Generator_TableVarName="tableStackList" msprop:Generator_RowChangedName="StackListRowChanged" msprop:Generator_TablePropName="StackList" msprop:Generator_RowDeletingName="StackListRowDeleting" msprop:Generator_RowChangingName="StackListRowChanging" msprop:Generator_RowEvHandlerName="StackListRowChangeEventHandler" msprop:Generator_RowDeletedName="StackListRowDeleted" msprop:Generator_RowClassName="StackListRow" msprop:Generator_UserTableName="StackList" msprop:Generator_RowEvArgName="StackListRowChangeEvent">
+        <xs:element name="StackList" msprop:Generator_TableClassName="StackListDataTable" msprop:Generator_TableVarName="tableStackList" msprop:Generator_TablePropName="StackList" msprop:Generator_RowDeletingName="StackListRowDeleting" msprop:Generator_RowChangingName="StackListRowChanging" msprop:Generator_RowEvHandlerName="StackListRowChangeEventHandler" msprop:Generator_RowDeletedName="StackListRowDeleted" msprop:Generator_UserTableName="StackList" msprop:Generator_RowChangedName="StackListRowChanged" msprop:Generator_RowEvArgName="StackListRowChangeEvent" msprop:Generator_RowClassName="StackListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="StackID" msprop:Generator_ColumnVarNameInTable="columnStackID" msprop:Generator_ColumnPropNameInRow="StackID" msprop:Generator_ColumnPropNameInTable="StackIDColumn" msprop:Generator_UserColumnName="StackID" type="xs:int" />
@@ -2375,7 +2386,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SheetList" msprop:Generator_TableClassName="SheetListDataTable" msprop:Generator_TableVarName="tableSheetList" msprop:Generator_RowChangedName="SheetListRowChanged" msprop:Generator_TablePropName="SheetList" msprop:Generator_RowDeletingName="SheetListRowDeleting" msprop:Generator_RowChangingName="SheetListRowChanging" msprop:Generator_RowEvHandlerName="SheetListRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetListRowDeleted" msprop:Generator_RowClassName="SheetListRow" msprop:Generator_UserTableName="SheetList" msprop:Generator_RowEvArgName="SheetListRowChangeEvent">
+        <xs:element name="SheetList" msprop:Generator_TableClassName="SheetListDataTable" msprop:Generator_TableVarName="tableSheetList" msprop:Generator_TablePropName="SheetList" msprop:Generator_RowDeletingName="SheetListRowDeleting" msprop:Generator_RowChangingName="SheetListRowChanging" msprop:Generator_RowEvHandlerName="SheetListRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetListRowDeleted" msprop:Generator_UserTableName="SheetList" msprop:Generator_RowChangedName="SheetListRowChanged" msprop:Generator_RowEvArgName="SheetListRowChangeEvent" msprop:Generator_RowClassName="SheetListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="SheetID" msprop:Generator_ColumnVarNameInTable="columnSheetID" msprop:Generator_ColumnPropNameInRow="SheetID" msprop:Generator_ColumnPropNameInTable="SheetIDColumn" msprop:Generator_UserColumnName="SheetID" type="xs:int" />
@@ -2430,7 +2441,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OrderList" msprop:Generator_TableClassName="OrderListDataTable" msprop:Generator_TableVarName="tableOrderList" msprop:Generator_RowChangedName="OrderListRowChanged" msprop:Generator_TablePropName="OrderList" msprop:Generator_RowDeletingName="OrderListRowDeleting" msprop:Generator_RowChangingName="OrderListRowChanging" msprop:Generator_RowEvHandlerName="OrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListRowDeleted" msprop:Generator_RowClassName="OrderListRow" msprop:Generator_UserTableName="OrderList" msprop:Generator_RowEvArgName="OrderListRowChangeEvent">
+        <xs:element name="OrderList" msprop:Generator_TableClassName="OrderListDataTable" msprop:Generator_TableVarName="tableOrderList" msprop:Generator_TablePropName="OrderList" msprop:Generator_RowDeletingName="OrderListRowDeleting" msprop:Generator_RowChangingName="OrderListRowChanging" msprop:Generator_RowEvHandlerName="OrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListRowDeleted" msprop:Generator_UserTableName="OrderList" msprop:Generator_RowChangedName="OrderListRowChanged" msprop:Generator_RowEvArgName="OrderListRowChangeEvent" msprop:Generator_RowClassName="OrderListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OrdID" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" />
@@ -2503,7 +2514,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="BatchReqList" msprop:Generator_TableClassName="BatchReqListDataTable" msprop:Generator_TableVarName="tableBatchReqList" msprop:Generator_RowChangedName="BatchReqListRowChanged" msprop:Generator_TablePropName="BatchReqList" msprop:Generator_RowDeletingName="BatchReqListRowDeleting" msprop:Generator_RowChangingName="BatchReqListRowChanging" msprop:Generator_RowEvHandlerName="BatchReqListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchReqListRowDeleted" msprop:Generator_RowClassName="BatchReqListRow" msprop:Generator_UserTableName="BatchReqList" msprop:Generator_RowEvArgName="BatchReqListRowChangeEvent">
+        <xs:element name="BatchReqList" msprop:Generator_TableClassName="BatchReqListDataTable" msprop:Generator_TableVarName="tableBatchReqList" msprop:Generator_TablePropName="BatchReqList" msprop:Generator_RowDeletingName="BatchReqListRowDeleting" msprop:Generator_RowChangingName="BatchReqListRowChanging" msprop:Generator_RowEvHandlerName="BatchReqListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchReqListRowDeleted" msprop:Generator_UserTableName="BatchReqList" msprop:Generator_RowChangedName="BatchReqListRowChanged" msprop:Generator_RowEvArgName="BatchReqListRowChangeEvent" msprop:Generator_RowClassName="BatchReqListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BatchID" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" />
@@ -2511,7 +2522,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ItemList" msprop:Generator_TableClassName="ItemListDataTable" msprop:Generator_TableVarName="tableItemList" msprop:Generator_RowChangedName="ItemListRowChanged" msprop:Generator_TablePropName="ItemList" msprop:Generator_RowDeletingName="ItemListRowDeleting" msprop:Generator_RowChangingName="ItemListRowChanging" msprop:Generator_RowEvHandlerName="ItemListRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemListRowDeleted" msprop:Generator_RowClassName="ItemListRow" msprop:Generator_UserTableName="ItemList" msprop:Generator_RowEvArgName="ItemListRowChangeEvent">
+        <xs:element name="ItemList" msprop:Generator_TableClassName="ItemListDataTable" msprop:Generator_TableVarName="tableItemList" msprop:Generator_TablePropName="ItemList" msprop:Generator_RowDeletingName="ItemListRowDeleting" msprop:Generator_RowChangingName="ItemListRowChanging" msprop:Generator_RowEvHandlerName="ItemListRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemListRowDeleted" msprop:Generator_UserTableName="ItemList" msprop:Generator_RowChangedName="ItemListRowChanged" msprop:Generator_RowEvArgName="ItemListRowChangeEvent" msprop:Generator_RowClassName="ItemListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnItemID" msprop:Generator_ColumnPropNameInRow="ItemID" msprop:Generator_ColumnPropNameInTable="ItemIDColumn" msprop:Generator_UserColumnName="ItemID" type="xs:int" />
@@ -2580,7 +2591,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Materials" msprop:Generator_TableClassName="MaterialsDataTable" msprop:Generator_TableVarName="tableMaterials" msprop:Generator_TablePropName="Materials" msprop:Generator_RowDeletingName="MaterialsRowDeleting" msprop:Generator_RowChangingName="MaterialsRowChanging" msprop:Generator_RowEvHandlerName="MaterialsRowChangeEventHandler" msprop:Generator_RowDeletedName="MaterialsRowDeleted" msprop:Generator_UserTableName="Materials" msprop:Generator_RowChangedName="MaterialsRowChanged" msprop:Generator_RowEvArgName="MaterialsRowChangeEvent" msprop:Generator_RowClassName="MaterialsRow">
+        <xs:element name="Materials" msprop:Generator_TableClassName="MaterialsDataTable" msprop:Generator_TableVarName="tableMaterials" msprop:Generator_RowChangedName="MaterialsRowChanged" msprop:Generator_TablePropName="Materials" msprop:Generator_RowDeletingName="MaterialsRowDeleting" msprop:Generator_RowChangingName="MaterialsRowChanging" msprop:Generator_RowEvHandlerName="MaterialsRowChangeEventHandler" msprop:Generator_RowDeletedName="MaterialsRowDeleted" msprop:Generator_RowClassName="MaterialsRow" msprop:Generator_UserTableName="Materials" msprop:Generator_RowEvArgName="MaterialsRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="MatID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnMatID" msprop:Generator_ColumnPropNameInRow="MatID" msprop:Generator_ColumnPropNameInTable="MatIDColumn" msprop:Generator_UserColumnName="MatID" type="xs:int" />
@@ -2613,7 +2624,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Bins" msprop:Generator_TableClassName="BinsDataTable" msprop:Generator_TableVarName="tableBins" msprop:Generator_TablePropName="Bins" msprop:Generator_RowDeletingName="BinsRowDeleting" msprop:Generator_RowChangingName="BinsRowChanging" msprop:Generator_RowEvHandlerName="BinsRowChangeEventHandler" msprop:Generator_RowDeletedName="BinsRowDeleted" msprop:Generator_UserTableName="Bins" msprop:Generator_RowChangedName="BinsRowChanged" msprop:Generator_RowEvArgName="BinsRowChangeEvent" msprop:Generator_RowClassName="BinsRow">
+        <xs:element name="Bins" msprop:Generator_TableClassName="BinsDataTable" msprop:Generator_TableVarName="tableBins" msprop:Generator_RowChangedName="BinsRowChanged" msprop:Generator_TablePropName="Bins" msprop:Generator_RowDeletingName="BinsRowDeleting" msprop:Generator_RowChangingName="BinsRowChanging" msprop:Generator_RowEvHandlerName="BinsRowChangeEventHandler" msprop:Generator_RowDeletedName="BinsRowDeleted" msprop:Generator_RowClassName="BinsRow" msprop:Generator_UserTableName="Bins" msprop:Generator_RowEvArgName="BinsRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BinID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnBinID" msprop:Generator_ColumnPropNameInRow="BinID" msprop:Generator_ColumnPropNameInTable="BinIDColumn" msprop:Generator_UserColumnName="BinID" type="xs:int" />
@@ -2654,7 +2665,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Carts" msprop:Generator_TableClassName="CartsDataTable" msprop:Generator_TableVarName="tableCarts" msprop:Generator_TablePropName="Carts" msprop:Generator_RowDeletingName="CartsRowDeleting" msprop:Generator_RowChangingName="CartsRowChanging" msprop:Generator_RowEvHandlerName="CartsRowChangeEventHandler" msprop:Generator_RowDeletedName="CartsRowDeleted" msprop:Generator_UserTableName="Carts" msprop:Generator_RowChangedName="CartsRowChanged" msprop:Generator_RowEvArgName="CartsRowChangeEvent" msprop:Generator_RowClassName="CartsRow">
+        <xs:element name="Carts" msprop:Generator_TableClassName="CartsDataTable" msprop:Generator_TableVarName="tableCarts" msprop:Generator_RowChangedName="CartsRowChanged" msprop:Generator_TablePropName="Carts" msprop:Generator_RowDeletingName="CartsRowDeleting" msprop:Generator_RowChangingName="CartsRowChanging" msprop:Generator_RowEvHandlerName="CartsRowChangeEventHandler" msprop:Generator_RowDeletedName="CartsRowDeleted" msprop:Generator_RowClassName="CartsRow" msprop:Generator_UserTableName="Carts" msprop:Generator_RowEvArgName="CartsRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CartID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" />
@@ -2673,7 +2684,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OfflineOrderList" msprop:Generator_TableClassName="OfflineOrderListDataTable" msprop:Generator_TableVarName="tableOfflineOrderList" msprop:Generator_RowChangedName="OfflineOrderListRowChanged" msprop:Generator_TablePropName="OfflineOrderList" msprop:Generator_RowDeletingName="OfflineOrderListRowDeleting" msprop:Generator_RowChangingName="OfflineOrderListRowChanging" msprop:Generator_RowEvHandlerName="OfflineOrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OfflineOrderListRowDeleted" msprop:Generator_RowClassName="OfflineOrderListRow" msprop:Generator_UserTableName="OfflineOrderList" msprop:Generator_RowEvArgName="OfflineOrderListRowChangeEvent">
+        <xs:element name="OfflineOrderList" msprop:Generator_TableClassName="OfflineOrderListDataTable" msprop:Generator_TableVarName="tableOfflineOrderList" msprop:Generator_TablePropName="OfflineOrderList" msprop:Generator_RowDeletingName="OfflineOrderListRowDeleting" msprop:Generator_RowChangingName="OfflineOrderListRowChanging" msprop:Generator_RowEvHandlerName="OfflineOrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OfflineOrderListRowDeleted" msprop:Generator_UserTableName="OfflineOrderList" msprop:Generator_RowChangedName="OfflineOrderListRowChanged" msprop:Generator_RowEvArgName="OfflineOrderListRowChangeEvent" msprop:Generator_RowClassName="OfflineOrderListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OrdID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" />
@@ -2697,7 +2708,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OffOrd2Item" msprop:Generator_TableClassName="OffOrd2ItemDataTable" msprop:Generator_TableVarName="tableOffOrd2Item" msprop:Generator_RowChangedName="OffOrd2ItemRowChanged" msprop:Generator_TablePropName="OffOrd2Item" msprop:Generator_RowDeletingName="OffOrd2ItemRowDeleting" msprop:Generator_RowChangingName="OffOrd2ItemRowChanging" msprop:Generator_RowEvHandlerName="OffOrd2ItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OffOrd2ItemRowDeleted" msprop:Generator_RowClassName="OffOrd2ItemRow" msprop:Generator_UserTableName="OffOrd2Item" msprop:Generator_RowEvArgName="OffOrd2ItemRowChangeEvent">
+        <xs:element name="OffOrd2Item" msprop:Generator_TableClassName="OffOrd2ItemDataTable" msprop:Generator_TableVarName="tableOffOrd2Item" msprop:Generator_TablePropName="OffOrd2Item" msprop:Generator_RowDeletingName="OffOrd2ItemRowDeleting" msprop:Generator_RowChangingName="OffOrd2ItemRowChanging" msprop:Generator_RowEvHandlerName="OffOrd2ItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OffOrd2ItemRowDeleted" msprop:Generator_UserTableName="OffOrd2Item" msprop:Generator_RowChangedName="OffOrd2ItemRowChanged" msprop:Generator_RowEvArgName="OffOrd2ItemRowChangeEvent" msprop:Generator_RowClassName="OffOrd2ItemRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OrdID" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" />
@@ -2705,7 +2716,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="KitList" msprop:Generator_TableClassName="KitListDataTable" msprop:Generator_TableVarName="tableKitList" msprop:Generator_TablePropName="KitList" msprop:Generator_RowDeletingName="KitListRowDeleting" msprop:Generator_RowChangingName="KitListRowChanging" msprop:Generator_RowEvHandlerName="KitListRowChangeEventHandler" msprop:Generator_RowDeletedName="KitListRowDeleted" msprop:Generator_UserTableName="KitList" msprop:Generator_RowChangedName="KitListRowChanged" msprop:Generator_RowEvArgName="KitListRowChangeEvent" msprop:Generator_RowClassName="KitListRow">
+        <xs:element name="KitList" msprop:Generator_TableClassName="KitListDataTable" msprop:Generator_TableVarName="tableKitList" msprop:Generator_RowChangedName="KitListRowChanged" msprop:Generator_TablePropName="KitList" msprop:Generator_RowDeletingName="KitListRowDeleting" msprop:Generator_RowChangingName="KitListRowChanging" msprop:Generator_RowEvHandlerName="KitListRowChangeEventHandler" msprop:Generator_RowDeletedName="KitListRowDeleted" msprop:Generator_RowClassName="KitListRow" msprop:Generator_UserTableName="KitList" msprop:Generator_RowEvArgName="KitListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="KitID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnKitID" msprop:Generator_ColumnPropNameInRow="KitID" msprop:Generator_ColumnPropNameInTable="KitIDColumn" msprop:Generator_UserColumnName="KitID" type="xs:int" />
@@ -2722,7 +2733,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Nesting" msprop:Generator_TableClassName="NestingDataTable" msprop:Generator_TableVarName="tableNesting" msprop:Generator_RowChangedName="NestingRowChanged" msprop:Generator_TablePropName="Nesting" msprop:Generator_RowDeletingName="NestingRowDeleting" msprop:Generator_RowChangingName="NestingRowChanging" msprop:Generator_RowEvHandlerName="NestingRowChangeEventHandler" msprop:Generator_RowDeletedName="NestingRowDeleted" msprop:Generator_RowClassName="NestingRow" msprop:Generator_UserTableName="Nesting" msprop:Generator_RowEvArgName="NestingRowChangeEvent">
+        <xs:element name="Nesting" msprop:Generator_TableClassName="NestingDataTable" msprop:Generator_TableVarName="tableNesting" msprop:Generator_TablePropName="Nesting" msprop:Generator_RowDeletingName="NestingRowDeleting" msprop:Generator_RowChangingName="NestingRowChanging" msprop:Generator_RowEvHandlerName="NestingRowChangeEventHandler" msprop:Generator_RowDeletedName="NestingRowDeleted" msprop:Generator_UserTableName="Nesting" msprop:Generator_RowChangedName="NestingRowChanged" msprop:Generator_RowEvArgName="NestingRowChangeEvent" msprop:Generator_RowClassName="NestingRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="SheetID" msprop:Generator_ColumnVarNameInTable="columnSheetID" msprop:Generator_ColumnPropNameInRow="SheetID" msprop:Generator_ColumnPropNameInTable="SheetIDColumn" msprop:Generator_UserColumnName="SheetID" type="xs:int" />
@@ -2731,7 +2742,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ImportLog" msprop:Generator_TableClassName="ImportLogDataTable" msprop:Generator_TableVarName="tableImportLog" msprop:Generator_RowChangedName="ImportLogRowChanged" msprop:Generator_TablePropName="ImportLog" msprop:Generator_RowDeletingName="ImportLogRowDeleting" msprop:Generator_RowChangingName="ImportLogRowChanging" msprop:Generator_RowEvHandlerName="ImportLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ImportLogRowDeleted" msprop:Generator_RowClassName="ImportLogRow" msprop:Generator_UserTableName="ImportLog" msprop:Generator_RowEvArgName="ImportLogRowChangeEvent">
+        <xs:element name="ImportLog" msprop:Generator_TableClassName="ImportLogDataTable" msprop:Generator_TableVarName="tableImportLog" msprop:Generator_TablePropName="ImportLog" msprop:Generator_RowDeletingName="ImportLogRowDeleting" msprop:Generator_RowChangingName="ImportLogRowChanging" msprop:Generator_RowEvHandlerName="ImportLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ImportLogRowDeleted" msprop:Generator_UserTableName="ImportLog" msprop:Generator_RowChangedName="ImportLogRowChanged" msprop:Generator_RowEvArgName="ImportLogRowChangeEvent" msprop:Generator_RowClassName="ImportLogRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="NumLog" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnNumLog" msprop:Generator_ColumnPropNameInRow="NumLog" msprop:Generator_ColumnPropNameInTable="NumLogColumn" msprop:Generator_UserColumnName="NumLog" type="xs:int" />
@@ -2762,7 +2773,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="BinList" msprop:Generator_TableClassName="BinListDataTable" msprop:Generator_TableVarName="tableBinList" msprop:Generator_RowChangedName="BinListRowChanged" msprop:Generator_TablePropName="BinList" msprop:Generator_RowDeletingName="BinListRowDeleting" msprop:Generator_RowChangingName="BinListRowChanging" msprop:Generator_RowEvHandlerName="BinListRowChangeEventHandler" msprop:Generator_RowDeletedName="BinListRowDeleted" msprop:Generator_RowClassName="BinListRow" msprop:Generator_UserTableName="BinList" msprop:Generator_RowEvArgName="BinListRowChangeEvent">
+        <xs:element name="BinList" msprop:Generator_TableClassName="BinListDataTable" msprop:Generator_TableVarName="tableBinList" msprop:Generator_TablePropName="BinList" msprop:Generator_RowDeletingName="BinListRowDeleting" msprop:Generator_RowChangingName="BinListRowChanging" msprop:Generator_RowEvHandlerName="BinListRowChangeEventHandler" msprop:Generator_RowDeletedName="BinListRowDeleted" msprop:Generator_UserTableName="BinList" msprop:Generator_RowChangedName="BinListRowChanged" msprop:Generator_RowEvArgName="BinListRowChangeEvent" msprop:Generator_RowClassName="BinListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BinID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnBinID" msprop:Generator_ColumnPropNameInRow="BinID" msprop:Generator_ColumnPropNameInTable="BinIDColumn" msprop:Generator_UserColumnName="BinID" type="xs:int" />
@@ -2770,7 +2781,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="FinalKit" msprop:Generator_TableClassName="FinalKitDataTable" msprop:Generator_TableVarName="tableFinalKit" msprop:Generator_TablePropName="FinalKit" msprop:Generator_RowDeletingName="FinalKitRowDeleting" msprop:Generator_RowChangingName="FinalKitRowChanging" msprop:Generator_RowEvHandlerName="FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="FinalKitRowDeleted" msprop:Generator_UserTableName="FinalKit" msprop:Generator_RowChangedName="FinalKitRowChanged" msprop:Generator_RowEvArgName="FinalKitRowChangeEvent" msprop:Generator_RowClassName="FinalKitRow">
+        <xs:element name="FinalKit" msprop:Generator_TableClassName="FinalKitDataTable" msprop:Generator_TableVarName="tableFinalKit" msprop:Generator_RowChangedName="FinalKitRowChanged" msprop:Generator_TablePropName="FinalKit" msprop:Generator_RowDeletingName="FinalKitRowDeleting" msprop:Generator_RowChangingName="FinalKitRowChanging" msprop:Generator_RowEvHandlerName="FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="FinalKitRowDeleted" msprop:Generator_RowClassName="FinalKitRow" msprop:Generator_UserTableName="FinalKit" msprop:Generator_RowEvArgName="FinalKitRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="FinalKitID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnFinalKitID" msprop:Generator_ColumnPropNameInRow="FinalKitID" msprop:Generator_ColumnPropNameInTable="FinalKitIDColumn" msprop:Generator_UserColumnName="FinalKitID" type="xs:int" />
@@ -2786,7 +2797,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Order2FinalKit" msprop:Generator_TableClassName="Order2FinalKitDataTable" msprop:Generator_TableVarName="tableOrder2FinalKit" msprop:Generator_TablePropName="Order2FinalKit" msprop:Generator_RowDeletingName="Order2FinalKitRowDeleting" msprop:Generator_RowChangingName="Order2FinalKitRowChanging" msprop:Generator_RowEvHandlerName="Order2FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="Order2FinalKitRowDeleted" msprop:Generator_UserTableName="Order2FinalKit" msprop:Generator_RowChangedName="Order2FinalKitRowChanged" msprop:Generator_RowEvArgName="Order2FinalKitRowChangeEvent" msprop:Generator_RowClassName="Order2FinalKitRow">
+        <xs:element name="Order2FinalKit" msprop:Generator_TableClassName="Order2FinalKitDataTable" msprop:Generator_TableVarName="tableOrder2FinalKit" msprop:Generator_RowChangedName="Order2FinalKitRowChanged" msprop:Generator_TablePropName="Order2FinalKit" msprop:Generator_RowDeletingName="Order2FinalKitRowDeleting" msprop:Generator_RowChangingName="Order2FinalKitRowChanging" msprop:Generator_RowEvHandlerName="Order2FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="Order2FinalKitRowDeleted" msprop:Generator_RowClassName="Order2FinalKitRow" msprop:Generator_UserTableName="Order2FinalKit" msprop:Generator_RowEvArgName="Order2FinalKitRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="FinalKitID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnFinalKitID" msprop:Generator_ColumnPropNameInRow="FinalKitID" msprop:Generator_ColumnPropNameInTable="FinalKitIDColumn" msprop:Generator_UserColumnName="FinalKitID" type="xs:int" />
@@ -2794,7 +2805,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Counters" msprop:Generator_TableClassName="CountersDataTable" msprop:Generator_TableVarName="tableCounters" msprop:Generator_RowChangedName="CountersRowChanged" msprop:Generator_TablePropName="Counters" msprop:Generator_RowDeletingName="CountersRowDeleting" msprop:Generator_RowChangingName="CountersRowChanging" msprop:Generator_RowEvHandlerName="CountersRowChangeEventHandler" msprop:Generator_RowDeletedName="CountersRowDeleted" msprop:Generator_RowClassName="CountersRow" msprop:Generator_UserTableName="Counters" msprop:Generator_RowEvArgName="CountersRowChangeEvent">
+        <xs:element name="Counters" msprop:Generator_TableClassName="CountersDataTable" msprop:Generator_TableVarName="tableCounters" msprop:Generator_TablePropName="Counters" msprop:Generator_RowDeletingName="CountersRowDeleting" msprop:Generator_RowChangingName="CountersRowChanging" msprop:Generator_RowEvHandlerName="CountersRowChangeEventHandler" msprop:Generator_RowDeletedName="CountersRowDeleted" msprop:Generator_UserTableName="Counters" msprop:Generator_RowChangedName="CountersRowChanged" msprop:Generator_RowEvArgName="CountersRowChangeEvent" msprop:Generator_RowClassName="CountersRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CountType" msprop:Generator_ColumnVarNameInTable="columnCountType" msprop:Generator_ColumnPropNameInRow="CountType" msprop:Generator_ColumnPropNameInTable="CountTypeColumn" msprop:Generator_UserColumnName="CountType">
@@ -2822,7 +2833,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ErrorsLog" msprop:Generator_TableClassName="ErrorsLogDataTable" msprop:Generator_TableVarName="tableErrorsLog" msprop:Generator_TablePropName="ErrorsLog" msprop:Generator_RowDeletingName="ErrorsLogRowDeleting" msprop:Generator_RowChangingName="ErrorsLogRowChanging" msprop:Generator_RowEvHandlerName="ErrorsLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ErrorsLogRowDeleted" msprop:Generator_UserTableName="ErrorsLog" msprop:Generator_RowChangedName="ErrorsLogRowChanged" msprop:Generator_RowEvArgName="ErrorsLogRowChangeEvent" msprop:Generator_RowClassName="ErrorsLogRow">
+        <xs:element name="ErrorsLog" msprop:Generator_TableClassName="ErrorsLogDataTable" msprop:Generator_TableVarName="tableErrorsLog" msprop:Generator_RowChangedName="ErrorsLogRowChanged" msprop:Generator_TablePropName="ErrorsLog" msprop:Generator_RowDeletingName="ErrorsLogRowDeleting" msprop:Generator_RowChangingName="ErrorsLogRowChanging" msprop:Generator_RowEvHandlerName="ErrorsLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ErrorsLogRowDeleted" msprop:Generator_RowClassName="ErrorsLogRow" msprop:Generator_UserTableName="ErrorsLog" msprop:Generator_RowEvArgName="ErrorsLogRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ErrID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnErrID" msprop:Generator_ColumnPropNameInRow="ErrID" msprop:Generator_ColumnPropNameInTable="ErrIDColumn" msprop:Generator_UserColumnName="ErrID" type="xs:int" />
@@ -2858,7 +2869,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ItemValidation" msprop:Generator_TableClassName="ItemValidationDataTable" msprop:Generator_TableVarName="tableItemValidation" msprop:Generator_TablePropName="ItemValidation" msprop:Generator_RowDeletingName="ItemValidationRowDeleting" msprop:Generator_RowChangingName="ItemValidationRowChanging" msprop:Generator_RowEvHandlerName="ItemValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemValidationRowDeleted" msprop:Generator_UserTableName="ItemValidation" msprop:Generator_RowChangedName="ItemValidationRowChanged" msprop:Generator_RowEvArgName="ItemValidationRowChangeEvent" msprop:Generator_RowClassName="ItemValidationRow">
+        <xs:element name="ItemValidation" msprop:Generator_TableClassName="ItemValidationDataTable" msprop:Generator_TableVarName="tableItemValidation" msprop:Generator_RowChangedName="ItemValidationRowChanged" msprop:Generator_TablePropName="ItemValidation" msprop:Generator_RowDeletingName="ItemValidationRowDeleting" msprop:Generator_RowChangingName="ItemValidationRowChanging" msprop:Generator_RowEvHandlerName="ItemValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemValidationRowDeleted" msprop:Generator_RowClassName="ItemValidationRow" msprop:Generator_UserTableName="ItemValidation" msprop:Generator_RowEvArgName="ItemValidationRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemExtCode" msprop:Generator_ColumnVarNameInTable="columnItemExtCode" msprop:Generator_ColumnPropNameInRow="ItemExtCode" msprop:Generator_ColumnPropNameInTable="ItemExtCodeColumn" msprop:Generator_UserColumnName="ItemExtCode">
@@ -2874,7 +2885,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PartValidPareto" msprop:Generator_TableClassName="PartValidParetoDataTable" msprop:Generator_TableVarName="tablePartValidPareto" msprop:Generator_RowChangedName="PartValidParetoRowChanged" msprop:Generator_TablePropName="PartValidPareto" msprop:Generator_RowDeletingName="PartValidParetoRowDeleting" msprop:Generator_RowChangingName="PartValidParetoRowChanging" msprop:Generator_RowEvHandlerName="PartValidParetoRowChangeEventHandler" msprop:Generator_RowDeletedName="PartValidParetoRowDeleted" msprop:Generator_RowClassName="PartValidParetoRow" msprop:Generator_UserTableName="PartValidPareto" msprop:Generator_RowEvArgName="PartValidParetoRowChangeEvent">
+        <xs:element name="PartValidPareto" msprop:Generator_TableClassName="PartValidParetoDataTable" msprop:Generator_TableVarName="tablePartValidPareto" msprop:Generator_TablePropName="PartValidPareto" msprop:Generator_RowDeletingName="PartValidParetoRowDeleting" msprop:Generator_RowChangingName="PartValidParetoRowChanging" msprop:Generator_RowEvHandlerName="PartValidParetoRowChangeEventHandler" msprop:Generator_RowDeletedName="PartValidParetoRowDeleted" msprop:Generator_UserTableName="PartValidPareto" msprop:Generator_RowChangedName="PartValidParetoRowChanged" msprop:Generator_RowEvArgName="PartValidParetoRowChangeEvent" msprop:Generator_RowClassName="PartValidParetoRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="TotParts" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnTotParts" msprop:Generator_ColumnPropNameInRow="TotParts" msprop:Generator_ColumnPropNameInTable="TotPartsColumn" msprop:Generator_UserColumnName="TotParts" type="xs:int" minOccurs="0" />
@@ -2884,7 +2895,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="UnloadStats" msprop:Generator_TableClassName="UnloadStatsDataTable" msprop:Generator_TableVarName="tableUnloadStats" msprop:Generator_RowChangedName="UnloadStatsRowChanged" msprop:Generator_TablePropName="UnloadStats" msprop:Generator_RowDeletingName="UnloadStatsRowDeleting" msprop:Generator_RowChangingName="UnloadStatsRowChanging" msprop:Generator_RowEvHandlerName="UnloadStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="UnloadStatsRowDeleted" msprop:Generator_RowClassName="UnloadStatsRow" msprop:Generator_UserTableName="UnloadStats" msprop:Generator_RowEvArgName="UnloadStatsRowChangeEvent">
+        <xs:element name="UnloadStats" msprop:Generator_TableClassName="UnloadStatsDataTable" msprop:Generator_TableVarName="tableUnloadStats" msprop:Generator_TablePropName="UnloadStats" msprop:Generator_RowDeletingName="UnloadStatsRowDeleting" msprop:Generator_RowChangingName="UnloadStatsRowChanging" msprop:Generator_RowEvHandlerName="UnloadStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="UnloadStatsRowDeleted" msprop:Generator_UserTableName="UnloadStats" msprop:Generator_RowChangedName="UnloadStatsRowChanged" msprop:Generator_RowEvArgName="UnloadStatsRowChangeEvent" msprop:Generator_RowClassName="UnloadStatsRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Stat" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnStat" msprop:Generator_ColumnPropNameInRow="Stat" msprop:Generator_ColumnPropNameInTable="StatColumn" msprop:Generator_UserColumnName="Stat" minOccurs="0">
@@ -2901,7 +2912,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Remnants" msprop:Generator_TableClassName="RemnantsDataTable" msprop:Generator_TableVarName="tableRemnants" msprop:Generator_TablePropName="Remnants" msprop:Generator_RowDeletingName="RemnantsRowDeleting" msprop:Generator_RowChangingName="RemnantsRowChanging" msprop:Generator_RowEvHandlerName="RemnantsRowChangeEventHandler" msprop:Generator_RowDeletedName="RemnantsRowDeleted" msprop:Generator_UserTableName="Remnants" msprop:Generator_RowChangedName="RemnantsRowChanged" msprop:Generator_RowEvArgName="RemnantsRowChangeEvent" msprop:Generator_RowClassName="RemnantsRow">
+        <xs:element name="Remnants" msprop:Generator_TableClassName="RemnantsDataTable" msprop:Generator_TableVarName="tableRemnants" msprop:Generator_RowChangedName="RemnantsRowChanged" msprop:Generator_TablePropName="Remnants" msprop:Generator_RowDeletingName="RemnantsRowDeleting" msprop:Generator_RowChangingName="RemnantsRowChanging" msprop:Generator_RowEvHandlerName="RemnantsRowChangeEventHandler" msprop:Generator_RowDeletedName="RemnantsRowDeleted" msprop:Generator_RowClassName="RemnantsRow" msprop:Generator_UserTableName="Remnants" msprop:Generator_RowEvArgName="RemnantsRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="RemnantID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnRemnantID" msprop:Generator_ColumnPropNameInRow="RemnantID" msprop:Generator_ColumnPropNameInTable="RemnantIDColumn" msprop:Generator_UserColumnName="RemnantID" type="xs:int" />
@@ -2914,7 +2925,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="CartOnKit" msprop:Generator_TableClassName="CartOnKitDataTable" msprop:Generator_TableVarName="tableCartOnKit" msprop:Generator_TablePropName="CartOnKit" msprop:Generator_RowDeletingName="CartOnKitRowDeleting" msprop:Generator_RowChangingName="CartOnKitRowChanging" msprop:Generator_RowEvHandlerName="CartOnKitRowChangeEventHandler" msprop:Generator_RowDeletedName="CartOnKitRowDeleted" msprop:Generator_UserTableName="CartOnKit" msprop:Generator_RowChangedName="CartOnKitRowChanged" msprop:Generator_RowEvArgName="CartOnKitRowChangeEvent" msprop:Generator_RowClassName="CartOnKitRow">
+        <xs:element name="CartOnKit" msprop:Generator_TableClassName="CartOnKitDataTable" msprop:Generator_TableVarName="tableCartOnKit" msprop:Generator_RowChangedName="CartOnKitRowChanged" msprop:Generator_TablePropName="CartOnKit" msprop:Generator_RowDeletingName="CartOnKitRowDeleting" msprop:Generator_RowChangingName="CartOnKitRowChanging" msprop:Generator_RowEvHandlerName="CartOnKitRowChangeEventHandler" msprop:Generator_RowDeletedName="CartOnKitRowDeleted" msprop:Generator_RowClassName="CartOnKitRow" msprop:Generator_UserTableName="CartOnKit" msprop:Generator_RowEvArgName="CartOnKitRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CartID" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" />
@@ -2964,7 +2975,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PackList" msprop:Generator_TableClassName="PackListDataTable" msprop:Generator_TableVarName="tablePackList" msprop:Generator_TablePropName="PackList" msprop:Generator_RowDeletingName="PackListRowDeleting" msprop:Generator_RowChangingName="PackListRowChanging" msprop:Generator_RowEvHandlerName="PackListRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListRowDeleted" msprop:Generator_UserTableName="PackList" msprop:Generator_RowChangedName="PackListRowChanged" msprop:Generator_RowEvArgName="PackListRowChangeEvent" msprop:Generator_RowClassName="PackListRow">
+        <xs:element name="PackList" msprop:Generator_TableClassName="PackListDataTable" msprop:Generator_TableVarName="tablePackList" msprop:Generator_RowChangedName="PackListRowChanged" msprop:Generator_TablePropName="PackList" msprop:Generator_RowDeletingName="PackListRowDeleting" msprop:Generator_RowChangingName="PackListRowChanging" msprop:Generator_RowEvHandlerName="PackListRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListRowDeleted" msprop:Generator_RowClassName="PackListRow" msprop:Generator_UserTableName="PackList" msprop:Generator_RowEvArgName="PackListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PackListID" msprop:Generator_ColumnVarNameInTable="columnPackListID" msprop:Generator_ColumnPropNameInRow="PackListID" msprop:Generator_ColumnPropNameInTable="PackListIDColumn" msprop:Generator_UserColumnName="PackListID" type="xs:int" />
@@ -2990,7 +3001,7 @@ FROM v_CartKitDetail</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OtherItem" msprop:Generator_TableClassName="OtherItemDataTable" msprop:Generator_TableVarName="tableOtherItem" msprop:Generator_TablePropName="OtherItem" msprop:Generator_RowDeletingName="OtherItemRowDeleting" msprop:Generator_RowChangingName="OtherItemRowChanging" msprop:Generator_RowEvHandlerName="OtherItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OtherItemRowDeleted" msprop:Generator_UserTableName="OtherItem" msprop:Generator_RowChangedName="OtherItemRowChanged" msprop:Generator_RowEvArgName="OtherItemRowChangeEvent" msprop:Generator_RowClassName="OtherItemRow">
+        <xs:element name="OtherItem" msprop:Generator_TableClassName="OtherItemDataTable" msprop:Generator_TableVarName="tableOtherItem" msprop:Generator_RowChangedName="OtherItemRowChanged" msprop:Generator_TablePropName="OtherItem" msprop:Generator_RowDeletingName="OtherItemRowDeleting" msprop:Generator_RowChangingName="OtherItemRowChanging" msprop:Generator_RowEvHandlerName="OtherItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OtherItemRowDeleted" msprop:Generator_RowClassName="OtherItemRow" msprop:Generator_UserTableName="OtherItem" msprop:Generator_RowEvArgName="OtherItemRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="OtherItemID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnOtherItemID" msprop:Generator_ColumnPropNameInRow="OtherItemID" msprop:Generator_ColumnPropNameInTable="OtherItemIDColumn" msprop:Generator_UserColumnName="OtherItemID" type="xs:int" />
@@ -3136,18 +3147,18 @@ FROM v_CartKitDetail</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_BatchReqList_OrderList" msdata:parent="OrderList" msdata:child="BatchReqList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="BatchReqList" msprop:Generator_ChildPropName="GetBatchReqListRows" msprop:Generator_UserRelationName="FK_BatchReqList_OrderList" msprop:Generator_RelationVarName="relationFK_BatchReqList_OrderList" msprop:Generator_UserParentTable="OrderList" msprop:Generator_ParentPropName="OrderListRow" />
-      <msdata:Relationship name="FK_ItemList_Materials1" msdata:parent="Materials" msdata:child="ItemList" msdata:parentkey="MatID" msdata:childkey="MatID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_Materials1" msprop:Generator_RelationVarName="relationFK_ItemList_Materials1" msprop:Generator_UserParentTable="Materials" msprop:Generator_ParentPropName="MaterialsRow" />
-      <msdata:Relationship name="FK_OffOrd2Item_OfflineOrderList" msdata:parent="OfflineOrderList" msdata:child="OffOrd2Item" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_OfflineOrderList" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_OfflineOrderList" msprop:Generator_UserParentTable="OfflineOrderList" msprop:Generator_ParentPropName="OfflineOrderListRow" />
-      <msdata:Relationship name="FK_ItemList_KitList" msdata:parent="KitList" msdata:child="ItemList" msdata:parentkey="KitID" msdata:childkey="KitID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_KitList" msprop:Generator_RelationVarName="relationFK_ItemList_KitList" msprop:Generator_UserParentTable="KitList" msprop:Generator_ParentPropName="KitListRow" />
-      <msdata:Relationship name="FK_Nesting_ItemList" msdata:parent="ItemList" msdata:child="Nesting" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="Nesting" msprop:Generator_ChildPropName="GetNestingRows" msprop:Generator_UserRelationName="FK_Nesting_ItemList" msprop:Generator_RelationVarName="relationFK_Nesting_ItemList" msprop:Generator_UserParentTable="ItemList" msprop:Generator_ParentPropName="ItemListRow" />
-      <msdata:Relationship name="FK_KitList_Carts" msdata:parent="Carts" msdata:child="KitList" msdata:parentkey="CartID" msdata:childkey="CartID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_Carts" msprop:Generator_RelationVarName="relationFK_KitList_Carts" msprop:Generator_UserParentTable="Carts" msprop:Generator_ParentPropName="CartsRow" />
-      <msdata:Relationship name="FK_KitList_OrderList" msdata:parent="OrderList" msdata:child="KitList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_OrderList" msprop:Generator_RelationVarName="relationFK_KitList_OrderList" msprop:Generator_UserParentTable="OrderList" msprop:Generator_ParentPropName="OrderListRow" />
-      <msdata:Relationship name="FK_OffOrd2Item_ItemList" msdata:parent="ItemList" msdata:child="OffOrd2Item" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_ItemList" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_ItemList" msprop:Generator_UserParentTable="ItemList" msprop:Generator_ParentPropName="ItemListRow" />
-      <msdata:Relationship name="FK_BinList_Bins" msdata:parent="Bins" msdata:child="BinList" msdata:parentkey="BinID" msdata:childkey="BinID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_Bins" msprop:Generator_RelationVarName="relationFK_BinList_Bins" msprop:Generator_UserParentTable="Bins" msprop:Generator_ParentPropName="BinsRow" />
-      <msdata:Relationship name="FK_BinList_ItemList" msdata:parent="ItemList" msdata:child="BinList" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_ItemList" msprop:Generator_RelationVarName="relationFK_BinList_ItemList" msprop:Generator_UserParentTable="ItemList" msprop:Generator_ParentPropName="ItemListRow" />
-      <msdata:Relationship name="FK_Order2FinalKit_FinalKit" msdata:parent="FinalKit" msdata:child="Order2FinalKit" msdata:parentkey="FinalKitID" msdata:childkey="FinalKitID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_FinalKit" msprop:Generator_ParentPropName="FinalKitRow" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_FinalKit" msprop:Generator_UserParentTable="FinalKit" />
-      <msdata:Relationship name="FK_Order2FinalKit_OrderList" msdata:parent="OrderList" msdata:child="Order2FinalKit" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_OrderList" msprop:Generator_ParentPropName="OrderListRow" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_OrderList" msprop:Generator_UserParentTable="OrderList" />
+      <msdata:Relationship name="FK_BatchReqList_OrderList" msdata:parent="OrderList" msdata:child="BatchReqList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="BatchReqList" msprop:Generator_ChildPropName="GetBatchReqListRows" msprop:Generator_UserRelationName="FK_BatchReqList_OrderList" msprop:Generator_ParentPropName="OrderListRow" msprop:Generator_RelationVarName="relationFK_BatchReqList_OrderList" msprop:Generator_UserParentTable="OrderList" />
+      <msdata:Relationship name="FK_ItemList_Materials1" msdata:parent="Materials" msdata:child="ItemList" msdata:parentkey="MatID" msdata:childkey="MatID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_Materials1" msprop:Generator_ParentPropName="MaterialsRow" msprop:Generator_RelationVarName="relationFK_ItemList_Materials1" msprop:Generator_UserParentTable="Materials" />
+      <msdata:Relationship name="FK_OffOrd2Item_OfflineOrderList" msdata:parent="OfflineOrderList" msdata:child="OffOrd2Item" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_OfflineOrderList" msprop:Generator_ParentPropName="OfflineOrderListRow" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_OfflineOrderList" msprop:Generator_UserParentTable="OfflineOrderList" />
+      <msdata:Relationship name="FK_ItemList_KitList" msdata:parent="KitList" msdata:child="ItemList" msdata:parentkey="KitID" msdata:childkey="KitID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_KitList" msprop:Generator_ParentPropName="KitListRow" msprop:Generator_RelationVarName="relationFK_ItemList_KitList" msprop:Generator_UserParentTable="KitList" />
+      <msdata:Relationship name="FK_Nesting_ItemList" msdata:parent="ItemList" msdata:child="Nesting" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="Nesting" msprop:Generator_ChildPropName="GetNestingRows" msprop:Generator_UserRelationName="FK_Nesting_ItemList" msprop:Generator_ParentPropName="ItemListRow" msprop:Generator_RelationVarName="relationFK_Nesting_ItemList" msprop:Generator_UserParentTable="ItemList" />
+      <msdata:Relationship name="FK_KitList_Carts" msdata:parent="Carts" msdata:child="KitList" msdata:parentkey="CartID" msdata:childkey="CartID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_Carts" msprop:Generator_ParentPropName="CartsRow" msprop:Generator_RelationVarName="relationFK_KitList_Carts" msprop:Generator_UserParentTable="Carts" />
+      <msdata:Relationship name="FK_KitList_OrderList" msdata:parent="OrderList" msdata:child="KitList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_OrderList" msprop:Generator_ParentPropName="OrderListRow" msprop:Generator_RelationVarName="relationFK_KitList_OrderList" msprop:Generator_UserParentTable="OrderList" />
+      <msdata:Relationship name="FK_OffOrd2Item_ItemList" msdata:parent="ItemList" msdata:child="OffOrd2Item" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_ItemList" msprop:Generator_ParentPropName="ItemListRow" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_ItemList" msprop:Generator_UserParentTable="ItemList" />
+      <msdata:Relationship name="FK_BinList_Bins" msdata:parent="Bins" msdata:child="BinList" msdata:parentkey="BinID" msdata:childkey="BinID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_Bins" msprop:Generator_ParentPropName="BinsRow" msprop:Generator_RelationVarName="relationFK_BinList_Bins" msprop:Generator_UserParentTable="Bins" />
+      <msdata:Relationship name="FK_BinList_ItemList" msdata:parent="ItemList" msdata:child="BinList" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_ItemList" msprop:Generator_ParentPropName="ItemListRow" msprop:Generator_RelationVarName="relationFK_BinList_ItemList" msprop:Generator_UserParentTable="ItemList" />
+      <msdata:Relationship name="FK_Order2FinalKit_FinalKit" msdata:parent="FinalKit" msdata:child="Order2FinalKit" msdata:parentkey="FinalKitID" msdata:childkey="FinalKitID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_FinalKit" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_FinalKit" msprop:Generator_UserParentTable="FinalKit" msprop:Generator_ParentPropName="FinalKitRow" />
+      <msdata:Relationship name="FK_Order2FinalKit_OrderList" msdata:parent="OrderList" msdata:child="Order2FinalKit" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_OrderList" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_OrderList" msprop:Generator_UserParentTable="OrderList" msprop:Generator_ParentPropName="OrderListRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss
index 189f968..34d3d98 100644
--- a/AppData/DS_App.xss
+++ b/AppData/DS_App.xss
@@ -4,18 +4,18 @@
      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="326" ViewPortY="440" 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="-10" ViewPortY="192" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:BatchList" ZOrder="9" X="251" Y="375" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:BatchList" ZOrder="4" X="251" Y="375" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
     <Shape ID="DesignTable:StackList" ZOrder="21" X="584" Y="890" Height="343" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:SheetList" ZOrder="5" X="240" Y="793" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:SheetList" ZOrder="3" X="254" Y="840" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:OrderList" ZOrder="29" X="352" Y="29" Height="324" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:BatchReqList" ZOrder="38" X="101" Y="100" Height="115" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:ItemList" ZOrder="19" X="861" Y="19" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:Materials" ZOrder="36" X="1197" Y="37" Height="248" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:Bins" ZOrder="4" X="1265" Y="529" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Carts" ZOrder="11" X="600" Y="340" Height="286" Width="187" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:OfflineOrderList" ZOrder="6" X="939" Y="907" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:Bins" ZOrder="8" X="1265" Y="529" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Carts" ZOrder="12" X="600" Y="340" Height="286" Width="187" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:OfflineOrderList" ZOrder="9" X="939" Y="907" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:OffOrd2Item" ZOrder="34" X="1031" Y="660" Height="134" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:KitList" ZOrder="32" X="604" Y="84" Height="229" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:Nesting" ZOrder="23" X="871" Y="458" Height="153" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
@@ -25,13 +25,13 @@
     <Shape ID="DesignTable:Order2FinalKit" ZOrder="18" X="13" Y="240" Height="134" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:Counters" ZOrder="14" X="16" Y="706" Height="172" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:ErrorsLog" ZOrder="13" X="-6" Y="928" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:ItemValidation" ZOrder="8" X="83" Y="1185" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:PartValidPareto" ZOrder="12" X="365" Y="1187" Height="153" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:UnloadStats" ZOrder="10" X="639" Y="1236" Height="172" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:Remnants" ZOrder="7" X="912" Y="1188" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:CartOnKit" ZOrder="3" X="1259" Y="925" Height="305" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:PackList" ZOrder="2" X="1264" Y="1256" Height="267" Width="280" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:OtherItem" ZOrder="1" X="369" Y="1401" Height="210" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:ItemValidation" ZOrder="2" X="-2" Y="1233" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:PartValidPareto" ZOrder="1" X="324" Y="1235" Height="153" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:UnloadStats" ZOrder="11" X="639" Y="1236" Height="172" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Remnants" ZOrder="10" X="912" Y="1188" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:CartOnKit" ZOrder="7" X="1259" Y="925" Height="305" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PackList" ZOrder="6" X="1264" Y="1256" Height="267" Width="280" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:OtherItem" ZOrder="5" X="369" Y="1401" Height="210" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_BatchReqList_OrderList" ZOrder="37" LineWidth="11">