diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 9eded29..c52b5c0 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -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 OtherItemID, global::System.Nullable 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 OtherItemID, global::System.Nullable 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; + } } /// diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 00036e0..a575832 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -2867,6 +2867,17 @@ FROM v_OKIB + + + + dbo.stp_OKOI_Sum_getByCartDtmx + + + + + + + @@ -2879,6 +2890,17 @@ FROM v_OKIB + + + + dbo.stp_OKOI_Sum_getByOtherItemDtmx + + + + + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 02bf352..2d1a66f 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -37,9 +37,9 @@ - - - + + + diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 8d42290..8d41c59 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -399,15 +399,16 @@ + + - @@ -420,6 +421,7 @@ + @@ -968,6 +970,13 @@ cmp_KS_BinCart.ascx + + cmp_KS_Cart.ascx + ASPXCodeBehind + + + cmp_KS_Cart.ascx + cmp_KS_currBin.ascx ASPXCodeBehind @@ -1010,6 +1019,13 @@ cmp_KS_OkibSum.ascx + + cmp_KS_OkoiCart.ascx + ASPXCodeBehind + + + cmp_KS_OkoiCart.ascx + cmp_KS_OkoiOI.ascx ASPXCodeBehind @@ -1024,13 +1040,6 @@ cmp_KS_OkoiSum.ascx - - cmp_KS_OtherCart.ascx - ASPXCodeBehind - - - cmp_KS_OtherCart.ascx - cmp_KS_OtherItemsCart.ascx ASPXCodeBehind @@ -1122,6 +1131,13 @@ cmp_offOrderDetail.ascx + + cmp_OkoiCart.ascx + ASPXCodeBehind + + + cmp_OkoiCart.ascx + cmp_OOLI_detail.ascx ASPXCodeBehind