From b05798ccadd0367ab2eb8688a6334f3f7fc7155d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 Mar 2014 10:00:46 +0100 Subject: [PATCH] Fix postazione TT x gestione durezza con checkbox... --- GMW/WebUserControls/mod_PostTT.ascx | 8 +- GMW/WebUserControls/mod_PostTT.ascx.cs | 34 +- .../mod_PostTT.ascx.designer.cs | 13 +- GMW_data/DS_magazzino.Designer.cs | 417 +++++++++++++++--- GMW_data/DS_magazzino.xsd | 143 +++--- GMW_data/DS_magazzino.xss | 10 +- GMW_data/MagClass.cs | 2 +- 7 files changed, 499 insertions(+), 128 deletions(-) diff --git a/GMW/WebUserControls/mod_PostTT.ascx b/GMW/WebUserControls/mod_PostTT.ascx index 9d011069..1a60c9bf 100644 --- a/GMW/WebUserControls/mod_PostTT.ascx +++ b/GMW/WebUserControls/mod_PostTT.ascx @@ -77,7 +77,7 @@
- +
@@ -85,7 +85,11 @@ <%: traduci("Durezza") %>(AL)
- +
+ +
diff --git a/GMW/WebUserControls/mod_PostTT.ascx.cs b/GMW/WebUserControls/mod_PostTT.ascx.cs index afa2ee36..a007e0ed 100644 --- a/GMW/WebUserControls/mod_PostTT.ascx.cs +++ b/GMW/WebUserControls/mod_PostTT.ascx.cs @@ -70,17 +70,17 @@ namespace GMW.WebUserControls } } /// - /// Durezza + /// Durezza (ok/ko) /// - public string Durezza + public bool Durezza { get { - return txtDurezza.Text.Trim(); + return chkDurezza.Checked; } set { - txtDurezza.Text = value; + chkDurezza.Checked = value; } } /// @@ -104,7 +104,7 @@ namespace GMW.WebUserControls AnnoTratt = DateTime.Now.Year.ToString(); sourceAL = ""; NumTratt = ""; - Durezza = ""; + Durezza = false; txtNote.Text = ""; } /// @@ -281,9 +281,9 @@ namespace GMW.WebUserControls } else { - if (Durezza == "") + if (!Durezza) { - txtDurezza.Focus(); + chkDurezza.Focus(); } else { @@ -309,7 +309,7 @@ namespace GMW.WebUserControls divNumTratt.Visible = btnVis; divDurezza.Visible = btnVis; // posso stampare se ho AL, ho num tratt e durezza.. - btnVis = (sourceAL != "" && NumTratt != "" && Durezza != ""); + btnVis = (sourceAL != "" && NumTratt != "" && Durezza); divStampa.Visible = btnVis; } /// @@ -349,7 +349,7 @@ namespace GMW.WebUserControls // creazione AL ed associazione UDC / spostamento... try { - AL = MagClass.magazzino.creaAssociaAlTT(sourceAL, tipoAL.AL_TT, MagClass.magazzino.CodSoggCurrUser, noteTrim, codTratt, Durezza); + AL = MagClass.magazzino.creaAssociaAlTT(sourceAL, tipoAL.AL_TT, MagClass.magazzino.CodSoggCurrUser, noteTrim, codTratt, Convert.ToInt32(Durezza)); } catch { } @@ -383,12 +383,24 @@ namespace GMW.WebUserControls doUpdate(); } /// - /// inserita durezza + /// modificata durezza /// /// /// - protected void txtDurezza_TextChanged(object sender, EventArgs e) + protected void chkDurezza_CheckedChanged(object sender, EventArgs e) { + if (Durezza) + { + chkDurezza.Text = "OK"; + lblDurezza.Attributes.Remove("class"); + lblDurezza.Attributes.Add("class","btn btn-success"); + } + else + { + chkDurezza.Text = "KO"; + lblDurezza.Attributes.Remove("class"); + lblDurezza.Attributes.Add("class", "btn btn-danger"); + } doUpdate(); } } diff --git a/GMW/WebUserControls/mod_PostTT.ascx.designer.cs b/GMW/WebUserControls/mod_PostTT.ascx.designer.cs index 22f65dab..d087118c 100644 --- a/GMW/WebUserControls/mod_PostTT.ascx.designer.cs +++ b/GMW/WebUserControls/mod_PostTT.ascx.designer.cs @@ -139,12 +139,21 @@ namespace GMW.WebUserControls { protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDurezza; /// - /// txtDurezza control. + /// lblDurezza control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtDurezza; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblDurezza; + + /// + /// chkDurezza control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox chkDurezza; } } diff --git a/GMW_data/DS_magazzino.Designer.cs b/GMW_data/DS_magazzino.Designer.cs index 2024ccf2..7b6e0482 100644 --- a/GMW_data/DS_magazzino.Designer.cs +++ b/GMW_data/DS_magazzino.Designer.cs @@ -14094,8 +14094,16 @@ namespace GMW_data { private global::System.Data.DataColumn columnDurezza; + private global::System.Data.DataColumn columnDataDur; + + private global::System.Data.DataColumn columnCodSoggettoDur; + private global::System.Data.DataColumn columnProveMecc; + private global::System.Data.DataColumn columnDataPM; + + private global::System.Data.DataColumn columnCodSoggettoPM; + private global::System.Data.DataColumn columnHasDtx; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14163,6 +14171,22 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn DataDurColumn { + get { + return this.columnDataDur; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn CodSoggettoDurColumn { + get { + return this.columnCodSoggettoDur; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn ProveMeccColumn { @@ -14171,6 +14195,22 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn DataPMColumn { + get { + return this.columnDataPM; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn CodSoggettoPMColumn { + get { + return this.columnCodSoggettoPM; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn HasDtxColumn { @@ -14216,14 +14256,18 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ElencoTrattamentiRow AddElencoTrattamentiRow(string Trattamento, ElencoAssiemiRow parentElencoAssiemiRowByFK_ElencoTrattamenti_ElencoAssiemi, System.DateTime DataTrattEnd, decimal Durezza, decimal ProveMecc, bool HasDtx) { + public ElencoTrattamentiRow AddElencoTrattamentiRow(string Trattamento, ElencoAssiemiRow parentElencoAssiemiRowByFK_ElencoTrattamenti_ElencoAssiemi, System.DateTime DataTrattEnd, int Durezza, System.DateTime DataDur, string CodSoggettoDur, int ProveMecc, System.DateTime DataPM, string CodSoggettoPM, bool HasDtx) { ElencoTrattamentiRow rowElencoTrattamentiRow = ((ElencoTrattamentiRow)(this.NewRow())); object[] columnValuesArray = new object[] { Trattamento, null, DataTrattEnd, Durezza, + DataDur, + CodSoggettoDur, ProveMecc, + DataPM, + CodSoggettoPM, HasDtx}; if ((parentElencoAssiemiRowByFK_ElencoTrattamenti_ElencoAssiemi != null)) { columnValuesArray[1] = parentElencoAssiemiRowByFK_ElencoTrattamenti_ElencoAssiemi[0]; @@ -14261,7 +14305,11 @@ namespace GMW_data { this.columnAL = base.Columns["AL"]; this.columnDataTrattEnd = base.Columns["DataTrattEnd"]; this.columnDurezza = base.Columns["Durezza"]; + this.columnDataDur = base.Columns["DataDur"]; + this.columnCodSoggettoDur = base.Columns["CodSoggettoDur"]; this.columnProveMecc = base.Columns["ProveMecc"]; + this.columnDataPM = base.Columns["DataPM"]; + this.columnCodSoggettoPM = base.Columns["CodSoggettoPM"]; this.columnHasDtx = base.Columns["HasDtx"]; } @@ -14274,10 +14322,18 @@ namespace GMW_data { base.Columns.Add(this.columnAL); this.columnDataTrattEnd = new global::System.Data.DataColumn("DataTrattEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDataTrattEnd); - this.columnDurezza = new global::System.Data.DataColumn("Durezza", typeof(decimal), null, global::System.Data.MappingType.Element); + this.columnDurezza = new global::System.Data.DataColumn("Durezza", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDurezza); - this.columnProveMecc = new global::System.Data.DataColumn("ProveMecc", typeof(decimal), null, global::System.Data.MappingType.Element); + this.columnDataDur = new global::System.Data.DataColumn("DataDur", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDataDur); + this.columnCodSoggettoDur = new global::System.Data.DataColumn("CodSoggettoDur", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodSoggettoDur); + this.columnProveMecc = new global::System.Data.DataColumn("ProveMecc", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnProveMecc); + this.columnDataPM = new global::System.Data.DataColumn("DataPM", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDataPM); + this.columnCodSoggettoPM = new global::System.Data.DataColumn("CodSoggettoPM", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodSoggettoPM); this.columnHasDtx = new global::System.Data.DataColumn("HasDtx", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnHasDtx); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { @@ -14289,7 +14345,11 @@ namespace GMW_data { this.columnAL.MaxLength = 50; this.columnDataTrattEnd.AllowDBNull = false; this.columnDurezza.AllowDBNull = false; + this.columnCodSoggettoDur.AllowDBNull = false; + this.columnCodSoggettoDur.MaxLength = 17; this.columnProveMecc.AllowDBNull = false; + this.columnCodSoggettoPM.AllowDBNull = false; + this.columnCodSoggettoPM.MaxLength = 17; this.columnHasDtx.AllowDBNull = false; } @@ -21101,9 +21161,9 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public decimal Durezza { + public int Durezza { get { - return ((decimal)(this[this.tableElencoTrattamenti.DurezzaColumn])); + return ((int)(this[this.tableElencoTrattamenti.DurezzaColumn])); } set { this[this.tableElencoTrattamenti.DurezzaColumn] = value; @@ -21112,15 +21172,69 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public decimal ProveMecc { + public System.DateTime DataDur { get { - return ((decimal)(this[this.tableElencoTrattamenti.ProveMeccColumn])); + try { + return ((global::System.DateTime)(this[this.tableElencoTrattamenti.DataDurColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DataDur\' in table \'ElencoTrattamenti\' is DBNull.", e); + } + } + set { + this[this.tableElencoTrattamenti.DataDurColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string CodSoggettoDur { + get { + return ((string)(this[this.tableElencoTrattamenti.CodSoggettoDurColumn])); + } + set { + this[this.tableElencoTrattamenti.CodSoggettoDurColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int ProveMecc { + get { + return ((int)(this[this.tableElencoTrattamenti.ProveMeccColumn])); } set { this[this.tableElencoTrattamenti.ProveMeccColumn] = value; } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public System.DateTime DataPM { + get { + try { + return ((global::System.DateTime)(this[this.tableElencoTrattamenti.DataPMColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DataPM\' in table \'ElencoTrattamenti\' is DBNull.", e); + } + } + set { + this[this.tableElencoTrattamenti.DataPMColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string CodSoggettoPM { + get { + return ((string)(this[this.tableElencoTrattamenti.CodSoggettoPMColumn])); + } + set { + this[this.tableElencoTrattamenti.CodSoggettoPMColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool HasDtx { @@ -21142,6 +21256,30 @@ namespace GMW_data { this.SetParentRow(value, this.Table.ParentRelations["FK_ElencoTrattamenti_ElencoAssiemi"]); } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsDataDurNull() { + return this.IsNull(this.tableElencoTrattamenti.DataDurColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetDataDurNull() { + this[this.tableElencoTrattamenti.DataDurColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsDataPMNull() { + return this.IsNull(this.tableElencoTrattamenti.DataPMColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetDataPMNull() { + this[this.tableElencoTrattamenti.DataPMColumn] = global::System.Convert.DBNull; + } } /// @@ -39363,7 +39501,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, this._commandCollection[7].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[7].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[7].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[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", 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("@AL", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.InputOutput, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -39938,7 +40076,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 Note, string NumTratt, string Durezza, ref string AL) { + public virtual object insertNewTT(string SourceAL, string TipoAl, global::System.Nullable DataCreaz, string CodSoggetto, string Note, string NumTratt, global::System.Nullable Durezza, ref string AL) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((SourceAL == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -39976,11 +40114,11 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, else { command.Parameters[6].Value = ((string)(NumTratt)); } - if ((Durezza == null)) { - command.Parameters[7].Value = global::System.DBNull.Value; + if ((Durezza.HasValue == true)) { + command.Parameters[7].Value = ((int)(Durezza.Value)); } else { - command.Parameters[7].Value = ((string)(Durezza)); + command.Parameters[7].Value = global::System.DBNull.Value; } if ((AL == null)) { command.Parameters[8].Value = global::System.DBNull.Value; @@ -40640,46 +40778,70 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ tableMapping.ColumnMappings.Add("AL", "AL"); tableMapping.ColumnMappings.Add("DataTrattEnd", "DataTrattEnd"); tableMapping.ColumnMappings.Add("Durezza", "Durezza"); + tableMapping.ColumnMappings.Add("DataDur", "DataDur"); + tableMapping.ColumnMappings.Add("CodSoggettoDur", "CodSoggettoDur"); tableMapping.ColumnMappings.Add("ProveMecc", "ProveMecc"); + tableMapping.ColumnMappings.Add("DataPM", "DataPM"); + tableMapping.ColumnMappings.Add("CodSoggettoPM", "CodSoggettoPM"); tableMapping.ColumnMappings.Add("HasDtx", "HasDtx"); 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].[ElencoTrattamenti] WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ([ProveMecc] = @Original_ProveMecc) AND ([HasDtx] = @Original_HasDtx))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [ElencoTrattamenti] WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ((@IsNull_DataDur = 1 AND [DataDur] IS NULL) OR ([DataDur] = @Original_DataDur)) AND ([CodSoggettoDur] = @Original_CodSoggettoDur) AND ([ProveMecc] = @Original_ProveMecc) AND ((@IsNull_DataPM = 1 AND [DataPM] IS NULL) OR ([DataPM] = @Original_DataPM)) AND ([CodSoggettoPM] = @Original_CodSoggettoPM) AND ([HasDtx] = @Original_HasDtx))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Trattamento", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Trattamento", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_AL", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AL", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataTrattEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTrattEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Durezza", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Durezza", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProveMecc", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "ProveMecc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Durezza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Durezza", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataDur", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataDur", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSoggettoDur", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoDur", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProveMecc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProveMecc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataPM", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataPM", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSoggettoPM", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoPM", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_HasDtx", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "HasDtx", 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].[ElencoTrattamenti] ([Trattamento], [AL], [DataTrattEnd], [Durezza], [ProveMecc], [HasDtx]) VALUES (@Trattamento, @AL, @DataTrattEnd, @Durezza, @ProveMecc, @HasDtx); -SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [ElencoTrattamenti] ([Trattamento], [AL], [DataTrattEnd], [Durezza], [DataDur], [CodSoggettoDur], [ProveMecc], [DataPM], [CodSoggettoPM], [HasDtx]) VALUES (@Trattamento, @AL, @DataTrattEnd, @Durezza, @DataDur, @CodSoggettoDur, @ProveMecc, @DataPM, @CodSoggettoPM, @HasDtx); +SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Trattamento", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Trattamento", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AL", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTrattEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTrattEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Durezza", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "ProveMecc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Durezza", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataDur", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoDur", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoDur", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProveMecc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataPM", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoPM", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoPM", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HasDtx", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "HasDtx", 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].[ElencoTrattamenti] SET [Trattamento] = @Trattamento, [AL] = @AL, [DataTrattEnd] = @DataTrattEnd, [Durezza] = @Durezza, [ProveMecc] = @ProveMecc, [HasDtx] = @HasDtx WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ([ProveMecc] = @Original_ProveMecc) AND ([HasDtx] = @Original_HasDtx)); -SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [ElencoTrattamenti] SET [Trattamento] = @Trattamento, [AL] = @AL, [DataTrattEnd] = @DataTrattEnd, [Durezza] = @Durezza, [DataDur] = @DataDur, [CodSoggettoDur] = @CodSoggettoDur, [ProveMecc] = @ProveMecc, [DataPM] = @DataPM, [CodSoggettoPM] = @CodSoggettoPM, [HasDtx] = @HasDtx WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ((@IsNull_DataDur = 1 AND [DataDur] IS NULL) OR ([DataDur] = @Original_DataDur)) AND ([CodSoggettoDur] = @Original_CodSoggettoDur) AND ([ProveMecc] = @Original_ProveMecc) AND ((@IsNull_DataPM = 1 AND [DataPM] IS NULL) OR ([DataPM] = @Original_DataPM)) AND ([CodSoggettoPM] = @Original_CodSoggettoPM) AND ([HasDtx] = @Original_HasDtx)); +SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Trattamento", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Trattamento", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AL", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTrattEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTrattEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Durezza", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "ProveMecc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Durezza", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataDur", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoDur", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoDur", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProveMecc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataPM", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoPM", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoPM", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HasDtx", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "HasDtx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Trattamento", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Trattamento", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_AL", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AL", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataTrattEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTrattEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Durezza", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Durezza", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProveMecc", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "ProveMecc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Durezza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Durezza", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataDur", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataDur", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSoggettoDur", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoDur", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProveMecc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProveMecc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataPM", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataPM", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSoggettoPM", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoPM", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_HasDtx", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "HasDtx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -40696,8 +40858,8 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM dbo.ElencoT" + - "rattamenti"; + this._commandCollection[0].CommandText = "SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, Pr" + + "oveMecc, DataPM, CodSoggettoPM, HasDtx\r\nFROM ElencoTrattamenti"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -40726,9 +40888,9 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Trattamento", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].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[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataPM", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoPM", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -40857,7 +41019,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(string Original_Trattamento, string Original_AL, System.DateTime Original_DataTrattEnd, decimal Original_Durezza, decimal Original_ProveMecc, bool Original_HasDtx) { + public virtual int Delete(string Original_Trattamento, string Original_AL, System.DateTime Original_DataTrattEnd, int Original_Durezza, global::System.Nullable Original_DataDur, string Original_CodSoggettoDur, int Original_ProveMecc, global::System.Nullable Original_DataPM, string Original_CodSoggettoPM, bool Original_HasDtx) { if ((Original_Trattamento == null)) { throw new global::System.ArgumentNullException("Original_Trattamento"); } @@ -40871,9 +41033,37 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_AL)); } this.Adapter.DeleteCommand.Parameters[2].Value = ((System.DateTime)(Original_DataTrattEnd)); - this.Adapter.DeleteCommand.Parameters[3].Value = ((decimal)(Original_Durezza)); - this.Adapter.DeleteCommand.Parameters[4].Value = ((decimal)(Original_ProveMecc)); - this.Adapter.DeleteCommand.Parameters[5].Value = ((bool)(Original_HasDtx)); + this.Adapter.DeleteCommand.Parameters[3].Value = ((int)(Original_Durezza)); + if ((Original_DataDur.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[5].Value = ((System.DateTime)(Original_DataDur.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; + } + if ((Original_CodSoggettoDur == null)) { + throw new global::System.ArgumentNullException("Original_CodSoggettoDur"); + } + else { + this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_CodSoggettoDur)); + } + this.Adapter.DeleteCommand.Parameters[7].Value = ((int)(Original_ProveMecc)); + if ((Original_DataPM.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[8].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[9].Value = ((System.DateTime)(Original_DataPM.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[8].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[9].Value = global::System.DBNull.Value; + } + if ((Original_CodSoggettoPM == null)) { + throw new global::System.ArgumentNullException("Original_CodSoggettoPM"); + } + else { + this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_CodSoggettoPM)); + } + this.Adapter.DeleteCommand.Parameters[11].Value = ((bool)(Original_HasDtx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -40894,7 +41084,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string Trattamento, string AL, System.DateTime DataTrattEnd, decimal Durezza, decimal ProveMecc, bool HasDtx) { + public virtual int Insert(string Trattamento, string AL, System.DateTime DataTrattEnd, int Durezza, global::System.Nullable DataDur, string CodSoggettoDur, int ProveMecc, global::System.Nullable DataPM, string CodSoggettoPM, bool HasDtx) { if ((Trattamento == null)) { throw new global::System.ArgumentNullException("Trattamento"); } @@ -40908,9 +41098,33 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat this.Adapter.InsertCommand.Parameters[1].Value = ((string)(AL)); } this.Adapter.InsertCommand.Parameters[2].Value = ((System.DateTime)(DataTrattEnd)); - this.Adapter.InsertCommand.Parameters[3].Value = ((decimal)(Durezza)); - this.Adapter.InsertCommand.Parameters[4].Value = ((decimal)(ProveMecc)); - this.Adapter.InsertCommand.Parameters[5].Value = ((bool)(HasDtx)); + this.Adapter.InsertCommand.Parameters[3].Value = ((int)(Durezza)); + if ((DataDur.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[4].Value = ((System.DateTime)(DataDur.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; + } + if ((CodSoggettoDur == null)) { + throw new global::System.ArgumentNullException("CodSoggettoDur"); + } + else { + this.Adapter.InsertCommand.Parameters[5].Value = ((string)(CodSoggettoDur)); + } + this.Adapter.InsertCommand.Parameters[6].Value = ((int)(ProveMecc)); + if ((DataPM.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[7].Value = ((System.DateTime)(DataPM.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; + } + if ((CodSoggettoPM == null)) { + throw new global::System.ArgumentNullException("CodSoggettoPM"); + } + else { + this.Adapter.InsertCommand.Parameters[8].Value = ((string)(CodSoggettoPM)); + } + this.Adapter.InsertCommand.Parameters[9].Value = ((bool)(HasDtx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -40931,7 +41145,27 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string Trattamento, string AL, System.DateTime DataTrattEnd, decimal Durezza, decimal ProveMecc, bool HasDtx, string Original_Trattamento, string Original_AL, System.DateTime Original_DataTrattEnd, decimal Original_Durezza, decimal Original_ProveMecc, bool Original_HasDtx) { + public virtual int Update( + string Trattamento, + string AL, + System.DateTime DataTrattEnd, + int Durezza, + global::System.Nullable DataDur, + string CodSoggettoDur, + int ProveMecc, + global::System.Nullable DataPM, + string CodSoggettoPM, + bool HasDtx, + string Original_Trattamento, + string Original_AL, + System.DateTime Original_DataTrattEnd, + int Original_Durezza, + global::System.Nullable Original_DataDur, + string Original_CodSoggettoDur, + int Original_ProveMecc, + global::System.Nullable Original_DataPM, + string Original_CodSoggettoPM, + bool Original_HasDtx) { if ((Trattamento == null)) { throw new global::System.ArgumentNullException("Trattamento"); } @@ -40945,25 +41179,77 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(AL)); } this.Adapter.UpdateCommand.Parameters[2].Value = ((System.DateTime)(DataTrattEnd)); - this.Adapter.UpdateCommand.Parameters[3].Value = ((decimal)(Durezza)); - this.Adapter.UpdateCommand.Parameters[4].Value = ((decimal)(ProveMecc)); - this.Adapter.UpdateCommand.Parameters[5].Value = ((bool)(HasDtx)); + this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Durezza)); + if ((DataDur.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[4].Value = ((System.DateTime)(DataDur.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; + } + if ((CodSoggettoDur == null)) { + throw new global::System.ArgumentNullException("CodSoggettoDur"); + } + else { + this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(CodSoggettoDur)); + } + this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(ProveMecc)); + if ((DataPM.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[7].Value = ((System.DateTime)(DataPM.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; + } + if ((CodSoggettoPM == null)) { + throw new global::System.ArgumentNullException("CodSoggettoPM"); + } + else { + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(CodSoggettoPM)); + } + this.Adapter.UpdateCommand.Parameters[9].Value = ((bool)(HasDtx)); if ((Original_Trattamento == null)) { throw new global::System.ArgumentNullException("Original_Trattamento"); } else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_Trattamento)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_Trattamento)); } if ((Original_AL == null)) { throw new global::System.ArgumentNullException("Original_AL"); } else { - this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_AL)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_AL)); } - this.Adapter.UpdateCommand.Parameters[8].Value = ((System.DateTime)(Original_DataTrattEnd)); - this.Adapter.UpdateCommand.Parameters[9].Value = ((decimal)(Original_Durezza)); - this.Adapter.UpdateCommand.Parameters[10].Value = ((decimal)(Original_ProveMecc)); - this.Adapter.UpdateCommand.Parameters[11].Value = ((bool)(Original_HasDtx)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((System.DateTime)(Original_DataTrattEnd)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_Durezza)); + if ((Original_DataDur.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((System.DateTime)(Original_DataDur.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; + } + if ((Original_CodSoggettoDur == null)) { + throw new global::System.ArgumentNullException("Original_CodSoggettoDur"); + } + else { + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_CodSoggettoDur)); + } + this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_ProveMecc)); + if ((Original_DataPM.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((System.DateTime)(Original_DataPM.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; + } + if ((Original_CodSoggettoPM == null)) { + throw new global::System.ArgumentNullException("Original_CodSoggettoPM"); + } + else { + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_CodSoggettoPM)); + } + this.Adapter.UpdateCommand.Parameters[21].Value = ((bool)(Original_HasDtx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -40984,14 +41270,33 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string AL, System.DateTime DataTrattEnd, decimal Durezza, decimal ProveMecc, bool HasDtx, string Original_Trattamento, string Original_AL, System.DateTime Original_DataTrattEnd, decimal Original_Durezza, decimal Original_ProveMecc, bool Original_HasDtx) { - return this.Update(Original_Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx, Original_Trattamento, Original_AL, Original_DataTrattEnd, Original_Durezza, Original_ProveMecc, Original_HasDtx); + public virtual int Update( + string AL, + System.DateTime DataTrattEnd, + int Durezza, + global::System.Nullable DataDur, + string CodSoggettoDur, + int ProveMecc, + global::System.Nullable DataPM, + string CodSoggettoPM, + bool HasDtx, + string Original_Trattamento, + string Original_AL, + System.DateTime Original_DataTrattEnd, + int Original_Durezza, + global::System.Nullable Original_DataDur, + string Original_CodSoggettoDur, + int Original_ProveMecc, + global::System.Nullable Original_DataPM, + string Original_CodSoggettoPM, + bool Original_HasDtx) { + return this.Update(Original_Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx, Original_Trattamento, Original_AL, Original_DataTrattEnd, Original_Durezza, Original_DataDur, Original_CodSoggettoDur, Original_ProveMecc, Original_DataPM, Original_CodSoggettoPM, Original_HasDtx); } [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 int updatePM(string Trattamento, global::System.Nullable ProveMecc, global::System.Nullable DataCreaz, string CodSoggetto) { + public virtual int updatePM(string Trattamento, global::System.Nullable ProveMecc, global::System.Nullable DataPM, string CodSoggettoPM) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((Trattamento == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -41000,22 +41305,22 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat command.Parameters[1].Value = ((string)(Trattamento)); } if ((ProveMecc.HasValue == true)) { - command.Parameters[2].Value = ((decimal)(ProveMecc.Value)); + command.Parameters[2].Value = ((int)(ProveMecc.Value)); } else { command.Parameters[2].Value = global::System.DBNull.Value; } - if ((DataCreaz.HasValue == true)) { - command.Parameters[3].Value = ((System.DateTime)(DataCreaz.Value)); + if ((DataPM.HasValue == true)) { + command.Parameters[3].Value = ((System.DateTime)(DataPM.Value)); } else { command.Parameters[3].Value = global::System.DBNull.Value; } - if ((CodSoggetto == null)) { + if ((CodSoggettoPM == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(CodSoggetto)); + command.Parameters[4].Value = ((string)(CodSoggettoPM)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd index 29502494..26e6fda4 100644 --- a/GMW_data/DS_magazzino.xsd +++ b/GMW_data/DS_magazzino.xsd @@ -3639,7 +3639,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, - + dbo.stp_UAL_Disattiva @@ -3650,7 +3650,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, - + dbo.stp_UAL_eliminaEmpty @@ -3686,7 +3686,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, - + dbo.stp_UAL_insertNewRX @@ -3710,7 +3710,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, - + dbo.stp_UAL_insertNewTL @@ -3725,7 +3725,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, - + dbo.stp_UAL_insertNewTT @@ -3737,7 +3737,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, - + @@ -3847,53 +3847,74 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - DELETE FROM [dbo].[ElencoTrattamenti] WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ([ProveMecc] = @Original_ProveMecc) AND ([HasDtx] = @Original_HasDtx)) + DELETE FROM [ElencoTrattamenti] WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ((@IsNull_DataDur = 1 AND [DataDur] IS NULL) OR ([DataDur] = @Original_DataDur)) AND ([CodSoggettoDur] = @Original_CodSoggettoDur) AND ([ProveMecc] = @Original_ProveMecc) AND ((@IsNull_DataPM = 1 AND [DataPM] IS NULL) OR ([DataPM] = @Original_DataPM)) AND ([CodSoggettoPM] = @Original_CodSoggettoPM) AND ([HasDtx] = @Original_HasDtx)) - - + + + + + + + + - INSERT INTO [dbo].[ElencoTrattamenti] ([Trattamento], [AL], [DataTrattEnd], [Durezza], [ProveMecc], [HasDtx]) VALUES (@Trattamento, @AL, @DataTrattEnd, @Durezza, @ProveMecc, @HasDtx); -SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento) + INSERT INTO [ElencoTrattamenti] ([Trattamento], [AL], [DataTrattEnd], [Durezza], [DataDur], [CodSoggettoDur], [ProveMecc], [DataPM], [CodSoggettoPM], [HasDtx]) VALUES (@Trattamento, @AL, @DataTrattEnd, @Durezza, @DataDur, @CodSoggettoDur, @ProveMecc, @DataPM, @CodSoggettoPM, @HasDtx); +SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento) - - + + + + + + - - SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM dbo.ElencoTrattamenti + + SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx +FROM ElencoTrattamenti - UPDATE [dbo].[ElencoTrattamenti] SET [Trattamento] = @Trattamento, [AL] = @AL, [DataTrattEnd] = @DataTrattEnd, [Durezza] = @Durezza, [ProveMecc] = @ProveMecc, [HasDtx] = @HasDtx WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ([ProveMecc] = @Original_ProveMecc) AND ([HasDtx] = @Original_HasDtx)); -SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento) + UPDATE [ElencoTrattamenti] SET [Trattamento] = @Trattamento, [AL] = @AL, [DataTrattEnd] = @DataTrattEnd, [Durezza] = @Durezza, [DataDur] = @DataDur, [CodSoggettoDur] = @CodSoggettoDur, [ProveMecc] = @ProveMecc, [DataPM] = @DataPM, [CodSoggettoPM] = @CodSoggettoPM, [HasDtx] = @HasDtx WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ((@IsNull_DataDur = 1 AND [DataDur] IS NULL) OR ([DataDur] = @Original_DataDur)) AND ([CodSoggettoDur] = @Original_CodSoggettoDur) AND ([ProveMecc] = @Original_ProveMecc) AND ((@IsNull_DataPM = 1 AND [DataPM] IS NULL) OR ([DataPM] = @Original_DataPM)) AND ([CodSoggettoPM] = @Original_CodSoggettoPM) AND ([HasDtx] = @Original_HasDtx)); +SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento) - - + + + + + + - - + + + + + + + + @@ -3905,7 +3926,11 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat + + + + @@ -3952,9 +3977,9 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - - - + + + @@ -5106,7 +5131,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - + @@ -5163,7 +5188,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - + @@ -5195,7 +5220,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - + @@ -5217,7 +5242,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - + @@ -5244,7 +5269,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - + @@ -5293,14 +5318,14 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - + - + @@ -5336,7 +5361,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - + @@ -5393,7 +5418,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - + @@ -5421,7 +5446,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - + @@ -5439,13 +5464,29 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - - + + + + + + + + + + + + + + + + + + - + @@ -5639,20 +5680,20 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/GMW_data/DS_magazzino.xss b/GMW_data/DS_magazzino.xss index df78a0f2..4253a900 100644 --- a/GMW_data/DS_magazzino.xss +++ b/GMW_data/DS_magazzino.xss @@ -4,9 +4,9 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + @@ -40,8 +40,8 @@ - - + + @@ -220,7 +220,7 @@ - + -47 diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs index 59b3a9a0..ea3bd6d2 100644 --- a/GMW_data/MagClass.cs +++ b/GMW_data/MagClass.cs @@ -293,7 +293,7 @@ namespace GMW_data /// Numero Trattamento /// Durezza rilevata /// - public string creaAssociaAlTT(string SourceAL, tipoAL tipologia, string CodSoggetto, string note, string NumTratt, string Durezza) + public string creaAssociaAlTT(string SourceAL, tipoAL tipologia, string CodSoggetto, string note, string NumTratt, int Durezza) { // imposto valori default string TipoAL = "";