diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index fdcf5cb..e585209 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -2580,7 +2580,7 @@ namespace AppData foreach (var currItem in OrdExtList) { // tempo in sec --> divido 60 - DLMan.taOLT.insert(BatchId, currItem.OrderId, currItem.OrderExtCode, currItem.NumBin, currItem.NumCart, currItem.NumPart, (currItem.TotTime / 60)); + DLMan.taOLT.insert(BatchId, 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 6f5dd19..1663e71 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -39379,6 +39379,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].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[5].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[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrderExtCode", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].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, "", "", "")); @@ -39525,7 +39526,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")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int insert(global::System.Nullable BatchID, global::System.Nullable OrdID, string OrderExtCode, global::System.Nullable EstNumBin, global::System.Nullable EstNumCart, global::System.Nullable EstNumPart, global::System.Nullable EstProcTime) { + public virtual int insert(global::System.Nullable BatchID, global::System.Nullable AncestBatchID, global::System.Nullable OrdID, string OrderExtCode, global::System.Nullable EstNumBin, global::System.Nullable EstNumCart, global::System.Nullable EstNumPart, global::System.Nullable EstProcTime) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(BatchID.Value)); @@ -39533,42 +39534,48 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE else { command.Parameters[1].Value = global::System.DBNull.Value; } - if ((OrdID.HasValue == true)) { - command.Parameters[2].Value = ((int)(OrdID.Value)); + if ((AncestBatchID.HasValue == true)) { + command.Parameters[2].Value = ((int)(AncestBatchID.Value)); } else { command.Parameters[2].Value = global::System.DBNull.Value; } - if ((OrderExtCode == null)) { + if ((OrdID.HasValue == true)) { + command.Parameters[3].Value = ((int)(OrdID.Value)); + } + else { command.Parameters[3].Value = global::System.DBNull.Value; } - else { - command.Parameters[3].Value = ((string)(OrderExtCode)); - } - if ((EstNumBin.HasValue == true)) { - command.Parameters[4].Value = ((int)(EstNumBin.Value)); - } - else { + if ((OrderExtCode == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } - if ((EstNumCart.HasValue == true)) { - command.Parameters[5].Value = ((int)(EstNumCart.Value)); + else { + command.Parameters[4].Value = ((string)(OrderExtCode)); + } + if ((EstNumBin.HasValue == true)) { + command.Parameters[5].Value = ((int)(EstNumBin.Value)); } else { command.Parameters[5].Value = global::System.DBNull.Value; } - if ((EstNumPart.HasValue == true)) { - command.Parameters[6].Value = ((int)(EstNumPart.Value)); + if ((EstNumCart.HasValue == true)) { + command.Parameters[6].Value = ((int)(EstNumCart.Value)); } else { command.Parameters[6].Value = global::System.DBNull.Value; } - if ((EstProcTime.HasValue == true)) { - command.Parameters[7].Value = ((double)(EstProcTime.Value)); + if ((EstNumPart.HasValue == true)) { + command.Parameters[7].Value = ((int)(EstNumPart.Value)); } else { command.Parameters[7].Value = global::System.DBNull.Value; } + if ((EstProcTime.HasValue == true)) { + command.Parameters[8].Value = ((double)(EstProcTime.Value)); + } + else { + command.Parameters[8].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)) { diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 98e3bf1..15dccc4 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -267,7 +267,7 @@ FROM v_BatchList - + dbo.stp_Batch_refuseNesting @@ -279,7 +279,7 @@ FROM v_BatchList - + dbo.stp_Batch_resetAllNesting @@ -290,7 +290,7 @@ FROM v_BatchList - + dbo.stp_Batch_resetPartUnValid @@ -300,7 +300,7 @@ FROM v_BatchList - + dbo.stp_zzz_resetProdCall @@ -310,7 +310,7 @@ FROM v_BatchList - + dbo.stp_Batch_resetTree @@ -321,7 +321,7 @@ FROM v_BatchList - + dbo.stp_Batch_updateSchedPrior @@ -333,7 +333,7 @@ FROM v_BatchList - + dbo.stp_Batch_updateStatus @@ -3331,6 +3331,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE + @@ -3376,7 +3377,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3434,7 +3435,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3459,7 +3460,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3514,7 +3515,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3587,7 +3588,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3656,7 +3657,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3689,7 +3690,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3761,7 +3762,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3780,7 +3781,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3811,7 +3812,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3819,7 +3820,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3836,7 +3837,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3845,7 +3846,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3876,7 +3877,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3884,7 +3885,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3900,7 +3901,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3908,7 +3909,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3936,7 +3937,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3972,7 +3973,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3988,7 +3989,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3998,7 +3999,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4015,7 +4016,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4028,7 +4029,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4077,7 +4078,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4106,7 +4107,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4148,7 +4149,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4259,7 +4260,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4322,7 +4323,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4367,7 +4368,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4393,7 +4394,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4486,7 +4487,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4549,7 +4550,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4608,7 +4609,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4657,7 +4658,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4696,7 +4697,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4749,7 +4750,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4766,7 +4767,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4779,7 +4780,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4950,17 +4951,17 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 1ef0cd2..05a7ed4 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -41,9 +41,9 @@ - + - +