diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 34ed7f7f..1fbf5108 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 6159089d..c4193872 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 155aefa5..bd9facc8 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW_data/DS_magazzino.Designer.cs b/GMW_data/DS_magazzino.Designer.cs index 6367840c..1edf2cb3 100644 --- a/GMW_data/DS_magazzino.Designer.cs +++ b/GMW_data/DS_magazzino.Designer.cs @@ -38070,8 +38070,9 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoAl", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataCreaz", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumTratt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.InputOutput, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -38490,7 +38491,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual object insertNewTT(string SourceAL, string TipoAl, global::System.Nullable DataCreaz, string CodSoggetto, string CodEvento, string Note, ref string AL) { + public virtual object insertNewTT(string SourceAL, string TipoAl, global::System.Nullable DataCreaz, string CodSoggetto, string Note, string NumTratt, string Durezza, ref string AL) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((SourceAL == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -38516,23 +38517,29 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, else { command.Parameters[4].Value = ((string)(CodSoggetto)); } - if ((CodEvento == null)) { + if ((Note == null)) { command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = ((string)(CodEvento)); + command.Parameters[5].Value = ((string)(Note)); } - if ((Note == null)) { + if ((NumTratt == null)) { command.Parameters[6].Value = global::System.DBNull.Value; } else { - command.Parameters[6].Value = ((string)(Note)); + command.Parameters[6].Value = ((string)(NumTratt)); } - if ((AL == null)) { + if ((Durezza == null)) { command.Parameters[7].Value = global::System.DBNull.Value; } else { - command.Parameters[7].Value = ((string)(AL)); + command.Parameters[7].Value = ((string)(Durezza)); + } + if ((AL == null)) { + command.Parameters[8].Value = global::System.DBNull.Value; + } + else { + command.Parameters[8].Value = ((string)(AL)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -38548,12 +38555,12 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, command.Connection.Close(); } } - if (((command.Parameters[7].Value == null) - || (command.Parameters[7].Value.GetType() == typeof(global::System.DBNull)))) { + if (((command.Parameters[8].Value == null) + || (command.Parameters[8].Value.GetType() == typeof(global::System.DBNull)))) { AL = null; } else { - AL = ((string)(command.Parameters[7].Value)); + AL = ((string)(command.Parameters[8].Value)); } if (((returnValue == null) || (returnValue.GetType() == typeof(global::System.DBNull)))) { diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd index 371da39c..012596b6 100644 --- a/GMW_data/DS_magazzino.xsd +++ b/GMW_data/DS_magazzino.xsd @@ -3625,8 +3625,9 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, - + + diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs index bb0e3b68..a601652c 100644 --- a/GMW_data/MagClass.cs +++ b/GMW_data/MagClass.cs @@ -284,8 +284,10 @@ namespace GMW_data /// tipologia (T) /// Operatore /// Note + /// Numero Trattamento + /// Durezza rilevata /// - public string creaAssociaAlTT(string SourceAL, tipoAL tipologia, string CodSoggetto, string note) + public string creaAssociaAlTT(string SourceAL, tipoAL tipologia, string CodSoggetto, string note, string NumTratt, string Durezza) { // imposto valori default string TipoAL = ""; @@ -308,7 +310,7 @@ namespace GMW_data // creo nuovo Assieme Logico ed associo UDC! try { - taEA.insertNewTT(SourceAL, TipoAL, DataRif, CodSoggetto, CodEvento, note, ref AL); + taEA.insertNewTT(SourceAL, TipoAL, DataRif, CodSoggetto, note, NumTratt, Durezza, ref AL); } catch (Exception exc) {