From bdc522af8906e286dd2d71ad225a435b8e226188 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 18 Nov 2016 11:17:02 +0100 Subject: [PATCH] aggiunta gestione modifica articolo x revisione UT (lato ADMIN) --- .vs/MP-Admin/v14/.suo | Bin 219136 -> 219136 bytes .../WebUserControls/mod_anagArticoli.ascx | 13 ++--- .../WebUserControls/mod_anagArticoli.ascx.cs | 8 ++- MapoDb/DS_ProdTempi.xsd | 15 +++--- MapoDb/DS_ProdTempi.xss | 36 ++++++------- MapoDb/DS_ProdTempi1.Designer.cs | 51 +++++++++++++----- 6 files changed, 76 insertions(+), 47 deletions(-) diff --git a/.vs/MP-Admin/v14/.suo b/.vs/MP-Admin/v14/.suo index 3f0f0c0d2060a3b83b2aef95350aeb63649ad467..192203c93f570c2ecbe95b8945cf1151cd09031a 100644 GIT binary patch delta 435 zcmZ`zODIHP7`^}buj`I6h$(j>3nPgs6y*`IMNQdIWFtE%nuXb^Nm6v>^(}0SG^J!N zqyDk6vapaOMoAu7DCM=m2-h9PMmcrr>zwa&&WPa{F&suel*itWn?Q492ya|joZJZ} zZe^Yosgfjpn5Ow@@fWhCWm(KkdNUrihS?&0>Vj>_DKBMXLmRd;U%>Acem67Am_FwB zGU4}PtcU5u*6_+6Y2Cmwh1XC>ZBdx)G$913;uCdr97bPg018!JpqjEYu2R`MYRNEg zELyiPT0rTu@K8)gi`duED3dma655_YsfeAS)RE?MNm7orFIA$0a~!d|?>-T}#V)7T z2kiaG8Dc7qI7`}zIW6M#2_A%=0qTk(Uo@rhb}q&<`Lw*rZ7DPz$4f}zn5*C&boqvr zzu{GGKeU>EP%grDe$5j3dz+?NB2O~s%BUYa>1-%|xL1Yl;)AltbMo$#|DSwrK2h}r DbwZ|{ delta 343 zcmZqJz}v8acS8;n+X3S%RX-dy7cu=}W}9$=5zJu^{wa&1oKn9Vtfhh;O1*dNA4LM)pkD!3WDn=6&KS1L39*JkW)uk>f!Ug^)& z9>>@{opBx0kL_n)GqE!-%VT1j{&5GB*7WmVnGC0&U(fVm`UYO+t=o1nU69>=p`Xcs zZP`609wa?=%+p`5XSxDXwQo5m3p3+3PUhJx(;I#=#Vq^A#I*g+Po_zX+b`T>GGLq@ zz{Silz5f%F*i<>@mD@Y{naf$WFmtj_<7EE6jExzn_A`?T6Ub7T?J_@@f|zk>d&emv r0`w{~5HkUB;q?exwfFBhrW+bFi*8>a$(+ElO@z6eb$huobEgRa&^m*V diff --git a/MP-Admin/WebUserControls/mod_anagArticoli.ascx b/MP-Admin/WebUserControls/mod_anagArticoli.ascx index b48b53d0..fbb1b751 100644 --- a/MP-Admin/WebUserControls/mod_anagArticoli.ascx +++ b/MP-Admin/WebUserControls/mod_anagArticoli.ascx @@ -58,15 +58,15 @@ - + - + - + @@ -102,11 +102,7 @@    - + @@ -117,6 +113,7 @@ + diff --git a/MP-Admin/WebUserControls/mod_anagArticoli.ascx.cs b/MP-Admin/WebUserControls/mod_anagArticoli.ascx.cs index 71ca4d03..0a29a207 100644 --- a/MP-Admin/WebUserControls/mod_anagArticoli.ascx.cs +++ b/MP-Admin/WebUserControls/mod_anagArticoli.ascx.cs @@ -261,7 +261,13 @@ namespace MoonProAdmin.WebUserControls resetSelezione(); } - #endregion + #endregion + protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e) + { + // verifico eventuali nulli --> "" + if (e.InputParameters["DescArticolo"] == null) e.InputParameters["DescArticolo"] = ""; + if (e.InputParameters["CurrRev"] == null) e.InputParameters["CurrRev"] = ""; + } } } \ No newline at end of file diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd index e1d08c11..7f5f0f38 100644 --- a/MapoDb/DS_ProdTempi.xsd +++ b/MapoDb/DS_ProdTempi.xsd @@ -382,14 +382,15 @@ ORDER BY idxODL DESC - DELETE FROM [dbo].[AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescArticolo = 1 AND [DescArticolo] IS NULL) OR ([DescArticolo] = @Original_DescArticolo)) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ([FlagIsNew] = @Original_FlagIsNew)) + DELETE FROM [dbo].[AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescArticolo = 1 AND [DescArticolo] IS NULL) OR ([DescArticolo] = @Original_DescArticolo)) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew))) - + + @@ -413,7 +414,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - UPDATE [dbo].[AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescArticolo] = @DescArticolo, [CurrRev] = @CurrRev, [ProdRev] = @ProdRev WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescArticolo = 1 AND [DescArticolo] IS NULL) OR ([DescArticolo] = @Original_DescArticolo)) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ([FlagIsNew] = @Original_FlagIsNew)); + UPDATE [dbo].[AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescArticolo] = @DescArticolo, [CurrRev] = @CurrRev, [ProdRev] = @ProdRev WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescArticolo = 1 AND [DescArticolo] IS NULL) OR ([DescArticolo] = @Original_DescArticolo)) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew))); SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli WHERE (CodArticolo = @CodArticolo) @@ -425,7 +426,8 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - + + @@ -462,7 +464,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - + dbo.stp_ART_update @@ -471,6 +473,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli + @@ -1871,7 +1874,7 @@ FROM export.v_AS400_BufferProdAs400 - + diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss index 82ffd07b..fe113f42 100644 --- a/MapoDb/DS_ProdTempi.xss +++ b/MapoDb/DS_ProdTempi.xss @@ -6,25 +6,25 @@ --> - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MapoDb/DS_ProdTempi1.Designer.cs b/MapoDb/DS_ProdTempi1.Designer.cs index 0b7b9b83..bd63e325 100644 --- a/MapoDb/DS_ProdTempi1.Designer.cs +++ b/MapoDb/DS_ProdTempi1.Designer.cs @@ -1836,7 +1836,7 @@ namespace MapoDb { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public AnagArticoliRow AddAnagArticoliRow(string CodArticolo, string DescArticolo, string CurrRev, string ProdRev, int FlagIsNew) { + public AnagArticoliRow AddAnagArticoliRow(string CodArticolo, string DescArticolo, string CurrRev, string ProdRev, bool FlagIsNew) { AnagArticoliRow rowAnagArticoliRow = ((AnagArticoliRow)(this.NewRow())); object[] columnValuesArray = new object[] { CodArticolo, @@ -1891,7 +1891,7 @@ namespace MapoDb { base.Columns.Add(this.columnCurrRev); this.columnProdRev = new global::System.Data.DataColumn("ProdRev", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnProdRev); - this.columnFlagIsNew = new global::System.Data.DataColumn("FlagIsNew", typeof(int), null, global::System.Data.MappingType.Element); + this.columnFlagIsNew = new global::System.Data.DataColumn("FlagIsNew", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnFlagIsNew); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCodArticolo}, true)); @@ -8521,10 +8521,10 @@ namespace MapoDb { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public int FlagIsNew { + public bool FlagIsNew { get { try { - return ((int)(this[this.tableAnagArticoli.FlagIsNewColumn])); + return ((bool)(this[this.tableAnagArticoli.FlagIsNewColumn])); } catch (global::System.InvalidCastException e) { throw new global::System.Data.StrongTypingException("The value for column \'FlagIsNew\' in table \'AnagArticoli\' is DBNull.", e); @@ -14538,14 +14538,15 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile 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].[AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescArticolo = 1 AND [DescArticolo] IS NULL) OR ([DescArticolo] = @Original_DescArticolo)) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ([FlagIsNew] = @Original_FlagIsNew))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescArticolo = 1 AND [DescArticolo] IS NULL) OR ([DescArticolo] = @Original_DescArticolo)) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DescArticolo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescArticolo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DescArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CurrRev", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CurrRev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProdRev", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProdRev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FlagIsNew", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FlagIsNew", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_FlagIsNew", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FlagIsNew", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FlagIsNew", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FlagIsNew", 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].[AnagArticoli] ([CodArticolo], [DescArticolo], [CurrRev], [ProdRev]) VALUES (@CodArticolo, @DescArticolo, @CurrRev, @ProdRev); @@ -14557,7 +14558,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProdRev", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProdRev", 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].[AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescArticolo] = @DescArticolo, [CurrRev] = @CurrRev, [ProdRev] = @ProdRev WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescArticolo = 1 AND [DescArticolo] IS NULL) OR ([DescArticolo] = @Original_DescArticolo)) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ([FlagIsNew] = @Original_FlagIsNew)); + this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescArticolo] = @DescArticolo, [CurrRev] = @CurrRev, [ProdRev] = @ProdRev WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescArticolo = 1 AND [DescArticolo] IS NULL) OR ([DescArticolo] = @Original_DescArticolo)) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew))); SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -14569,7 +14570,8 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DescArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CurrRev", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CurrRev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProdRev", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProdRev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FlagIsNew", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FlagIsNew", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_FlagIsNew", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FlagIsNew", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FlagIsNew", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "FlagIsNew", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14608,6 +14610,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", 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("@CodArticolo", 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("@DescArticolo", global::System.Data.SqlDbType.NVarChar, 250, 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("@CurrRev", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14667,7 +14670,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli [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_CodArticolo, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, int Original_FlagIsNew) { + public virtual int Delete(string Original_CodArticolo, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, global::System.Nullable Original_FlagIsNew) { if ((Original_CodArticolo == null)) { throw new global::System.ArgumentNullException("Original_CodArticolo"); } @@ -14694,7 +14697,14 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli else { this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_ProdRev)); } - this.Adapter.DeleteCommand.Parameters[5].Value = ((int)(Original_FlagIsNew)); + if ((Original_FlagIsNew.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[6].Value = ((bool)(Original_FlagIsNew.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; + } 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)) { @@ -14760,7 +14770,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli [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 CodArticolo, string DescArticolo, string CurrRev, string ProdRev, string Original_CodArticolo, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, int Original_FlagIsNew) { + public virtual int Update(string CodArticolo, string DescArticolo, string CurrRev, string ProdRev, string Original_CodArticolo, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, global::System.Nullable Original_FlagIsNew) { if ((CodArticolo == null)) { throw new global::System.ArgumentNullException("CodArticolo"); } @@ -14811,7 +14821,14 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli else { this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_ProdRev)); } - this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_FlagIsNew)); + if ((Original_FlagIsNew.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((bool)(Original_FlagIsNew.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + } 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)) { @@ -14832,7 +14849,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli [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 DescArticolo, string CurrRev, string ProdRev, string Original_CodArticolo, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, int Original_FlagIsNew) { + public virtual int Update(string DescArticolo, string CurrRev, string ProdRev, string Original_CodArticolo, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, global::System.Nullable Original_FlagIsNew) { return this.Update(Original_CodArticolo, DescArticolo, CurrRev, ProdRev, Original_CodArticolo, Original_DescArticolo, Original_CurrRev, Original_ProdRev, Original_FlagIsNew); } @@ -14914,7 +14931,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli [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 updateQry(string Original_CodArticolo, string CodArticolo, string DescArticolo) { + public virtual int updateQry(string Original_CodArticolo, string CodArticolo, string DescArticolo, string CurrRev) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((Original_CodArticolo == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -14934,6 +14951,12 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli else { command.Parameters[3].Value = ((string)(DescArticolo)); } + if ((CurrRev == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(CurrRev)); + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) {