diff --git a/GMW/GMW/Type/Cartellino.cs b/GMW/GMW/Type/Cartellino.cs
index 54adee89..735d23a8 100644
--- a/GMW/GMW/Type/Cartellino.cs
+++ b/GMW/GMW/Type/Cartellino.cs
@@ -16,33 +16,7 @@ namespace GMW.Type
}
public Cartellino(DS_Applicazione.ElencoCartelliniRow riga)
{
- UDC = riga.UDC;
- CodCS = riga.CodCS;
- CodCliente = riga.CodCliente;
- RagSociale = riga.RagSociale;
- Particolare = riga.Particolare;
- DescParticolare = riga.DescParticolare;
- DisegnoGrezzo = riga.DisegnoGrezzo;
- Esponente = riga.Esponente;
- CodImpianto = riga.CodImpianto;
- DescImpianto = riga.DescImpianto;
- CodCliente = riga.CodCliente;
- CodStampo = riga.CodStampo;
- Figura = riga.Figura;
- DataFus = riga.DataFus;
- TurnoFus = riga.TurnoFus;
- CodImballo = riga.CodImballo;
- CodSoggetto = riga.CodSoggetto;
- NomeSoggetto = riga.CodSoggetto; // !!! correggere
- NumCont = riga.NumCont;
- Tara = riga.Tara;
- Quantita = riga.Qta;
- CodStato = riga.CodStato;
- IdxPosizione = riga.IdxPosizione;
- PesoTot = riga.PesoTot;
- PesoCad = riga.PesoCad;
- CreateDate = riga.CreateDate;
- ModDate = riga.ModDate;
+ setFromTabRow(riga);
}
///
@@ -102,17 +76,25 @@ namespace GMW.Type
///
public int TurnoFus { get; set; }
///
- /// CodiceImballo associato all'UDC
+ /// Codice Imballo associato all'UDC
///
public string CodImballo { get; set; }
///
+ /// Descrizione Imballo associato all'UDC
+ ///
+ public string DescImballo { get; set; }
+ ///
/// Codice operatore della dichiarazione
///
public string CodSoggetto { get; set; }
///
- /// Cognome-nome operatore della dichiarazione
+ /// Cognome operatore della dichiarazione
///
- public string NomeSoggetto { get; set; }
+ public string Cognome { get; set; }
+ ///
+ /// Nome operatore della dichiarazione
+ ///
+ public string Nome { get; set; }
///
/// Numero contenitore (PROGRESSIVO)
///
@@ -130,6 +112,10 @@ namespace GMW.Type
///
public string CodStato { get; set; }
///
+ /// Descrizione Stato pezzo (sabbiato, smaterozzato, ...)
+ ///
+ public string DescStato { get; set; }
+ ///
/// Codice Posizione associato all'UDC
///
public int IdxPosizione { get; set; }
@@ -172,7 +158,6 @@ namespace GMW.Type
TurnoFus = riga.TurnoFus;
CodImballo = riga.CodImballo;
CodSoggetto = riga.CodSoggetto;
- NomeSoggetto = riga.CodSoggetto; // !!! correggere
NumCont = riga.NumCont;
Tara = riga.Tara;
Quantita = riga.Qta;
@@ -182,6 +167,40 @@ namespace GMW.Type
PesoCad = riga.PesoCad;
CreateDate = riga.CreateDate;
ModDate = riga.ModDate;
+ // campi calcolati
+ DS_Applicazione.AnagOperatoriRow rigaOper = GMW_data.DataProxy.obj.taAnagOperatore.getByCodSoggetto(riga.CodSoggetto)[0];
+ try
+ {
+ Cognome = rigaOper.Cognome;
+ }
+ catch
+ {
+ Cognome = "n.d.";
+ }
+ try
+ {
+ Nome = rigaOper.Nome;
+ }
+ catch
+ {
+ Nome = "n.d.";
+ }
+ try
+ {
+ DescImballo = DataProxy.obj.taAnagImballi.stp_getImballoByCod(riga.CodImballo)[0].DescImballo;
+ }
+ catch
+ {
+ DescImballo = "n.d.";
+ }
+ try
+ {
+ DescStato = DataProxy.obj.taStatiProd.getByCodStato(riga.CodStato)[0].DescStato;
+ }
+ catch
+ {
+ DescStato = "n.d.";
+ }
}
}
}
diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index e1bdfd2b..7ab292f1 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -87,8 +87,8 @@
-
-
+
+
@@ -130,10 +130,10 @@
-
+
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index c2e0a81b..20b71414 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 7dcd2137..05681461 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll
index 2843a925..fa95249a 100644
Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ
diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config
index d281dba5..b3f6c461 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -5,8 +5,8 @@
-
-
+
+
@@ -26,13 +26,13 @@
-
-
+
+
-
+
@@ -48,11 +48,11 @@
-
-
-
-
+
+
+
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index c2e0a81b..1679eebd 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 dd9a54da..e6b6aa75 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.csproj.FileListAbsolute.txt b/GMW/GMW/obj/Release/GMW.csproj.FileListAbsolute.txt
index f1ed561d..ef7df8b6 100644
--- a/GMW/GMW/obj/Release/GMW.csproj.FileListAbsolute.txt
+++ b/GMW/GMW/obj/Release/GMW.csproj.FileListAbsolute.txt
@@ -10,3 +10,23 @@ c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\GMW.d
c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\GMW.pdb
c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\RdlCompile.cache
c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\RdlCompile.compiled
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\AjaxControlToolkit.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\System.Web.Ajax.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\System.Web.Ajax.pdb
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\AjaxControlToolkit.pdb
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ar\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\cs\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\de\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\es\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\fr\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\he\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\hi\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\it\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ja\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ko\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\nl\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\pt\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ru\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\tr-TR\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\zh-CHS\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\zh-CHT\AjaxControlToolkit.resources.dll
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index 45d94e74..20b71414 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 8dc1e10b..cceac248 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/GMW_WS.csproj.user b/GMW/GMW_WS/GMW_WS.csproj.user
index ded0e139..473ba2cb 100644
--- a/GMW/GMW_WS/GMW_WS.csproj.user
+++ b/GMW/GMW_WS/GMW_WS.csproj.user
@@ -1,7 +1,7 @@
-
+
diff --git a/GMW/GMW_WS/Web.config b/GMW/GMW_WS/Web.config
index e444d86a..7ab292f1 100644
--- a/GMW/GMW_WS/Web.config
+++ b/GMW/GMW_WS/Web.config
@@ -87,7 +87,7 @@
-
+
@@ -130,10 +130,10 @@
-
+
diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll
index c2e0a81b..20b71414 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.pdb b/GMW/GMW_WS/bin/GMW.pdb
deleted file mode 100644
index 76c48b71..00000000
Binary files a/GMW/GMW_WS/bin/GMW.pdb and /dev/null differ
diff --git a/GMW/GMW_WS/bin/GMW_WS.dll b/GMW/GMW_WS/bin/GMW_WS.dll
index 60b4b059..35a62be9 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_WS.pdb b/GMW/GMW_WS/bin/GMW_WS.pdb
deleted file mode 100644
index 6e8e00e9..00000000
Binary files a/GMW/GMW_WS/bin/GMW_WS.pdb and /dev/null differ
diff --git a/GMW/GMW_WS/bin/GMW_data.dll b/GMW/GMW_WS/bin/GMW_data.dll
index 7dcd2137..05681461 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/bin/GMW_data.pdb b/GMW/GMW_WS/bin/GMW_data.pdb
deleted file mode 100644
index 7215abb2..00000000
Binary files a/GMW/GMW_WS/bin/GMW_data.pdb and /dev/null differ
diff --git a/GMW/GMW_WS/bin/SteamWare.dll b/GMW/GMW_WS/bin/SteamWare.dll
index 2843a925..fa95249a 100644
Binary files a/GMW/GMW_WS/bin/SteamWare.dll and b/GMW/GMW_WS/bin/SteamWare.dll differ
diff --git a/GMW/GMW_WS/bin/SteamWare.pdb b/GMW/GMW_WS/bin/SteamWare.pdb
deleted file mode 100644
index cb92eb77..00000000
Binary files a/GMW/GMW_WS/bin/SteamWare.pdb and /dev/null differ
diff --git a/GMW/GMW_WS/mazzAppSettings.config b/GMW/GMW_WS/mazzAppSettings.config
index d281dba5..b3f6c461 100644
--- a/GMW/GMW_WS/mazzAppSettings.config
+++ b/GMW/GMW_WS/mazzAppSettings.config
@@ -5,8 +5,8 @@
-
-
+
+
@@ -26,13 +26,13 @@
-
-
+
+
-
+
@@ -48,11 +48,11 @@
-
-
-
-
+
+
+
+
diff --git a/GMW/GMW_WS/obj/Debug/GMW_WS.dll b/GMW/GMW_WS/obj/Debug/GMW_WS.dll
index 60b4b059..b7a403a7 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/GMW_WS.pdb b/GMW/GMW_WS/obj/Debug/GMW_WS.pdb
deleted file mode 100644
index 6e8e00e9..00000000
Binary files a/GMW/GMW_WS/obj/Debug/GMW_WS.pdb and /dev/null differ
diff --git a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache
index 92e10ba0..8fde94e0 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.csproj.FileListAbsolute.txt b/GMW/GMW_WS/obj/Release/GMW_WS.csproj.FileListAbsolute.txt
new file mode 100644
index 00000000..2c1eb6b6
--- /dev/null
+++ b/GMW/GMW_WS/obj/Release/GMW_WS.csproj.FileListAbsolute.txt
@@ -0,0 +1,32 @@
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW_WS.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW_WS.pdb
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW_data.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\SteamWare.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\System.Web.Ajax.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\AjaxControlToolkit.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ICSharpCode.SharpZipLib.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\System.Web.Ajax.pdb
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\AjaxControlToolkit.pdb
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW_data.pdb
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\SteamWare.pdb
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW.pdb
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ar\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\cs\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\de\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\es\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\fr\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\he\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\hi\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\it\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ja\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ko\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\nl\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\pt\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ru\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\tr-TR\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\zh-CHS\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\zh-CHT\AjaxControlToolkit.resources.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Release\ResolveAssemblyReference.cache
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Release\GMW_WS.dll
+c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Release\GMW_WS.pdb
diff --git a/GMW/GMW_WS/obj/Release/GMW_WS.dll b/GMW/GMW_WS/obj/Release/GMW_WS.dll
new file mode 100644
index 00000000..35a62be9
Binary files /dev/null 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
new file mode 100644
index 00000000..9f3d3d13
Binary files /dev/null and b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_WS_deploy/GMW_WS_deploy.wdproj b/GMW/GMW_WS_deploy/GMW_WS_deploy.wdproj
index 19210b18..b9ba7c26 100644
--- a/GMW/GMW_WS_deploy/GMW_WS_deploy.wdproj
+++ b/GMW/GMW_WS_deploy/GMW_WS_deploy.wdproj
@@ -32,6 +32,10 @@
true
true
GMW_WS_deploy
+ true
+ true
+ true
+ true
diff --git a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj
index 9ef91a55..834327d0 100644
--- a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj
+++ b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj
@@ -104,6 +104,27 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
+ "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+ {
+ "Enabled" = "11:TRUE"
+ "PromptEnabled" = "11:TRUE"
+ "PrerequisitesLocation" = "2:1"
+ "Url" = "8:"
+ "ComponentsUrl" = "8:"
+ "Items"
+ {
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.3.5.SP1"
+ {
+ "Name" = "8:.NET Framework 3.5 SP1"
+ "ProductCode" = "8:Microsoft.Net.Framework.3.5.SP1"
+ }
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+ {
+ "Name" = "8:Windows Installer 3.1"
+ "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+ }
+ }
+ }
}
}
"Deployable"
@@ -214,7 +235,7 @@
{
"{80453C8E-1031-40EC-8E7A-9762B297303A}:_B61BA0CAC3474474B971A8F12A1C93F2"
{
- "VirtualDirectory" = "8:GMW_WS_installer"
+ "VirtualDirectory" = "8:GMW_WS"
"Port" = "3:80"
"IsApplication" = "11:TRUE"
"AllowScriptSourceAccess" = "11:FALSE"
@@ -322,24 +343,24 @@
"Product"
{
"Name" = "8:Microsoft Visual Studio"
- "ProductName" = "8:GMW_WS_installer"
- "ProductCode" = "8:{4E0C6BD2-9309-4558-940E-173F2C311CE2}"
- "PackageCode" = "8:{FB7E213C-7BE9-4294-9FB2-733E8D6C3660}"
+ "ProductName" = "8:GMW_WS"
+ "ProductCode" = "8:{E33824F7-D5DE-4EA9-A07D-D97E233DF9B0}"
+ "PackageCode" = "8:{47E710A1-2368-40F1-AE1C-4A9F293016F9}"
"UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}"
- "RestartWWWService" = "11:FALSE"
- "RemovePreviousVersions" = "11:FALSE"
+ "RestartWWWService" = "11:TRUE"
+ "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.0"
- "Manufacturer" = "8:Microsoft"
- "ARPHELPTELEPHONE" = "8:"
- "ARPHELPLINK" = "8:"
- "Title" = "8:GMW_WS_installer"
+ "ProductVersion" = "8:1.0.50"
+ "Manufacturer" = "8:SteamWare s.r.l."
+ "ARPHELPTELEPHONE" = "8:+39-035460560"
+ "ARPHELPLINK" = "8:http://www.steamware.net"
+ "Title" = "8:GMW_WS Installer"
"Subject" = "8:"
- "ARPCONTACT" = "8:Microsoft"
+ "ARPCONTACT" = "8:SteamWare s.r.l."
"Keywords" = "8:"
- "ARPCOMMENTS" = "8:"
- "ARPURLINFOABOUT" = "8:"
+ "ARPCOMMENTS" = "8:WebServices per Gestione Magazzino web"
+ "ARPURLINFOABOUT" = "8:http://www.steamware.net"
"ARPPRODUCTICON" = "8:"
"ARPIconIndex" = "3:0"
"SearchPath" = "8:"
@@ -803,7 +824,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1E28C0CBEB3498E83D9B97B28568D55"
{
- "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_B61BA0CAC3474474B971A8F12A1C93F2"
@@ -831,7 +852,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D67ABEB91C7F428EB3C512E4A505628A"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_B61BA0CAC3474474B971A8F12A1C93F2"
diff --git a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi
new file mode 100644
index 00000000..e0624110
Binary files /dev/null and b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi differ
diff --git a/GMW/GMW_WS_installer/Release/setup.exe b/GMW/GMW_WS_installer/Release/setup.exe
new file mode 100644
index 00000000..04fc3942
Binary files /dev/null and b/GMW/GMW_WS_installer/Release/setup.exe differ
diff --git a/GMW/GMW_data/DS_Applicazione.Designer.cs b/GMW/GMW_data/DS_Applicazione.Designer.cs
index 60323dd5..1b2017e5 100644
--- a/GMW/GMW_data/DS_Applicazione.Designer.cs
+++ b/GMW/GMW_data/DS_Applicazione.Designer.cs
@@ -10798,11 +10798,16 @@ SELECT CodStato, DescStato FROM AnagStatiProdotto WHERE (CodStato = @CodStato)";
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+ 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 CodStato, DescStato FROM dbo.AnagStatiProdotto";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+ this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[1].Connection = this.Connection;
+ this._commandCollection[1].CommandText = "SELECT CodStato, DescStato FROM dbo.AnagStatiProdotto\r\nwhere CodStato=@CodStato";
+ this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStato", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "CodStato", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10827,6 +10832,22 @@ SELECT CodStato, DescStato FROM AnagStatiProdotto WHERE (CodStato = @CodStato)";
return dataTable;
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+ public virtual DS_Applicazione.AnagStatiProdottoDataTable getByCodStato(string CodStato) {
+ this.Adapter.SelectCommand = this.CommandCollection[1];
+ if ((CodStato == null)) {
+ throw new global::System.ArgumentNullException("CodStato");
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[0].Value = ((string)(CodStato));
+ }
+ DS_Applicazione.AnagStatiProdottoDataTable dataTable = new DS_Applicazione.AnagStatiProdottoDataTable();
+ this.Adapter.Fill(dataTable);
+ return dataTable;
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int Update(DS_Applicazione.AnagStatiProdottoDataTable dataTable) {
@@ -17097,12 +17118,19 @@ SELECT CodSoggetto, CodCS, CodDipendente, CodAziendaOp, DescAziendaOp, CodFilial
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+ 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 CodSoggetto, CodCS, CodDipendente, CodAziendaOp, DescAziendaOp, CodFiliale" +
"Op, DescFilialeOp, Cognome, Nome FROM RilPro.AnagOperatori";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+ this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[1].Connection = this.Connection;
+ this._commandCollection[1].CommandText = "SELECT CodSoggetto, CodCS, CodDipendente, CodAziendaOp, DescAziendaOp, Cod" +
+ "FilialeOp, DescFilialeOp, Cognome, Nome\r\nFROM RilPro.AnagOperatori\r\nW" +
+ "HERE (CodSoggetto = @CodSoggetto)";
+ this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NChar, 16, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggetto", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -17127,6 +17155,22 @@ SELECT CodSoggetto, CodCS, CodDipendente, CodAziendaOp, DescAziendaOp, CodFilial
return dataTable;
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+ public virtual DS_Applicazione.AnagOperatoriDataTable getByCodSoggetto(string CodSoggetto) {
+ this.Adapter.SelectCommand = this.CommandCollection[1];
+ if ((CodSoggetto == null)) {
+ throw new global::System.ArgumentNullException("CodSoggetto");
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[0].Value = ((string)(CodSoggetto));
+ }
+ DS_Applicazione.AnagOperatoriDataTable dataTable = new DS_Applicazione.AnagOperatoriDataTable();
+ this.Adapter.Fill(dataTable);
+ return dataTable;
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int Update(DS_Applicazione.AnagOperatoriDataTable dataTable) {
diff --git a/GMW/GMW_data/DS_Applicazione.xsd b/GMW/GMW_data/DS_Applicazione.xsd
index 22ec4171..89533ed8 100644
--- a/GMW/GMW_data/DS_Applicazione.xsd
+++ b/GMW/GMW_data/DS_Applicazione.xsd
@@ -155,7 +155,19 @@ SELECT CodStato, DescStato FROM AnagStatiProdotto WHERE (CodStato = @CodStato)
-
+
+
+
+
+ SELECT CodStato, DescStato FROM dbo.AnagStatiProdotto
+where CodStato=@CodStato
+
+
+
+
+
+
+
@@ -1303,7 +1315,20 @@ SELECT CodSoggetto, CodCS, CodDipendente, CodAziendaOp, DescAziendaOp, CodFilial
-
+
+
+
+
+ SELECT CodSoggetto, CodCS, CodDipendente, CodAziendaOp, DescAziendaOp, CodFilialeOp, DescFilialeOp, Cognome, Nome
+FROM RilPro.AnagOperatori
+WHERE (CodSoggetto = @CodSoggetto)
+
+
+
+
+
+
+
@@ -2095,7 +2120,7 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
diff --git a/GMW/GMW_data/DS_Applicazione.xss b/GMW/GMW_data/DS_Applicazione.xss
index 71d0e319..156b00f8 100644
--- a/GMW/GMW_data/DS_Applicazione.xss
+++ b/GMW/GMW_data/DS_Applicazione.xss
@@ -4,27 +4,27 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
385
@@ -36,7 +36,7 @@
-
+
947
@@ -48,7 +48,7 @@
-
+
853
@@ -60,7 +60,7 @@
-
+
1156
@@ -72,7 +72,7 @@
-
+
1173
@@ -88,7 +88,7 @@
-
+
336
@@ -104,7 +104,7 @@
-
+
1181
@@ -115,7 +115,7 @@
838
- 719
+ 725
838
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index 7dcd2137..862163dd 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 9930f8e4..05681461 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/bin/Release/SteamWare.dll b/GMW/GMW_data/bin/Release/SteamWare.dll
index c8d3ab8a..fa95249a 100644
Binary files a/GMW/GMW_data/bin/Release/SteamWare.dll and b/GMW/GMW_data/bin/Release/SteamWare.dll differ
diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll
index 7dcd2137..862163dd 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 f66418bf..0b64b368 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 9930f8e4..05681461 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/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache
index d9b868da..6227474e 100644
Binary files a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache 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 c6cd626c..90783997 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