diff --git a/Jenkinsfile b/Jenkinsfile index b88d5df3..66c8b245 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=823']) { + withEnv(['NEXT_BUILD_NUMBER=824']) { // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-Admin/WebUserControls/mod_anagArticoli.ascx b/MP-Admin/WebUserControls/mod_anagArticoli.ascx index fbb1b751..ab87c5d3 100644 --- a/MP-Admin/WebUserControls/mod_anagArticoli.ascx +++ b/MP-Admin/WebUserControls/mod_anagArticoli.ascx @@ -1,122 +1,138 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_anagArticoli.ascx.cs" - Inherits="MoonProAdmin.WebUserControls.mod_anagArticoli" %> + Inherits="MoonProAdmin.WebUserControls.mod_anagArticoli" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> - - - - - - - - - - - - - - - - <%-- + + + + + + + + + + + + + + + + <%----%> - - - <%-- + + <%--  --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +    - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/MP-Admin/WebUserControls/mod_anagArticoli.ascx.cs b/MP-Admin/WebUserControls/mod_anagArticoli.ascx.cs index 62c95896..263c0f84 100644 --- a/MP-Admin/WebUserControls/mod_anagArticoli.ascx.cs +++ b/MP-Admin/WebUserControls/mod_anagArticoli.ascx.cs @@ -252,7 +252,7 @@ namespace MoonProAdmin.WebUserControls { string tempCode = string.Format("_{0:yyyyMMdd-HHmmss}", DateTime.Now); string tempName = string.Format("Nuovo articolo creato {0:dd/MM/yyyy HH:mm:ss}", DateTime.Now); - DataLayer.obj.taAnagArt.Insert(tempCode, tempName, "", "", ""); + DataLayer.obj.taAnagArt.Insert(tempCode, tempName, "", "", "", "ART"); // reset! resetSelezione(); } diff --git a/MP-Admin/WebUserControls/mod_anagArticoli.ascx.designer.cs b/MP-Admin/WebUserControls/mod_anagArticoli.ascx.designer.cs index 2b274af4..2c91429e 100644 --- a/MP-Admin/WebUserControls/mod_anagArticoli.ascx.designer.cs +++ b/MP-Admin/WebUserControls/mod_anagArticoli.ascx.designer.cs @@ -1,51 +1,50 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MoonProAdmin.WebUserControls -{ - - +namespace MoonProAdmin.WebUserControls { + + public partial class mod_anagArticoli { /// - /// grView control. + /// Controllo grView. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.GridView grView; /// - /// lblNumRec control. + /// Controllo lblNumRec. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label lblNumRec; /// - /// lblWarning control. + /// Controllo lblWarning. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label lblWarning; /// - /// ods control. + /// Controllo ods. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; } diff --git a/MapoDb/DS_ProdTempi.Designer.cs b/MapoDb/DS_ProdTempi.Designer.cs index 408f01c4..f440bdf6 100644 --- a/MapoDb/DS_ProdTempi.Designer.cs +++ b/MapoDb/DS_ProdTempi.Designer.cs @@ -1933,6 +1933,8 @@ namespace MapoDb { private global::System.Data.DataColumn columnDisegno; + private global::System.Data.DataColumn columnTipo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public AnagArticoliDataTable() { @@ -2014,6 +2016,14 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn TipoColumn { + get { + return this.columnTipo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2051,7 +2061,7 @@ namespace MapoDb { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public AnagArticoliRow AddAnagArticoliRow(string CodArticolo, string DescArticolo, string CurrRev, string ProdRev, bool FlagIsNew, string Disegno) { + public AnagArticoliRow AddAnagArticoliRow(string CodArticolo, string DescArticolo, string CurrRev, string ProdRev, bool FlagIsNew, string Disegno, string Tipo) { AnagArticoliRow rowAnagArticoliRow = ((AnagArticoliRow)(this.NewRow())); object[] columnValuesArray = new object[] { CodArticolo, @@ -2059,7 +2069,8 @@ namespace MapoDb { CurrRev, ProdRev, FlagIsNew, - Disegno}; + Disegno, + Tipo}; rowAnagArticoliRow.ItemArray = columnValuesArray; this.Rows.Add(rowAnagArticoliRow); return rowAnagArticoliRow; @@ -2095,6 +2106,7 @@ namespace MapoDb { this.columnProdRev = base.Columns["ProdRev"]; this.columnFlagIsNew = base.Columns["FlagIsNew"]; this.columnDisegno = base.Columns["Disegno"]; + this.columnTipo = base.Columns["Tipo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2112,6 +2124,8 @@ namespace MapoDb { base.Columns.Add(this.columnFlagIsNew); this.columnDisegno = new global::System.Data.DataColumn("Disegno", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDisegno); + this.columnTipo = new global::System.Data.DataColumn("Tipo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTipo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCodArticolo}, true)); this.columnCodArticolo.AllowDBNull = false; @@ -2126,6 +2140,8 @@ namespace MapoDb { this.columnFlagIsNew.ReadOnly = true; this.columnDisegno.AllowDBNull = false; this.columnDisegno.MaxLength = 50; + this.columnTipo.AllowDBNull = false; + this.columnTipo.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10490,6 +10506,17 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string Tipo { + get { + return ((string)(this[this.tableAnagArticoli.TipoColumn])); + } + set { + this[this.tableAnagArticoli.TipoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsFlagIsNewNull() { @@ -17713,45 +17740,50 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile tableMapping.ColumnMappings.Add("ProdRev", "ProdRev"); tableMapping.ColumnMappings.Add("FlagIsNew", "FlagIsNew"); tableMapping.ColumnMappings.Add("Disegno", "Disegno"); + tableMapping.ColumnMappings.Add("Tipo", "Tipo"); 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 [AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ([DescArticolo] = @Original_DescArticolo) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew)) AND ([Disegno] = @Original_Disegno))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ([Disegno] = @Original_Disegno) AND ([DescArticolo] = @Original_DescArticolo) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew)) AND ([Tipo] = @Original_Tipo))"; 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("@Original_Disegno", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Disegno", global::System.Data.DataRowVersion.Original, false, 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("@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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Disegno", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Disegno", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Tipo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Tipo", 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 [AnagArticoli] ([CodArticolo], [DescArticolo], [CurrRev], [ProdRev], [Disegno]) VALUES (@CodArticolo, @DescArticolo, @CurrRev, @ProdRev, @Disegno); -SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [AnagArticoli] ([CodArticolo], [Disegno], [DescArticolo], [CurrRev], [ProdRev], [Tipo]) VALUES (@CodArticolo, @Disegno, @DescArticolo, @CurrRev, @ProdRev, @Tipo); +SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.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, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Disegno", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Disegno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CurrRev", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CurrRev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Disegno", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Disegno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tipo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Tipo", 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 [AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescArticolo] = @DescArticolo, [CurrRev] = @CurrRev, [ProdRev] = @ProdRev, [Disegno] = @Disegno WHERE (([CodArticolo] = @Original_CodArticolo) AND ([DescArticolo] = @Original_DescArticolo) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew)) AND ([Disegno] = @Original_Disegno)); -SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [AnagArticoli] SET [CodArticolo] = @CodArticolo, [Disegno] = @Disegno, [DescArticolo] = @DescArticolo, [CurrRev] = @CurrRev, [ProdRev] = @ProdRev, [Tipo] = @Tipo WHERE (([CodArticolo] = @Original_CodArticolo) AND ([Disegno] = @Original_Disegno) AND ([DescArticolo] = @Original_DescArticolo) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew)) AND ([Tipo] = @Original_Tipo)); +SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo 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, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Disegno", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Disegno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CurrRev", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CurrRev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.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.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Disegno", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Disegno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tipo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Tipo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Disegno", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Disegno", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); 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("@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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Disegno", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Disegno", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Tipo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Tipo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17803,6 +17835,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag this._commandCollection[5].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[5].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[5].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, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tipo", 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()] @@ -17879,44 +17912,50 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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, global::System.Nullable Original_FlagIsNew, string Original_Disegno) { + public virtual int Delete(string Original_CodArticolo, string Original_Disegno, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, global::System.Nullable Original_FlagIsNew, string Original_Tipo) { if ((Original_CodArticolo == null)) { throw new global::System.ArgumentNullException("Original_CodArticolo"); } else { this.Adapter.DeleteCommand.Parameters[0].Value = ((string)(Original_CodArticolo)); } + if ((Original_Disegno == null)) { + throw new global::System.ArgumentNullException("Original_Disegno"); + } + else { + this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_Disegno)); + } if ((Original_DescArticolo == null)) { throw new global::System.ArgumentNullException("Original_DescArticolo"); } else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_DescArticolo)); + this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_DescArticolo)); } if ((Original_CurrRev == null)) { throw new global::System.ArgumentNullException("Original_CurrRev"); } else { - this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_CurrRev)); + this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_CurrRev)); } if ((Original_ProdRev == null)) { throw new global::System.ArgumentNullException("Original_ProdRev"); } else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_ProdRev)); + this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_ProdRev)); } if ((Original_FlagIsNew.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[5].Value = ((bool)(Original_FlagIsNew.Value)); + this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[6].Value = ((bool)(Original_FlagIsNew.Value)); } else { - this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; + this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; } - if ((Original_Disegno == null)) { - throw new global::System.ArgumentNullException("Original_Disegno"); + if ((Original_Tipo == null)) { + throw new global::System.ArgumentNullException("Original_Tipo"); } else { - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_Disegno)); + this.Adapter.DeleteCommand.Parameters[7].Value = ((string)(Original_Tipo)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -17938,36 +17977,42 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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 CodArticolo, string DescArticolo, string CurrRev, string ProdRev, string Disegno) { + public virtual int Insert(string CodArticolo, string Disegno, string DescArticolo, string CurrRev, string ProdRev, string Tipo) { if ((CodArticolo == null)) { throw new global::System.ArgumentNullException("CodArticolo"); } else { this.Adapter.InsertCommand.Parameters[0].Value = ((string)(CodArticolo)); } + if ((Disegno == null)) { + throw new global::System.ArgumentNullException("Disegno"); + } + else { + this.Adapter.InsertCommand.Parameters[1].Value = ((string)(Disegno)); + } if ((DescArticolo == null)) { throw new global::System.ArgumentNullException("DescArticolo"); } else { - this.Adapter.InsertCommand.Parameters[1].Value = ((string)(DescArticolo)); + this.Adapter.InsertCommand.Parameters[2].Value = ((string)(DescArticolo)); } if ((CurrRev == null)) { throw new global::System.ArgumentNullException("CurrRev"); } else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(CurrRev)); + this.Adapter.InsertCommand.Parameters[3].Value = ((string)(CurrRev)); } if ((ProdRev == null)) { throw new global::System.ArgumentNullException("ProdRev"); } else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(ProdRev)); + this.Adapter.InsertCommand.Parameters[4].Value = ((string)(ProdRev)); } - if ((Disegno == null)) { - throw new global::System.ArgumentNullException("Disegno"); + if ((Tipo == null)) { + throw new global::System.ArgumentNullException("Tipo"); } else { - this.Adapter.InsertCommand.Parameters[4].Value = ((string)(Disegno)); + this.Adapter.InsertCommand.Parameters[5].Value = ((string)(Tipo)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -17989,74 +18034,86 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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 Disegno, string Original_CodArticolo, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, global::System.Nullable Original_FlagIsNew, string Original_Disegno) { + public virtual int Update(string CodArticolo, string Disegno, string DescArticolo, string CurrRev, string ProdRev, string Tipo, string Original_CodArticolo, string Original_Disegno, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, global::System.Nullable Original_FlagIsNew, string Original_Tipo) { if ((CodArticolo == null)) { throw new global::System.ArgumentNullException("CodArticolo"); } else { this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(CodArticolo)); } + if ((Disegno == null)) { + throw new global::System.ArgumentNullException("Disegno"); + } + else { + this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(Disegno)); + } if ((DescArticolo == null)) { throw new global::System.ArgumentNullException("DescArticolo"); } else { - this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(DescArticolo)); + this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(DescArticolo)); } if ((CurrRev == null)) { throw new global::System.ArgumentNullException("CurrRev"); } else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(CurrRev)); + this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(CurrRev)); } if ((ProdRev == null)) { throw new global::System.ArgumentNullException("ProdRev"); } else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(ProdRev)); + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(ProdRev)); } - if ((Disegno == null)) { - throw new global::System.ArgumentNullException("Disegno"); + if ((Tipo == null)) { + throw new global::System.ArgumentNullException("Tipo"); } else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Disegno)); + this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Tipo)); } if ((Original_CodArticolo == null)) { throw new global::System.ArgumentNullException("Original_CodArticolo"); } else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_CodArticolo)); - } - if ((Original_DescArticolo == null)) { - throw new global::System.ArgumentNullException("Original_DescArticolo"); - } - else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_DescArticolo)); - } - if ((Original_CurrRev == null)) { - throw new global::System.ArgumentNullException("Original_CurrRev"); - } - else { - this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_CurrRev)); - } - if ((Original_ProdRev == null)) { - throw new global::System.ArgumentNullException("Original_ProdRev"); - } - else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_ProdRev)); - } - 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; + this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_CodArticolo)); } if ((Original_Disegno == null)) { throw new global::System.ArgumentNullException("Original_Disegno"); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_Disegno)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_Disegno)); + } + if ((Original_DescArticolo == null)) { + throw new global::System.ArgumentNullException("Original_DescArticolo"); + } + else { + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_DescArticolo)); + } + if ((Original_CurrRev == null)) { + throw new global::System.ArgumentNullException("Original_CurrRev"); + } + else { + this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_CurrRev)); + } + if ((Original_ProdRev == null)) { + throw new global::System.ArgumentNullException("Original_ProdRev"); + } + else { + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_ProdRev)); + } + if ((Original_FlagIsNew.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((bool)(Original_FlagIsNew.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + } + if ((Original_Tipo == null)) { + throw new global::System.ArgumentNullException("Original_Tipo"); + } + else { + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_Tipo)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -18078,8 +18135,8 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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 Disegno, string Original_CodArticolo, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, global::System.Nullable Original_FlagIsNew, string Original_Disegno) { - return this.Update(Original_CodArticolo, DescArticolo, CurrRev, ProdRev, Disegno, Original_CodArticolo, Original_DescArticolo, Original_CurrRev, Original_ProdRev, Original_FlagIsNew, Original_Disegno); + public virtual int Update(string Disegno, string DescArticolo, string CurrRev, string ProdRev, string Tipo, string Original_CodArticolo, string Original_Disegno, string Original_DescArticolo, string Original_CurrRev, string Original_ProdRev, global::System.Nullable Original_FlagIsNew, string Original_Tipo) { + return this.Update(Original_CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, Tipo, Original_CodArticolo, Original_Disegno, Original_DescArticolo, Original_CurrRev, Original_ProdRev, Original_FlagIsNew, Original_Tipo); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -18188,7 +18245,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int updateQry(string Original_CodArticolo, string CodArticolo, string DescArticolo, string CurrRev) { + public virtual int updateQry(string Original_CodArticolo, string CodArticolo, string DescArticolo, string CurrRev, string Tipo) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((Original_CodArticolo == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -18214,6 +18271,12 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag else { command.Parameters[4].Value = ((string)(CurrRev)); } + if ((Tipo == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Tipo)); + } 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/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd index 8ec18d67..4f80fd73 100644 --- a/MapoDb/DS_ProdTempi.xsd +++ b/MapoDb/DS_ProdTempi.xsd @@ -460,28 +460,30 @@ ORDER BY idxODL DESC - DELETE FROM [AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ([DescArticolo] = @Original_DescArticolo) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew)) AND ([Disegno] = @Original_Disegno)) + DELETE FROM [AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ([Disegno] = @Original_Disegno) AND ([DescArticolo] = @Original_DescArticolo) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew)) AND ([Tipo] = @Original_Tipo)) + - + - INSERT INTO [AnagArticoli] ([CodArticolo], [DescArticolo], [CurrRev], [ProdRev], [Disegno]) VALUES (@CodArticolo, @DescArticolo, @CurrRev, @ProdRev, @Disegno); -SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM AnagArticoli WHERE (CodArticolo = @CodArticolo) + INSERT INTO [AnagArticoli] ([CodArticolo], [Disegno], [DescArticolo], [CurrRev], [ProdRev], [Tipo]) VALUES (@CodArticolo, @Disegno, @DescArticolo, @CurrRev, @ProdRev, @Tipo); +SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FROM AnagArticoli WHERE (CodArticolo = @CodArticolo) + - + @@ -493,21 +495,23 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag - UPDATE [AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescArticolo] = @DescArticolo, [CurrRev] = @CurrRev, [ProdRev] = @ProdRev, [Disegno] = @Disegno WHERE (([CodArticolo] = @Original_CodArticolo) AND ([DescArticolo] = @Original_DescArticolo) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew)) AND ([Disegno] = @Original_Disegno)); -SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM AnagArticoli WHERE (CodArticolo = @CodArticolo) + UPDATE [AnagArticoli] SET [CodArticolo] = @CodArticolo, [Disegno] = @Disegno, [DescArticolo] = @DescArticolo, [CurrRev] = @CurrRev, [ProdRev] = @ProdRev, [Tipo] = @Tipo WHERE (([CodArticolo] = @Original_CodArticolo) AND ([Disegno] = @Original_Disegno) AND ([DescArticolo] = @Original_DescArticolo) AND ([CurrRev] = @Original_CurrRev) AND ([ProdRev] = @Original_ProdRev) AND ((@IsNull_FlagIsNew = 1 AND [FlagIsNew] IS NULL) OR ([FlagIsNew] = @Original_FlagIsNew)) AND ([Tipo] = @Original_Tipo)); +SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FROM AnagArticoli WHERE (CodArticolo = @CodArticolo) + - + + - + @@ -520,6 +524,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag + @@ -577,6 +582,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag + @@ -2295,6 +2301,13 @@ ORDER BY idxPromessa DESC + + + + + + + @@ -2560,7 +2573,7 @@ ORDER BY idxPromessa DESC - + @@ -2641,7 +2654,7 @@ ORDER BY idxPromessa DESC - + @@ -2670,7 +2683,7 @@ ORDER BY idxPromessa DESC - + @@ -2682,7 +2695,7 @@ ORDER BY idxPromessa DESC - + @@ -2707,7 +2720,7 @@ ORDER BY idxPromessa DESC - + @@ -2745,7 +2758,7 @@ ORDER BY idxPromessa DESC - + @@ -2784,7 +2797,7 @@ ORDER BY idxPromessa DESC - + @@ -2850,7 +2863,7 @@ ORDER BY idxPromessa DESC - + @@ -2872,7 +2885,7 @@ ORDER BY idxPromessa DESC - + diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss index b4281999..986a53d3 100644 --- a/MapoDb/DS_ProdTempi.xss +++ b/MapoDb/DS_ProdTempi.xss @@ -4,17 +4,17 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - + @@ -28,7 +28,7 @@ - + \ No newline at end of file