diff --git a/MP-MAG/WebUserControls/cmp_AnagCliFor.ascx b/MP-MAG/WebUserControls/cmp_AnagCliFor.ascx index 9c108dbe..daa8a461 100644 --- a/MP-MAG/WebUserControls/cmp_AnagCliFor.ascx +++ b/MP-MAG/WebUserControls/cmp_AnagCliFor.ascx @@ -62,42 +62,42 @@ - + - + - + - + - + - + - + - + - + - + @@ -152,7 +152,7 @@ -
+
diff --git a/MP-MAG/WebUserControls/cmp_AnagCliFor.ascx.cs b/MP-MAG/WebUserControls/cmp_AnagCliFor.ascx.cs index dfb83ba8..d6603fa8 100644 --- a/MP-MAG/WebUserControls/cmp_AnagCliFor.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_AnagCliFor.ascx.cs @@ -41,7 +41,7 @@ namespace MP_MAG.WebUserControls { divMain.Visible = true; divDetail.Visible = showDetail; - string mainCss = showDetail ? "col-7 pr-0" : "col-12"; + string mainCss = showDetail ? "col-6 pr-0" : "col-12"; divMain.Attributes.Remove("class"); divMain.Attributes.Add("class", mainCss); for (int i = 7; i < 11; i++) @@ -50,6 +50,11 @@ namespace MP_MAG.WebUserControls } } + protected void grView_PageIndexChanged(object sender, EventArgs e) + { + doReset(); + } + protected void grView_RowDeleted(object sender, System.Web.UI.WebControls.GridViewDeletedEventArgs e) { doReset(); @@ -60,6 +65,12 @@ namespace MP_MAG.WebUserControls grView.SelectedIndex = e.NewEditIndex; } + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + showDet = true; + cmp_destClienti.codCli = $"{grView.SelectedValue}"; + } + /// /// Aggiunta nuovo record /// @@ -104,16 +115,5 @@ namespace MP_MAG.WebUserControls } #endregion Public Methods - - protected void grView_SelectedIndexChanged(object sender, EventArgs e) - { - showDet = true; - cmp_destClienti.codCli = $"{grView.SelectedValue}"; - } - - protected void grView_PageIndexChanged(object sender, EventArgs e) - { - doReset(); - } } } \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_destClienti.ascx b/MP-MAG/WebUserControls/cmp_destClienti.ascx index 26d25d45..29572a3f 100644 --- a/MP-MAG/WebUserControls/cmp_destClienti.ascx +++ b/MP-MAG/WebUserControls/cmp_destClienti.ascx @@ -4,25 +4,130 @@

0 Record Found

+ + Aggiungi Nuovo
- <%----%> - - - - - - - + + + + + +
+ +   +
+ + +
+ +   +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP-MAG/WebUserControls/cmp_destClienti.ascx.cs b/MP-MAG/WebUserControls/cmp_destClienti.ascx.cs index 462a8e49..fb35c0be 100644 --- a/MP-MAG/WebUserControls/cmp_destClienti.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_destClienti.ascx.cs @@ -1,18 +1,10 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; namespace MP_MAG.WebUserControls { - public partial class cmp_destClienti : System.Web.UI.UserControl + public partial class cmp_destClienti : BaseUserControl { - protected void Page_Load(object sender, EventArgs e) - { - - } + #region Public Properties public string codCli { @@ -27,5 +19,54 @@ namespace MP_MAG.WebUserControls grView.SelectedIndex = -1; } } + + #endregion Public Properties + + #region Protected Methods + + /// + /// Aggiunta nuovo record + /// + /// + /// + protected void lbtAddNew_Click(object sender, EventArgs e) + { + // cerco il num di cli esistenti e usi + 1... + var destCli = MagDataLayerObj.taADC.getByCodCli(codCli); + string newCodDest = "__CodDestNew"; + if (destCli != null) + { + newCodDest = $"D{destCli.Count + 1:0000}"; + } + MagDataLayerObj.taADC.insertQuery(codCli, newCodDest, "Nuova Destinazione", "Nuovo Indirizzo", "00000", "Nuova Località", "BA", "IT"); + doReset(); + } + + /// + /// comando reset + /// + /// + /// + protected void lbtReset_Click(object sender, EventArgs e) + { + doReset(); + raiseReset(); + } + + protected void Page_Load(object sender, EventArgs e) + { + } + + #endregion Protected Methods + + #region Public Methods + + public void doReset() + { + grView.SelectedIndex = -1; + grView.DataBind(); + } + + #endregion Public Methods } } \ No newline at end of file diff --git a/MagData/DS_Mag.Designer.cs b/MagData/DS_Mag.Designer.cs index 91c83847..878df799 100644 --- a/MagData/DS_Mag.Designer.cs +++ b/MagData/DS_Mag.Designer.cs @@ -11509,17 +11509,51 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM AnagDestinClienti"; 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 = "dbo.stp_ADC_getByCodCli"; + this._commandCollection[1].CommandText = "dbo.stp_ADC_deleteQuery"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", 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("@Original_CodCliente", 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("@Original_CodDestinazione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_ADC_getByCodCli"; + 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("@CodCliente", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "dbo.stp_ADC_insertQuery"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodDestinazione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescDestinazione", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Indirizzo", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Cap", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Localita", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Provincia", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Nazione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "dbo.stp_ADC_updateQuery"; + this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodDestinazione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescDestinazione", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Indirizzo", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Cap", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Localita", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Provincia", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Nazione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodDestinazione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodCliente", 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()] @@ -11551,7 +11585,7 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Mag.AnagDestinClientiDataTable getByCodCli(string CodCliente) { - this.Adapter.SelectCommand = this.CommandCollection[1]; + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((CodCliente == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -11886,6 +11920,186 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, public virtual int Update(string DescDestinazione, string Indirizzo, string Cap, string Localita, string Provincia, string Nazione, string Original_CodCliente, string Original_CodDestinazione, string Original_DescDestinazione, string Original_Indirizzo, string Original_Cap, string Original_Localita, string Original_Provincia, string Original_Nazione) { return this.Update(Original_CodCliente, Original_CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, Provincia, Nazione, Original_CodCliente, Original_CodDestinazione, Original_DescDestinazione, Original_Indirizzo, Original_Cap, Original_Localita, Original_Provincia, Original_Nazione); } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int deleteQuery(string Original_CodCliente, string Original_CodDestinazione) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((Original_CodCliente == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_CodCliente)); + } + if ((Original_CodDestinazione == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(Original_CodDestinazione)); + } + 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", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int insertQuery(string CodCliente, string CodDestinazione, string DescDestinazione, string Indirizzo, string Cap, string Localita, string Provincia, string Nazione) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + if ((CodCliente == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CodCliente)); + } + if ((CodDestinazione == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(CodDestinazione)); + } + if ((DescDestinazione == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(DescDestinazione)); + } + if ((Indirizzo == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(Indirizzo)); + } + if ((Cap == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Cap)); + } + if ((Localita == null)) { + command.Parameters[6].Value = global::System.DBNull.Value; + } + else { + command.Parameters[6].Value = ((string)(Localita)); + } + if ((Provincia == null)) { + command.Parameters[7].Value = global::System.DBNull.Value; + } + else { + command.Parameters[7].Value = ((string)(Provincia)); + } + if ((Nazione == null)) { + command.Parameters[8].Value = global::System.DBNull.Value; + } + else { + command.Parameters[8].Value = ((string)(Nazione)); + } + 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", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int updateQuery(string CodDestinazione, string DescDestinazione, string Indirizzo, string Cap, string Localita, string Provincia, string Nazione, string Original_CodDestinazione, string Original_CodCliente) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + if ((CodDestinazione == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CodDestinazione)); + } + if ((DescDestinazione == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(DescDestinazione)); + } + if ((Indirizzo == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(Indirizzo)); + } + if ((Cap == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(Cap)); + } + if ((Localita == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Localita)); + } + if ((Provincia == null)) { + command.Parameters[6].Value = global::System.DBNull.Value; + } + else { + command.Parameters[6].Value = ((string)(Provincia)); + } + if ((Nazione == null)) { + command.Parameters[7].Value = global::System.DBNull.Value; + } + else { + command.Parameters[7].Value = ((string)(Nazione)); + } + if ((Original_CodDestinazione == null)) { + command.Parameters[8].Value = global::System.DBNull.Value; + } + else { + command.Parameters[8].Value = ((string)(Original_CodDestinazione)); + } + if ((Original_CodCliente == null)) { + command.Parameters[9].Value = global::System.DBNull.Value; + } + else { + command.Parameters[9].Value = ((string)(Original_CodCliente)); + } + 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/MagData/DS_Mag.xsd b/MagData/DS_Mag.xsd index 5bbc02e2..7ef66184 100644 --- a/MagData/DS_Mag.xsd +++ b/MagData/DS_Mag.xsd @@ -619,7 +619,7 @@ SELECT CodCliente, RagSociale, Indirizzo, Localita, Cap, Provincia, Nazione, IsC - + dbo.stp_ACF_deleteQuery @@ -643,7 +643,7 @@ SELECT CodCliente, RagSociale, Indirizzo, Localita, Cap, Provincia, Nazione, IsC - + dbo.stp_ACF_insertQuery @@ -908,6 +908,18 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, + + + + dbo.stp_ADC_deleteQuery + + + + + + + + @@ -919,6 +931,43 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, + + + + dbo.stp_ADC_insertQuery + + + + + + + + + + + + + + + + + + dbo.stp_ADC_updateQuery + + + + + + + + + + + + + + + @@ -926,83 +975,83 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, - + - + - + - - + + - + - + - + - + - - + + - - - - - - + + + + + + - + - + @@ -1012,152 +1061,152 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, - + - + - + - + - + - - - - + + + + - - - - + + + + - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + @@ -1167,31 +1216,31 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, - + - + - + - + - + @@ -1201,64 +1250,64 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, - + - - + + - + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - + + @@ -1268,17 +1317,17 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, - + - + - + @@ -1288,40 +1337,40 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, - + - + - + - - - - - - + + + + + + - - - - - + + + + + @@ -1331,109 +1380,109 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + @@ -1443,123 +1492,123 @@ SELECT CodCliente, CodDestinazione, DescDestinazione, Indirizzo, Cap, Localita, - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + diff --git a/MagData/DS_Mag.xss b/MagData/DS_Mag.xss index 084e2514..d5757f00 100644 --- a/MagData/DS_Mag.xss +++ b/MagData/DS_Mag.xss @@ -6,16 +6,17 @@ --> - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/MagData/MagDataLayer.cs b/MagData/MagDataLayer.cs index b4e28b1f..14aac3a8 100644 --- a/MagData/MagDataLayer.cs +++ b/MagData/MagDataLayer.cs @@ -38,8 +38,9 @@ namespace MagData public static string redReportConf = "MP-CTRACK:MAG:reportConf"; public DS_MagTableAdapters.AnagArtTableAdapter taAA; - public DS_MagTableAdapters.AnagClientiTableAdapter taACF; public DS_MagTableAdapters.AnagArticoli2ClientiTableAdapter taAA2C; + public DS_MagTableAdapters.AnagClientiTableAdapter taACF; + public DS_MagTableAdapters.AnagDestinClientiTableAdapter taADC; public DS_ReportTableAdapters.stp_prt_CartellinoFinitiOdetteTableAdapter taCFOdette; public DS_ReportTableAdapters.stp_prt_CartellinoPedaneTableAdapter taCPed; public DS_ReportTableAdapters.stp_prt_CartellinoSemilavoratiTableAdapter taCSemil; @@ -326,8 +327,9 @@ namespace MagData taRepPLFull = new DS_ReportTableAdapters.stp_prt_ReportPackListFullTableAdapter(); taAA = new DS_MagTableAdapters.AnagArtTableAdapter(); - taACF = new DS_MagTableAdapters.AnagClientiTableAdapter(); taAA2C = new DS_MagTableAdapters.AnagArticoli2ClientiTableAdapter(); + taACF = new DS_MagTableAdapters.AnagClientiTableAdapter(); + taADC= new DS_MagTableAdapters.AnagDestinClientiTableAdapter(); taEA2U = new DS_MagTableAdapters.ElencoAL2UDCTableAdapter(); taEAL = new DS_MagTableAdapters.ElencoALTableAdapter(); taEL = new DS_MagTableAdapters.ElencoLottiTableAdapter(); @@ -352,8 +354,9 @@ namespace MagData taRepPLFull.Connection.ConnectionString = connString; taAA.Connection.ConnectionString = connString; - taACF.Connection.ConnectionString = connString; taAA2C.Connection.ConnectionString = connString; + taACF.Connection.ConnectionString = connString; + taADC.Connection.ConnectionString = connString; taEA2U.Connection.ConnectionString = connString; taEAL.Connection.ConnectionString = connString; taEL.Connection.ConnectionString = connString;