From b3c7efabc2b9221020505448bbe462c86a265fd3 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 28 Nov 2019 12:53:08 +0100 Subject: [PATCH] Fix metodo lettura ordini da batch... --- AppData/DS_App.Designer.cs | 289 +++++++++++++++++++++---------------- AppData/DS_App.xsd | 61 ++++---- AppData/DS_App.xss | 16 +- 3 files changed, 204 insertions(+), 162 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 414c3bd..f4d24cf 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -2246,15 +2246,15 @@ namespace AppData { private global::System.Data.DataColumn columnOrderNote; + private global::System.Data.DataColumn columnKitQty; + private global::System.Data.DataColumn columnImportDate; private global::System.Data.DataColumn columnImportUser; private global::System.Data.DataColumn columnOrdCodOrig; - private global::System.Data.DataColumn columnKitQty; - - private global::System.Data.DataColumn columnBatchID; + private global::System.Data.DataColumn columnKittingDate; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] @@ -2353,6 +2353,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 KitQtyColumn { + get { + return this.columnKitQty; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn ImportDateColumn { @@ -2379,17 +2387,9 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn KitQtyColumn { + public global::System.Data.DataColumn KittingDateColumn { get { - return this.columnKitQty; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn BatchIDColumn { - get { - return this.columnBatchID; + return this.columnKittingDate; } } @@ -2430,7 +2430,7 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public OrderListRow AddOrderListRow(int OrdID, string OrdType, string DestPlant, string FamilyCode, string OrdDtmx, string OrderExtCode, string OrderDesc, string OrderNote, System.DateTime ImportDate, string ImportUser, string OrdCodOrig, int KitQty, int BatchID) { + public OrderListRow AddOrderListRow(int OrdID, string OrdType, string DestPlant, string FamilyCode, string OrdDtmx, string OrderExtCode, string OrderDesc, string OrderNote, int KitQty, System.DateTime ImportDate, string ImportUser, string OrdCodOrig, System.DateTime KittingDate) { OrderListRow rowOrderListRow = ((OrderListRow)(this.NewRow())); object[] columnValuesArray = new object[] { OrdID, @@ -2441,11 +2441,11 @@ namespace AppData { OrderExtCode, OrderDesc, OrderNote, + KitQty, ImportDate, ImportUser, OrdCodOrig, - KitQty, - BatchID}; + KittingDate}; rowOrderListRow.ItemArray = columnValuesArray; this.Rows.Add(rowOrderListRow); return rowOrderListRow; @@ -2483,11 +2483,11 @@ namespace AppData { this.columnOrderExtCode = base.Columns["OrderExtCode"]; this.columnOrderDesc = base.Columns["OrderDesc"]; this.columnOrderNote = base.Columns["OrderNote"]; + this.columnKitQty = base.Columns["KitQty"]; this.columnImportDate = base.Columns["ImportDate"]; this.columnImportUser = base.Columns["ImportUser"]; this.columnOrdCodOrig = base.Columns["OrdCodOrig"]; - this.columnKitQty = base.Columns["KitQty"]; - this.columnBatchID = base.Columns["BatchID"]; + this.columnKittingDate = base.Columns["KittingDate"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2509,16 +2509,16 @@ namespace AppData { base.Columns.Add(this.columnOrderDesc); this.columnOrderNote = new global::System.Data.DataColumn("OrderNote", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOrderNote); + this.columnKitQty = new global::System.Data.DataColumn("KitQty", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnKitQty); this.columnImportDate = new global::System.Data.DataColumn("ImportDate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnImportDate); this.columnImportUser = new global::System.Data.DataColumn("ImportUser", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnImportUser); this.columnOrdCodOrig = new global::System.Data.DataColumn("OrdCodOrig", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOrdCodOrig); - this.columnKitQty = new global::System.Data.DataColumn("KitQty", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnKitQty); - this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnBatchID); + this.columnKittingDate = new global::System.Data.DataColumn("KittingDate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnKittingDate); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnOrdID}, true)); this.columnOrdID.AllowDBNull = false; @@ -2530,7 +2530,6 @@ namespace AppData { this.columnFamilyCode.AllowDBNull = false; this.columnFamilyCode.MaxLength = 250; this.columnOrdDtmx.ReadOnly = true; - this.columnOrdDtmx.Caption = "OrdCodDtmx"; this.columnOrdDtmx.MaxLength = 10; this.columnOrderExtCode.AllowDBNull = false; this.columnOrderExtCode.MaxLength = 250; @@ -2538,12 +2537,11 @@ namespace AppData { this.columnOrderDesc.MaxLength = 500; this.columnOrderNote.AllowDBNull = false; this.columnOrderNote.MaxLength = 500; + this.columnKitQty.AllowDBNull = false; this.columnImportDate.AllowDBNull = false; this.columnImportUser.AllowDBNull = false; this.columnImportUser.MaxLength = 50; this.columnOrdCodOrig.MaxLength = 50; - this.columnKitQty.AllowDBNull = false; - this.columnBatchID.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6685,6 +6683,17 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int KitQty { + get { + return ((int)(this[this.tableOrderList.KitQtyColumn])); + } + set { + this[this.tableOrderList.KitQtyColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public System.DateTime ImportDate { @@ -6711,12 +6720,12 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string OrdCodOrig { get { - if (this.IsOrdCodOrigNull()) { - return string.Empty; - } - else { + try { return ((string)(this[this.tableOrderList.OrdCodOrigColumn])); } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'OrdCodOrig\' nella tabella \'OrderList\' è DBNull.", e); + } } set { this[this.tableOrderList.OrdCodOrigColumn] = value; @@ -6725,23 +6734,17 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int KitQty { + public System.DateTime KittingDate { get { - return ((int)(this[this.tableOrderList.KitQtyColumn])); + try { + return ((global::System.DateTime)(this[this.tableOrderList.KittingDateColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'KittingDate\' nella tabella \'OrderList\' è DBNull.", e); + } } set { - this[this.tableOrderList.KitQtyColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int BatchID { - get { - return ((int)(this[this.tableOrderList.BatchIDColumn])); - } - set { - this[this.tableOrderList.BatchIDColumn] = value; + this[this.tableOrderList.KittingDateColumn] = value; } } @@ -6769,6 +6772,18 @@ namespace AppData { this[this.tableOrderList.OrdCodOrigColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsKittingDateNull() { + return this.IsNull(this.tableOrderList.KittingDateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetKittingDateNull() { + this[this.tableOrderList.KittingDateColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public BatchReqListRow[] GetBatchReqListRows() { @@ -9494,18 +9509,17 @@ namespace AppData.DS_AppTableAdapters { tableMapping.ColumnMappings.Add("OrderExtCode", "OrderExtCode"); tableMapping.ColumnMappings.Add("OrderDesc", "OrderDesc"); tableMapping.ColumnMappings.Add("OrderNote", "OrderNote"); + tableMapping.ColumnMappings.Add("KitQty", "KitQty"); tableMapping.ColumnMappings.Add("ImportDate", "ImportDate"); tableMapping.ColumnMappings.Add("ImportUser", "ImportUser"); tableMapping.ColumnMappings.Add("OrdCodOrig", "OrdCodOrig"); - tableMapping.ColumnMappings.Add("KitQty", "KitQty"); - tableMapping.ColumnMappings.Add("BatchID", "BatchID"); + tableMapping.ColumnMappings.Add("KittingDate", "KittingDate"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[OrderList] WHERE (([OrdID] = @Original_OrdID) AND ([BatchID] = @Original_BatchID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [OrderList] WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdType", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdType", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DestPlant", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DestPlant", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FamilyCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FamilyCode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -9519,12 +9533,13 @@ namespace AppData.DS_AppTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ImportUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportUser", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_OrdCodOrig", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdCodOrig", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_KittingDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_KittingDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[OrderList] ([BatchID], [OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig]) VALUES (@BatchID, @OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig); -SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig FROM OrderList WHERE (OrdID = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [OrderList] ([OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig], [KittingDate]) VALUES (@OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig, @KittingDate); +SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate FROM OrderList WHERE (OrdID = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdType", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdType", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DestPlant", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DestPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FamilyCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FamilyCode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -9535,12 +9550,12 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ImportDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ImportUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportUser", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdCodOrig", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@KittingDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[OrderList] SET [BatchID] = @BatchID, [OrdType] = @OrdType, [DestPlant] = @DestPlant, [FamilyCode] = @FamilyCode, [OrderExtCode] = @OrderExtCode, [OrderDesc] = @OrderDesc, [OrderNote] = @OrderNote, [KitQty] = @KitQty, [ImportDate] = @ImportDate, [ImportUser] = @ImportUser, [OrdCodOrig] = @OrdCodOrig WHERE (([OrdID] = @Original_OrdID) AND ([BatchID] = @Original_BatchID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig))); -SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig FROM OrderList WHERE (OrdID = @OrdID)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [OrderList] SET [OrdType] = @OrdType, [DestPlant] = @DestPlant, [FamilyCode] = @FamilyCode, [OrderExtCode] = @OrderExtCode, [OrderDesc] = @OrderDesc, [OrderNote] = @OrderNote, [KitQty] = @KitQty, [ImportDate] = @ImportDate, [ImportUser] = @ImportUser, [OrdCodOrig] = @OrdCodOrig, [KittingDate] = @KittingDate WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate))); +SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate FROM OrderList WHERE (OrdID = @OrdID)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdType", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdType", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DestPlant", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DestPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FamilyCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FamilyCode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -9551,8 +9566,8 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ImportDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ImportUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportUser", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdCodOrig", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@KittingDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdType", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdType", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DestPlant", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DestPlant", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FamilyCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FamilyCode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -9566,6 +9581,8 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ImportUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportUser", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_OrdCodOrig", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdCodOrig", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_KittingDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_KittingDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -9582,7 +9599,7 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.OrderList"; + this._commandCollection[0].CommandText = "SELECT * FROM OrderList"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -9666,68 +9683,75 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or [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.Delete, true)] - public virtual int Delete(int Original_OrdID, int Original_BatchID, string Original_OrdType, string Original_DestPlant, string Original_FamilyCode, string Original_OrdDtmx, string Original_OrderExtCode, string Original_OrderDesc, string Original_OrderNote, int Original_KitQty, System.DateTime Original_ImportDate, string Original_ImportUser, string Original_OrdCodOrig) { + public virtual int Delete(int Original_OrdID, string Original_OrdType, string Original_DestPlant, string Original_FamilyCode, string Original_OrdDtmx, string Original_OrderExtCode, string Original_OrderDesc, string Original_OrderNote, int Original_KitQty, System.DateTime Original_ImportDate, string Original_ImportUser, string Original_OrdCodOrig, global::System.Nullable Original_KittingDate) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_OrdID)); - this.Adapter.DeleteCommand.Parameters[1].Value = ((int)(Original_BatchID)); if ((Original_OrdType == null)) { throw new global::System.ArgumentNullException("Original_OrdType"); } else { - this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_OrdType)); + this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_OrdType)); } if ((Original_DestPlant == null)) { throw new global::System.ArgumentNullException("Original_DestPlant"); } else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_DestPlant)); + this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_DestPlant)); } if ((Original_FamilyCode == null)) { throw new global::System.ArgumentNullException("Original_FamilyCode"); } else { - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_FamilyCode)); + this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_FamilyCode)); } if ((Original_OrdDtmx == null)) { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_OrdDtmx)); + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_OrdDtmx)); } if ((Original_OrderExtCode == null)) { throw new global::System.ArgumentNullException("Original_OrderExtCode"); } else { - this.Adapter.DeleteCommand.Parameters[7].Value = ((string)(Original_OrderExtCode)); + this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_OrderExtCode)); } if ((Original_OrderDesc == null)) { throw new global::System.ArgumentNullException("Original_OrderDesc"); } else { - this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_OrderDesc)); + this.Adapter.DeleteCommand.Parameters[7].Value = ((string)(Original_OrderDesc)); } if ((Original_OrderNote == null)) { throw new global::System.ArgumentNullException("Original_OrderNote"); } else { - this.Adapter.DeleteCommand.Parameters[9].Value = ((string)(Original_OrderNote)); + this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_OrderNote)); } - this.Adapter.DeleteCommand.Parameters[10].Value = ((int)(Original_KitQty)); - this.Adapter.DeleteCommand.Parameters[11].Value = ((System.DateTime)(Original_ImportDate)); + this.Adapter.DeleteCommand.Parameters[9].Value = ((int)(Original_KitQty)); + this.Adapter.DeleteCommand.Parameters[10].Value = ((System.DateTime)(Original_ImportDate)); if ((Original_ImportUser == null)) { throw new global::System.ArgumentNullException("Original_ImportUser"); } else { - this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_ImportUser)); + this.Adapter.DeleteCommand.Parameters[11].Value = ((string)(Original_ImportUser)); } if ((Original_OrdCodOrig == null)) { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; + this.Adapter.DeleteCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[13].Value = global::System.DBNull.Value; } else { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_OrdCodOrig)); + this.Adapter.DeleteCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[13].Value = ((string)(Original_OrdCodOrig)); + } + if ((Original_KittingDate.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[15].Value = ((System.DateTime)(Original_KittingDate.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[15].Value = global::System.DBNull.Value; } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -9749,57 +9773,62 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or [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.Insert, true)] - public virtual int Insert(int BatchID, string OrdType, string DestPlant, string FamilyCode, string OrderExtCode, string OrderDesc, string OrderNote, int KitQty, System.DateTime ImportDate, string ImportUser, string OrdCodOrig) { - this.Adapter.InsertCommand.Parameters[0].Value = ((int)(BatchID)); + public virtual int Insert(string OrdType, string DestPlant, string FamilyCode, string OrderExtCode, string OrderDesc, string OrderNote, int KitQty, System.DateTime ImportDate, string ImportUser, string OrdCodOrig, global::System.Nullable KittingDate) { if ((OrdType == null)) { throw new global::System.ArgumentNullException("OrdType"); } else { - this.Adapter.InsertCommand.Parameters[1].Value = ((string)(OrdType)); + this.Adapter.InsertCommand.Parameters[0].Value = ((string)(OrdType)); } if ((DestPlant == null)) { throw new global::System.ArgumentNullException("DestPlant"); } else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(DestPlant)); + this.Adapter.InsertCommand.Parameters[1].Value = ((string)(DestPlant)); } if ((FamilyCode == null)) { throw new global::System.ArgumentNullException("FamilyCode"); } else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(FamilyCode)); + this.Adapter.InsertCommand.Parameters[2].Value = ((string)(FamilyCode)); } if ((OrderExtCode == null)) { throw new global::System.ArgumentNullException("OrderExtCode"); } else { - this.Adapter.InsertCommand.Parameters[4].Value = ((string)(OrderExtCode)); + this.Adapter.InsertCommand.Parameters[3].Value = ((string)(OrderExtCode)); } if ((OrderDesc == null)) { throw new global::System.ArgumentNullException("OrderDesc"); } else { - this.Adapter.InsertCommand.Parameters[5].Value = ((string)(OrderDesc)); + this.Adapter.InsertCommand.Parameters[4].Value = ((string)(OrderDesc)); } if ((OrderNote == null)) { throw new global::System.ArgumentNullException("OrderNote"); } else { - this.Adapter.InsertCommand.Parameters[6].Value = ((string)(OrderNote)); + this.Adapter.InsertCommand.Parameters[5].Value = ((string)(OrderNote)); } - this.Adapter.InsertCommand.Parameters[7].Value = ((int)(KitQty)); - this.Adapter.InsertCommand.Parameters[8].Value = ((System.DateTime)(ImportDate)); + this.Adapter.InsertCommand.Parameters[6].Value = ((int)(KitQty)); + this.Adapter.InsertCommand.Parameters[7].Value = ((System.DateTime)(ImportDate)); if ((ImportUser == null)) { throw new global::System.ArgumentNullException("ImportUser"); } else { - this.Adapter.InsertCommand.Parameters[9].Value = ((string)(ImportUser)); + this.Adapter.InsertCommand.Parameters[8].Value = ((string)(ImportUser)); } if ((OrdCodOrig == null)) { - this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value; + this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[10].Value = ((string)(OrdCodOrig)); + this.Adapter.InsertCommand.Parameters[9].Value = ((string)(OrdCodOrig)); + } + if ((KittingDate.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[10].Value = ((System.DateTime)(KittingDate.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value; } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -9822,7 +9851,6 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] public virtual int Update( - int BatchID, string OrdType, string DestPlant, string FamilyCode, @@ -9833,8 +9861,8 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or System.DateTime ImportDate, string ImportUser, string OrdCodOrig, + global::System.Nullable KittingDate, int Original_OrdID, - int Original_BatchID, string Original_OrdType, string Original_DestPlant, string Original_FamilyCode, @@ -9846,121 +9874,134 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or System.DateTime Original_ImportDate, string Original_ImportUser, string Original_OrdCodOrig, + global::System.Nullable Original_KittingDate, int OrdID) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(BatchID)); if ((OrdType == null)) { throw new global::System.ArgumentNullException("OrdType"); } else { - this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(OrdType)); + this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(OrdType)); } if ((DestPlant == null)) { throw new global::System.ArgumentNullException("DestPlant"); } else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(DestPlant)); + this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(DestPlant)); } if ((FamilyCode == null)) { throw new global::System.ArgumentNullException("FamilyCode"); } else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(FamilyCode)); + this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(FamilyCode)); } if ((OrderExtCode == null)) { throw new global::System.ArgumentNullException("OrderExtCode"); } else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(OrderExtCode)); + this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(OrderExtCode)); } if ((OrderDesc == null)) { throw new global::System.ArgumentNullException("OrderDesc"); } else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(OrderDesc)); + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(OrderDesc)); } if ((OrderNote == null)) { throw new global::System.ArgumentNullException("OrderNote"); } else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(OrderNote)); + this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(OrderNote)); } - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(KitQty)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((System.DateTime)(ImportDate)); + this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(KitQty)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((System.DateTime)(ImportDate)); if ((ImportUser == null)) { throw new global::System.ArgumentNullException("ImportUser"); } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(ImportUser)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(ImportUser)); } if ((OrdCodOrig == null)) { - this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(OrdCodOrig)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(OrdCodOrig)); + } + if ((KittingDate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[10].Value = ((System.DateTime)(KittingDate.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; } this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_OrdID)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(Original_BatchID)); if ((Original_OrdType == null)) { throw new global::System.ArgumentNullException("Original_OrdType"); } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_OrdType)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_OrdType)); } if ((Original_DestPlant == null)) { throw new global::System.ArgumentNullException("Original_DestPlant"); } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_DestPlant)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_DestPlant)); } if ((Original_FamilyCode == null)) { throw new global::System.ArgumentNullException("Original_FamilyCode"); } else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_FamilyCode)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_FamilyCode)); } if ((Original_OrdDtmx == null)) { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_OrdDtmx)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_OrdDtmx)); } if ((Original_OrderExtCode == null)) { throw new global::System.ArgumentNullException("Original_OrderExtCode"); } else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_OrderExtCode)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_OrderExtCode)); } if ((Original_OrderDesc == null)) { throw new global::System.ArgumentNullException("Original_OrderDesc"); } else { - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_OrderDesc)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_OrderDesc)); } if ((Original_OrderNote == null)) { throw new global::System.ArgumentNullException("Original_OrderNote"); } else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_OrderNote)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_OrderNote)); } - this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(Original_KitQty)); - this.Adapter.UpdateCommand.Parameters[22].Value = ((System.DateTime)(Original_ImportDate)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(Original_KitQty)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((System.DateTime)(Original_ImportDate)); if ((Original_ImportUser == null)) { throw new global::System.ArgumentNullException("Original_ImportUser"); } else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_ImportUser)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_ImportUser)); } if ((Original_OrdCodOrig == null)) { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_OrdCodOrig)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_OrdCodOrig)); } - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(OrdID)); + if ((Original_KittingDate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((System.DateTime)(Original_KittingDate.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(OrdID)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -9982,7 +10023,6 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] public virtual int Update( - int BatchID, string OrdType, string DestPlant, string FamilyCode, @@ -9993,8 +10033,8 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or System.DateTime ImportDate, string ImportUser, string OrdCodOrig, + global::System.Nullable KittingDate, int Original_OrdID, - int Original_BatchID, string Original_OrdType, string Original_DestPlant, string Original_FamilyCode, @@ -10005,8 +10045,9 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or int Original_KitQty, System.DateTime Original_ImportDate, string Original_ImportUser, - string Original_OrdCodOrig) { - return this.Update(BatchID, OrdType, DestPlant, FamilyCode, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, Original_OrdID, Original_BatchID, Original_OrdType, Original_DestPlant, Original_FamilyCode, Original_OrdDtmx, Original_OrderExtCode, Original_OrderDesc, Original_OrderNote, Original_KitQty, Original_ImportDate, Original_ImportUser, Original_OrdCodOrig, Original_OrdID); + string Original_OrdCodOrig, + global::System.Nullable Original_KittingDate) { + return this.Update(OrdType, DestPlant, FamilyCode, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, Original_OrdID, Original_OrdType, Original_DestPlant, Original_FamilyCode, Original_OrdDtmx, Original_OrderExtCode, Original_OrderDesc, Original_OrderNote, Original_KitQty, Original_ImportDate, Original_ImportUser, Original_OrdCodOrig, Original_KittingDate, Original_OrdID); } } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 9fa8d30..7ea7390 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -371,10 +371,9 @@ FROM v_SheetList - DELETE FROM [dbo].[OrderList] WHERE (([OrdID] = @Original_OrdID) AND ([BatchID] = @Original_BatchID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig))) + DELETE FROM [OrderList] WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate))) - @@ -388,15 +387,16 @@ FROM v_SheetList + + - INSERT INTO [dbo].[OrderList] ([BatchID], [OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig]) VALUES (@BatchID, @OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig); -SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig FROM OrderList WHERE (OrdID = SCOPE_IDENTITY()) + INSERT INTO [OrderList] ([OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig], [KittingDate]) VALUES (@OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig, @KittingDate); +SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate FROM OrderList WHERE (OrdID = SCOPE_IDENTITY()) - @@ -407,22 +407,21 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or + - SELECT * -FROM dbo.OrderList + SELECT * FROM OrderList - UPDATE [dbo].[OrderList] SET [BatchID] = @BatchID, [OrdType] = @OrdType, [DestPlant] = @DestPlant, [FamilyCode] = @FamilyCode, [OrderExtCode] = @OrderExtCode, [OrderDesc] = @OrderDesc, [OrderNote] = @OrderNote, [KitQty] = @KitQty, [ImportDate] = @ImportDate, [ImportUser] = @ImportUser, [OrdCodOrig] = @OrdCodOrig WHERE (([OrdID] = @Original_OrdID) AND ([BatchID] = @Original_BatchID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig))); -SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig FROM OrderList WHERE (OrdID = @OrdID) + UPDATE [OrderList] SET [OrdType] = @OrdType, [DestPlant] = @DestPlant, [FamilyCode] = @FamilyCode, [OrderExtCode] = @OrderExtCode, [OrderDesc] = @OrderDesc, [OrderNote] = @OrderNote, [KitQty] = @KitQty, [ImportDate] = @ImportDate, [ImportUser] = @ImportUser, [OrdCodOrig] = @OrdCodOrig, [KittingDate] = @KittingDate WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate))); +SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate FROM OrderList WHERE (OrdID = @OrdID) - @@ -433,8 +432,8 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or + - @@ -448,6 +447,8 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or + + @@ -463,11 +464,11 @@ SELECT OrdID, BatchID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, Or + - - + @@ -1430,7 +1431,7 @@ SELECT SheetID, ItemID, QtyNest FROM Nesting WHERE (ItemID = @ItemID) AND (Sheet - + @@ -1458,23 +1459,23 @@ SELECT SheetID, ItemID, QtyNest FROM Nesting WHERE (ItemID = @ItemID) AND (Sheet - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 7adb8aa..4018539 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,12 +4,12 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + @@ -24,12 +24,12 @@ - 329 - 150 + 352 + 144 321 - 150 + 144 @@ -60,12 +60,12 @@ - 527 - 137 + 550 + 134 588 - 137 + 134