diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index d806b4f..abc8739 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -2371,7 +2371,7 @@ namespace AppData // salvo elenco materiali x ogni item... foreach (var currItem in OrdExtList) { - DLMan.taOL.updateExtEst(currItem.OrderId, currItem.NumCart, currItem.NumPart, currItem.TotTime); + DLMan.taOL.updateExtEst(currItem.OrderId, currItem.NumBin, currItem.NumCart, currItem.NumPart, currItem.TotTime); } } diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index ad1dac7..72907ec 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -3303,10 +3303,12 @@ namespace AppData { private global::System.Data.DataColumn columnKittingDate; - private global::System.Data.DataColumn columnEstNumPart; + private global::System.Data.DataColumn columnEstNumBin; private global::System.Data.DataColumn columnEstNumCart; + private global::System.Data.DataColumn columnEstNumPart; + private global::System.Data.DataColumn columnEstProcTime; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3448,9 +3450,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 EstNumPartColumn { + public global::System.Data.DataColumn EstNumBinColumn { get { - return this.columnEstNumPart; + return this.columnEstNumBin; } } @@ -3462,6 +3464,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 EstNumPartColumn { + get { + return this.columnEstNumPart; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn EstProcTimeColumn { @@ -3521,8 +3531,9 @@ namespace AppData { string ImportUser, string OrdCodOrig, System.DateTime KittingDate, - int EstNumPart, + int EstNumBin, int EstNumCart, + int EstNumPart, double EstProcTime) { OrderListRow rowOrderListRow = ((OrderListRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -3539,8 +3550,9 @@ namespace AppData { ImportUser, OrdCodOrig, KittingDate, - EstNumPart, + EstNumBin, EstNumCart, + EstNumPart, EstProcTime}; rowOrderListRow.ItemArray = columnValuesArray; this.Rows.Add(rowOrderListRow); @@ -3584,8 +3596,9 @@ namespace AppData { this.columnImportUser = base.Columns["ImportUser"]; this.columnOrdCodOrig = base.Columns["OrdCodOrig"]; this.columnKittingDate = base.Columns["KittingDate"]; - this.columnEstNumPart = base.Columns["EstNumPart"]; + this.columnEstNumBin = base.Columns["EstNumBin"]; this.columnEstNumCart = base.Columns["EstNumCart"]; + this.columnEstNumPart = base.Columns["EstNumPart"]; this.columnEstProcTime = base.Columns["EstProcTime"]; } @@ -3618,10 +3631,12 @@ namespace AppData { base.Columns.Add(this.columnOrdCodOrig); this.columnKittingDate = new global::System.Data.DataColumn("KittingDate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnKittingDate); - this.columnEstNumPart = new global::System.Data.DataColumn("EstNumPart", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnEstNumPart); + this.columnEstNumBin = new global::System.Data.DataColumn("EstNumBin", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnEstNumBin); this.columnEstNumCart = new global::System.Data.DataColumn("EstNumCart", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnEstNumCart); + this.columnEstNumPart = new global::System.Data.DataColumn("EstNumPart", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnEstNumPart); this.columnEstProcTime = new global::System.Data.DataColumn("EstProcTime", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnEstProcTime); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { @@ -3647,8 +3662,9 @@ namespace AppData { this.columnImportUser.AllowDBNull = false; this.columnImportUser.MaxLength = 50; this.columnOrdCodOrig.MaxLength = 50; - this.columnEstNumPart.AllowDBNull = false; + this.columnEstNumBin.AllowDBNull = false; this.columnEstNumCart.AllowDBNull = false; + this.columnEstNumPart.AllowDBNull = false; this.columnEstProcTime.AllowDBNull = false; } @@ -18223,12 +18239,12 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int EstNumPart { + public int EstNumBin { get { - return ((int)(this[this.tableOrderList.EstNumPartColumn])); + return ((int)(this[this.tableOrderList.EstNumBinColumn])); } set { - this[this.tableOrderList.EstNumPartColumn] = value; + this[this.tableOrderList.EstNumBinColumn] = value; } } @@ -18243,6 +18259,17 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int EstNumPart { + get { + return ((int)(this[this.tableOrderList.EstNumPartColumn])); + } + set { + this[this.tableOrderList.EstNumPartColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public double EstProcTime { @@ -27809,91 +27836,11 @@ namespace AppData.DS_AppTableAdapters { tableMapping.ColumnMappings.Add("ImportUser", "ImportUser"); tableMapping.ColumnMappings.Add("OrdCodOrig", "OrdCodOrig"); tableMapping.ColumnMappings.Add("KittingDate", "KittingDate"); - tableMapping.ColumnMappings.Add("EstNumPart", "EstNumPart"); + tableMapping.ColumnMappings.Add("EstNumBin", "EstNumBin"); tableMapping.ColumnMappings.Add("EstNumCart", "EstNumCart"); + tableMapping.ColumnMappings.Add("EstNumPart", "EstNumPart"); tableMapping.ColumnMappings.Add("EstProcTime", "EstProcTime"); 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 [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)) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstProcTime] = @Original_EstProcTime))"; - 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_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, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_OrdDtmx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDtmx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdDtmx", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDtmx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrderExtCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderExtCode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrderDesc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderDesc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrderNote", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderNote", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_KitQty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KitQty", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ImportDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - 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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstNumPart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumPart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstNumCart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumCart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstProcTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstProcTime", 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 [OrderList] ([OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig], [KittingDate], [EstNumPart], [EstNumCart], [EstProcTime]) VALUES (@OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig, @KittingDate, @EstNumPart, @EstNumCart, @EstProcTime); -SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime 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("@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, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrderExtCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderExtCode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrderDesc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderDesc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrderNote", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderNote", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@KitQty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KitQty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - 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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumPart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumPart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumCart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumCart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstProcTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstProcTime", 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 [OrderList] SET [OrdType] = @OrdType, [DestPlant] = @DestPlant, [FamilyCode] = @FamilyCode, [OrderExtCode] = @OrderExtCode, [OrderDesc] = @OrderDesc, [OrderNote] = @OrderNote, [KitQty] = @KitQty, [ImportDate] = @ImportDate, [ImportUser] = @ImportUser, [OrdCodOrig] = @OrdCodOrig, [KittingDate] = @KittingDate, [EstNumPart] = @EstNumPart, [EstNumCart] = @EstNumCart, [EstProcTime] = @EstProcTime 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)) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstProcTime] = @Original_EstProcTime)); -SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime 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("@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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrderExtCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderExtCode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrderDesc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderDesc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrderNote", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderNote", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@KitQty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KitQty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - 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("@EstNumPart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumPart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumCart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumCart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstProcTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstProcTime", 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_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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_OrdDtmx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDtmx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdDtmx", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDtmx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrderExtCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderExtCode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrderDesc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderDesc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrderNote", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrderNote", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_KitQty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KitQty", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ImportDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - 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("@Original_EstNumPart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumPart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstNumCart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumCart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstProcTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstProcTime", 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, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -27909,7 +27856,7 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, 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 OrderList"; + this._commandCollection[0].CommandText = "SELECT * FROM v_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; @@ -27929,6 +27876,7 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, 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("@Original_OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumBin", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumCart", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumPart", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstProcTime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -27995,447 +27943,7 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, [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")] - public virtual int Update(DS_App.OrderListDataTable dataTable) { - return this.Adapter.Update(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")] - public virtual int Update(DS_App dataSet) { - return this.Adapter.Update(dataSet, "OrderList"); - } - - [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")] - public virtual int Update(global::System.Data.DataRow dataRow) { - return this.Adapter.Update(new global::System.Data.DataRow[] { - dataRow}); - } - - [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")] - public virtual int Update(global::System.Data.DataRow[] dataRows) { - return this.Adapter.Update(dataRows); - } - - [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.Delete, true)] - 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, - int Original_EstNumPart, - int Original_EstNumCart, - double Original_EstProcTime) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_OrdID)); - if ((Original_OrdType == null)) { - throw new global::System.ArgumentNullException("Original_OrdType"); - } - else { - 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[2].Value = ((string)(Original_DestPlant)); - } - if ((Original_FamilyCode == null)) { - throw new global::System.ArgumentNullException("Original_FamilyCode"); - } - else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_FamilyCode)); - } - if ((Original_OrdDtmx == null)) { - this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; - } - else { - 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[6].Value = ((string)(Original_OrderExtCode)); - } - if ((Original_OrderDesc == null)) { - throw new global::System.ArgumentNullException("Original_OrderDesc"); - } - else { - 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[8].Value = ((string)(Original_OrderNote)); - } - 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[11].Value = ((string)(Original_ImportUser)); - } - if ((Original_OrdCodOrig == null)) { - this.Adapter.DeleteCommand.Parameters[12].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[13].Value = global::System.DBNull.Value; - } - else { - 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; - } - this.Adapter.DeleteCommand.Parameters[16].Value = ((int)(Original_EstNumPart)); - this.Adapter.DeleteCommand.Parameters[17].Value = ((int)(Original_EstNumCart)); - this.Adapter.DeleteCommand.Parameters[18].Value = ((double)(Original_EstProcTime)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; - if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.DeleteCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.DeleteCommand.Connection.Close(); - } - } - } - - [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.Insert, true)] - 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, int EstNumPart, int EstNumCart, double EstProcTime) { - if ((OrdType == null)) { - throw new global::System.ArgumentNullException("OrdType"); - } - else { - this.Adapter.InsertCommand.Parameters[0].Value = ((string)(OrdType)); - } - if ((DestPlant == null)) { - throw new global::System.ArgumentNullException("DestPlant"); - } - else { - this.Adapter.InsertCommand.Parameters[1].Value = ((string)(DestPlant)); - } - if ((FamilyCode == null)) { - throw new global::System.ArgumentNullException("FamilyCode"); - } - else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(FamilyCode)); - } - if ((OrderExtCode == null)) { - throw new global::System.ArgumentNullException("OrderExtCode"); - } - else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(OrderExtCode)); - } - if ((OrderDesc == null)) { - throw new global::System.ArgumentNullException("OrderDesc"); - } - else { - this.Adapter.InsertCommand.Parameters[4].Value = ((string)(OrderDesc)); - } - if ((OrderNote == null)) { - throw new global::System.ArgumentNullException("OrderNote"); - } - else { - this.Adapter.InsertCommand.Parameters[5].Value = ((string)(OrderNote)); - } - 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[8].Value = ((string)(ImportUser)); - } - if ((OrdCodOrig == null)) { - this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value; - } - else { - 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; - } - this.Adapter.InsertCommand.Parameters[11].Value = ((int)(EstNumPart)); - this.Adapter.InsertCommand.Parameters[12].Value = ((int)(EstNumCart)); - this.Adapter.InsertCommand.Parameters[13].Value = ((double)(EstProcTime)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; - if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.InsertCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.InsertCommand.Connection.Close(); - } - } - } - - [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.Update, true)] - public virtual int Update( - 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, - int EstNumPart, - int EstNumCart, - double EstProcTime, - 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, - int Original_EstNumPart, - int Original_EstNumCart, - double Original_EstProcTime, - int OrdID) { - if ((OrdType == null)) { - throw new global::System.ArgumentNullException("OrdType"); - } - else { - this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(OrdType)); - } - if ((DestPlant == null)) { - throw new global::System.ArgumentNullException("DestPlant"); - } - else { - this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(DestPlant)); - } - if ((FamilyCode == null)) { - throw new global::System.ArgumentNullException("FamilyCode"); - } - else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(FamilyCode)); - } - if ((OrderExtCode == null)) { - throw new global::System.ArgumentNullException("OrderExtCode"); - } - else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(OrderExtCode)); - } - if ((OrderDesc == null)) { - throw new global::System.ArgumentNullException("OrderDesc"); - } - else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(OrderDesc)); - } - if ((OrderNote == null)) { - throw new global::System.ArgumentNullException("OrderNote"); - } - else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(OrderNote)); - } - 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[8].Value = ((string)(ImportUser)); - } - if ((OrdCodOrig == null)) { - this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; - } - else { - 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)(EstNumPart)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(EstNumCart)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((double)(EstProcTime)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_OrdID)); - if ((Original_OrdType == null)) { - throw new global::System.ArgumentNullException("Original_OrdType"); - } - else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_OrdType)); - } - if ((Original_DestPlant == null)) { - throw new global::System.ArgumentNullException("Original_DestPlant"); - } - else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_DestPlant)); - } - if ((Original_FamilyCode == null)) { - throw new global::System.ArgumentNullException("Original_FamilyCode"); - } - else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_FamilyCode)); - } - if ((Original_OrdDtmx == null)) { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_OrdDtmx)); - } - if ((Original_OrderExtCode == null)) { - throw new global::System.ArgumentNullException("Original_OrderExtCode"); - } - else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_OrderExtCode)); - } - if ((Original_OrderDesc == null)) { - throw new global::System.ArgumentNullException("Original_OrderDesc"); - } - else { - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_OrderDesc)); - } - if ((Original_OrderNote == null)) { - throw new global::System.ArgumentNullException("Original_OrderNote"); - } - else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_OrderNote)); - } - this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_KitQty)); - this.Adapter.UpdateCommand.Parameters[24].Value = ((System.DateTime)(Original_ImportDate)); - if ((Original_ImportUser == null)) { - throw new global::System.ArgumentNullException("Original_ImportUser"); - } - else { - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_ImportUser)); - } - if ((Original_OrdCodOrig == null)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_OrdCodOrig)); - } - if ((Original_KittingDate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((System.DateTime)(Original_KittingDate.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; - } - this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_EstNumPart)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_EstNumCart)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((double)(Original_EstProcTime)); - this.Adapter.UpdateCommand.Parameters[33].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)) { - this.Adapter.UpdateCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.UpdateCommand.Connection.Close(); - } - } - } - - [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.Update, true)] - public virtual int Update( - 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, - int EstNumPart, - int EstNumCart, - double EstProcTime, - 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, - int Original_EstNumPart, - int Original_EstNumCart, - double Original_EstProcTime) { - return this.Update(OrdType, DestPlant, FamilyCode, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime, 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_EstNumPart, Original_EstNumCart, Original_EstProcTime, Original_OrdID); - } - - [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")] - public virtual int updateExtEst(global::System.Nullable Original_OrdID, global::System.Nullable EstNumCart, global::System.Nullable EstNumPart, global::System.Nullable EstProcTime) { + public virtual int updateExtEst(global::System.Nullable Original_OrdID, global::System.Nullable EstNumBin, global::System.Nullable EstNumCart, global::System.Nullable EstNumPart, global::System.Nullable EstProcTime) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((Original_OrdID.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_OrdID.Value)); @@ -28443,24 +27951,30 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, else { command.Parameters[1].Value = global::System.DBNull.Value; } - if ((EstNumCart.HasValue == true)) { - command.Parameters[2].Value = ((int)(EstNumCart.Value)); + if ((EstNumBin.HasValue == true)) { + command.Parameters[2].Value = ((int)(EstNumBin.Value)); } else { command.Parameters[2].Value = global::System.DBNull.Value; } - if ((EstNumPart.HasValue == true)) { - command.Parameters[3].Value = ((int)(EstNumPart.Value)); + if ((EstNumCart.HasValue == true)) { + command.Parameters[3].Value = ((int)(EstNumCart.Value)); } else { command.Parameters[3].Value = global::System.DBNull.Value; } - if ((EstProcTime.HasValue == true)) { - command.Parameters[4].Value = ((double)(EstProcTime.Value)); + if ((EstNumPart.HasValue == true)) { + command.Parameters[4].Value = ((int)(EstNumPart.Value)); } else { command.Parameters[4].Value = global::System.DBNull.Value; } + if ((EstProcTime.HasValue == true)) { + command.Parameters[5].Value = ((double)(EstProcTime.Value)); + } + else { + command.Parameters[5].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -39112,8 +38626,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE private UpdateOrderOption _updateOrder; - private OrderListTableAdapter _orderListTableAdapter; - private ItemListTableAdapter _itemListTableAdapter; private MaterialsTableAdapter _materialsTableAdapter; @@ -39155,20 +38667,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + - "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + - "a", "System.Drawing.Design.UITypeEditor")] - public OrderListTableAdapter OrderListTableAdapter { - get { - return this._orderListTableAdapter; - } - set { - this._orderListTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + @@ -39370,10 +38868,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE if ((this._connection != null)) { return this._connection; } - if (((this._orderListTableAdapter != null) - && (this._orderListTableAdapter.Connection != null))) { - return this._orderListTableAdapter.Connection; - } if (((this._itemListTableAdapter != null) && (this._itemListTableAdapter.Connection != null))) { return this._itemListTableAdapter.Connection; @@ -39439,9 +38933,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE public int TableAdapterInstanceCount { get { int count = 0; - if ((this._orderListTableAdapter != null)) { - count = (count + 1); - } if ((this._itemListTableAdapter != null)) { count = (count + 1); } @@ -39492,15 +38983,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateUpdatedRows(DS_App dataSet, global::System.Collections.Generic.List allChangedRows, global::System.Collections.Generic.List allAddedRows) { int result = 0; - if ((this._orderListTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.OrderList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._orderListTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._kitListTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.KitList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -39628,14 +39110,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateInsertedRows(DS_App dataSet, global::System.Collections.Generic.List allAddedRows) { int result = 0; - if ((this._orderListTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.OrderList.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._orderListTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._kitListTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.KitList.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -39854,14 +39328,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(deletedRows); } } - if ((this._orderListTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.OrderList.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._orderListTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } return result; } @@ -39901,11 +39367,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE if ((dataSet.HasChanges() == false)) { return 0; } - if (((this._orderListTableAdapter != null) - && (this.MatchTableAdapterConnection(this._orderListTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + - "tring."); - } if (((this._itemListTableAdapter != null) && (this.MatchTableAdapterConnection(this._itemListTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + @@ -40003,15 +39464,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE try { // ---- Prepare for update ----------- // - if ((this._orderListTableAdapter != null)) { - revertConnections.Add(this._orderListTableAdapter, this._orderListTableAdapter.Connection); - this._orderListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._orderListTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._orderListTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._orderListTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._orderListTableAdapter.Adapter); - } - } if ((this._itemListTableAdapter != null)) { revertConnections.Add(this._itemListTableAdapter, this._itemListTableAdapter.Connection); this._itemListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); @@ -40187,10 +39639,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE if (workConnOpened) { workConnection.Close(); } - if ((this._orderListTableAdapter != null)) { - this._orderListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._orderListTableAdapter])); - this._orderListTableAdapter.Transaction = null; - } if ((this._itemListTableAdapter != null)) { this._itemListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._itemListTableAdapter])); this._itemListTableAdapter.Transaction = null; diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index bec5ecc..4caf786 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -622,103 +622,13 @@ FROM v_SheetList - - - - 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)) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstProcTime] = @Original_EstProcTime)) - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO [OrderList] ([OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig], [KittingDate], [EstNumPart], [EstNumCart], [EstProcTime]) VALUES (@OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig, @KittingDate, @EstNumPart, @EstNumCart, @EstProcTime); -SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime FROM OrderList WHERE (OrdID = SCOPE_IDENTITY()) - - - - - - - - - - - - - - - - - - + - SELECT * FROM OrderList + SELECT * FROM v_OrderList - - - 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, [EstNumPart] = @EstNumPart, [EstNumCart] = @EstNumCart, [EstProcTime] = @EstProcTime 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)) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstProcTime] = @Original_EstProcTime)); -SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime FROM OrderList WHERE (OrdID = @OrdID) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -735,8 +645,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, - + + @@ -769,6 +680,7 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, + @@ -3523,8 +3435,9 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 81fa551..6782251 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -9,7 +9,7 @@ - + @@ -108,12 +108,12 @@ - 582 - 295 + 592 + 286 677 - 295 + 286 677 @@ -172,12 +172,12 @@ - 360 - 266 + 292 + 257 247 - 266 + 257 diff --git a/NKC_SDK/Objects.cs b/NKC_SDK/Objects.cs index 75346cf..edc2075 100644 --- a/NKC_SDK/Objects.cs +++ b/NKC_SDK/Objects.cs @@ -582,7 +582,12 @@ namespace NKC_SDK #region Public Properties /// - /// Num totale cart predisposti + /// Num totale BIN predisposti + /// + public int NumBin { get; set; } = 0; + + /// + /// Num totale CART predisposti /// public int NumCart { get; set; } = 0; diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index 4e826e0..cf0b4d2 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -42,7 +42,7 @@
-
+
@@ -65,15 +65,29 @@
- + + + + <%# Eval("Takt") %> + + + + <%-- + + + + + + + --%> -
-
+
+
<%# BStatus(Eval("Status")) %>
-
+
diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index e9895d6..528f08a 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -322,6 +322,36 @@ namespace NKC_WF.WebUserControls return answ; } + /// + /// Codice CSS in base a BatchType... + /// + /// + /// + public string cssIconByType(object _BatchType) + { + string answ = "fa fa-circle-thin"; + int status = -1; + int.TryParse(_BatchType.ToString(), out status); + switch (status) + { + case 0: + answ = "fa fa-file-text-o"; + break; + + case 1: + answ = "fa fa-file-text"; + break; + + case 2: + answ = "fa fa-scissors"; + break; + + default: + break; + } + return answ; + } + public void doUpdate() { checkFixOds(); @@ -348,6 +378,19 @@ namespace NKC_WF.WebUserControls return answ; } + /// + /// Tooltip in base a BatchType... + /// + /// + /// + public string tooltipByType(object _BatchType) + { + string answ = "-"; + + answ = traduci($"tooltipBatchType_{_BatchType}"); + return answ; + } + #endregion Public Methods } } \ No newline at end of file