From ed57cfb4c8c1f6cbf29a66c13ce111efacf0a9c8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 14 Jun 2021 10:03:12 +0200 Subject: [PATCH 1/2] start new release --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9e0dec7..458c864 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=395']) { + withEnv(['NEXT_BUILD_NUMBER=396']) { // env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.3.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') From 68fd166aea799e16ff495b729a2352ce52f99324 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 14 Jun 2021 11:19:19 +0200 Subject: [PATCH 2/2] Fix assegnazione KIT a veri nuovi batch --- AppData/DS_App.Designer.cs | 221 ++++++------------ AppData/DS_App.xsd | 65 ++---- AppData/DS_App.xss | 88 +++---- .../WebUserControls/cmp_batchDetail.ascx.cs | 3 + 4 files changed, 138 insertions(+), 239 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 9c4cabd..2e16c85 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -16878,6 +16878,8 @@ namespace AppData { private global::System.Data.DataColumn columnTimeQuota; + private global::System.Data.DataColumn columnAncestBatchID; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public OrderListTreeDataTable() { @@ -16983,6 +16985,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 AncestBatchIDColumn { + get { + return this.columnAncestBatchID; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -17020,7 +17030,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, double TotalTime, double TimeQuota) { + public OrderListTreeRow AddOrderListTreeRow(int BatchID, int OrdID, string OrderExtCode, int EstNumBin, int EstNumCart, int EstNumPart, double EstProcTime, double TotalTime, double TimeQuota, int AncestBatchID) { OrderListTreeRow rowOrderListTreeRow = ((OrderListTreeRow)(this.NewRow())); object[] columnValuesArray = new object[] { BatchID, @@ -17031,7 +17041,8 @@ namespace AppData { EstNumPart, EstProcTime, TotalTime, - TimeQuota}; + TimeQuota, + AncestBatchID}; rowOrderListTreeRow.ItemArray = columnValuesArray; this.Rows.Add(rowOrderListTreeRow); return rowOrderListTreeRow; @@ -17071,6 +17082,7 @@ namespace AppData { this.columnEstProcTime = base.Columns["EstProcTime"]; this.columnTotalTime = base.Columns["TotalTime"]; this.columnTimeQuota = base.Columns["TimeQuota"]; + this.columnAncestBatchID = base.Columns["AncestBatchID"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17094,6 +17106,8 @@ namespace AppData { 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.columnAncestBatchID = new global::System.Data.DataColumn("AncestBatchID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnAncestBatchID); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnBatchID, this.columnOrdID}, true)); @@ -17107,6 +17121,7 @@ namespace AppData { this.columnEstProcTime.AllowDBNull = false; this.columnTotalTime.AllowDBNull = false; this.columnTimeQuota.ReadOnly = true; + this.columnAncestBatchID.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -24958,6 +24973,17 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int AncestBatchID { + get { + return ((int)(this[this.tableOrderListTree.AncestBatchIDColumn])); + } + set { + this[this.tableOrderListTree.AncestBatchIDColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsTimeQuotaNull() { @@ -39239,49 +39265,8 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE tableMapping.ColumnMappings.Add("EstProcTime", "EstProcTime"); tableMapping.ColumnMappings.Add("TotalTime", "TotalTime"); tableMapping.ColumnMappings.Add("TimeQuota", "TimeQuota"); + tableMapping.ColumnMappings.Add("AncestBatchID", "AncestBatchID"); this._adapter.TableMappings.Add(tableMapping); - this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[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, "", "", "")); - 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_EstNumBin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumBin", 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_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_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 [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, "", "", "")); - 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("@EstNumBin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumBin", 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("@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("@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 [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, "", "", "")); - 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("@EstNumBin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumBin", 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("@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("@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_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_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_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_EstNumBin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumBin", 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_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_EstProcTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstProcTime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -39294,7 +39279,7 @@ 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")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM v_OrderListTree"; @@ -39338,12 +39323,19 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE this._commandCollection[5].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, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_OLT_updateBatch"; + this._commandCollection[6].CommandText = "dbo.stp_OLT_setBatchSplit"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AncestBatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SetSplit", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[7].Connection = this.Connection; + this._commandCollection[7].CommandText = "dbo.stp_OLT_updateBatch"; + this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -39404,35 +39396,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE return dataTable; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(DS_App.OrderListTreeDataTable 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, "OrderListTree"); - } - - [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")] @@ -39562,8 +39525,42 @@ 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.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int updateBatch(global::System.Nullable Original_BatchID, global::System.Nullable Original_OrdID, global::System.Nullable BatchID) { + public virtual int setBatchSplit(global::System.Nullable AncestBatchID, global::System.Nullable SetSplit) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + if ((AncestBatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(AncestBatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((SetSplit.HasValue == true)) { + command.Parameters[2].Value = ((bool)(SetSplit.Value)); + } + else { + command.Parameters[2].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)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [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 updateBatch(global::System.Nullable Original_BatchID, global::System.Nullable Original_OrdID, global::System.Nullable BatchID) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((Original_BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_BatchID.Value)); } @@ -39638,8 +39635,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE private FileValidationTableAdapter _fileValidationTableAdapter; - private OrderListTreeTableAdapter _orderListTreeTableAdapter; - private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -39837,20 +39832,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 OrderListTreeTableAdapter OrderListTreeTableAdapter { - get { - return this._orderListTreeTableAdapter; - } - set { - this._orderListTreeTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -39922,10 +39903,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE && (this._fileValidationTableAdapter.Connection != null))) { return this._fileValidationTableAdapter.Connection; } - if (((this._orderListTreeTableAdapter != null) - && (this._orderListTreeTableAdapter.Connection != null))) { - return this._orderListTreeTableAdapter.Connection; - } return null; } set { @@ -39978,9 +39955,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE if ((this._fileValidationTableAdapter != null)) { count = (count + 1); } - if ((this._orderListTreeTableAdapter != null)) { - count = (count + 1); - } return count; } } @@ -40109,15 +40083,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(updatedRows); } } - if ((this._orderListTreeTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.OrderListTree.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._orderListTreeTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } return result; } @@ -40232,14 +40197,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allAddedRows.AddRange(addedRows); } } - if ((this._orderListTreeTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.OrderListTree.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._orderListTreeTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } return result; } @@ -40250,14 +40207,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 UpdateDeletedRows(DS_App dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._orderListTreeTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.OrderListTree.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._orderListTreeTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._offOrd2ItemTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -40466,11 +40415,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + "tring."); } - if (((this._orderListTreeTableAdapter != null) - && (this.MatchTableAdapterConnection(this._orderListTreeTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + - "tring."); - } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" + @@ -40620,15 +40564,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE adaptersWithAcceptChangesDuringUpdate.Add(this._fileValidationTableAdapter.Adapter); } } - if ((this._orderListTreeTableAdapter != null)) { - revertConnections.Add(this._orderListTreeTableAdapter, this._orderListTreeTableAdapter.Connection); - this._orderListTreeTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._orderListTreeTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._orderListTreeTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._orderListTreeTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._orderListTreeTableAdapter.Adapter); - } - } // //---- Perform updates ----------- // @@ -40739,10 +40674,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE this._fileValidationTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._fileValidationTableAdapter])); this._fileValidationTableAdapter.Transaction = null; } - if ((this._orderListTreeTableAdapter != null)) { - this._orderListTreeTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._orderListTreeTableAdapter])); - this._orderListTreeTableAdapter.Transaction = null; - } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 5dbf64f..1180cfe 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -3235,61 +3235,12 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - - - 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)) - - - - - - - - - - - - - - INSERT INTO [dbo].[OrderListTree] ([BatchID], [OrdID], [OrderExtCode], [EstNumBin], [EstNumCart], [EstNumPart], [EstProcTime]) VALUES (@BatchID, @OrdID, @OrderExtCode, @EstNumBin, @EstNumCart, @EstNumPart, @EstProcTime) - - - - - - - - - - - - + SELECT * FROM v_OrderListTree - - - 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)) - - - - - - - - - - - - - - - - - - @@ -3302,6 +3253,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE + @@ -3366,6 +3318,18 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE + + + + dbo.stp_OLT_setBatchSplit + + + + + + + + @@ -4810,6 +4774,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index c2904db..be64a32 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,46 +4,46 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -73,12 +73,12 @@ - 806 - 216 + 828 + 235 853 - 216 + 235 @@ -101,12 +101,12 @@ - 699 + 721 408 - 699 - 358 + 721 + 377 @@ -114,11 +114,11 @@ 482 - 336 + 355 - 612 - 336 + 634 + 355 diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index abd2153..7f3100d 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -571,6 +571,9 @@ namespace NKC_WF.WebUserControls // controllo SE SIA un batch ANCESTOR --> invio il PRIMO batch da calcolare... if (batchIsAncestor) { + // effettuo VERA ri-assegnazione ordini/kit a nuovi batch + DLMan.taOLT.setBatchSplit(BatchId, true); + // invio il PRIMO batch descendant var tabDesc = ComLib.BatchDescendant(BatchId); if (tabDesc != null && tabDesc.Count > 0)