diff --git a/project/XPS/Web.config b/project/XPS/Web.config index e325089..da2a278 100644 --- a/project/XPS/Web.config +++ b/project/XPS/Web.config @@ -3,26 +3,26 @@ -
+
-
-
-
-
+
+
+
+
-
-
+
+
- + @@ -35,9 +35,9 @@ - - - + + + @@ -49,7 +49,7 @@ - StoragePath must specify a write enabled server path ( ~ means site root path) If StoragePath is a web path (i.e.: \\MachineName\Dir), when used in webfarms, please add the following line under - + - Default (default ViewState saving method, sending hidden fields to client side) @@ -66,60 +66,57 @@ Compression method is not suported by StorageMethod="Session" --> - + - - + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + - + - + - + - + - + - + - + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -206,48 +203,48 @@ providerName="System.Data.SqlClient" /> - + - - + + - - - - - - - - + + + + + + + + - - + + - - + + - - + + - - + + - - - + + + diff --git a/project/XPS/bin/XPS.dll b/project/XPS/bin/XPS.dll index fab2e0c..92214c5 100644 Binary files a/project/XPS/bin/XPS.dll and b/project/XPS/bin/XPS.dll differ diff --git a/project/XPS/bin/XPS_data.dll b/project/XPS/bin/XPS_data.dll index 6b370ba..f51b6ff 100644 Binary files a/project/XPS/bin/XPS_data.dll and b/project/XPS/bin/XPS_data.dll differ diff --git a/project/XPS/equaAppSettings.config b/project/XPS/equaAppSettings.config index 6fc7a94..94131e9 100644 --- a/project/XPS/equaAppSettings.config +++ b/project/XPS/equaAppSettings.config @@ -50,7 +50,7 @@ - + diff --git a/project/XPS/obj/Debug/XPS.dll b/project/XPS/obj/Debug/XPS.dll index 2f7958d..92214c5 100644 Binary files a/project/XPS/obj/Debug/XPS.dll and b/project/XPS/obj/Debug/XPS.dll differ diff --git a/project/XPS/obj/Release/ResolveAssemblyReference.cache b/project/XPS/obj/Release/ResolveAssemblyReference.cache index 727c034..3d718ee 100644 Binary files a/project/XPS/obj/Release/ResolveAssemblyReference.cache and b/project/XPS/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPS/obj/Release/XPS.dll b/project/XPS/obj/Release/XPS.dll index fab2e0c..5b42e3b 100644 Binary files a/project/XPS/obj/Release/XPS.dll and b/project/XPS/obj/Release/XPS.dll differ diff --git a/project/XPS/tmp/LabelEqua_1.emf b/project/XPS/tmp/LabelEqua_1.emf index 10e5578..c306aaf 100644 Binary files a/project/XPS/tmp/LabelEqua_1.emf and b/project/XPS/tmp/LabelEqua_1.emf differ diff --git a/project/XPST/Web.config b/project/XPST/Web.config index ee05b33..cbe8c43 100644 --- a/project/XPST/Web.config +++ b/project/XPST/Web.config @@ -165,6 +165,7 @@ + diff --git a/project/XPST/WebUserControls/mod_btnComandi.ascx.cs b/project/XPST/WebUserControls/mod_btnComandi.ascx.cs index 4aaee93..f3e3fdb 100644 --- a/project/XPST/WebUserControls/mod_btnComandi.ascx.cs +++ b/project/XPST/WebUserControls/mod_btnComandi.ascx.cs @@ -75,6 +75,7 @@ namespace XPST.WebUserControls { eh_clickComando(this, new EventArgs()); } + } protected void btn1_Click(object sender, EventArgs e) diff --git a/project/XPST/bin/XPST.dll b/project/XPST/bin/XPST.dll index 1b19dcd..3145db6 100644 Binary files a/project/XPST/bin/XPST.dll and b/project/XPST/bin/XPST.dll differ diff --git a/project/XPST/bin/XPS_data.dll b/project/XPST/bin/XPS_data.dll index 6b370ba..f51b6ff 100644 Binary files a/project/XPST/bin/XPS_data.dll and b/project/XPST/bin/XPS_data.dll differ diff --git a/project/XPST/equaAppSettings.config b/project/XPST/equaAppSettings.config index debe3bb..237cdfc 100644 --- a/project/XPST/equaAppSettings.config +++ b/project/XPST/equaAppSettings.config @@ -31,6 +31,7 @@ + diff --git a/project/XPST/obj/Debug/ResolveAssemblyReference.cache b/project/XPST/obj/Debug/ResolveAssemblyReference.cache index 2b2ce42..87c04f4 100644 Binary files a/project/XPST/obj/Debug/ResolveAssemblyReference.cache and b/project/XPST/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/project/XPST/obj/Debug/XPST.dll b/project/XPST/obj/Debug/XPST.dll index bc8450f..6fda652 100644 Binary files a/project/XPST/obj/Debug/XPST.dll and b/project/XPST/obj/Debug/XPST.dll differ diff --git a/project/XPST/obj/Release/ResolveAssemblyReference.cache b/project/XPST/obj/Release/ResolveAssemblyReference.cache index ee1bc2e..2ce7adf 100644 Binary files a/project/XPST/obj/Release/ResolveAssemblyReference.cache and b/project/XPST/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPST/obj/Release/XPST.dll b/project/XPST/obj/Release/XPST.dll index 1b19dcd..3145db6 100644 Binary files a/project/XPST/obj/Release/XPST.dll and b/project/XPST/obj/Release/XPST.dll differ diff --git a/project/XPST_deploy/Release/bin/XPST.dll b/project/XPST_deploy/Release/bin/XPST.dll index 1b19dcd..3145db6 100644 Binary files a/project/XPST_deploy/Release/bin/XPST.dll and b/project/XPST_deploy/Release/bin/XPST.dll differ diff --git a/project/XPST_deploy/Release/bin/XPS_data.dll b/project/XPST_deploy/Release/bin/XPS_data.dll index 6b370ba..f51b6ff 100644 Binary files a/project/XPST_deploy/Release/bin/XPS_data.dll and b/project/XPST_deploy/Release/bin/XPS_data.dll differ diff --git a/project/XPST_deploy/Release/equaAppSettings.config b/project/XPST_deploy/Release/equaAppSettings.config index debe3bb..237cdfc 100644 --- a/project/XPST_deploy/Release/equaAppSettings.config +++ b/project/XPST_deploy/Release/equaAppSettings.config @@ -31,6 +31,7 @@ + diff --git a/project/XPST_deploy/Release/obj/Debug/ResolveAssemblyReference.cache b/project/XPST_deploy/Release/obj/Debug/ResolveAssemblyReference.cache index 2b2ce42..87c04f4 100644 Binary files a/project/XPST_deploy/Release/obj/Debug/ResolveAssemblyReference.cache and b/project/XPST_deploy/Release/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/project/XPST_deploy/Release/obj/Debug/XPST.dll b/project/XPST_deploy/Release/obj/Debug/XPST.dll index bc8450f..6fda652 100644 Binary files a/project/XPST_deploy/Release/obj/Debug/XPST.dll and b/project/XPST_deploy/Release/obj/Debug/XPST.dll differ diff --git a/project/XPST_deploy/Release/obj/Release/ResolveAssemblyReference.cache b/project/XPST_deploy/Release/obj/Release/ResolveAssemblyReference.cache index ee1bc2e..2ce7adf 100644 Binary files a/project/XPST_deploy/Release/obj/Release/ResolveAssemblyReference.cache and b/project/XPST_deploy/Release/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPST_deploy/Release/obj/Release/XPST.dll b/project/XPST_deploy/Release/obj/Release/XPST.dll index 1b19dcd..3145db6 100644 Binary files a/project/XPST_deploy/Release/obj/Release/XPST.dll and b/project/XPST_deploy/Release/obj/Release/XPST.dll differ diff --git a/project/XPST_deploy/Release/web.config b/project/XPST_deploy/Release/web.config index 72bea36..b1ceab9 100644 --- a/project/XPST_deploy/Release/web.config +++ b/project/XPST_deploy/Release/web.config @@ -164,6 +164,7 @@ + diff --git a/project/XPST_deploy/Source/Web.config b/project/XPST_deploy/Source/Web.config index ee05b33..cbe8c43 100644 --- a/project/XPST_deploy/Source/Web.config +++ b/project/XPST_deploy/Source/Web.config @@ -165,6 +165,7 @@ + diff --git a/project/XPST_deploy/Source/WebUserControls/mod_btnComandi.ascx.cs b/project/XPST_deploy/Source/WebUserControls/mod_btnComandi.ascx.cs index 4aaee93..f3e3fdb 100644 --- a/project/XPST_deploy/Source/WebUserControls/mod_btnComandi.ascx.cs +++ b/project/XPST_deploy/Source/WebUserControls/mod_btnComandi.ascx.cs @@ -75,6 +75,7 @@ namespace XPST.WebUserControls { eh_clickComando(this, new EventArgs()); } + } protected void btn1_Click(object sender, EventArgs e) diff --git a/project/XPST_deploy/Source/bin/XPST.dll b/project/XPST_deploy/Source/bin/XPST.dll index 1b19dcd..3145db6 100644 Binary files a/project/XPST_deploy/Source/bin/XPST.dll and b/project/XPST_deploy/Source/bin/XPST.dll differ diff --git a/project/XPST_deploy/Source/bin/XPS_data.dll b/project/XPST_deploy/Source/bin/XPS_data.dll index 6b370ba..f51b6ff 100644 Binary files a/project/XPST_deploy/Source/bin/XPS_data.dll and b/project/XPST_deploy/Source/bin/XPS_data.dll differ diff --git a/project/XPST_deploy/Source/equaAppSettings.config b/project/XPST_deploy/Source/equaAppSettings.config index debe3bb..237cdfc 100644 --- a/project/XPST_deploy/Source/equaAppSettings.config +++ b/project/XPST_deploy/Source/equaAppSettings.config @@ -31,6 +31,7 @@ + diff --git a/project/XPST_deploy/Source/obj/Debug/ResolveAssemblyReference.cache b/project/XPST_deploy/Source/obj/Debug/ResolveAssemblyReference.cache index 2b2ce42..87c04f4 100644 Binary files a/project/XPST_deploy/Source/obj/Debug/ResolveAssemblyReference.cache and b/project/XPST_deploy/Source/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/project/XPST_deploy/Source/obj/Debug/XPST.dll b/project/XPST_deploy/Source/obj/Debug/XPST.dll index bc8450f..6fda652 100644 Binary files a/project/XPST_deploy/Source/obj/Debug/XPST.dll and b/project/XPST_deploy/Source/obj/Debug/XPST.dll differ diff --git a/project/XPST_deploy/Source/obj/Release/ResolveAssemblyReference.cache b/project/XPST_deploy/Source/obj/Release/ResolveAssemblyReference.cache index ee1bc2e..2ce7adf 100644 Binary files a/project/XPST_deploy/Source/obj/Release/ResolveAssemblyReference.cache and b/project/XPST_deploy/Source/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPST_deploy/Source/obj/Release/XPST.dll b/project/XPST_deploy/Source/obj/Release/XPST.dll index 1b19dcd..3145db6 100644 Binary files a/project/XPST_deploy/Source/obj/Release/XPST.dll and b/project/XPST_deploy/Source/obj/Release/XPST.dll differ diff --git a/project/XPST_deploy/XPST_deploy.wdproj b/project/XPST_deploy/XPST_deploy.wdproj index e01f8b9..e26776b 100644 --- a/project/XPST_deploy/XPST_deploy.wdproj +++ b/project/XPST_deploy/XPST_deploy.wdproj @@ -23,6 +23,8 @@ XPST_deploy true true + true + true false @@ -33,6 +35,7 @@ true true true + true diff --git a/project/XPST_installer/Release/XPST_installer.msi b/project/XPST_installer/Release/XPST_installer.msi index 04d7581..4bdcf53 100644 Binary files a/project/XPST_installer/Release/XPST_installer.msi and b/project/XPST_installer/Release/XPST_installer.msi differ diff --git a/project/XPST_installer/XPST_installer.vdproj b/project/XPST_installer/XPST_installer.vdproj index 0b21ce5..72d4f56 100644 --- a/project/XPST_installer/XPST_installer.vdproj +++ b/project/XPST_installer/XPST_installer.vdproj @@ -244,7 +244,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:XPST" "ProductCode" = "8:{46210ABC-7AAF-4AF7-B7C0-E228355BC843}" - "PackageCode" = "8:{5C54F780-89C2-4127-B7B9-1677881651D5}" + "PackageCode" = "8:{802E5502-613F-4031-A6EB-28DFF7DDF985}" "UpgradeCode" = "8:{1F4D37F4-ED5E-41B7-9D58-560A137B61D4}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" diff --git a/project/XPS_data/DS_applicazione.Designer.cs b/project/XPS_data/DS_applicazione.Designer.cs index 10cc9ac..2c68546 100644 --- a/project/XPS_data/DS_applicazione.Designer.cs +++ b/project/XPS_data/DS_applicazione.Designer.cs @@ -10804,28 +10804,28 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT 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].[IstObj] WHERE (([IdxObj] = @Original_IdxObj) AND ((@IsNull_Cod" + - "Cliente = 1 AND [CodCliente] IS NULL) OR ([CodCliente] = @Original_CodCliente)) " + - "AND ((@IsNull_CodStato = 1 AND [CodStato] IS NULL) OR ([CodStato] = @Original_Co" + - "dStato)) AND ((@IsNull_Posizione = 1 AND [Posizione] IS NULL) OR ([Posizione] = " + - "@Original_Posizione)) AND ((@IsNull_Livello = 1 AND [Livello] IS NULL) OR ([Live" + - "llo] = @Original_Livello)) AND ((@IsNull_Rev = 1 AND [Rev] IS NULL) OR ([Rev] = " + - "@Original_Rev)) AND ((@IsNull_CodObj = 1 AND [CodObj] IS NULL) OR ([CodObj] = @O" + - "riginal_CodObj)) AND ((@IsNull_Nome = 1 AND [Nome] IS NULL) OR ([Nome] = @Origin" + - "al_Nome)) AND ((@IsNull_DataRif = 1 AND [DataRif] IS NULL) OR ([DataRif] = @Orig" + - "inal_DataRif)) AND ((@IsNull_IdxObjMamma = 1 AND [IdxObjMamma] IS NULL) OR ([Idx" + - "ObjMamma] = @Original_IdxObjMamma)) AND ((@IsNull_Note = 1 AND [Note] IS NULL) O" + - "R ([Note] = @Original_Note)) AND ((@IsNull_ExtKey = 1 AND [ExtKey] IS NULL) OR (" + - "[ExtKey] = @Original_ExtKey)) AND ((@IsNull_DueDate = 1 AND [DueDate] IS NULL) O" + - "R ([DueDate] = @Original_DueDate)) AND ((@IsNull_LeadTime = 1 AND [LeadTime] IS " + - "NULL) OR ([LeadTime] = @Original_LeadTime)) AND ((@IsNull_LeadTimeUM = 1 AND [Le" + - "adTimeUM] IS NULL) OR ([LeadTimeUM] = @Original_LeadTimeUM)) AND ((@IsNull_UserC" + - "reaz = 1 AND [UserCreaz] IS NULL) OR ([UserCreaz] = @Original_UserCreaz)) AND ((" + - "@IsNull_DataCreaz = 1 AND [DataCreaz] IS NULL) OR ([DataCreaz] = @Original_DataC" + - "reaz)) AND ((@IsNull_UserMod = 1 AND [UserMod] IS NULL) OR ([UserMod] = @Origina" + - "l_UserMod)) AND ((@IsNull_DataMod = 1 AND [DataMod] IS NULL) OR ([DataMod] = @Or" + - "iginal_DataMod)) AND ((@IsNull_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_" + - "Qta)) AND ((@IsNull_Peso = 1 AND [Peso] IS NULL) OR ([Peso] = @Original_Peso)))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [IstObj] WHERE (([IdxObj] = @Original_IdxObj) AND ((@IsNull_CodClient" + + "e = 1 AND [CodCliente] IS NULL) OR ([CodCliente] = @Original_CodCliente)) AND ((" + + "@IsNull_CodStato = 1 AND [CodStato] IS NULL) OR ([CodStato] = @Original_CodStato" + + ")) AND ((@IsNull_Posizione = 1 AND [Posizione] IS NULL) OR ([Posizione] = @Origi" + + "nal_Posizione)) AND ((@IsNull_Livello = 1 AND [Livello] IS NULL) OR ([Livello] =" + + " @Original_Livello)) AND ((@IsNull_Rev = 1 AND [Rev] IS NULL) OR ([Rev] = @Origi" + + "nal_Rev)) AND ((@IsNull_CodObj = 1 AND [CodObj] IS NULL) OR ([CodObj] = @Origina" + + "l_CodObj)) AND ((@IsNull_Nome = 1 AND [Nome] IS NULL) OR ([Nome] = @Original_Nom" + + "e)) AND ((@IsNull_DataRif = 1 AND [DataRif] IS NULL) OR ([DataRif] = @Original_D" + + "ataRif)) AND ((@IsNull_IdxObjMamma = 1 AND [IdxObjMamma] IS NULL) OR ([IdxObjMam" + + "ma] = @Original_IdxObjMamma)) AND ((@IsNull_Note = 1 AND [Note] IS NULL) OR ([No" + + "te] = @Original_Note)) AND ((@IsNull_ExtKey = 1 AND [ExtKey] IS NULL) OR ([ExtKe" + + "y] = @Original_ExtKey)) AND ((@IsNull_DueDate = 1 AND [DueDate] IS NULL) OR ([Du" + + "eDate] = @Original_DueDate)) AND ((@IsNull_LeadTime = 1 AND [LeadTime] IS NULL) " + + "OR ([LeadTime] = @Original_LeadTime)) AND ((@IsNull_LeadTimeUM = 1 AND [LeadTime" + + "UM] IS NULL) OR ([LeadTimeUM] = @Original_LeadTimeUM)) AND ((@IsNull_UserCreaz =" + + " 1 AND [UserCreaz] IS NULL) OR ([UserCreaz] = @Original_UserCreaz)) AND ((@IsNul" + + "l_DataCreaz = 1 AND [DataCreaz] IS NULL) OR ([DataCreaz] = @Original_DataCreaz))" + + " AND ((@IsNull_UserMod = 1 AND [UserMod] IS NULL) OR ([UserMod] = @Original_User" + + "Mod)) AND ((@IsNull_DataMod = 1 AND [DataMod] IS NULL) OR ([DataMod] = @Original" + + "_DataMod)) AND ((@IsNull_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_Qta)) " + + "AND ((@IsNull_Peso = 1 AND [Peso] IS NULL) OR ([Peso] = @Original_Peso)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxObj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxObj", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CodCliente", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCliente", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -10870,7 +10870,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Peso", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Peso", 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].[IstObj] ([IdxObj], [CodCliente], [CodStato], [Posizione], [Livello], [Rev], [CodObj], [Nome], [DataRif], [IdxObjMamma], [Note], [ExtKey], [DueDate], [LeadTime], [LeadTimeUM], [UserCreaz], [DataCreaz], [UserMod], [DataMod], [Qta], [Peso]) VALUES (@IdxObj, @CodCliente, @CodStato, @Posizione, @Livello, @Rev, @CodObj, @Nome, @DataRif, @IdxObjMamma, @Note, @ExtKey, @DueDate, @LeadTime, @LeadTimeUM, @UserCreaz, @DataCreaz, @UserMod, @DataMod, @Qta, @Peso); + this._adapter.InsertCommand.CommandText = @"INSERT INTO [IstObj] ([IdxObj], [CodCliente], [CodStato], [Posizione], [Livello], [Rev], [CodObj], [Nome], [DataRif], [IdxObjMamma], [Note], [ExtKey], [DueDate], [LeadTime], [LeadTimeUM], [UserCreaz], [DataCreaz], [UserMod], [DataMod], [Qta], [Peso]) VALUES (@IdxObj, @CodCliente, @CodStato, @Posizione, @Livello, @Rev, @CodObj, @Nome, @DataRif, @IdxObjMamma, @Note, @ExtKey, @DueDate, @LeadTime, @LeadTimeUM, @UserCreaz, @DataCreaz, @UserMod, @DataMod, @Qta, @Peso); SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, DataRif, IdxObjMamma, Note, ExtKey, DueDate, LeadTime, LeadTimeUM, UserCreaz, DataCreaz, UserMod, DataMod, Qta, Peso FROM IstObj WHERE (IdxObj = @IdxObj)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxObj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxObj", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -10896,37 +10896,37 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Peso", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Peso", 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].[IstObj] SET [IdxObj] = @IdxObj, [CodCliente] = @CodCliente, [CodSta" + - "to] = @CodStato, [Posizione] = @Posizione, [Livello] = @Livello, [Rev] = @Rev, [" + - "CodObj] = @CodObj, [Nome] = @Nome, [DataRif] = @DataRif, [IdxObjMamma] = @IdxObj" + - "Mamma, [Note] = @Note, [ExtKey] = @ExtKey, [DueDate] = @DueDate, [LeadTime] = @L" + - "eadTime, [LeadTimeUM] = @LeadTimeUM, [UserCreaz] = @UserCreaz, [DataCreaz] = @Da" + - "taCreaz, [UserMod] = @UserMod, [DataMod] = @DataMod, [Qta] = @Qta, [Peso] = @Pes" + - "o WHERE (([IdxObj] = @Original_IdxObj) AND ((@IsNull_CodCliente = 1 AND [CodClie" + - "nte] IS NULL) OR ([CodCliente] = @Original_CodCliente)) AND ((@IsNull_CodStato =" + - " 1 AND [CodStato] IS NULL) OR ([CodStato] = @Original_CodStato)) AND ((@IsNull_P" + - "osizione = 1 AND [Posizione] IS NULL) OR ([Posizione] = @Original_Posizione)) AN" + - "D ((@IsNull_Livello = 1 AND [Livello] IS NULL) OR ([Livello] = @Original_Livello" + - ")) AND ((@IsNull_Rev = 1 AND [Rev] IS NULL) OR ([Rev] = @Original_Rev)) AND ((@I" + - "sNull_CodObj = 1 AND [CodObj] IS NULL) OR ([CodObj] = @Original_CodObj)) AND ((@" + - "IsNull_Nome = 1 AND [Nome] IS NULL) OR ([Nome] = @Original_Nome)) AND ((@IsNull_" + - "DataRif = 1 AND [DataRif] IS NULL) OR ([DataRif] = @Original_DataRif)) AND ((@Is" + - "Null_IdxObjMamma = 1 AND [IdxObjMamma] IS NULL) OR ([IdxObjMamma] = @Original_Id" + - "xObjMamma)) AND ((@IsNull_Note = 1 AND [Note] IS NULL) OR ([Note] = @Original_No" + - "te)) AND ((@IsNull_ExtKey = 1 AND [ExtKey] IS NULL) OR ([ExtKey] = @Original_Ext" + - "Key)) AND ((@IsNull_DueDate = 1 AND [DueDate] IS NULL) OR ([DueDate] = @Original" + - "_DueDate)) AND ((@IsNull_LeadTime = 1 AND [LeadTime] IS NULL) OR ([LeadTime] = @" + - "Original_LeadTime)) AND ((@IsNull_LeadTimeUM = 1 AND [LeadTimeUM] IS NULL) OR ([" + - "LeadTimeUM] = @Original_LeadTimeUM)) AND ((@IsNull_UserCreaz = 1 AND [UserCreaz]" + - " IS NULL) OR ([UserCreaz] = @Original_UserCreaz)) AND ((@IsNull_DataCreaz = 1 AN" + - "D [DataCreaz] IS NULL) OR ([DataCreaz] = @Original_DataCreaz)) AND ((@IsNull_Use" + - "rMod = 1 AND [UserMod] IS NULL) OR ([UserMod] = @Original_UserMod)) AND ((@IsNul" + - "l_DataMod = 1 AND [DataMod] IS NULL) OR ([DataMod] = @Original_DataMod)) AND ((@" + - "IsNull_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_Qta)) AND ((@IsNull_Peso" + - " = 1 AND [Peso] IS NULL) OR ([Peso] = @Original_Peso)));\r\nSELECT IdxObj, CodClie" + - "nte, CodStato, Posizione, Livello, Rev, CodObj, Nome, DataRif, IdxObjMamma, Note" + - ", ExtKey, DueDate, LeadTime, LeadTimeUM, UserCreaz, DataCreaz, UserMod, DataMod," + - " Qta, Peso FROM IstObj WHERE (IdxObj = @IdxObj)"; + this._adapter.UpdateCommand.CommandText = "UPDATE [IstObj] SET [IdxObj] = @IdxObj, [CodCliente] = @CodCliente, [CodStato] = " + + "@CodStato, [Posizione] = @Posizione, [Livello] = @Livello, [Rev] = @Rev, [CodObj" + + "] = @CodObj, [Nome] = @Nome, [DataRif] = @DataRif, [IdxObjMamma] = @IdxObjMamma," + + " [Note] = @Note, [ExtKey] = @ExtKey, [DueDate] = @DueDate, [LeadTime] = @LeadTim" + + "e, [LeadTimeUM] = @LeadTimeUM, [UserCreaz] = @UserCreaz, [DataCreaz] = @DataCrea" + + "z, [UserMod] = @UserMod, [DataMod] = @DataMod, [Qta] = @Qta, [Peso] = @Peso WHER" + + "E (([IdxObj] = @Original_IdxObj) AND ((@IsNull_CodCliente = 1 AND [CodCliente] I" + + "S NULL) OR ([CodCliente] = @Original_CodCliente)) AND ((@IsNull_CodStato = 1 AND" + + " [CodStato] IS NULL) OR ([CodStato] = @Original_CodStato)) AND ((@IsNull_Posizio" + + "ne = 1 AND [Posizione] IS NULL) OR ([Posizione] = @Original_Posizione)) AND ((@I" + + "sNull_Livello = 1 AND [Livello] IS NULL) OR ([Livello] = @Original_Livello)) AND" + + " ((@IsNull_Rev = 1 AND [Rev] IS NULL) OR ([Rev] = @Original_Rev)) AND ((@IsNull_" + + "CodObj = 1 AND [CodObj] IS NULL) OR ([CodObj] = @Original_CodObj)) AND ((@IsNull" + + "_Nome = 1 AND [Nome] IS NULL) OR ([Nome] = @Original_Nome)) AND ((@IsNull_DataRi" + + "f = 1 AND [DataRif] IS NULL) OR ([DataRif] = @Original_DataRif)) AND ((@IsNull_I" + + "dxObjMamma = 1 AND [IdxObjMamma] IS NULL) OR ([IdxObjMamma] = @Original_IdxObjMa" + + "mma)) AND ((@IsNull_Note = 1 AND [Note] IS NULL) OR ([Note] = @Original_Note)) A" + + "ND ((@IsNull_ExtKey = 1 AND [ExtKey] IS NULL) OR ([ExtKey] = @Original_ExtKey)) " + + "AND ((@IsNull_DueDate = 1 AND [DueDate] IS NULL) OR ([DueDate] = @Original_DueDa" + + "te)) AND ((@IsNull_LeadTime = 1 AND [LeadTime] IS NULL) OR ([LeadTime] = @Origin" + + "al_LeadTime)) AND ((@IsNull_LeadTimeUM = 1 AND [LeadTimeUM] IS NULL) OR ([LeadTi" + + "meUM] = @Original_LeadTimeUM)) AND ((@IsNull_UserCreaz = 1 AND [UserCreaz] IS NU" + + "LL) OR ([UserCreaz] = @Original_UserCreaz)) AND ((@IsNull_DataCreaz = 1 AND [Dat" + + "aCreaz] IS NULL) OR ([DataCreaz] = @Original_DataCreaz)) AND ((@IsNull_UserMod =" + + " 1 AND [UserMod] IS NULL) OR ([UserMod] = @Original_UserMod)) AND ((@IsNull_Data" + + "Mod = 1 AND [DataMod] IS NULL) OR ([DataMod] = @Original_DataMod)) AND ((@IsNull" + + "_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_Qta)) AND ((@IsNull_Peso = 1 A" + + "ND [Peso] IS NULL) OR ([Peso] = @Original_Peso)));\r\nSELECT IdxObj, CodCliente, C" + + "odStato, Posizione, Livello, Rev, CodObj, Nome, DataRif, IdxObjMamma, Note, ExtK" + + "ey, DueDate, LeadTime, LeadTimeUM, UserCreaz, DataCreaz, UserMod, DataMod, Qta, " + + "Peso FROM IstObj WHERE (IdxObj = @IdxObj)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxObj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxObj", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCliente", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -11003,9 +11003,10 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, DataR" + - "if, IdxObjMamma, Note, ExtKey, DueDate, LeadTime, LeadTimeUM, UserCreaz, DataCre" + - "az, UserMod, DataMod, Qta, Peso FROM dbo.IstObj"; + this._commandCollection[0].CommandText = "SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome" + + ", DataRif, IdxObjMamma, Note, ExtKey, DueDate, LeadTime, LeadTimeUM, UserCreaz, " + + "\r\n DataCreaz, UserMod, DataMod, Qta, Peso\r\nFROM " + + " IstObj"; 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/project/XPS_data/DS_applicazione.xsd b/project/XPS_data/DS_applicazione.xsd index 08f304e..841eb43 100644 --- a/project/XPS_data/DS_applicazione.xsd +++ b/project/XPS_data/DS_applicazione.xsd @@ -271,7 +271,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT - DELETE FROM [dbo].[IstObj] WHERE (([IdxObj] = @Original_IdxObj) AND ((@IsNull_CodCliente = 1 AND [CodCliente] IS NULL) OR ([CodCliente] = @Original_CodCliente)) AND ((@IsNull_CodStato = 1 AND [CodStato] IS NULL) OR ([CodStato] = @Original_CodStato)) AND ((@IsNull_Posizione = 1 AND [Posizione] IS NULL) OR ([Posizione] = @Original_Posizione)) AND ((@IsNull_Livello = 1 AND [Livello] IS NULL) OR ([Livello] = @Original_Livello)) AND ((@IsNull_Rev = 1 AND [Rev] IS NULL) OR ([Rev] = @Original_Rev)) AND ((@IsNull_CodObj = 1 AND [CodObj] IS NULL) OR ([CodObj] = @Original_CodObj)) AND ((@IsNull_Nome = 1 AND [Nome] IS NULL) OR ([Nome] = @Original_Nome)) AND ((@IsNull_DataRif = 1 AND [DataRif] IS NULL) OR ([DataRif] = @Original_DataRif)) AND ((@IsNull_IdxObjMamma = 1 AND [IdxObjMamma] IS NULL) OR ([IdxObjMamma] = @Original_IdxObjMamma)) AND ((@IsNull_Note = 1 AND [Note] IS NULL) OR ([Note] = @Original_Note)) AND ((@IsNull_ExtKey = 1 AND [ExtKey] IS NULL) OR ([ExtKey] = @Original_ExtKey)) AND ((@IsNull_DueDate = 1 AND [DueDate] IS NULL) OR ([DueDate] = @Original_DueDate)) AND ((@IsNull_LeadTime = 1 AND [LeadTime] IS NULL) OR ([LeadTime] = @Original_LeadTime)) AND ((@IsNull_LeadTimeUM = 1 AND [LeadTimeUM] IS NULL) OR ([LeadTimeUM] = @Original_LeadTimeUM)) AND ((@IsNull_UserCreaz = 1 AND [UserCreaz] IS NULL) OR ([UserCreaz] = @Original_UserCreaz)) AND ((@IsNull_DataCreaz = 1 AND [DataCreaz] IS NULL) OR ([DataCreaz] = @Original_DataCreaz)) AND ((@IsNull_UserMod = 1 AND [UserMod] IS NULL) OR ([UserMod] = @Original_UserMod)) AND ((@IsNull_DataMod = 1 AND [DataMod] IS NULL) OR ([DataMod] = @Original_DataMod)) AND ((@IsNull_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_Qta)) AND ((@IsNull_Peso = 1 AND [Peso] IS NULL) OR ([Peso] = @Original_Peso))) + DELETE FROM [IstObj] WHERE (([IdxObj] = @Original_IdxObj) AND ((@IsNull_CodCliente = 1 AND [CodCliente] IS NULL) OR ([CodCliente] = @Original_CodCliente)) AND ((@IsNull_CodStato = 1 AND [CodStato] IS NULL) OR ([CodStato] = @Original_CodStato)) AND ((@IsNull_Posizione = 1 AND [Posizione] IS NULL) OR ([Posizione] = @Original_Posizione)) AND ((@IsNull_Livello = 1 AND [Livello] IS NULL) OR ([Livello] = @Original_Livello)) AND ((@IsNull_Rev = 1 AND [Rev] IS NULL) OR ([Rev] = @Original_Rev)) AND ((@IsNull_CodObj = 1 AND [CodObj] IS NULL) OR ([CodObj] = @Original_CodObj)) AND ((@IsNull_Nome = 1 AND [Nome] IS NULL) OR ([Nome] = @Original_Nome)) AND ((@IsNull_DataRif = 1 AND [DataRif] IS NULL) OR ([DataRif] = @Original_DataRif)) AND ((@IsNull_IdxObjMamma = 1 AND [IdxObjMamma] IS NULL) OR ([IdxObjMamma] = @Original_IdxObjMamma)) AND ((@IsNull_Note = 1 AND [Note] IS NULL) OR ([Note] = @Original_Note)) AND ((@IsNull_ExtKey = 1 AND [ExtKey] IS NULL) OR ([ExtKey] = @Original_ExtKey)) AND ((@IsNull_DueDate = 1 AND [DueDate] IS NULL) OR ([DueDate] = @Original_DueDate)) AND ((@IsNull_LeadTime = 1 AND [LeadTime] IS NULL) OR ([LeadTime] = @Original_LeadTime)) AND ((@IsNull_LeadTimeUM = 1 AND [LeadTimeUM] IS NULL) OR ([LeadTimeUM] = @Original_LeadTimeUM)) AND ((@IsNull_UserCreaz = 1 AND [UserCreaz] IS NULL) OR ([UserCreaz] = @Original_UserCreaz)) AND ((@IsNull_DataCreaz = 1 AND [DataCreaz] IS NULL) OR ([DataCreaz] = @Original_DataCreaz)) AND ((@IsNull_UserMod = 1 AND [UserMod] IS NULL) OR ([UserMod] = @Original_UserMod)) AND ((@IsNull_DataMod = 1 AND [DataMod] IS NULL) OR ([DataMod] = @Original_DataMod)) AND ((@IsNull_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_Qta)) AND ((@IsNull_Peso = 1 AND [Peso] IS NULL) OR ([Peso] = @Original_Peso))) @@ -319,7 +319,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT - INSERT INTO [dbo].[IstObj] ([IdxObj], [CodCliente], [CodStato], [Posizione], [Livello], [Rev], [CodObj], [Nome], [DataRif], [IdxObjMamma], [Note], [ExtKey], [DueDate], [LeadTime], [LeadTimeUM], [UserCreaz], [DataCreaz], [UserMod], [DataMod], [Qta], [Peso]) VALUES (@IdxObj, @CodCliente, @CodStato, @Posizione, @Livello, @Rev, @CodObj, @Nome, @DataRif, @IdxObjMamma, @Note, @ExtKey, @DueDate, @LeadTime, @LeadTimeUM, @UserCreaz, @DataCreaz, @UserMod, @DataMod, @Qta, @Peso); + INSERT INTO [IstObj] ([IdxObj], [CodCliente], [CodStato], [Posizione], [Livello], [Rev], [CodObj], [Nome], [DataRif], [IdxObjMamma], [Note], [ExtKey], [DueDate], [LeadTime], [LeadTimeUM], [UserCreaz], [DataCreaz], [UserMod], [DataMod], [Qta], [Peso]) VALUES (@IdxObj, @CodCliente, @CodStato, @Posizione, @Livello, @Rev, @CodObj, @Nome, @DataRif, @IdxObjMamma, @Note, @ExtKey, @DueDate, @LeadTime, @LeadTimeUM, @UserCreaz, @DataCreaz, @UserMod, @DataMod, @Qta, @Peso); SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, DataRif, IdxObjMamma, Note, ExtKey, DueDate, LeadTime, LeadTimeUM, UserCreaz, DataCreaz, UserMod, DataMod, Qta, Peso FROM IstObj WHERE (IdxObj = @IdxObj) @@ -348,13 +348,15 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, DataRif, IdxObjMamma, Note, ExtKey, DueDate, LeadTime, LeadTimeUM, UserCreaz, DataCreaz, UserMod, DataMod, Qta, Peso FROM dbo.IstObj + SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, DataRif, IdxObjMamma, Note, ExtKey, DueDate, LeadTime, LeadTimeUM, UserCreaz, + DataCreaz, UserMod, DataMod, Qta, Peso +FROM IstObj - UPDATE [dbo].[IstObj] SET [IdxObj] = @IdxObj, [CodCliente] = @CodCliente, [CodStato] = @CodStato, [Posizione] = @Posizione, [Livello] = @Livello, [Rev] = @Rev, [CodObj] = @CodObj, [Nome] = @Nome, [DataRif] = @DataRif, [IdxObjMamma] = @IdxObjMamma, [Note] = @Note, [ExtKey] = @ExtKey, [DueDate] = @DueDate, [LeadTime] = @LeadTime, [LeadTimeUM] = @LeadTimeUM, [UserCreaz] = @UserCreaz, [DataCreaz] = @DataCreaz, [UserMod] = @UserMod, [DataMod] = @DataMod, [Qta] = @Qta, [Peso] = @Peso WHERE (([IdxObj] = @Original_IdxObj) AND ((@IsNull_CodCliente = 1 AND [CodCliente] IS NULL) OR ([CodCliente] = @Original_CodCliente)) AND ((@IsNull_CodStato = 1 AND [CodStato] IS NULL) OR ([CodStato] = @Original_CodStato)) AND ((@IsNull_Posizione = 1 AND [Posizione] IS NULL) OR ([Posizione] = @Original_Posizione)) AND ((@IsNull_Livello = 1 AND [Livello] IS NULL) OR ([Livello] = @Original_Livello)) AND ((@IsNull_Rev = 1 AND [Rev] IS NULL) OR ([Rev] = @Original_Rev)) AND ((@IsNull_CodObj = 1 AND [CodObj] IS NULL) OR ([CodObj] = @Original_CodObj)) AND ((@IsNull_Nome = 1 AND [Nome] IS NULL) OR ([Nome] = @Original_Nome)) AND ((@IsNull_DataRif = 1 AND [DataRif] IS NULL) OR ([DataRif] = @Original_DataRif)) AND ((@IsNull_IdxObjMamma = 1 AND [IdxObjMamma] IS NULL) OR ([IdxObjMamma] = @Original_IdxObjMamma)) AND ((@IsNull_Note = 1 AND [Note] IS NULL) OR ([Note] = @Original_Note)) AND ((@IsNull_ExtKey = 1 AND [ExtKey] IS NULL) OR ([ExtKey] = @Original_ExtKey)) AND ((@IsNull_DueDate = 1 AND [DueDate] IS NULL) OR ([DueDate] = @Original_DueDate)) AND ((@IsNull_LeadTime = 1 AND [LeadTime] IS NULL) OR ([LeadTime] = @Original_LeadTime)) AND ((@IsNull_LeadTimeUM = 1 AND [LeadTimeUM] IS NULL) OR ([LeadTimeUM] = @Original_LeadTimeUM)) AND ((@IsNull_UserCreaz = 1 AND [UserCreaz] IS NULL) OR ([UserCreaz] = @Original_UserCreaz)) AND ((@IsNull_DataCreaz = 1 AND [DataCreaz] IS NULL) OR ([DataCreaz] = @Original_DataCreaz)) AND ((@IsNull_UserMod = 1 AND [UserMod] IS NULL) OR ([UserMod] = @Original_UserMod)) AND ((@IsNull_DataMod = 1 AND [DataMod] IS NULL) OR ([DataMod] = @Original_DataMod)) AND ((@IsNull_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_Qta)) AND ((@IsNull_Peso = 1 AND [Peso] IS NULL) OR ([Peso] = @Original_Peso))); + UPDATE [IstObj] SET [IdxObj] = @IdxObj, [CodCliente] = @CodCliente, [CodStato] = @CodStato, [Posizione] = @Posizione, [Livello] = @Livello, [Rev] = @Rev, [CodObj] = @CodObj, [Nome] = @Nome, [DataRif] = @DataRif, [IdxObjMamma] = @IdxObjMamma, [Note] = @Note, [ExtKey] = @ExtKey, [DueDate] = @DueDate, [LeadTime] = @LeadTime, [LeadTimeUM] = @LeadTimeUM, [UserCreaz] = @UserCreaz, [DataCreaz] = @DataCreaz, [UserMod] = @UserMod, [DataMod] = @DataMod, [Qta] = @Qta, [Peso] = @Peso WHERE (([IdxObj] = @Original_IdxObj) AND ((@IsNull_CodCliente = 1 AND [CodCliente] IS NULL) OR ([CodCliente] = @Original_CodCliente)) AND ((@IsNull_CodStato = 1 AND [CodStato] IS NULL) OR ([CodStato] = @Original_CodStato)) AND ((@IsNull_Posizione = 1 AND [Posizione] IS NULL) OR ([Posizione] = @Original_Posizione)) AND ((@IsNull_Livello = 1 AND [Livello] IS NULL) OR ([Livello] = @Original_Livello)) AND ((@IsNull_Rev = 1 AND [Rev] IS NULL) OR ([Rev] = @Original_Rev)) AND ((@IsNull_CodObj = 1 AND [CodObj] IS NULL) OR ([CodObj] = @Original_CodObj)) AND ((@IsNull_Nome = 1 AND [Nome] IS NULL) OR ([Nome] = @Original_Nome)) AND ((@IsNull_DataRif = 1 AND [DataRif] IS NULL) OR ([DataRif] = @Original_DataRif)) AND ((@IsNull_IdxObjMamma = 1 AND [IdxObjMamma] IS NULL) OR ([IdxObjMamma] = @Original_IdxObjMamma)) AND ((@IsNull_Note = 1 AND [Note] IS NULL) OR ([Note] = @Original_Note)) AND ((@IsNull_ExtKey = 1 AND [ExtKey] IS NULL) OR ([ExtKey] = @Original_ExtKey)) AND ((@IsNull_DueDate = 1 AND [DueDate] IS NULL) OR ([DueDate] = @Original_DueDate)) AND ((@IsNull_LeadTime = 1 AND [LeadTime] IS NULL) OR ([LeadTime] = @Original_LeadTime)) AND ((@IsNull_LeadTimeUM = 1 AND [LeadTimeUM] IS NULL) OR ([LeadTimeUM] = @Original_LeadTimeUM)) AND ((@IsNull_UserCreaz = 1 AND [UserCreaz] IS NULL) OR ([UserCreaz] = @Original_UserCreaz)) AND ((@IsNull_DataCreaz = 1 AND [DataCreaz] IS NULL) OR ([DataCreaz] = @Original_DataCreaz)) AND ((@IsNull_UserMod = 1 AND [UserMod] IS NULL) OR ([UserMod] = @Original_UserMod)) AND ((@IsNull_DataMod = 1 AND [DataMod] IS NULL) OR ([DataMod] = @Original_DataMod)) AND ((@IsNull_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_Qta)) AND ((@IsNull_Peso = 1 AND [Peso] IS NULL) OR ([Peso] = @Original_Peso))); SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, DataRif, IdxObjMamma, Note, ExtKey, DueDate, LeadTime, LeadTimeUM, UserCreaz, DataCreaz, UserMod, DataMod, Qta, Peso FROM IstObj WHERE (IdxObj = @IdxObj) @@ -1068,14 +1070,14 @@ WHERE (IdxObj = @IdxObj) - + - + @@ -1088,14 +1090,14 @@ WHERE (IdxObj = @IdxObj) - + - + @@ -1108,21 +1110,21 @@ WHERE (IdxObj = @IdxObj) - + - + - + @@ -1135,98 +1137,98 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - + - - - + + + - - - - - - + + + + + + - + - + - + - + - + @@ -1237,385 +1239,6 @@ WHERE (IdxObj = @IdxObj) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1632,6 +1255,29 @@ WHERE (IdxObj = @IdxObj) + + + + + + + + + + + + + + + + + + + + + + + @@ -1640,6 +1286,13 @@ WHERE (IdxObj = @IdxObj) + + + + + + + @@ -1654,28 +1307,54 @@ WHERE (IdxObj = @IdxObj) - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + + + + + + + + @@ -1689,6 +1368,20 @@ WHERE (IdxObj = @IdxObj) + + + + + + + + + + + + + + @@ -1696,98 +1389,85 @@ WHERE (IdxObj = @IdxObj) - + - + - - - + + + + + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1798,20 +1478,342 @@ WHERE (IdxObj = @IdxObj) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + diff --git a/project/XPS_data/app.config b/project/XPS_data/app.config index 36dbdac..2661d6a 100644 --- a/project/XPS_data/app.config +++ b/project/XPS_data/app.config @@ -1,16 +1,16 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/project/XPS_data/bin/Debug/XPS_data.dll b/project/XPS_data/bin/Debug/XPS_data.dll index 456e9fd..437c818 100644 Binary files a/project/XPS_data/bin/Debug/XPS_data.dll and b/project/XPS_data/bin/Debug/XPS_data.dll differ diff --git a/project/XPS_data/bin/Debug/XPS_data.dll.config b/project/XPS_data/bin/Debug/XPS_data.dll.config index 36dbdac..2661d6a 100644 --- a/project/XPS_data/bin/Debug/XPS_data.dll.config +++ b/project/XPS_data/bin/Debug/XPS_data.dll.config @@ -1,16 +1,16 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/project/XPS_data/bin/Release/XPS_data.dll b/project/XPS_data/bin/Release/XPS_data.dll index 6b370ba..f51b6ff 100644 Binary files a/project/XPS_data/bin/Release/XPS_data.dll and b/project/XPS_data/bin/Release/XPS_data.dll differ diff --git a/project/XPS_data/bin/Release/XPS_data.dll.config b/project/XPS_data/bin/Release/XPS_data.dll.config index 36dbdac..2661d6a 100644 --- a/project/XPS_data/bin/Release/XPS_data.dll.config +++ b/project/XPS_data/bin/Release/XPS_data.dll.config @@ -1,16 +1,16 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll b/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll index c95f178..3840fde 100644 Binary files a/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll and b/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll differ diff --git a/project/XPS_data/obj/Debug/XPS_data.dll b/project/XPS_data/obj/Debug/XPS_data.dll index 456e9fd..437c818 100644 Binary files a/project/XPS_data/obj/Debug/XPS_data.dll and b/project/XPS_data/obj/Debug/XPS_data.dll differ diff --git a/project/XPS_data/obj/Release/ResolveAssemblyReference.cache b/project/XPS_data/obj/Release/ResolveAssemblyReference.cache index 9801e02..452fe18 100644 Binary files a/project/XPS_data/obj/Release/ResolveAssemblyReference.cache and b/project/XPS_data/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll b/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll index 6407d2d..7bc5409 100644 Binary files a/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll and b/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll differ diff --git a/project/XPS_data/obj/Release/XPS_data.dll b/project/XPS_data/obj/Release/XPS_data.dll index 6b370ba..f51b6ff 100644 Binary files a/project/XPS_data/obj/Release/XPS_data.dll and b/project/XPS_data/obj/Release/XPS_data.dll differ diff --git a/project/XPS_deploy/XPS_deploy.wdproj b/project/XPS_deploy/XPS_deploy.wdproj index 6924b24..6af1169 100644 --- a/project/XPS_deploy/XPS_deploy.wdproj +++ b/project/XPS_deploy/XPS_deploy.wdproj @@ -35,6 +35,7 @@ true true true + true diff --git a/project/XPS_installer/Release/XPS_installer.msi b/project/XPS_installer/Release/XPS_installer.msi index e93a2aa..347066b 100644 Binary files a/project/XPS_installer/Release/XPS_installer.msi and b/project/XPS_installer/Release/XPS_installer.msi differ diff --git a/project/XPS_installer/XPS_installer.vdproj b/project/XPS_installer/XPS_installer.vdproj index 18c6d53..4beec5c 100644 --- a/project/XPS_installer/XPS_installer.vdproj +++ b/project/XPS_installer/XPS_installer.vdproj @@ -350,7 +350,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:XPS" "ProductCode" = "8:{92BF7180-2725-4C26-A532-CCA18042C999}" - "PackageCode" = "8:{06624122-ABDC-4E51-8AAD-DF229C7F71A0}" + "PackageCode" = "8:{B9376248-A422-4231-9678-C39E41327FF7}" "UpgradeCode" = "8:{71B65361-FEA5-44CA-9B9A-45597433DB20}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"