diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 46093e64..9114586d 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index ba563153..dd8827f3 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 0c586c53..092b4b18 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index 1f21f896..37cee4dd 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index 46093e64..9114586d 100644 Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache index c5c90540..1e6bedd1 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs index 523f2dd5..0b0b6eaa 100644 --- a/GMW/GMW_WS/bilance.asmx.cs +++ b/GMW/GMW_WS/bilance.asmx.cs @@ -873,7 +873,6 @@ namespace GMW_WS return answ; } - #region area rettifiche e scarti /// diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll index 46093e64..9114586d 100644 Binary files a/GMW/GMW_WS/bin/GMW.dll and b/GMW/GMW_WS/bin/GMW.dll differ diff --git a/GMW/GMW_WS/bin/GMW_WS.dll b/GMW/GMW_WS/bin/GMW_WS.dll index 78351334..a5cbf6bd 100644 Binary files a/GMW/GMW_WS/bin/GMW_WS.dll and b/GMW/GMW_WS/bin/GMW_WS.dll differ diff --git a/GMW/GMW_WS/bin/GMW_data.dll b/GMW/GMW_WS/bin/GMW_data.dll index ba563153..dd8827f3 100644 Binary files a/GMW/GMW_WS/bin/GMW_data.dll and b/GMW/GMW_WS/bin/GMW_data.dll differ diff --git a/GMW/GMW_WS/obj/Debug/GMW_WS.dll b/GMW/GMW_WS/obj/Debug/GMW_WS.dll index e500fa56..c96236b2 100644 Binary files a/GMW/GMW_WS/obj/Debug/GMW_WS.dll and b/GMW/GMW_WS/obj/Debug/GMW_WS.dll differ diff --git a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache index 02f1d72b..201865ee 100644 Binary files a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_WS/obj/Release/GMW_WS.dll b/GMW/GMW_WS/obj/Release/GMW_WS.dll index 78351334..a5cbf6bd 100644 Binary files a/GMW/GMW_WS/obj/Release/GMW_WS.dll and b/GMW/GMW_WS/obj/Release/GMW_WS.dll differ diff --git a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache index 67411927..2db7bb64 100644 Binary files a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj index d4970b5b..84a90090 100644 --- a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj +++ b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj @@ -345,7 +345,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_WS" "ProductCode" = "8:{F532F1C4-AAED-48FB-AC7C-AC086DFD52DD}" - "PackageCode" = "8:{F2185411-CC69-4F2E-84C3-E800BCF01D1C}" + "PackageCode" = "8:{FF9145E8-FDE7-44AD-A4E7-91E88D6CC510}" "UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" diff --git a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi index 24639d4b..e4f2c618 100644 Binary files a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi and b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi differ diff --git a/GMW/GMW_data/DS_Applicazione.Designer.cs b/GMW/GMW_data/DS_Applicazione.Designer.cs index d0549a2a..836ba7b5 100644 --- a/GMW/GMW_data/DS_Applicazione.Designer.cs +++ b/GMW/GMW_data/DS_Applicazione.Designer.cs @@ -6648,8 +6648,14 @@ namespace GMW_data { [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] public partial class v_specParticolariDataTable : global::System.Data.TypedTableBase { + private global::System.Data.DataColumn columnCodCliente; + + private global::System.Data.DataColumn columnRagSociale; + private global::System.Data.DataColumn columnParticolare; + private global::System.Data.DataColumn columnDescParticolare; + private global::System.Data.DataColumn columnDisegnoGrezzo; private global::System.Data.DataColumn columnEsponente; @@ -6688,6 +6694,20 @@ namespace GMW_data { this.InitVars(); } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn CodClienteColumn { + get { + return this.columnCodCliente; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn RagSocialeColumn { + get { + return this.columnRagSociale; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public global::System.Data.DataColumn ParticolareColumn { get { @@ -6695,6 +6715,13 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn DescParticolareColumn { + get { + return this.columnDescParticolare; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public global::System.Data.DataColumn DisegnoGrezzoColumn { get { @@ -6752,10 +6779,13 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public v_specParticolariRow Addv_specParticolariRow(string Particolare, string DisegnoGrezzo, string Esponente, string CodStampo, string Figura) { + public v_specParticolariRow Addv_specParticolariRow(string CodCliente, string RagSociale, string Particolare, string DescParticolare, string DisegnoGrezzo, string Esponente, string CodStampo, string Figura) { v_specParticolariRow rowv_specParticolariRow = ((v_specParticolariRow)(this.NewRow())); object[] columnValuesArray = new object[] { + CodCliente, + RagSociale, Particolare, + DescParticolare, DisegnoGrezzo, Esponente, CodStampo, @@ -6779,7 +6809,10 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] internal void InitVars() { + this.columnCodCliente = base.Columns["CodCliente"]; + this.columnRagSociale = base.Columns["RagSociale"]; this.columnParticolare = base.Columns["Particolare"]; + this.columnDescParticolare = base.Columns["DescParticolare"]; this.columnDisegnoGrezzo = base.Columns["DisegnoGrezzo"]; this.columnEsponente = base.Columns["Esponente"]; this.columnCodStampo = base.Columns["CodStampo"]; @@ -6788,8 +6821,14 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitClass() { + this.columnCodCliente = new global::System.Data.DataColumn("CodCliente", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodCliente); + this.columnRagSociale = new global::System.Data.DataColumn("RagSociale", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnRagSociale); this.columnParticolare = new global::System.Data.DataColumn("Particolare", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnParticolare); + this.columnDescParticolare = new global::System.Data.DataColumn("DescParticolare", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDescParticolare); this.columnDisegnoGrezzo = new global::System.Data.DataColumn("DisegnoGrezzo", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDisegnoGrezzo); this.columnEsponente = new global::System.Data.DataColumn("Esponente", typeof(string), null, global::System.Data.MappingType.Element); @@ -6798,7 +6837,10 @@ namespace GMW_data { base.Columns.Add(this.columnCodStampo); this.columnFigura = new global::System.Data.DataColumn("Figura", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnFigura); + this.columnCodCliente.MaxLength = 6; + this.columnRagSociale.MaxLength = 35; this.columnParticolare.MaxLength = 15; + this.columnDescParticolare.MaxLength = 30; this.columnDisegnoGrezzo.MaxLength = 30; this.columnEsponente.MaxLength = 6; this.columnCodStampo.MaxLength = 8; @@ -10087,6 +10129,36 @@ namespace GMW_data { this.tablev_specParticolari = ((v_specParticolariDataTable)(this.Table)); } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string CodCliente { + get { + try { + return ((string)(this[this.tablev_specParticolari.CodClienteColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'CodCliente\' in table \'v_specParticolari\' is DBNull.", e); + } + } + set { + this[this.tablev_specParticolari.CodClienteColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string RagSociale { + get { + try { + return ((string)(this[this.tablev_specParticolari.RagSocialeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'RagSociale\' in table \'v_specParticolari\' is DBNull.", e); + } + } + set { + this[this.tablev_specParticolari.RagSocialeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string Particolare { get { @@ -10102,6 +10174,21 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string DescParticolare { + get { + try { + return ((string)(this[this.tablev_specParticolari.DescParticolareColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DescParticolare\' in table \'v_specParticolari\' is DBNull.", e); + } + } + set { + this[this.tablev_specParticolari.DescParticolareColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string DisegnoGrezzo { get { @@ -10162,6 +10249,26 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsCodClienteNull() { + return this.IsNull(this.tablev_specParticolari.CodClienteColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetCodClienteNull() { + this[this.tablev_specParticolari.CodClienteColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsRagSocialeNull() { + return this.IsNull(this.tablev_specParticolari.RagSocialeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetRagSocialeNull() { + this[this.tablev_specParticolari.RagSocialeColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public bool IsParticolareNull() { return this.IsNull(this.tablev_specParticolari.ParticolareColumn); @@ -10172,6 +10279,16 @@ namespace GMW_data { this[this.tablev_specParticolari.ParticolareColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsDescParticolareNull() { + return this.IsNull(this.tablev_specParticolari.DescParticolareColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetDescParticolareNull() { + this[this.tablev_specParticolari.DescParticolareColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public bool IsDisegnoGrezzoNull() { return this.IsNull(this.tablev_specParticolari.DisegnoGrezzoColumn); @@ -18733,7 +18850,10 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); tableMapping.SourceTable = "Table"; tableMapping.DataSetTable = "v_specParticolari"; + tableMapping.ColumnMappings.Add("CodCliente", "CodCliente"); + tableMapping.ColumnMappings.Add("RagSociale", "RagSociale"); tableMapping.ColumnMappings.Add("Particolare", "Particolare"); + tableMapping.ColumnMappings.Add("DescParticolare", "DescParticolare"); tableMapping.ColumnMappings.Add("DisegnoGrezzo", "DisegnoGrezzo"); tableMapping.ColumnMappings.Add("Esponente", "Esponente"); tableMapping.ColumnMappings.Add("CodStampo", "CodStampo"); @@ -18752,8 +18872,8 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT Particolare, DisegnoGrezzo, Esponente, CodStampo, Figura FROM dbo.v_specPa" + - "rticolari"; + this._commandCollection[0].CommandText = "SELECT CodCliente, RagSociale, Particolare, DescParticolare, DisegnoGrezzo, Espon" + + "ente, CodStampo, Figura FROM dbo.v_specParticolari"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/GMW/GMW_data/DS_Applicazione.xsd b/GMW/GMW_data/DS_Applicazione.xsd index ac4f3ddd..7015c9a6 100644 --- a/GMW/GMW_data/DS_Applicazione.xsd +++ b/GMW/GMW_data/DS_Applicazione.xsd @@ -1435,14 +1435,17 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - SELECT Particolare, DisegnoGrezzo, Esponente, CodStampo, Figura FROM dbo.v_specParticolari + SELECT CodCliente, RagSociale, Particolare, DescParticolare, DisegnoGrezzo, Esponente, CodStampo, Figura FROM dbo.v_specParticolari + + + @@ -1473,8 +1476,8 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - - + + @@ -1487,14 +1490,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1507,14 +1510,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1527,14 +1530,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1547,35 +1550,35 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + @@ -1588,35 +1591,35 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + @@ -1629,21 +1632,21 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + @@ -1656,93 +1659,93 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + @@ -1756,28 +1759,28 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - - - - + + + + - - - - - + + + + + - + @@ -1804,96 +1807,96 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - - - + + + - - - - + + + + - + - + - + - + - + - + - + - + - + @@ -1975,14 +1978,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1995,157 +1998,157 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - + - + - + - + - + @@ -2158,42 +2161,42 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + @@ -2206,14 +2209,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -2226,21 +2229,21 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + @@ -2253,102 +2256,102 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - - - + + + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + @@ -2361,6 +2364,20 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = + + + + + + + + + + + + + + @@ -2368,6 +2385,13 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = + + + + + + + diff --git a/GMW/GMW_data/DS_Applicazione.xss b/GMW/GMW_data/DS_Applicazione.xss index 1dcd2287..a6a585d8 100644 --- a/GMW/GMW_data/DS_Applicazione.xss +++ b/GMW/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. --> - + @@ -23,7 +23,7 @@ - + diff --git a/GMW/GMW_data/Type/SpecParticolare.cs b/GMW/GMW_data/Type/SpecParticolare.cs index 064f5c50..350ff0af 100644 --- a/GMW/GMW_data/Type/SpecParticolare.cs +++ b/GMW/GMW_data/Type/SpecParticolare.cs @@ -15,10 +15,22 @@ namespace GMW_data.Type setFromTabRow(riga); } /// + /// Codice cliente + /// + public string CodCliente { get; set; } + /// + /// Ragione Sociale + /// + public string RagSociale { get; set; } + /// /// Codice Particolare /// public string Particolare { get; set; } /// + /// Descrizione Particolare + /// + public string DescParticolare { get; set; } + /// /// Disegno Grezzo /// public string DisegnoGrezzo { get; set; } @@ -41,8 +53,10 @@ namespace GMW_data.Type /// public void setFromTabRow(DS_Applicazione.v_specParticolariRow riga) { - + CodCliente = riga.CodCliente; + RagSociale = riga.RagSociale; Particolare = riga.Particolare; + DescParticolare = riga.DescParticolare; DisegnoGrezzo = riga.DisegnoGrezzo; Esponente = riga.Esponente; CodStampo = riga.CodStampo; diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 15cae66d..fd901f46 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index ba563153..dd8827f3 100644 Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 15cae66d..fd901f46 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index be8a1a00..c2f11347 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index ba563153..dd8827f3 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 1dbdd03e..0f66e15a 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ