diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index 38c3717c..6f8f0777 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll index 3932da66..68400e9f 100644 Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll index 5d20ac92..65b2db6d 100644 Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll index f67ff706..aa0618e8 100644 Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll index 3932da66..68400e9f 100644 Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ diff --git a/GMW-UT/bin/SteamWare.dll b/GMW-UT/bin/SteamWare.dll index 5d20ac92..65b2db6d 100644 Binary files a/GMW-UT/bin/SteamWare.dll and b/GMW-UT/bin/SteamWare.dll differ diff --git a/GMW/WebUserControls/mod_assegnaNC.ascx b/GMW/WebUserControls/mod_assegnaNC.ascx index 440ad0ec..42cd958d 100644 --- a/GMW/WebUserControls/mod_assegnaNC.ascx +++ b/GMW/WebUserControls/mod_assegnaNC.ascx @@ -34,7 +34,7 @@ - + - + + + + + - + @@ -64,9 +68,13 @@ + +
+ <%: traduci("btnSaveSelUdc") %> +
a questo punto
    diff --git a/GMW/WebUserControls/mod_assegnaNC.ascx.cs b/GMW/WebUserControls/mod_assegnaNC.ascx.cs index 381bf8a0..cca6e3bf 100644 --- a/GMW/WebUserControls/mod_assegnaNC.ascx.cs +++ b/GMW/WebUserControls/mod_assegnaNC.ascx.cs @@ -65,11 +65,11 @@ namespace GMW.WebUserControls { get { - return memLayer.ML.IntSessionObj("idxNcsel"); + return memLayer.ML.IntSessionObj("idxNcSel"); } set { - memLayer.ML.setSessionVal("idxNcsel", value); + memLayer.ML.setSessionVal("idxNcSel", value); } } void mod_selPeriodo_eh_doUpdate(object sender, EventArgs e) @@ -118,6 +118,7 @@ namespace GMW.WebUserControls { ((CheckBox)riga.FindControl("chkSelect")).Checked = isChecked; } + lbSaveSel.Visible = true; } /// /// salva nuovo filtraggio @@ -129,6 +130,29 @@ namespace GMW.WebUserControls salvaFilt(); } /// + /// salva nelenco selezioni UDC + /// + /// + /// + protected void lbSaveSel_Click(object sender, EventArgs e) + { + // ciclo grView e salvo le righe selezionate, e cancello le EVENTUALI deselezionate + DateTime start; + foreach (GridViewRow riga in grView.Rows) + { + if (((CheckBox)riga.FindControl("chkSelect")).Visible) + { + start = DateTime.Now; + // recupero codice UDC... + string UDC = ((Label)riga.FindControl("lblUDC")).Text; + // chiamo toggle selezione... + DataProxy.obj.taUDC2NC.toggleSel(idxNcSel, UDC, ((CheckBox)riga.FindControl("chkSelect")).Checked); + } + } + grView.DataBind(); + lbSaveSel.Visible = false; + } + /// /// salvo il nuovo filtraggio... /// private void salvaFilt() @@ -143,5 +167,11 @@ namespace GMW.WebUserControls NoteNC = txtSearch.Text.Trim(); lbSave.Visible = true; } + + protected void chkSelect_CheckedChanged(object sender, EventArgs e) + { + // mostro pulsante salvataggio... + lbSaveSel.Visible = true; + } } } \ No newline at end of file diff --git a/GMW/WebUserControls/mod_assegnaNC.ascx.designer.cs b/GMW/WebUserControls/mod_assegnaNC.ascx.designer.cs index a3c363f6..7bf7e1b1 100644 --- a/GMW/WebUserControls/mod_assegnaNC.ascx.designer.cs +++ b/GMW/WebUserControls/mod_assegnaNC.ascx.designer.cs @@ -83,5 +83,14 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// lbSaveSel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbSaveSel; } } diff --git a/GMW/WebUserControls/mod_elencoNC.ascx.cs b/GMW/WebUserControls/mod_elencoNC.ascx.cs index c9e5a834..ca0ac354 100644 --- a/GMW/WebUserControls/mod_elencoNC.ascx.cs +++ b/GMW/WebUserControls/mod_elencoNC.ascx.cs @@ -47,11 +47,11 @@ namespace GMW.WebUserControls { get { - return memLayer.ML.IntSessionObj("idxNcsel"); + return memLayer.ML.IntSessionObj("idxNcSel"); } set { - memLayer.ML.setSessionVal("idxNcsel", value); + memLayer.ML.setSessionVal("idxNcSel", value); } } /// diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 6c1e37c8..ca42fbbf 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 3932da66..68400e9f 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 5d20ac92..65b2db6d 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 2d8c0660..116dcac4 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/GMW_data/DS_Applicazione.Designer.cs b/GMW_data/DS_Applicazione.Designer.cs index b718e4ff..5f0edc10 100644 --- a/GMW_data/DS_Applicazione.Designer.cs +++ b/GMW_data/DS_Applicazione.Designer.cs @@ -9250,7 +9250,9 @@ namespace GMW_data { private global::System.Data.DataColumn columnDecodPosizione; - private global::System.Data.DataColumn columnCodNC; + private global::System.Data.DataColumn columnNC; + + private global::System.Data.DataColumn columnIsSelected; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] @@ -9351,9 +9353,17 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn CodNCColumn { + public global::System.Data.DataColumn NCColumn { get { - return this.columnCodNC; + return this.columnNC; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn IsSelectedColumn { + get { + return this.columnIsSelected; } } @@ -9394,7 +9404,7 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public UDC_NCRow AddUDC_NCRow(string UDC, string Particolare, string DescParticolare, System.DateTime DataFus, decimal Qta, string CodStato, string Note, string DecodPosizione, string CodNC) { + public UDC_NCRow AddUDC_NCRow(string UDC, string Particolare, string DescParticolare, System.DateTime DataFus, decimal Qta, string CodStato, string Note, string DecodPosizione, string NC, int IsSelected) { UDC_NCRow rowUDC_NCRow = ((UDC_NCRow)(this.NewRow())); object[] columnValuesArray = new object[] { UDC, @@ -9405,7 +9415,8 @@ namespace GMW_data { CodStato, Note, DecodPosizione, - CodNC}; + NC, + IsSelected}; rowUDC_NCRow.ItemArray = columnValuesArray; this.Rows.Add(rowUDC_NCRow); return rowUDC_NCRow; @@ -9443,7 +9454,8 @@ namespace GMW_data { this.columnCodStato = base.Columns["CodStato"]; this.columnNote = base.Columns["Note"]; this.columnDecodPosizione = base.Columns["DecodPosizione"]; - this.columnCodNC = base.Columns["CodNC"]; + this.columnNC = base.Columns["NC"]; + this.columnIsSelected = base.Columns["IsSelected"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9465,8 +9477,10 @@ namespace GMW_data { base.Columns.Add(this.columnNote); this.columnDecodPosizione = new global::System.Data.DataColumn("DecodPosizione", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDecodPosizione); - this.columnCodNC = new global::System.Data.DataColumn("CodNC", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnCodNC); + this.columnNC = new global::System.Data.DataColumn("NC", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNC); + this.columnIsSelected = new global::System.Data.DataColumn("IsSelected", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIsSelected); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnUDC}, true)); this.columnUDC.AllowDBNull = false; @@ -9478,8 +9492,9 @@ namespace GMW_data { this.columnNote.MaxLength = 500; this.columnDecodPosizione.AllowDBNull = false; this.columnDecodPosizione.MaxLength = 10; - this.columnCodNC.ReadOnly = true; - this.columnCodNC.MaxLength = 2500; + this.columnNC.ReadOnly = true; + this.columnNC.MaxLength = 2500; + this.columnIsSelected.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14693,17 +14708,33 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string CodNC { + public string NC { get { try { - return ((string)(this[this.tableUDC_NC.CodNCColumn])); + return ((string)(this[this.tableUDC_NC.NCColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'CodNC\' in table \'UDC_NC\' is DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'NC\' in table \'UDC_NC\' is DBNull.", e); } } set { - this[this.tableUDC_NC.CodNCColumn] = value; + this[this.tableUDC_NC.NCColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int IsSelected { + get { + try { + return ((int)(this[this.tableUDC_NC.IsSelectedColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'IsSelected\' in table \'UDC_NC\' is DBNull.", e); + } + } + set { + this[this.tableUDC_NC.IsSelectedColumn] = value; } } @@ -14781,14 +14812,26 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsCodNCNull() { - return this.IsNull(this.tableUDC_NC.CodNCColumn); + public bool IsNCNull() { + return this.IsNull(this.tableUDC_NC.NCColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetCodNCNull() { - this[this.tableUDC_NC.CodNCColumn] = global::System.Convert.DBNull; + public void SetNCNull() { + this[this.tableUDC_NC.NCColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsIsSelectedNull() { + return this.IsNull(this.tableUDC_NC.IsSelectedColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetIsSelectedNull() { + this[this.tableUDC_NC.IsSelectedColumn] = global::System.Convert.DBNull; } } @@ -25608,7 +25651,7 @@ SELECT codPostazione, stampante, note, FormatoDtmx FROM ElencoPostazioni WHERE ( 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].[ElencoNC] WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [ElencoNC] WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxNC", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxNC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodNC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -25622,7 +25665,7 @@ SELECT codPostazione, stampante, note, FormatoDtmx FROM ElencoPostazioni WHERE ( this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtCreaz", 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].[ElencoNC] ([CodNC], [DescrNC], [TipoCart], [DataFrom], [DataTo], [SearchNote], [DtCreaz]) VALUES (@CodNC, @DescrNC, @TipoCart, @DataFrom, @DataTo, @SearchNote, @DtCreaz); + this._adapter.InsertCommand.CommandText = @"INSERT INTO [ElencoNC] ([CodNC], [DescrNC], [TipoCart], [DataFrom], [DataTo], [SearchNote], [DtCreaz]) VALUES (@CodNC, @DescrNC, @TipoCart, @DataFrom, @DataTo, @SearchNote, @DtCreaz); SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC WHERE (IdxNC = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodNC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -25634,7 +25677,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtCreaz", 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].[ElencoNC] SET [CodNC] = @CodNC, [DescrNC] = @DescrNC, [TipoCart] = @TipoCart, [DataFrom] = @DataFrom, [DataTo] = @DataTo, [SearchNote] = @SearchNote, [DtCreaz] = @DtCreaz WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz)); + this._adapter.UpdateCommand.CommandText = @"UPDATE [ElencoNC] SET [CodNC] = @CodNC, [DescrNC] = @DescrNC, [TipoCart] = @TipoCart, [DataFrom] = @DataFrom, [DataTo] = @DataTo, [SearchNote] = @SearchNote, [DtCreaz] = @DtCreaz WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz)); SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC WHERE (IdxNC = @IdxNC)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodNC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -25667,10 +25710,11 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.ElencoNC"; + this._commandCollection[0].CommandText = "SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FRO" + + "M ElencoNC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -25717,22 +25761,29 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxNC", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_ENC_updFilt"; + this._commandCollection[6].CommandText = "dbo.stp_ENC_updCompleta"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoCart", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchNote", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxNC", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsCompl", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "dbo.stp_ENC_updNome"; + this._commandCollection[7].CommandText = "dbo.stp_ENC_updFilt"; this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodNC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrNC", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoCart", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchNote", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxNC", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[8].Connection = this.Connection; + this._commandCollection[8].CommandText = "dbo.stp_ENC_updNome"; + this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodNC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrNC", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxNC", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -26236,8 +26287,42 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR [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 updFilt(string TipoCart, global::System.Nullable DataFrom, global::System.Nullable DataTo, string SearchNote, global::System.Nullable Original_IdxNC) { + public virtual int updCompleta(global::System.Nullable Original_IdxNC, global::System.Nullable IsCompl) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + if ((Original_IdxNC.HasValue == true)) { + command.Parameters[1].Value = ((int)(Original_IdxNC.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((IsCompl.HasValue == true)) { + command.Parameters[2].Value = ((bool)(IsCompl.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [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 updFilt(string TipoCart, global::System.Nullable DataFrom, global::System.Nullable DataTo, string SearchNote, global::System.Nullable Original_IdxNC) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((TipoCart == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -26289,7 +26374,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updNome(string CodNC, string DescrNC, global::System.Nullable Original_IdxNC) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; if ((CodNC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -26455,7 +26540,8 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR tableMapping.ColumnMappings.Add("CodStato", "CodStato"); tableMapping.ColumnMappings.Add("Note", "Note"); tableMapping.ColumnMappings.Add("DecodPosizione", "DecodPosizione"); - tableMapping.ColumnMappings.Add("CodNC", "CodNC"); + tableMapping.ColumnMappings.Add("NC", "NC"); + tableMapping.ColumnMappings.Add("IsSelected", "IsSelected"); this._adapter.TableMappings.Add(tableMapping); } @@ -26469,11 +26555,10 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT UDC, Particolare, DescParticolare, DataFus, Qta, CodStato, Note, DecodPosi" + - "zione, CodNC FROM v_UDC_NC"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_UDC_NC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -26485,6 +26570,15 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxNC", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_ENC2U_toggle"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxNC", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsSel", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -26515,7 +26609,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR [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.Select, false)] - public virtual DS_Applicazione.UDC_NCDataTable getByFlussoDate(string CodCS, string Flusso, global::System.Nullable DataFrom, global::System.Nullable DataTo, string Note) { + public virtual DS_Applicazione.UDC_NCDataTable getByFlussoDate(string CodCS, string Flusso, global::System.Nullable DataFrom, global::System.Nullable DataTo, string Note, global::System.Nullable IdxNC) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((CodCS == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -26547,10 +26641,56 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR else { this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Note)); } + if ((IdxNC.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[6].Value = ((int)(IdxNC.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; + } DS_Applicazione.UDC_NCDataTable dataTable = new DS_Applicazione.UDC_NCDataTable(); this.Adapter.Fill(dataTable); return dataTable; } + + [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 toggleSel(global::System.Nullable IdxNC, string UDC, global::System.Nullable IsSel) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((IdxNC.HasValue == true)) { + command.Parameters[1].Value = ((int)(IdxNC.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((UDC == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(UDC)); + } + if ((IsSel.HasValue == true)) { + command.Parameters[3].Value = ((bool)(IsSel.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/GMW_data/DS_Applicazione.xsd b/GMW_data/DS_Applicazione.xsd index ee8947ba..755a26da 100644 --- a/GMW_data/DS_Applicazione.xsd +++ b/GMW_data/DS_Applicazione.xsd @@ -1814,7 +1814,7 @@ SELECT codPostazione, stampante, note, FormatoDtmx FROM ElencoPostazioni WHERE ( - DELETE FROM [dbo].[ElencoNC] WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz)) + DELETE FROM [ElencoNC] WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz)) @@ -1831,7 +1831,7 @@ SELECT codPostazione, stampante, note, FormatoDtmx FROM ElencoPostazioni WHERE ( - INSERT INTO [dbo].[ElencoNC] ([CodNC], [DescrNC], [TipoCart], [DataFrom], [DataTo], [SearchNote], [DtCreaz]) VALUES (@CodNC, @DescrNC, @TipoCart, @DataFrom, @DataTo, @SearchNote, @DtCreaz); + INSERT INTO [ElencoNC] ([CodNC], [DescrNC], [TipoCart], [DataFrom], [DataTo], [SearchNote], [DtCreaz]) VALUES (@CodNC, @DescrNC, @TipoCart, @DataFrom, @DataTo, @SearchNote, @DtCreaz); SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC WHERE (IdxNC = SCOPE_IDENTITY()) @@ -1846,14 +1846,13 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - SELECT * -FROM dbo.ElencoNC + SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC - UPDATE [dbo].[ElencoNC] SET [CodNC] = @CodNC, [DescrNC] = @DescrNC, [TipoCart] = @TipoCart, [DataFrom] = @DataFrom, [DataTo] = @DataTo, [SearchNote] = @SearchNote, [DtCreaz] = @DtCreaz WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz)); + UPDATE [ElencoNC] SET [CodNC] = @CodNC, [DescrNC] = @DescrNC, [TipoCart] = @TipoCart, [DataFrom] = @DataFrom, [DataTo] = @DataTo, [SearchNote] = @SearchNote, [DtCreaz] = @DtCreaz WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz)); SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC WHERE (IdxNC = @IdxNC) @@ -1958,6 +1957,18 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR + + + + dbo.stp_ENC_updCompleta + + + + + + + + @@ -1990,10 +2001,11 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - + - - SELECT UDC, Particolare, DescParticolare, DataFus, Qta, CodStato, Note, DecodPosizione, CodNC FROM v_UDC_NC + + SELECT * +FROM v_UDC_NC @@ -2008,7 +2020,8 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - + + @@ -2022,6 +2035,20 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR + + + + + + + + + dbo.stp_ENC2U_toggle + + + + + @@ -3199,7 +3226,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - + @@ -3237,7 +3264,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - + @@ -3284,13 +3311,14 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - + + @@ -3381,12 +3409,12 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - - - - - - + + + + + + \ No newline at end of file diff --git a/GMW_data/DS_Applicazione.xss b/GMW_data/DS_Applicazione.xss index 897cfc0b..9bea8f10 100644 --- a/GMW_data/DS_Applicazione.xss +++ b/GMW_data/DS_Applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -17,7 +17,7 @@ - + @@ -26,8 +26,8 @@ - - + + diff --git a/GMW_data/DataProxy.cs b/GMW_data/DataProxy.cs index 9604e355..1e0997f5 100644 --- a/GMW_data/DataProxy.cs +++ b/GMW_data/DataProxy.cs @@ -31,6 +31,7 @@ namespace GMW_data public DS_ApplicazioneTableAdapters.v_specParticolariTableAdapter taSpecPart; public DS_ApplicazioneTableAdapters.AnagStatiProdottoTableAdapter taStatiProd; public DS_ApplicazioneTableAdapters.AnagTipoDichiarazTableAdapter taTipoDich; + public DS_ApplicazioneTableAdapters.UDC_NCTableAdapter taUDC2NC; public DS_cartelliniTableAdapters.stp_prtCartByUDCTableAdapter taPrtCart; public DS_cartelliniTableAdapters.stp_prtCartALTableAdapter taPrtCartAL; @@ -68,6 +69,7 @@ namespace GMW_data taSpecPart = new GMW_data.DS_ApplicazioneTableAdapters.v_specParticolariTableAdapter(); taStatiProd = new GMW_data.DS_ApplicazioneTableAdapters.AnagStatiProdottoTableAdapter(); taTipoDich = new GMW_data.DS_ApplicazioneTableAdapters.AnagTipoDichiarazTableAdapter(); + taUDC2NC = new GMW_data.DS_ApplicazioneTableAdapters.UDC_NCTableAdapter(); taPrtCart = new GMW_data.DS_cartelliniTableAdapters.stp_prtCartByUDCTableAdapter(); taPrtCartAL = new DS_cartelliniTableAdapters.stp_prtCartALTableAdapter(); @@ -107,6 +109,7 @@ namespace GMW_data taSpecPart.Connection.ConnectionString = connString; taStatiProd.Connection.ConnectionString = connString; taTipoDich.Connection.ConnectionString = connString; + taUDC2NC.Connection.ConnectionString = connString; taPrtCart.Connection.ConnectionString = connString; taPrtCartAL.Connection.ConnectionString = connString; diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index fd05b580..0c8056b5 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("3.1.787.2001")] -[assembly: AssemblyFileVersion("3.1.787.2001")] +[assembly: AssemblyVersion("3.1.789.2002")] +[assembly: AssemblyFileVersion("3.1.789.2002")] [assembly: AssemblyCopyright("Steamware © 2007-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index a23dcefc..89c99ddf 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("3.1.787.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("3.1.787.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("3.1.789.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("3.1.789.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+