From 4e47b89baf4ff041aea3263136a561130ea53974 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 11 Jun 2021 14:55:29 +0200 Subject: [PATCH] Update display da tabella (OK salvataggio e tab) --- AppData/ComLib.cs | 19 +-- AppData/DS_App.Designer.cs | 87 +++++++++++-- AppData/DS_App.xsd | 114 +++++++++--------- AppData/DS_App.xss | 4 +- NKC_SDK/Objects.cs | 5 + .../WebUserControls/cmp_batchDetail.ascx.cs | 77 ++++++++---- NKC_WF/WebUserControls/cmp_orderExtList.ascx | 18 ++- .../WebUserControls/cmp_orderExtList.ascx.cs | 12 +- .../cmp_orderExtList.ascx.designer.cs | 9 ++ 9 files changed, 238 insertions(+), 107 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 85cb47e..61e1eb4 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -686,14 +686,14 @@ namespace AppData catch { } } - // se vuoto rileggo - if (answ.Count == 0) - { - answ = DLMan.taBL.getDescendByKey(BatchId); - // salvo in cache - rawData = JsonConvert.SerializeObject(answ); - memLayer.ML.setRSV(redKey, rawData, 5 * 60); - } + } + // se vuoto rileggo + if (answ.Count == 0) + { + answ = DLMan.taBL.getDescendByKey(BatchId); + // salvo in cache + rawData = JsonConvert.SerializeObject(answ); + memLayer.ML.setRSV(redKey, rawData, 5 * 60); } return answ; } @@ -2499,7 +2499,8 @@ namespace AppData // salvo elenco materiali x ogni item... foreach (var currItem in OrdExtList) { - DLMan.taOLT.insert(BatchId, currItem.OrderId, currItem.OrderExtCode, currItem.NumBin, currItem.NumCart, currItem.NumPart, currItem.TotTime); + // tempo in sec --> divido 60 + DLMan.taOLT.insert(BatchId, currItem.OrderId, currItem.OrderExtCode, currItem.NumBin, currItem.NumCart, currItem.NumPart, currItem.TotTime / 60); } } diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index e679883..e7adee0 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -16874,6 +16874,10 @@ namespace AppData { private global::System.Data.DataColumn columnEstProcTime; + private global::System.Data.DataColumn columnTotalTime; + + private global::System.Data.DataColumn columnTimeQuota; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public OrderListTreeDataTable() { @@ -16963,6 +16967,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TotalTimeColumn { + get { + return this.columnTotalTime; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TimeQuotaColumn { + get { + return this.columnTimeQuota; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -17000,7 +17020,7 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public OrderListTreeRow AddOrderListTreeRow(int BatchID, int OrdID, string OrderExtCode, int EstNumBin, int EstNumCart, int EstNumPart, double EstProcTime) { + public OrderListTreeRow AddOrderListTreeRow(int BatchID, int OrdID, string OrderExtCode, int EstNumBin, int EstNumCart, int EstNumPart, double EstProcTime, double TotalTime, double TimeQuota) { OrderListTreeRow rowOrderListTreeRow = ((OrderListTreeRow)(this.NewRow())); object[] columnValuesArray = new object[] { BatchID, @@ -17009,7 +17029,9 @@ namespace AppData { EstNumBin, EstNumCart, EstNumPart, - EstProcTime}; + EstProcTime, + TotalTime, + TimeQuota}; rowOrderListTreeRow.ItemArray = columnValuesArray; this.Rows.Add(rowOrderListTreeRow); return rowOrderListTreeRow; @@ -17047,6 +17069,8 @@ namespace AppData { this.columnEstNumCart = base.Columns["EstNumCart"]; this.columnEstNumPart = base.Columns["EstNumPart"]; this.columnEstProcTime = base.Columns["EstProcTime"]; + this.columnTotalTime = base.Columns["TotalTime"]; + this.columnTimeQuota = base.Columns["TimeQuota"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17066,6 +17090,10 @@ namespace AppData { 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.columnTotalTime = new global::System.Data.DataColumn("TotalTime", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTotalTime); + this.columnTimeQuota = new global::System.Data.DataColumn("TimeQuota", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTimeQuota); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnBatchID, this.columnOrdID}, true)); @@ -17077,6 +17105,8 @@ namespace AppData { this.columnEstNumCart.AllowDBNull = false; this.columnEstNumPart.AllowDBNull = false; this.columnEstProcTime.AllowDBNull = false; + this.columnTotalTime.AllowDBNull = false; + this.columnTimeQuota.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -24900,6 +24930,45 @@ namespace AppData { this[this.tableOrderListTree.EstProcTimeColumn] = value; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double TotalTime { + get { + return ((double)(this[this.tableOrderListTree.TotalTimeColumn])); + } + set { + this[this.tableOrderListTree.TotalTimeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double TimeQuota { + get { + try { + return ((double)(this[this.tableOrderListTree.TimeQuotaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'TimeQuota\' in table \'OrderListTree\' is DBNull.", e); + } + } + set { + this[this.tableOrderListTree.TimeQuotaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsTimeQuotaNull() { + return this.IsNull(this.tableOrderListTree.TimeQuotaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetTimeQuotaNull() { + this[this.tableOrderListTree.TimeQuotaColumn] = global::System.Convert.DBNull; + } } /// @@ -39161,10 +39230,12 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE tableMapping.ColumnMappings.Add("EstNumCart", "EstNumCart"); tableMapping.ColumnMappings.Add("EstNumPart", "EstNumPart"); tableMapping.ColumnMappings.Add("EstProcTime", "EstProcTime"); + tableMapping.ColumnMappings.Add("TotalTime", "TotalTime"); + tableMapping.ColumnMappings.Add("TimeQuota", "TimeQuota"); 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 [OrderListTree] WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([EstNumBin] = @Original_EstNumBin) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstProcTime] = @Original_EstProcTime))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[OrderListTree] WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([EstNumBin] = @Original_EstNumBin) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstNumPart] = @Original_EstNumPart) 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_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_OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -39175,8 +39246,9 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE 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 [OrderListTree] ([BatchID], [OrdID], [OrderExtCode], [EstNumBin], [EstNumCart], [EstNumPart], [EstProcTime]) VALUES (@BatchID, @OrdID, @OrderExtCode, @EstNumBin, @EstNumCart, @EstNumPart, @EstProcTime); -SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcTime FROM OrderListTree WHERE (BatchID = @BatchID) AND (OrdID = @OrdID)"; + this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[OrderListTree] ([BatchID], [OrdID], [OrderExtCode], [EstNumBin" + + "], [EstNumCart], [EstNumPart], [EstProcTime]) VALUES (@BatchID, @OrdID, @OrderEx" + + "tCode, @EstNumBin, @EstNumCart, @EstNumPart, @EstProcTime)"; 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("@OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -39187,8 +39259,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT 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 [OrderListTree] SET [BatchID] = @BatchID, [OrdID] = @OrdID, [OrderExtCode] = @OrderExtCode, [EstNumBin] = @EstNumBin, [EstNumCart] = @EstNumCart, [EstNumPart] = @EstNumPart, [EstProcTime] = @EstProcTime WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([EstNumBin] = @Original_EstNumBin) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstProcTime] = @Original_EstProcTime)); -SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcTime FROM OrderListTree WHERE (BatchID = @BatchID) AND (OrdID = @OrdID)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[OrderListTree] SET [BatchID] = @BatchID, [OrdID] = @OrdID, [OrderExtCode] = @OrderExtCode, [EstNumBin] = @EstNumBin, [EstNumCart] = @EstNumCart, [EstNumPart] = @EstNumPart, [EstProcTime] = @EstProcTime WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([EstNumBin] = @Original_EstNumBin) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstProcTime] = @Original_EstProcTime))"; 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("@OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -39219,7 +39290,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT * FROM OrderListTree"; + this._commandCollection[0].CommandText = "SELECT * FROM v_OrderListTree"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 2c72408..06dd43a 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -3233,10 +3233,10 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + - DELETE FROM [OrderListTree] WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([EstNumBin] = @Original_EstNumBin) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstProcTime] = @Original_EstProcTime)) + DELETE FROM [dbo].[OrderListTree] WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([EstNumBin] = @Original_EstNumBin) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstProcTime] = @Original_EstProcTime)) @@ -3250,8 +3250,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - INSERT INTO [OrderListTree] ([BatchID], [OrdID], [OrderExtCode], [EstNumBin], [EstNumCart], [EstNumPart], [EstProcTime]) VALUES (@BatchID, @OrdID, @OrderExtCode, @EstNumBin, @EstNumCart, @EstNumPart, @EstProcTime); -SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcTime FROM OrderListTree WHERE (BatchID = @BatchID) AND (OrdID = @OrdID) + INSERT INTO [dbo].[OrderListTree] ([BatchID], [OrdID], [OrderExtCode], [EstNumBin], [EstNumCart], [EstNumPart], [EstProcTime]) VALUES (@BatchID, @OrdID, @OrderExtCode, @EstNumBin, @EstNumCart, @EstNumPart, @EstProcTime) @@ -3265,14 +3264,13 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - SELECT * FROM OrderListTree + SELECT * FROM v_OrderListTree - UPDATE [OrderListTree] SET [BatchID] = @BatchID, [OrdID] = @OrdID, [OrderExtCode] = @OrderExtCode, [EstNumBin] = @EstNumBin, [EstNumCart] = @EstNumCart, [EstNumPart] = @EstNumPart, [EstProcTime] = @EstProcTime WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([EstNumBin] = @Original_EstNumBin) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstProcTime] = @Original_EstProcTime)); -SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcTime FROM OrderListTree WHERE (BatchID = @BatchID) AND (OrdID = @OrdID) + UPDATE [dbo].[OrderListTree] SET [BatchID] = @BatchID, [OrdID] = @OrdID, [OrderExtCode] = @OrderExtCode, [EstNumBin] = @EstNumBin, [EstNumCart] = @EstNumCart, [EstNumPart] = @EstNumPart, [EstProcTime] = @EstProcTime WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([EstNumBin] = @Original_EstNumBin) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstProcTime] = @Original_EstProcTime)) @@ -3301,6 +3299,8 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT + + @@ -3388,7 +3388,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3446,7 +3446,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3471,7 +3471,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3526,7 +3526,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3599,7 +3599,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3668,7 +3668,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3701,7 +3701,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3773,7 +3773,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3792,7 +3792,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3823,7 +3823,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3831,7 +3831,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3848,7 +3848,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3857,7 +3857,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3888,7 +3888,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3896,7 +3896,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3912,7 +3912,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3920,7 +3920,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3948,7 +3948,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -3984,7 +3984,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4000,7 +4000,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4010,7 +4010,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4027,7 +4027,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4040,7 +4040,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4089,7 +4089,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4118,7 +4118,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4160,7 +4160,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4271,7 +4271,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4334,7 +4334,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4379,7 +4379,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4405,7 +4405,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4498,7 +4498,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4561,7 +4561,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4620,7 +4620,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4669,7 +4669,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4708,7 +4708,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4761,7 +4761,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4778,7 +4778,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4791,7 +4791,7 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - + @@ -4807,6 +4807,8 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT + + @@ -4959,17 +4961,17 @@ SELECT BatchID, OrdID, OrderExtCode, EstNumBin, EstNumCart, EstNumPart, EstProcT - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 359458c..f1107a4 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -43,7 +43,7 @@ - + diff --git a/NKC_SDK/Objects.cs b/NKC_SDK/Objects.cs index 851603f..5be77bf 100644 --- a/NKC_SDK/Objects.cs +++ b/NKC_SDK/Objects.cs @@ -596,6 +596,11 @@ namespace NKC_SDK /// public int NumPart { get; set; } = 0; + /// + /// Tempo totale in % + /// + public double Quota { get; set; } = 0; + /// /// Tempo totale in minuti /// diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index d4932dc..bfb559c 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -130,19 +130,22 @@ namespace NKC_WF.WebUserControls { try { - foreach (var bunk in nestAnsw.BunkList) + if (nestAnsw.BunkList != null) { - foreach (var sheet in bunk.SheetList) + foreach (var bunk in nestAnsw.BunkList) { - foreach (var part in sheet.PartList) + foreach (var sheet in bunk.SheetList) { - if (partListNest.Contains(part.PartId)) + foreach (var part in sheet.PartList) { - partListNestDupl.Add(part.PartId); - } - else - { - partListNest.Add(part.PartId); + if (partListNest.Contains(part.PartId)) + { + partListNestDupl.Add(part.PartId); + } + else + { + partListNest.Add(part.PartId); + } } } } @@ -153,9 +156,12 @@ namespace NKC_WF.WebUserControls int totKit = 0; try { - foreach (var cart in nestAnsw.CartList) + if (nestAnsw.CartList != null) { - totKit += cart.KitList.Count; + foreach (var cart in nestAnsw.CartList) + { + totKit += cart.KitList.Count; + } } } catch @@ -170,19 +176,22 @@ namespace NKC_WF.WebUserControls List workRatio = new List(); try { - foreach (var bunk in nestAnsw.BunkList) + if (nestAnsw.BunkList != null) { - totSheet += bunk.SheetList.Count; - foreach (var sheet in bunk.SheetList) + foreach (var bunk in nestAnsw.BunkList) { - totPartNum += sheet.PartList.Count; - num = sheet.SurfaceWork > 0 ? sheet.SurfaceWork : 0; - den = sheet.SurfaceTotal > 0 ? sheet.SurfaceTotal : 1; - currRatio = ratioProt(num, den); - workRatio.Add(currRatio); - if (!materialsList.Contains(sheet.MatId)) + totSheet += bunk.SheetList.Count; + foreach (var sheet in bunk.SheetList) { - materialsList.Add(sheet.MatId); + totPartNum += sheet.PartList.Count; + num = sheet.SurfaceWork > 0 ? sheet.SurfaceWork : 0; + den = sheet.SurfaceTotal > 0 ? sheet.SurfaceTotal : 1; + currRatio = ratioProt(num, den); + workRatio.Add(currRatio); + if (!materialsList.Contains(sheet.MatId)) + { + materialsList.Add(sheet.MatId); + } } } } @@ -347,6 +356,11 @@ namespace NKC_WF.WebUserControls } } + var TabBatch = TabBatchDesc; + + int BatchNe01 = TabBatchDesc[0].BatchID; + int BatchNe02 = TabBatchDesc[1].BatchID; + // riorganizzo tabOrders... List OrdersNe01 = new List(); List OrdersNe02 = new List(); @@ -354,18 +368,35 @@ namespace NKC_WF.WebUserControls { if (SetNe01.OrderSet.ContainsKey(orderItem.OrdID)) { - OrdersNe01.Add(new OrderPrev() { OrderId = orderItem.OrdID, OrderExtCode = orderItem.OrderExtCode, NumBin = orderItem.EstNumBin, NumCart = orderItem.EstNumCart, TotTime = orderItem.EstProcTime }); +#if false + OrdersNe01.Add(new OrderPrev() { OrderId = orderItem.OrdID, OrderExtCode = orderItem.OrderExtCode, NumBin = orderItem.EstNumBin, NumCart = orderItem.EstNumCart, TotTime = orderItem.EstProcTime, Quota = orderItem.TimeQuota }); +#endif + if (orderItem.BatchID != BatchNe01) + { + DLMan.taOLT.updateBatch(orderItem.BatchID, orderItem.OrdID, BatchNe01); + } } else { - OrdersNe02.Add(new OrderPrev() { OrderId = orderItem.OrdID, OrderExtCode = orderItem.OrderExtCode, NumBin = orderItem.EstNumBin, NumCart = orderItem.EstNumCart, TotTime = orderItem.EstProcTime }); +#if false + OrdersNe02.Add(new OrderPrev() { OrderId = orderItem.OrdID, OrderExtCode = orderItem.OrderExtCode, NumBin = orderItem.EstNumBin, NumCart = orderItem.EstNumCart, TotTime = orderItem.EstProcTime, Quota = orderItem.TimeQuota }); +#endif + if (orderItem.BatchID != BatchNe01) + { + DLMan.taOLT.updateBatch(orderItem.BatchID, orderItem.OrdID, BatchNe02); + } } } + // ...e poi mostro + cmp_orderExtListNE01.BatchId = BatchNe01; + cmp_orderExtListNE02.BatchId = BatchNe02; +#if false // ...e poi mostro cmp_orderExtListNE01.CurrOrders = OrdersNe01; cmp_orderExtListNE02.CurrOrders = OrdersNe02; +#endif // --> richiede salvataggio needSave = true; } diff --git a/NKC_WF/WebUserControls/cmp_orderExtList.ascx b/NKC_WF/WebUserControls/cmp_orderExtList.ascx index 215679e..1afd6a6 100644 --- a/NKC_WF/WebUserControls/cmp_orderExtList.ascx +++ b/NKC_WF/WebUserControls/cmp_orderExtList.ascx @@ -1,4 +1,18 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_orderExtList.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_orderExtList" %> - - \ No newline at end of file + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_orderExtList.ascx.cs b/NKC_WF/WebUserControls/cmp_orderExtList.ascx.cs index 9d95bd2..6a0e878 100644 --- a/NKC_WF/WebUserControls/cmp_orderExtList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_orderExtList.ascx.cs @@ -14,19 +14,17 @@ namespace NKC_WF.WebUserControls { #region Public Properties - public List _CurrOrders { get; set; } = new List(); - - public List CurrOrders + public int BatchId { get { - return _CurrOrders; + int answ = 0; + int.TryParse(hfBatchId.Value, out answ); + return answ; } set { - _CurrOrders = value; - grView.DataSource = value; - grView.DataBind(); + hfBatchId.Value = $"{value}"; } } diff --git a/NKC_WF/WebUserControls/cmp_orderExtList.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_orderExtList.ascx.designer.cs index 9316e98..59e4a29 100644 --- a/NKC_WF/WebUserControls/cmp_orderExtList.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_orderExtList.ascx.designer.cs @@ -31,5 +31,14 @@ namespace NKC_WF.WebUserControls /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// hfBatchId control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfBatchId; } }