diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 5f49b85..4b1a990 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -15463,6 +15463,8 @@ namespace AppData { private global::System.Data.DataColumn columnCartID; + private global::System.Data.DataColumn columnBatchName; + private global::System.Data.DataColumn columnCartIndex; private global::System.Data.DataColumn columnCartDtmx; @@ -15524,6 +15526,14 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn BatchNameColumn { + get { + return this.columnBatchName; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn CartIndexColumn { @@ -15609,11 +15619,12 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, int CartIndex, string CartDtmx, string OrderExtCode, string FamilyCode, int Started, int Completed) { + public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, string BatchName, int CartIndex, string CartDtmx, string OrderExtCode, string FamilyCode, int Started, int Completed) { Pack2CartRow rowPack2CartRow = ((Pack2CartRow)(this.NewRow())); object[] columnValuesArray = new object[] { PackListID, CartID, + BatchName, CartIndex, CartDtmx, OrderExtCode, @@ -15652,6 +15663,7 @@ namespace AppData { internal void InitVars() { this.columnPackListID = base.Columns["PackListID"]; this.columnCartID = base.Columns["CartID"]; + this.columnBatchName = base.Columns["BatchName"]; this.columnCartIndex = base.Columns["CartIndex"]; this.columnCartDtmx = base.Columns["CartDtmx"]; this.columnOrderExtCode = base.Columns["OrderExtCode"]; @@ -15667,6 +15679,8 @@ namespace AppData { base.Columns.Add(this.columnPackListID); this.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartID); + this.columnBatchName = new global::System.Data.DataColumn("BatchName", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBatchName); this.columnCartIndex = new global::System.Data.DataColumn("CartIndex", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartIndex); this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element); @@ -15684,6 +15698,8 @@ namespace AppData { this.columnPackListID}, true)); this.columnPackListID.AllowDBNull = false; this.columnCartID.AllowDBNull = false; + this.columnBatchName.AllowDBNull = false; + this.columnBatchName.MaxLength = 50; this.columnCartIndex.AllowDBNull = false; this.columnCartDtmx.ReadOnly = true; this.columnCartDtmx.MaxLength = 10; @@ -23163,6 +23179,17 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string BatchName { + get { + return ((string)(this[this.tablePack2Cart.BatchNameColumn])); + } + set { + this[this.tablePack2Cart.BatchNameColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int CartIndex { @@ -37330,6 +37357,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W tableMapping.DataSetTable = "Pack2Cart"; tableMapping.ColumnMappings.Add("PackListID", "PackListID"); tableMapping.ColumnMappings.Add("CartID", "CartID"); + tableMapping.ColumnMappings.Add("BatchName", "BatchName"); tableMapping.ColumnMappings.Add("CartIndex", "CartIndex"); tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); tableMapping.ColumnMappings.Add("OrderExtCode", "OrderExtCode"); @@ -37349,17 +37377,23 @@ 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[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_Pack2Cart"; 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_P2C_getByPackListId"; + this._commandCollection[1].CommandText = "dbo.stp_P2C_getByCartId"; 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("@PackListID", 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[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_P2C_getByPackListId"; + 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("@PackListID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -37390,8 +37424,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.Pack2CartDataTable getByPackListId(global::System.Nullable PackListID) { + public virtual DS_App.Pack2CartDataTable getByCartId(global::System.Nullable CartID) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((CartID.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(CartID.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_App.Pack2CartDataTable dataTable = new DS_App.Pack2CartDataTable(); + 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.Pack2CartDataTable getByPackListId(global::System.Nullable PackListID) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((PackListID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(PackListID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index f577a08..04d5ba4 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -3089,6 +3089,7 @@ FROM v_Pack2Cart + @@ -3097,6 +3098,17 @@ FROM v_Pack2Cart + + + + dbo.stp_P2C_getByCartId + + + + + + + @@ -4401,6 +4413,13 @@ FROM v_Pack2Cart + + + + + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 1101821..8010df8 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. --> - + @@ -40,7 +40,7 @@ - + diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx index 0596b62..f2455d1 100644 --- a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx +++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx @@ -7,19 +7,26 @@
-
- order: - +
+ req date: +
-
- <%# Eval("CartIndex","C{0}") %> <%# Eval("CartDtmx") %> +
+ model: +
+
+ order: + +
+
+ cart: <%# Eval("CartIndex","C{0}") %> <%# Eval("CartDtmx") %>
- + diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx index 639ce21..ca1be4f 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx +++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx @@ -39,7 +39,7 @@ <%----%> - + <%----%> diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx index 0134a6e..7b30c51 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx @@ -47,9 +47,8 @@ - + - <%----%>