update DB methods

2020-07-24 11:27:49 +02:00
parent 0a9468dc7f
commit 8d729c75ec
4 changed files with 101 additions and 17 deletions
@@ -35336,18 +35336,30 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
        [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[2];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
            this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[0].Connection = this.Connection;
            this._commandCollection[0].CommandText = "SELECT * FROM v_OKOI_sum";
            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
            this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[1].Connection = this.Connection;
-            this._commandCollection[1].CommandText = "dbo.stp_OKOI_Sum_byKey";
+            this._commandCollection[1].CommandText = "dbo.stp_OKOI_Sum_getByCartDtmx";
            this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure;
            this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OtherItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartDtmx", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[2].Connection = this.Connection;
+            this._commandCollection[2].CommandText = "dbo.stp_OKOI_Sum_byKey";
+            this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OtherItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[3].Connection = this.Connection;
+            this._commandCollection[3].CommandText = "dbo.stp_OKOI_Sum_getByOtherItemDtmx";
+            this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OtherItemDtmx", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
        }
        
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -35378,8 +35390,25 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
        [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.OKOI_sumDataTable getByKey(global::System.Nullable<int> OtherItemID, global::System.Nullable<int> CartID) {
+        public virtual DS_App.OKOI_sumDataTable getByCartDtmx(string CartDtmx) {
            this.Adapter.SelectCommand = this.CommandCollection[1];
+            if ((CartDtmx == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CartDtmx));
+            }
+            DS_App.OKOI_sumDataTable dataTable = new DS_App.OKOI_sumDataTable();
+            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.OKOI_sumDataTable getByKey(global::System.Nullable<int> OtherItemID, global::System.Nullable<int> CartID) {
+            this.Adapter.SelectCommand = this.CommandCollection[2];
            if ((OtherItemID.HasValue == true)) {
                this.Adapter.SelectCommand.Parameters[1].Value = ((int)(OtherItemID.Value));
            }
@@ -35396,6 +35425,23 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
            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.OKOI_sumDataTable getByOtherItemDtmx(string OtherItemDtmx) {
+            this.Adapter.SelectCommand = this.CommandCollection[3];
+            if ((OtherItemDtmx == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(OtherItemDtmx));
+            }
+            DS_App.OKOI_sumDataTable dataTable = new DS_App.OKOI_sumDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
    }
    
    /// <summary>
@@ -2867,6 +2867,17 @@ FROM v_OKIB</CommandText>
              <Mapping SourceColumn="CartKitEnd" DataSetColumn="CartKitEnd" />
            </Mappings>
            <Sources>
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_OKOI_Sum_getByCartDtmx" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCartDtmx" GetMethodModifier="Public" GetMethodName="getByCartDtmx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCartDtmx" UserSourceName="getByCartDtmx">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_OKOI_Sum_getByCartDtmx</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="@CartDtmx" 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_OKOI_Sum_byKey" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByKey" GetMethodModifier="Public" GetMethodName="getByKey" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByKey" UserSourceName="getByKey">
                <SelectCommand>
                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -2879,6 +2890,17 @@ FROM v_OKIB</CommandText>
                  </DbCommand>
                </SelectCommand>
              </DbSource>
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_OKOI_Sum_getByOtherItemDtmx" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByOtherItemDtmx" GetMethodModifier="Public" GetMethodName="getByOtherItemDtmx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByOtherItemDtmx" UserSourceName="getByOtherItemDtmx">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_OKOI_Sum_getByOtherItemDtmx</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="@OtherItemDtmx" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
            </Sources>
          </TableAdapter>
        </Tables>
@@ -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="445" ViewPortY="1247" 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="1247" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
    <Shape ID="DesignTable:BatchList" ZOrder="10" X="291" Y="375" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:StackList" ZOrder="9" X="584" Y="890" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -37,9 +37,9 @@
    <Shape ID="DesignTable:PackLog" ZOrder="7" X="1243" Y="1650" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:PackCheck" ZOrder="6" X="644" Y="1492" Height="248" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:OKIB" ZOrder="4" X="41" Y="1425" Height="324" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:OKIB_Sum" ZOrder="3" X="50" Y="1823" Height="362" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:OKOI" ZOrder="2" X="342" Y="1417" Height="362" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
-    <Shape ID="DesignTable:OKOI_sum" ZOrder="1" X="338" Y="1822" Height="324" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:OKIB_Sum" ZOrder="3" X="50" Y="1823" Height="362" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:OKOI" ZOrder="2" X="342" Y="1417" Height="324" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:OKOI_sum" ZOrder="1" X="338" Y="1822" Height="362" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
  </Shapes>
  <Connectors>
    <Connector ID="DesignRelation:FK_BatchReqList_OrderList" ZOrder="45" LineWidth="11">
@@ -399,15 +399,16 @@
    <Content Include="WebUserControls\cmp_kittingCart.ascx" />
    <Content Include="WebUserControls\cmp_kittingSmart.ascx" />
    <Content Include="WebUserControls\cmp_KS_BinCart.ascx" />
+    <Content Include="WebUserControls\cmp_KS_Cart.ascx" />
    <Content Include="WebUserControls\cmp_KS_currBin.ascx" />
    <Content Include="WebUserControls\cmp_KS_currCart.ascx" />
    <Content Include="WebUserControls\cmp_KS_currOI.ascx" />
    <Content Include="WebUserControls\cmp_KS_OkibBin.ascx" />
    <Content Include="WebUserControls\cmp_KS_OkibCart.ascx" />
    <Content Include="WebUserControls\cmp_KS_OkibSum.ascx" />
+    <Content Include="WebUserControls\cmp_KS_OkoiCart.ascx" />
    <Content Include="WebUserControls\cmp_KS_OkoiOI.ascx" />
    <Content Include="WebUserControls\cmp_KS_OkoiSum.ascx" />
-    <Content Include="WebUserControls\cmp_KS_OtherCart.ascx" />
    <Content Include="WebUserControls\cmp_KS_OtherItemsCart.ascx" />
    <Content Include="WebUserControls\cmp_login.ascx" />
    <Content Include="WebUserControls\cmp_ML_ShDet.ascx" />
@@ -420,6 +421,7 @@
    <Content Include="WebUserControls\cmp_numRow.ascx" />
    <Content Include="WebUserControls\cmp_offlineOrders.ascx" />
    <Content Include="WebUserControls\cmp_offOrderDetail.ascx" />
+    <Content Include="WebUserControls\cmp_OkoiCart.ascx" />
    <Content Include="WebUserControls\cmp_OOLI_detail.ascx" />
    <Content Include="WebUserControls\cmp_orderRunning.ascx" />
    <Content Include="WebUserControls\cmp_orderSched.ascx" />
@@ -968,6 +970,13 @@
    <Compile Include="WebUserControls\cmp_KS_BinCart.ascx.designer.cs">
      <DependentUpon>cmp_KS_BinCart.ascx</DependentUpon>
    </Compile>
+    <Compile Include="WebUserControls\cmp_KS_Cart.ascx.cs">
+      <DependentUpon>cmp_KS_Cart.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_KS_Cart.ascx.designer.cs">
+      <DependentUpon>cmp_KS_Cart.ascx</DependentUpon>
+    </Compile>
    <Compile Include="WebUserControls\cmp_KS_currBin.ascx.cs">
      <DependentUpon>cmp_KS_currBin.ascx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1010,6 +1019,13 @@
    <Compile Include="WebUserControls\cmp_KS_OkibSum.ascx.designer.cs">
      <DependentUpon>cmp_KS_OkibSum.ascx</DependentUpon>
    </Compile>
+    <Compile Include="WebUserControls\cmp_KS_OkoiCart.ascx.cs">
+      <DependentUpon>cmp_KS_OkoiCart.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_KS_OkoiCart.ascx.designer.cs">
+      <DependentUpon>cmp_KS_OkoiCart.ascx</DependentUpon>
+    </Compile>
    <Compile Include="WebUserControls\cmp_KS_OkoiOI.ascx.cs">
      <DependentUpon>cmp_KS_OkoiOI.ascx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1024,13 +1040,6 @@
    <Compile Include="WebUserControls\cmp_KS_OkoiSum.ascx.designer.cs">
      <DependentUpon>cmp_KS_OkoiSum.ascx</DependentUpon>
    </Compile>
-    <Compile Include="WebUserControls\cmp_KS_OtherCart.ascx.cs">
-      <DependentUpon>cmp_KS_OtherCart.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebUserControls\cmp_KS_OtherCart.ascx.designer.cs">
-      <DependentUpon>cmp_KS_OtherCart.ascx</DependentUpon>
-    </Compile>
    <Compile Include="WebUserControls\cmp_KS_OtherItemsCart.ascx.cs">
      <DependentUpon>cmp_KS_OtherItemsCart.ascx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1122,6 +1131,13 @@
    <Compile Include="WebUserControls\cmp_offOrderDetail.ascx.designer.cs">
      <DependentUpon>cmp_offOrderDetail.ascx</DependentUpon>
    </Compile>
+    <Compile Include="WebUserControls\cmp_OkoiCart.ascx.cs">
+      <DependentUpon>cmp_OkoiCart.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_OkoiCart.ascx.designer.cs">
+      <DependentUpon>cmp_OkoiCart.ascx</DependentUpon>
+    </Compile>
    <Compile Include="WebUserControls\cmp_OOLI_detail.ascx.cs">
      <DependentUpon>cmp_OOLI_detail.ascx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>