diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index c8eeea5f..a0b000f0 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -62,7 +62,7 @@
-
+
diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx
index ff40f824..3d45c660 100644
--- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx
+++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx
@@ -32,7 +32,8 @@
-
+
-
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index eb8e3065..ca66ed1f 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 7a8a2a4c..9733abeb 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config
index cd31fb77..3735cb12 100644
--- a/GMW/GMW_Term/Web.config
+++ b/GMW/GMW_Term/Web.config
@@ -58,7 +58,7 @@
-
+
diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config
index a20cb2f2..b2aed67e 100644
--- a/GMW/GMW_Term/mazzAppSettings.config
+++ b/GMW/GMW_Term/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
index 63cadc1d..f48a36c5 100644
--- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
+++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
@@ -330,14 +330,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_Term"
- "ProductCode" = "8:{1BBDACA5-8892-414E-8C79-B4A1C7EFA3BF}"
- "PackageCode" = "8:{47C2ACF1-7E3D-4F00-BD02-70FCB2C70727}"
+ "ProductCode" = "8:{677D3CA0-5628-4280-BAA0-1B19ADF08B7D}"
+ "PackageCode" = "8:{DA09CC56-45EF-4E38-A5E5-70A044E96F19}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.320"
+ "ProductVersion" = "8:1.0.325"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
diff --git a/GMW/GMW_WS/Web.config b/GMW/GMW_WS/Web.config
index e0ed17fa..b388b4c3 100644
--- a/GMW/GMW_WS/Web.config
+++ b/GMW/GMW_WS/Web.config
@@ -88,7 +88,7 @@
-
+
diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs
index 9a9f4d4c..8e966755 100644
--- a/GMW/GMW_WS/bilance.asmx.cs
+++ b/GMW/GMW_WS/bilance.asmx.cs
@@ -14,7 +14,7 @@ namespace GMW_WS
///
/// WebService per gestione sw bilance
///
- [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.320")]
+ [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.325")]
[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
[System.ComponentModel.ToolboxItem(false)]
public class bilance : System.Web.Services.WebService
@@ -740,7 +740,7 @@ namespace GMW_WS
{
try
{
- logger.lg.scriviLog(string.Format("UdcCall_GetNew_WIP: {0} | {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13} | {14} | {15} | {16} | {17} | {18} | {19} | {20} | {21} | {22}", CodCS, CodBilanciaTrim, string.Format("{0:yy}", DateTime.Now), CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, "UDC_WIP", Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, toAS400), tipoLog.INFO);
+ logger.lg.scriviLog(string.Format("UdcCall_GetNew_RientroTerz: {0} | {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13} | {14} | {15} | {16} | {17} | {18} | {19} | {20} | {21} | {22}", CodCS, CodBilanciaTrim, string.Format("{0:yy}", DateTime.Now), CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, "UDC_WIP", Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, toAS400), tipoLog.INFO);
}
catch
{ }
@@ -823,7 +823,6 @@ namespace GMW_WS
}
return answ;
}
-
///
/// Modifica (se possibile poiché sbloccato) un cartellino esistente dato il suo UDC e salva i dati, restituendo conferma avvenuta modifica (true/false)
///
@@ -921,7 +920,6 @@ namespace GMW_WS
}
return answ;
}
-
///
/// Annulla un dato UDC (se permesso)
///
@@ -956,7 +954,6 @@ namespace GMW_WS
{ }
return answ;
}
-
///
/// Sblocca un dato UDC (se la chiave passata è valida)
///
@@ -964,7 +961,7 @@ namespace GMW_WS
/// codice dell'operatore
/// parola chiave x effettuare lo sblocco
/// restituisce true/false a seconda che sia riuscito a sbloccare l'UDC
- [WebMethod(Description = "Annulla un dato UDC (se permesso)")]
+ [WebMethod(Description = "Sblocca un dato UDC (se la chiave passata è valida)")]
public bool UdcCall_sbloccaUDC(string UDC_req, string CodSoggetto, string passkey)
{
// trim fix
@@ -992,7 +989,6 @@ namespace GMW_WS
}
return answ;
}
-
///
/// Riattiva un UDC consumato (se permesso da web.config) in mag 84
///
@@ -1029,7 +1025,6 @@ namespace GMW_WS
}
return answ;
}
-
///
/// Sposta un UDC da 88 a 84 (con consumo immediato se da web.config)
///
@@ -1117,7 +1112,7 @@ namespace GMW_WS
{
try
{
- logger.lg.scriviLog(string.Format("UdcCall_rientroInWip: {0} | {1}", UDC_reqTrim, CodSoggettoTrim), tipoLog.INFO);
+ logger.lg.scriviLog(string.Format("UdcCall_rientroInOVAS: {0} | {1}", UDC_reqTrim, CodSoggettoTrim), tipoLog.INFO);
}
catch
{ }
@@ -1192,6 +1187,16 @@ namespace GMW_WS
string passkeyOk = memLayer.ML.confReadString("passkey");
if (passkeyOk == passkeyTrim)
{
+ // loggo tutto!
+ if (logLevel > 5)
+ {
+ try
+ {
+ logger.lg.scriviLog("UdcCall_processUdcTerzisti", tipoLog.INFO);
+ }
+ catch
+ { }
+ }
try
{
utils.obj.taSTP.stp_processaSpedizTerz();
@@ -1282,8 +1287,6 @@ namespace GMW_WS
}
return suggerimenti.ToArray();
}
-
-
///
/// Restituisce tutti i dati salienti di un particolare (= necessari e distinti x cartellino)
///
diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll
index 9d9c076e..d5194d03 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 8d275136..9078664f 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 d00ceb21..2d8fa9c6 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/mazzAppSettings.config b/GMW/GMW_WS/mazzAppSettings.config
index d9929d19..987cc2ae 100644
--- a/GMW/GMW_WS/mazzAppSettings.config
+++ b/GMW/GMW_WS/mazzAppSettings.config
@@ -6,7 +6,7 @@
-
+
diff --git a/GMW/GMW_WS/obj/Debug/GMW_WS.dll b/GMW/GMW_WS/obj/Debug/GMW_WS.dll
index 693a8804..9078664f 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 02cb2f8c..710c6f8b 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 8d275136..afa888ac 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 7858f7e0..a51ef5c9 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 4fffcc22..b1f35a61 100644
--- a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj
+++ b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj
@@ -344,14 +344,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_WS"
- "ProductCode" = "8:{D47542AF-9DC7-4DCD-ABDC-E934AF3F4615}"
- "PackageCode" = "8:{213EA7C1-9FD4-4782-A601-E02DE5550F20}"
+ "ProductCode" = "8:{840FE6BD-2BF2-44F4-A0A0-88C39EEE6C1B}"
+ "PackageCode" = "8:{A6264CDE-5990-4A3B-80BD-568FD73FC7A0}"
"UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.320"
+ "ProductVersion" = "8:1.0.325"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -824,7 +824,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1E28C0CBEB3498E83D9B97B28568D55"
{
- "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_B61BA0CAC3474474B971A8F12A1C93F2"
@@ -852,7 +852,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D67ABEB91C7F428EB3C512E4A505628A"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\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
index 757fed5b..b79f8fe4 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/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index 6dd2368d..397a17f6 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/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll
index 6dd2368d..397a17f6 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_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj
index 8ae094b6..768a44da 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -349,14 +349,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
- "ProductCode" = "8:{B84DEEED-6DFF-4A43-8208-F594A30A60C7}"
- "PackageCode" = "8:{0AAA0EB6-6B09-4A0C-B6C3-D2C08DE2D0F4}"
+ "ProductCode" = "8:{B0F7CD84-CA6C-4739-B558-85065DF74E2F}"
+ "PackageCode" = "8:{09308E6C-8667-46E3-A1A6-BBCB47AEF095}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.320"
+ "ProductVersion" = "8:1.0.325"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -829,7 +829,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"
@@ -857,7 +857,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E"
{
- "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"
|