diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd index 6ee527fb..8200018e 100644 --- a/MapoDb/DS_ProdTempi.xsd +++ b/MapoDb/DS_ProdTempi.xsd @@ -695,6 +695,7 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO + @@ -890,7 +891,7 @@ SELECT IdxPostazione, DescPostazione, IdxMacchina, MatrOperatore, InputUntil, La - + dbo.stp_ConfermaProduzCompletaFull @@ -910,7 +911,7 @@ SELECT IdxPostazione, DescPostazione, IdxMacchina, MatrOperatore, InputUntil, La - + dbo.stp_DatiConf_conferma @@ -2560,6 +2561,7 @@ FROM v_ECP + @@ -2787,7 +2789,7 @@ FROM v_ECP - + @@ -2868,7 +2870,7 @@ FROM v_ECP - + @@ -2880,7 +2882,7 @@ FROM v_ECP - + @@ -2905,7 +2907,7 @@ FROM v_ECP - + @@ -2943,7 +2945,7 @@ FROM v_ECP - + @@ -2982,7 +2984,7 @@ FROM v_ECP - + @@ -3048,7 +3050,7 @@ FROM v_ECP - + @@ -3125,7 +3127,7 @@ FROM v_ECP - + @@ -3160,7 +3162,7 @@ FROM v_ECP - + diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss index 83b05229..3da72408 100644 --- a/MapoDb/DS_ProdTempi.xss +++ b/MapoDb/DS_ProdTempi.xss @@ -4,12 +4,12 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + diff --git a/MapoDb/DS_ProdTempi1.Designer.cs b/MapoDb/DS_ProdTempi1.Designer.cs index 035d6959..f7ab1876 100644 --- a/MapoDb/DS_ProdTempi1.Designer.cs +++ b/MapoDb/DS_ProdTempi1.Designer.cs @@ -2291,6 +2291,8 @@ namespace MapoDb { private global::System.Data.DataColumn columnCodArticolo_B; + private global::System.Data.DataColumn columnhasCounter; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public DatiMacchineDataTable() { @@ -2388,6 +2390,14 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn hasCounterColumn { + get { + return this.columnhasCounter; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2425,7 +2435,7 @@ namespace MapoDb { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public DatiMacchineRow AddDatiMacchineRow(string idxMacchina, string DescFull, bool palletChange, string serialPort, int refreshPeriod, bool simulazione, string CodArticolo_A, string CodArticolo_B) { + public DatiMacchineRow AddDatiMacchineRow(string idxMacchina, string DescFull, bool palletChange, string serialPort, int refreshPeriod, bool simulazione, string CodArticolo_A, string CodArticolo_B, bool hasCounter) { DatiMacchineRow rowDatiMacchineRow = ((DatiMacchineRow)(this.NewRow())); object[] columnValuesArray = new object[] { idxMacchina, @@ -2435,7 +2445,8 @@ namespace MapoDb { refreshPeriod, simulazione, CodArticolo_A, - CodArticolo_B}; + CodArticolo_B, + hasCounter}; rowDatiMacchineRow.ItemArray = columnValuesArray; this.Rows.Add(rowDatiMacchineRow); return rowDatiMacchineRow; @@ -2473,6 +2484,7 @@ namespace MapoDb { this.columnsimulazione = base.Columns["simulazione"]; this.columnCodArticolo_A = base.Columns["CodArticolo_A"]; this.columnCodArticolo_B = base.Columns["CodArticolo_B"]; + this.columnhasCounter = base.Columns["hasCounter"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2494,6 +2506,8 @@ namespace MapoDb { base.Columns.Add(this.columnCodArticolo_A); this.columnCodArticolo_B = new global::System.Data.DataColumn("CodArticolo_B", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodArticolo_B); + this.columnhasCounter = new global::System.Data.DataColumn("hasCounter", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnhasCounter); this.Constraints.Add(new global::System.Data.UniqueConstraint("DatiMacchineKey1", new global::System.Data.DataColumn[] { this.columnidxMacchina}, true)); this.columnidxMacchina.AllowDBNull = false; @@ -2503,6 +2517,7 @@ namespace MapoDb { this.columnserialPort.MaxLength = 50; this.columnCodArticolo_A.MaxLength = 50; this.columnCodArticolo_B.MaxLength = 50; + this.columnhasCounter.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10796,6 +10811,17 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool hasCounter { + get { + return ((bool)(this[this.tableDatiMacchine.hasCounterColumn])); + } + set { + this[this.tableDatiMacchine.hasCounterColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsDescFullNull() { @@ -18931,6 +18957,7 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO tableMapping.ColumnMappings.Add("simulazione", "simulazione"); tableMapping.ColumnMappings.Add("CodArticolo_A", "CodArticolo_A"); tableMapping.ColumnMappings.Add("CodArticolo_B", "CodArticolo_B"); + tableMapping.ColumnMappings.Add("hasCounter", "hasCounter"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/MapoDb/DS_applicazione.Designer.cs b/MapoDb/DS_applicazione.Designer.cs index 3701e904..db80554b 100644 --- a/MapoDb/DS_applicazione.Designer.cs +++ b/MapoDb/DS_applicazione.Designer.cs @@ -6490,6 +6490,10 @@ namespace MapoDb { private global::System.Data.DataColumn columnCodArticolo_B; + private global::System.Data.DataColumn columnisTrigerDBOn; + + private global::System.Data.DataColumn columnhasCounter; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public DatiMacchineDataTable() { @@ -6603,6 +6607,22 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn isTrigerDBOnColumn { + get { + return this.columnisTrigerDBOn; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn hasCounterColumn { + get { + return this.columnhasCounter; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -6640,7 +6660,7 @@ namespace MapoDb { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public DatiMacchineRow AddDatiMacchineRow(string idxMacchina, bool palletChange, string serialPort, int refreshPeriod, bool simulazione, bool simplePallet, bool insEnabled, bool sLogEnabled, string CodArticolo_A, string CodArticolo_B) { + public DatiMacchineRow AddDatiMacchineRow(string idxMacchina, bool palletChange, string serialPort, int refreshPeriod, bool simulazione, bool simplePallet, bool insEnabled, bool sLogEnabled, string CodArticolo_A, string CodArticolo_B, bool isTrigerDBOn, bool hasCounter) { DatiMacchineRow rowDatiMacchineRow = ((DatiMacchineRow)(this.NewRow())); object[] columnValuesArray = new object[] { idxMacchina, @@ -6652,7 +6672,9 @@ namespace MapoDb { insEnabled, sLogEnabled, CodArticolo_A, - CodArticolo_B}; + CodArticolo_B, + isTrigerDBOn, + hasCounter}; rowDatiMacchineRow.ItemArray = columnValuesArray; this.Rows.Add(rowDatiMacchineRow); return rowDatiMacchineRow; @@ -6692,6 +6714,8 @@ namespace MapoDb { this.columnsLogEnabled = base.Columns["sLogEnabled"]; this.columnCodArticolo_A = base.Columns["CodArticolo_A"]; this.columnCodArticolo_B = base.Columns["CodArticolo_B"]; + this.columnisTrigerDBOn = base.Columns["isTrigerDBOn"]; + this.columnhasCounter = base.Columns["hasCounter"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6717,6 +6741,10 @@ namespace MapoDb { base.Columns.Add(this.columnCodArticolo_A); this.columnCodArticolo_B = new global::System.Data.DataColumn("CodArticolo_B", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodArticolo_B); + this.columnisTrigerDBOn = new global::System.Data.DataColumn("isTrigerDBOn", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnisTrigerDBOn); + this.columnhasCounter = new global::System.Data.DataColumn("hasCounter", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnhasCounter); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidxMacchina}, true)); this.columnidxMacchina.AllowDBNull = false; @@ -6725,6 +6753,8 @@ namespace MapoDb { this.columnsLogEnabled.AllowDBNull = false; this.columnCodArticolo_A.MaxLength = 50; this.columnCodArticolo_B.MaxLength = 50; + this.columnisTrigerDBOn.AllowDBNull = false; + this.columnhasCounter.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12819,6 +12849,28 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool isTrigerDBOn { + get { + return ((bool)(this[this.tableDatiMacchine.isTrigerDBOnColumn])); + } + set { + this[this.tableDatiMacchine.isTrigerDBOnColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool hasCounter { + get { + return ((bool)(this[this.tableDatiMacchine.hasCounterColumn])); + } + set { + this[this.tableDatiMacchine.hasCounterColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspalletChangeNull() { @@ -23729,10 +23781,12 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( tableMapping.ColumnMappings.Add("sLogEnabled", "sLogEnabled"); tableMapping.ColumnMappings.Add("CodArticolo_A", "CodArticolo_A"); tableMapping.ColumnMappings.Add("CodArticolo_B", "CodArticolo_B"); + tableMapping.ColumnMappings.Add("isTrigerDBOn", "isTrigerDBOn"); + tableMapping.ColumnMappings.Add("hasCounter", "hasCounter"); 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 [DatiMacchine] WHERE (([idxMacchina] = @Original_idxMacchina) AND ((@IsNull_palletChange = 1 AND [palletChange] IS NULL) OR ([palletChange] = @Original_palletChange)) AND ((@IsNull_CodArticolo_A = 1 AND [CodArticolo_A] IS NULL) OR ([CodArticolo_A] = @Original_CodArticolo_A)) AND ((@IsNull_CodArticolo_B = 1 AND [CodArticolo_B] IS NULL) OR ([CodArticolo_B] = @Original_CodArticolo_B)) AND ((@IsNull_serialPort = 1 AND [serialPort] IS NULL) OR ([serialPort] = @Original_serialPort)) AND ((@IsNull_refreshPeriod = 1 AND [refreshPeriod] IS NULL) OR ([refreshPeriod] = @Original_refreshPeriod)) AND ((@IsNull_simulazione = 1 AND [simulazione] IS NULL) OR ([simulazione] = @Original_simulazione)) AND ((@IsNull_simplePallet = 1 AND [simplePallet] IS NULL) OR ([simplePallet] = @Original_simplePallet)) AND ((@IsNull_insEnabled = 1 AND [insEnabled] IS NULL) OR ([insEnabled] = @Original_insEnabled)) AND ([sLogEnabled] = @Original_sLogEnabled))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [DatiMacchine] WHERE (([idxMacchina] = @Original_idxMacchina) AND ((@IsNull_palletChange = 1 AND [palletChange] IS NULL) OR ([palletChange] = @Original_palletChange)) AND ((@IsNull_CodArticolo_A = 1 AND [CodArticolo_A] IS NULL) OR ([CodArticolo_A] = @Original_CodArticolo_A)) AND ((@IsNull_CodArticolo_B = 1 AND [CodArticolo_B] IS NULL) OR ([CodArticolo_B] = @Original_CodArticolo_B)) AND ((@IsNull_serialPort = 1 AND [serialPort] IS NULL) OR ([serialPort] = @Original_serialPort)) AND ((@IsNull_refreshPeriod = 1 AND [refreshPeriod] IS NULL) OR ([refreshPeriod] = @Original_refreshPeriod)) AND ((@IsNull_simulazione = 1 AND [simulazione] IS NULL) OR ([simulazione] = @Original_simulazione)) AND ((@IsNull_simplePallet = 1 AND [simplePallet] IS NULL) OR ([simplePallet] = @Original_simplePallet)) AND ((@IsNull_insEnabled = 1 AND [insEnabled] IS NULL) OR ([insEnabled] = @Original_insEnabled)) AND ([sLogEnabled] = @Original_sLogEnabled) AND ([isTrigerDBOn] = @Original_isTrigerDBOn) AND ([hasCounter] = @Original_hasCounter))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_palletChange", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "palletChange", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -23752,9 +23806,11 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_insEnabled", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "insEnabled", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_insEnabled", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "insEnabled", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sLogEnabled", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sLogEnabled", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isTrigerDBOn", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isTrigerDBOn", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hasCounter", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hasCounter", 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 [DatiMacchine] ([idxMacchina], [palletChange], [CodArticolo_A], [CodArticolo_B], [serialPort], [refreshPeriod], [simulazione], [simplePallet], [insEnabled], [sLogEnabled]) VALUES (@idxMacchina, @palletChange, @CodArticolo_A, @CodArticolo_B, @serialPort, @refreshPeriod, @simulazione, @simplePallet, @insEnabled, @sLogEnabled)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [DatiMacchine] ([idxMacchina], [palletChange], [CodArticolo_A], [CodArticolo_B], [serialPort], [refreshPeriod], [simulazione], [simplePallet], [insEnabled], [sLogEnabled], [isTrigerDBOn], [hasCounter]) VALUES (@idxMacchina, @palletChange, @CodArticolo_A, @CodArticolo_B, @serialPort, @refreshPeriod, @simulazione, @simplePallet, @insEnabled, @sLogEnabled, @isTrigerDBOn, @hasCounter)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@palletChange", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "palletChange", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -23766,9 +23822,11 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@simplePallet", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "simplePallet", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@insEnabled", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "insEnabled", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sLogEnabled", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sLogEnabled", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isTrigerDBOn", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isTrigerDBOn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hasCounter", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hasCounter", 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 [DatiMacchine] SET [idxMacchina] = @idxMacchina, [palletChange] = @palletChange, [CodArticolo_A] = @CodArticolo_A, [CodArticolo_B] = @CodArticolo_B, [serialPort] = @serialPort, [refreshPeriod] = @refreshPeriod, [simulazione] = @simulazione, [simplePallet] = @simplePallet, [insEnabled] = @insEnabled, [sLogEnabled] = @sLogEnabled WHERE (([idxMacchina] = @Original_idxMacchina) AND ((@IsNull_palletChange = 1 AND [palletChange] IS NULL) OR ([palletChange] = @Original_palletChange)) AND ((@IsNull_CodArticolo_A = 1 AND [CodArticolo_A] IS NULL) OR ([CodArticolo_A] = @Original_CodArticolo_A)) AND ((@IsNull_CodArticolo_B = 1 AND [CodArticolo_B] IS NULL) OR ([CodArticolo_B] = @Original_CodArticolo_B)) AND ((@IsNull_serialPort = 1 AND [serialPort] IS NULL) OR ([serialPort] = @Original_serialPort)) AND ((@IsNull_refreshPeriod = 1 AND [refreshPeriod] IS NULL) OR ([refreshPeriod] = @Original_refreshPeriod)) AND ((@IsNull_simulazione = 1 AND [simulazione] IS NULL) OR ([simulazione] = @Original_simulazione)) AND ((@IsNull_simplePallet = 1 AND [simplePallet] IS NULL) OR ([simplePallet] = @Original_simplePallet)) AND ((@IsNull_insEnabled = 1 AND [insEnabled] IS NULL) OR ([insEnabled] = @Original_insEnabled)) AND ([sLogEnabled] = @Original_sLogEnabled))"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [DatiMacchine] SET [idxMacchina] = @idxMacchina, [palletChange] = @palletChange, [CodArticolo_A] = @CodArticolo_A, [CodArticolo_B] = @CodArticolo_B, [serialPort] = @serialPort, [refreshPeriod] = @refreshPeriod, [simulazione] = @simulazione, [simplePallet] = @simplePallet, [insEnabled] = @insEnabled, [sLogEnabled] = @sLogEnabled, [isTrigerDBOn] = @isTrigerDBOn, [hasCounter] = @hasCounter WHERE (([idxMacchina] = @Original_idxMacchina) AND ((@IsNull_palletChange = 1 AND [palletChange] IS NULL) OR ([palletChange] = @Original_palletChange)) AND ((@IsNull_CodArticolo_A = 1 AND [CodArticolo_A] IS NULL) OR ([CodArticolo_A] = @Original_CodArticolo_A)) AND ((@IsNull_CodArticolo_B = 1 AND [CodArticolo_B] IS NULL) OR ([CodArticolo_B] = @Original_CodArticolo_B)) AND ((@IsNull_serialPort = 1 AND [serialPort] IS NULL) OR ([serialPort] = @Original_serialPort)) AND ((@IsNull_refreshPeriod = 1 AND [refreshPeriod] IS NULL) OR ([refreshPeriod] = @Original_refreshPeriod)) AND ((@IsNull_simulazione = 1 AND [simulazione] IS NULL) OR ([simulazione] = @Original_simulazione)) AND ((@IsNull_simplePallet = 1 AND [simplePallet] IS NULL) OR ([simplePallet] = @Original_simplePallet)) AND ((@IsNull_insEnabled = 1 AND [insEnabled] IS NULL) OR ([insEnabled] = @Original_insEnabled)) AND ([sLogEnabled] = @Original_sLogEnabled) AND ([isTrigerDBOn] = @Original_isTrigerDBOn) AND ([hasCounter] = @Original_hasCounter))"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@palletChange", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "palletChange", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -23780,6 +23838,8 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@simplePallet", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "simplePallet", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@insEnabled", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "insEnabled", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sLogEnabled", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sLogEnabled", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isTrigerDBOn", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isTrigerDBOn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hasCounter", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hasCounter", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_palletChange", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "palletChange", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_palletChange", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "palletChange", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -23798,6 +23858,8 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_insEnabled", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "insEnabled", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_insEnabled", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "insEnabled", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sLogEnabled", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sLogEnabled", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isTrigerDBOn", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isTrigerDBOn", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hasCounter", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hasCounter", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -23817,7 +23879,9 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT *\r\nFROM DatiMacchine WHERE (idxMacchina = @idxMacchina)"; + this._commandCollection[1].CommandText = "SELECT CodArticolo_A, CodArticolo_B, hasCounter, idxMacchina, insEnabled, isTrige" + + "rDBOn, palletChange, refreshPeriod, sLogEnabled, serialPort, simplePallet, simul" + + "azione FROM DatiMacchine WHERE (idxMacchina = @idxMacchina)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -23896,7 +23960,7 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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_idxMacchina, global::System.Nullable Original_palletChange, string Original_CodArticolo_A, string Original_CodArticolo_B, string Original_serialPort, global::System.Nullable Original_refreshPeriod, global::System.Nullable Original_simulazione, global::System.Nullable Original_simplePallet, global::System.Nullable Original_insEnabled, bool Original_sLogEnabled) { + public virtual int Delete(string Original_idxMacchina, global::System.Nullable Original_palletChange, string Original_CodArticolo_A, string Original_CodArticolo_B, string Original_serialPort, global::System.Nullable Original_refreshPeriod, global::System.Nullable Original_simulazione, global::System.Nullable Original_simplePallet, global::System.Nullable Original_insEnabled, bool Original_sLogEnabled, bool Original_isTrigerDBOn, bool Original_hasCounter) { if ((Original_idxMacchina == null)) { throw new global::System.ArgumentNullException("Original_idxMacchina"); } @@ -23968,6 +24032,8 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value; } this.Adapter.DeleteCommand.Parameters[17].Value = ((bool)(Original_sLogEnabled)); + this.Adapter.DeleteCommand.Parameters[18].Value = ((bool)(Original_isTrigerDBOn)); + this.Adapter.DeleteCommand.Parameters[19].Value = ((bool)(Original_hasCounter)); 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)) { @@ -23988,7 +24054,7 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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 idxMacchina, global::System.Nullable palletChange, string CodArticolo_A, string CodArticolo_B, string serialPort, global::System.Nullable refreshPeriod, global::System.Nullable simulazione, global::System.Nullable simplePallet, global::System.Nullable insEnabled, bool sLogEnabled) { + public virtual int Insert(string idxMacchina, global::System.Nullable palletChange, string CodArticolo_A, string CodArticolo_B, string serialPort, global::System.Nullable refreshPeriod, global::System.Nullable simulazione, global::System.Nullable simplePallet, global::System.Nullable insEnabled, bool sLogEnabled, bool isTrigerDBOn, bool hasCounter) { if ((idxMacchina == null)) { throw new global::System.ArgumentNullException("idxMacchina"); } @@ -24044,6 +24110,8 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( this.Adapter.InsertCommand.Parameters[8].Value = global::System.DBNull.Value; } this.Adapter.InsertCommand.Parameters[9].Value = ((bool)(sLogEnabled)); + this.Adapter.InsertCommand.Parameters[10].Value = ((bool)(isTrigerDBOn)); + this.Adapter.InsertCommand.Parameters[11].Value = ((bool)(hasCounter)); 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)) { @@ -24075,6 +24143,8 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( global::System.Nullable simplePallet, global::System.Nullable insEnabled, bool sLogEnabled, + bool isTrigerDBOn, + bool hasCounter, string Original_idxMacchina, global::System.Nullable Original_palletChange, string Original_CodArticolo_A, @@ -24084,7 +24154,9 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( global::System.Nullable Original_simulazione, global::System.Nullable Original_simplePallet, global::System.Nullable Original_insEnabled, - bool Original_sLogEnabled) { + bool Original_sLogEnabled, + bool Original_isTrigerDBOn, + bool Original_hasCounter) { if ((idxMacchina == null)) { throw new global::System.ArgumentNullException("idxMacchina"); } @@ -24140,77 +24212,81 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value; } this.Adapter.UpdateCommand.Parameters[9].Value = ((bool)(sLogEnabled)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((bool)(isTrigerDBOn)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((bool)(hasCounter)); if ((Original_idxMacchina == null)) { throw new global::System.ArgumentNullException("Original_idxMacchina"); } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_idxMacchina)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_idxMacchina)); } if ((Original_palletChange.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((bool)(Original_palletChange.Value)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((bool)(Original_palletChange.Value)); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; - } - if ((Original_CodArticolo_A == null)) { this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_CodArticolo_A)); - } - if ((Original_CodArticolo_B == null)) { + if ((Original_CodArticolo_A == null)) { this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_CodArticolo_B)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_CodArticolo_A)); } - if ((Original_serialPort == null)) { + if ((Original_CodArticolo_B == null)) { this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_serialPort)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_CodArticolo_B)); } - if ((Original_refreshPeriod.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(Original_refreshPeriod.Value)); - } - else { + if ((Original_serialPort == null)) { this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } - if ((Original_simulazione.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_serialPort)); + } + if ((Original_refreshPeriod.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[22].Value = ((bool)(Original_simulazione.Value)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_refreshPeriod.Value)); } else { this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; } - if ((Original_simplePallet.HasValue == true)) { + if ((Original_simulazione.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[24].Value = ((bool)(Original_simplePallet.Value)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((bool)(Original_simulazione.Value)); } else { this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } - if ((Original_insEnabled.HasValue == true)) { + if ((Original_simplePallet.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((bool)(Original_insEnabled.Value)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((bool)(Original_simplePallet.Value)); } else { this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[27].Value = ((bool)(Original_sLogEnabled)); + if ((Original_insEnabled.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((bool)(Original_insEnabled.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[29].Value = ((bool)(Original_sLogEnabled)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((bool)(Original_isTrigerDBOn)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((bool)(Original_hasCounter)); 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)) { @@ -24241,6 +24317,8 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( global::System.Nullable simplePallet, global::System.Nullable insEnabled, bool sLogEnabled, + bool isTrigerDBOn, + bool hasCounter, string Original_idxMacchina, global::System.Nullable Original_palletChange, string Original_CodArticolo_A, @@ -24250,8 +24328,10 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( global::System.Nullable Original_simulazione, global::System.Nullable Original_simplePallet, global::System.Nullable Original_insEnabled, - bool Original_sLogEnabled) { - return this.Update(Original_idxMacchina, palletChange, CodArticolo_A, CodArticolo_B, serialPort, refreshPeriod, simulazione, simplePallet, insEnabled, sLogEnabled, Original_idxMacchina, Original_palletChange, Original_CodArticolo_A, Original_CodArticolo_B, Original_serialPort, Original_refreshPeriod, Original_simulazione, Original_simplePallet, Original_insEnabled, Original_sLogEnabled); + bool Original_sLogEnabled, + bool Original_isTrigerDBOn, + bool Original_hasCounter) { + return this.Update(Original_idxMacchina, palletChange, CodArticolo_A, CodArticolo_B, serialPort, refreshPeriod, simulazione, simplePallet, insEnabled, sLogEnabled, isTrigerDBOn, hasCounter, Original_idxMacchina, Original_palletChange, Original_CodArticolo_A, Original_CodArticolo_B, Original_serialPort, Original_refreshPeriod, Original_simulazione, Original_simplePallet, Original_insEnabled, Original_sLogEnabled, Original_isTrigerDBOn, Original_hasCounter); } } diff --git a/MapoDb/DS_applicazione.cs b/MapoDb/DS_applicazione.cs index 5a683ddc..12e8cfd2 100644 --- a/MapoDb/DS_applicazione.cs +++ b/MapoDb/DS_applicazione.cs @@ -2,14 +2,14 @@ { - partial class DS_applicazione - { - partial class MacchineDataTable + partial class DS_applicazione { - } + partial class MacchineDataTable + { + } - partial class StatoMacchineDataTable - { + partial class StatoMacchineDataTable + { + } } - } } diff --git a/MapoDb/DS_applicazione.xsd b/MapoDb/DS_applicazione.xsd index 9fd52b59..f7c7b2a3 100644 --- a/MapoDb/DS_applicazione.xsd +++ b/MapoDb/DS_applicazione.xsd @@ -1837,7 +1837,7 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( - DELETE FROM [DatiMacchine] WHERE (([idxMacchina] = @Original_idxMacchina) AND ((@IsNull_palletChange = 1 AND [palletChange] IS NULL) OR ([palletChange] = @Original_palletChange)) AND ((@IsNull_CodArticolo_A = 1 AND [CodArticolo_A] IS NULL) OR ([CodArticolo_A] = @Original_CodArticolo_A)) AND ((@IsNull_CodArticolo_B = 1 AND [CodArticolo_B] IS NULL) OR ([CodArticolo_B] = @Original_CodArticolo_B)) AND ((@IsNull_serialPort = 1 AND [serialPort] IS NULL) OR ([serialPort] = @Original_serialPort)) AND ((@IsNull_refreshPeriod = 1 AND [refreshPeriod] IS NULL) OR ([refreshPeriod] = @Original_refreshPeriod)) AND ((@IsNull_simulazione = 1 AND [simulazione] IS NULL) OR ([simulazione] = @Original_simulazione)) AND ((@IsNull_simplePallet = 1 AND [simplePallet] IS NULL) OR ([simplePallet] = @Original_simplePallet)) AND ((@IsNull_insEnabled = 1 AND [insEnabled] IS NULL) OR ([insEnabled] = @Original_insEnabled)) AND ([sLogEnabled] = @Original_sLogEnabled)) + DELETE FROM [DatiMacchine] WHERE (([idxMacchina] = @Original_idxMacchina) AND ((@IsNull_palletChange = 1 AND [palletChange] IS NULL) OR ([palletChange] = @Original_palletChange)) AND ((@IsNull_CodArticolo_A = 1 AND [CodArticolo_A] IS NULL) OR ([CodArticolo_A] = @Original_CodArticolo_A)) AND ((@IsNull_CodArticolo_B = 1 AND [CodArticolo_B] IS NULL) OR ([CodArticolo_B] = @Original_CodArticolo_B)) AND ((@IsNull_serialPort = 1 AND [serialPort] IS NULL) OR ([serialPort] = @Original_serialPort)) AND ((@IsNull_refreshPeriod = 1 AND [refreshPeriod] IS NULL) OR ([refreshPeriod] = @Original_refreshPeriod)) AND ((@IsNull_simulazione = 1 AND [simulazione] IS NULL) OR ([simulazione] = @Original_simulazione)) AND ((@IsNull_simplePallet = 1 AND [simplePallet] IS NULL) OR ([simplePallet] = @Original_simplePallet)) AND ((@IsNull_insEnabled = 1 AND [insEnabled] IS NULL) OR ([insEnabled] = @Original_insEnabled)) AND ([sLogEnabled] = @Original_sLogEnabled) AND ([isTrigerDBOn] = @Original_isTrigerDBOn) AND ([hasCounter] = @Original_hasCounter)) @@ -1857,12 +1857,14 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( + + - INSERT INTO [DatiMacchine] ([idxMacchina], [palletChange], [CodArticolo_A], [CodArticolo_B], [serialPort], [refreshPeriod], [simulazione], [simplePallet], [insEnabled], [sLogEnabled]) VALUES (@idxMacchina, @palletChange, @CodArticolo_A, @CodArticolo_B, @serialPort, @refreshPeriod, @simulazione, @simplePallet, @insEnabled, @sLogEnabled) + INSERT INTO [DatiMacchine] ([idxMacchina], [palletChange], [CodArticolo_A], [CodArticolo_B], [serialPort], [refreshPeriod], [simulazione], [simplePallet], [insEnabled], [sLogEnabled], [isTrigerDBOn], [hasCounter]) VALUES (@idxMacchina, @palletChange, @CodArticolo_A, @CodArticolo_B, @serialPort, @refreshPeriod, @simulazione, @simplePallet, @insEnabled, @sLogEnabled, @isTrigerDBOn, @hasCounter) @@ -1874,6 +1876,8 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( + + @@ -1885,7 +1889,7 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( - UPDATE [DatiMacchine] SET [idxMacchina] = @idxMacchina, [palletChange] = @palletChange, [CodArticolo_A] = @CodArticolo_A, [CodArticolo_B] = @CodArticolo_B, [serialPort] = @serialPort, [refreshPeriod] = @refreshPeriod, [simulazione] = @simulazione, [simplePallet] = @simplePallet, [insEnabled] = @insEnabled, [sLogEnabled] = @sLogEnabled WHERE (([idxMacchina] = @Original_idxMacchina) AND ((@IsNull_palletChange = 1 AND [palletChange] IS NULL) OR ([palletChange] = @Original_palletChange)) AND ((@IsNull_CodArticolo_A = 1 AND [CodArticolo_A] IS NULL) OR ([CodArticolo_A] = @Original_CodArticolo_A)) AND ((@IsNull_CodArticolo_B = 1 AND [CodArticolo_B] IS NULL) OR ([CodArticolo_B] = @Original_CodArticolo_B)) AND ((@IsNull_serialPort = 1 AND [serialPort] IS NULL) OR ([serialPort] = @Original_serialPort)) AND ((@IsNull_refreshPeriod = 1 AND [refreshPeriod] IS NULL) OR ([refreshPeriod] = @Original_refreshPeriod)) AND ((@IsNull_simulazione = 1 AND [simulazione] IS NULL) OR ([simulazione] = @Original_simulazione)) AND ((@IsNull_simplePallet = 1 AND [simplePallet] IS NULL) OR ([simplePallet] = @Original_simplePallet)) AND ((@IsNull_insEnabled = 1 AND [insEnabled] IS NULL) OR ([insEnabled] = @Original_insEnabled)) AND ([sLogEnabled] = @Original_sLogEnabled)) + UPDATE [DatiMacchine] SET [idxMacchina] = @idxMacchina, [palletChange] = @palletChange, [CodArticolo_A] = @CodArticolo_A, [CodArticolo_B] = @CodArticolo_B, [serialPort] = @serialPort, [refreshPeriod] = @refreshPeriod, [simulazione] = @simulazione, [simplePallet] = @simplePallet, [insEnabled] = @insEnabled, [sLogEnabled] = @sLogEnabled, [isTrigerDBOn] = @isTrigerDBOn, [hasCounter] = @hasCounter WHERE (([idxMacchina] = @Original_idxMacchina) AND ((@IsNull_palletChange = 1 AND [palletChange] IS NULL) OR ([palletChange] = @Original_palletChange)) AND ((@IsNull_CodArticolo_A = 1 AND [CodArticolo_A] IS NULL) OR ([CodArticolo_A] = @Original_CodArticolo_A)) AND ((@IsNull_CodArticolo_B = 1 AND [CodArticolo_B] IS NULL) OR ([CodArticolo_B] = @Original_CodArticolo_B)) AND ((@IsNull_serialPort = 1 AND [serialPort] IS NULL) OR ([serialPort] = @Original_serialPort)) AND ((@IsNull_refreshPeriod = 1 AND [refreshPeriod] IS NULL) OR ([refreshPeriod] = @Original_refreshPeriod)) AND ((@IsNull_simulazione = 1 AND [simulazione] IS NULL) OR ([simulazione] = @Original_simulazione)) AND ((@IsNull_simplePallet = 1 AND [simplePallet] IS NULL) OR ([simplePallet] = @Original_simplePallet)) AND ((@IsNull_insEnabled = 1 AND [insEnabled] IS NULL) OR ([insEnabled] = @Original_insEnabled)) AND ([sLogEnabled] = @Original_sLogEnabled) AND ([isTrigerDBOn] = @Original_isTrigerDBOn) AND ([hasCounter] = @Original_hasCounter)) @@ -1897,6 +1901,8 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( + + @@ -1915,6 +1921,8 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( + + @@ -1931,13 +1939,14 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE ( + + - SELECT * -FROM DatiMacchine WHERE (idxMacchina = @idxMacchina) + SELECT CodArticolo_A, CodArticolo_B, hasCounter, idxMacchina, insEnabled, isTrigerDBOn, palletChange, refreshPeriod, sLogEnabled, serialPort, simplePallet, simulazione FROM DatiMacchine WHERE (idxMacchina = @idxMacchina) @@ -3143,10 +3152,12 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER + + - + @@ -3168,7 +3179,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3204,7 +3215,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3240,7 +3251,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3257,7 +3268,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3281,7 +3292,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3323,7 +3334,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3402,7 +3413,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3431,7 +3442,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3459,7 +3470,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - + @@ -3590,26 +3601,26 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo, SelEnabled FROM AnagraficaGruppi WHER - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MapoDb/DS_applicazione.xss b/MapoDb/DS_applicazione.xss index 3269b78f..827101e5 100644 --- a/MapoDb/DS_applicazione.xss +++ b/MapoDb/DS_applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -22,7 +22,7 @@ - +