diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index e71f69b..cab0dc1 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -11820,6 +11820,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ 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("@BasePath", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 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, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ForceAll", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; @@ -12439,7 +12440,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ [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 updateCadPath(string BasePath, global::System.Nullable ForceAll) { + public virtual int updateCadPath(string BasePath, global::System.Nullable BatchID, global::System.Nullable ForceAll) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((BasePath == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -12447,12 +12448,18 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ else { command.Parameters[1].Value = ((string)(BasePath)); } - if ((ForceAll.HasValue == true)) { - command.Parameters[2].Value = ((bool)(ForceAll.Value)); + if ((BatchID.HasValue == true)) { + command.Parameters[2].Value = ((int)(BatchID.Value)); } else { command.Parameters[2].Value = global::System.DBNull.Value; } + if ((ForceAll.HasValue == true)) { + command.Parameters[3].Value = ((bool)(ForceAll.Value)); + } + else { + command.Parameters[3].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 465a3ab..742d0eb 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -727,6 +727,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 82742c9..c61a8fa 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -6,21 +6,21 @@ --> - - - + + + - + - - + + - - - + + + @@ -83,7 +83,7 @@ - + 694 @@ -107,7 +107,7 @@ - + 1129 @@ -119,7 +119,7 @@ - + 1359 @@ -131,7 +131,7 @@ - + 1161 diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index a993b86..e1c3ab7 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -143,7 +143,7 @@ namespace NKC_WF.Controllers // salvo udpate elenco ITEMS ComLib.updateMaterialsFromNesting(rispStima.PartList); // aggiorno cadPath x items che non abbiano valorizzato... - DataLayer.man.taIL.updateCadPath(memLayer.ML.CRS("cadBaseBath"), false); + DataLayer.man.taIL.updateCadPath(memLayer.ML.CRS("cadBaseBath"), rispStima.BatchID, false); // registro OK answ = "OK"; }