diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index 4b943875..3903a592 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -62,7 +62,7 @@
-
+
diff --git a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs
index 6cf97ae6..02a20d5f 100644
--- a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs
@@ -268,7 +268,10 @@ namespace GMW.WebUserControls
{ }
try
{
+ // registor consumo in AS400
utils.obj.taSTP.stp_accodaConsumoUdcMP(UDC, DateTime.Now, turno, rbl.SelectedValue, codTerz);
+ // registro nuova posizione 56 --> -56
+ MagClass.magazzino.scaricaUdcMpWip(UDC);
}
catch (Exception e)
{
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 3466244a..f7d99d56 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 bcd657b0..1c80fcf1 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config
index 40500144..3bf72599 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index 3466244a..f7d99d56 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 2793f61b..87328353 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_WS/Web.config b/GMW/GMW_WS/Web.config
index 5d0ec741..920ddfdd 100644
--- a/GMW/GMW_WS/Web.config
+++ b/GMW/GMW_WS/Web.config
@@ -88,7 +88,7 @@
-
+
diff --git a/GMW/GMW_WS/mazzAppSettings.config b/GMW/GMW_WS/mazzAppSettings.config
index f56864e4..882b8e99 100644
--- a/GMW/GMW_WS/mazzAppSettings.config
+++ b/GMW/GMW_WS/mazzAppSettings.config
@@ -6,7 +6,7 @@
-
+
diff --git a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj
index 5eee09ee..c5ba052f 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:{1AD4372A-EAE1-450D-9F01-9474FD2E9FC9}"
- "PackageCode" = "8:{479AA99D-DD79-46F3-B05C-D7173BE2A97B}"
+ "ProductCode" = "8:{DCB31FBD-9350-4A6E-AE6A-73847C77AC0B}"
+ "PackageCode" = "8:{AE8690F1-13FB-4BCF-A729-4A61E689013D}"
"UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.330"
+ "ProductVersion" = "8:1.0.335"
"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_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj
index 8e2355de..e58015a2 100644
--- a/GMW/GMW_data/GMW_data.csproj
+++ b/GMW/GMW_data/GMW_data.csproj
@@ -161,6 +161,7 @@
SettingsSingleFileGenerator
Settings.Designer.cs
+
diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs
index 6712ab5c..62499729 100644
--- a/GMW/GMW_data/MagClass.cs
+++ b/GMW/GMW_data/MagClass.cs
@@ -353,12 +353,6 @@ namespace GMW_data
GMW_data.DataProxy.obj.taCartellini.stp_riattivaUdc(UDC, CodSoggetto);
// salvo dati cartellino POST
DS_Applicazione.ElencoCartelliniRow rigaUdcPost = DataProxy.obj.taCartellini.stp_getByUdc(UDC)[0];
- // controllo se ho modificato posizione...
- if (rigaUdcPre.IdxPosizione != rigaUdcPost.IdxPosizione)
- {
- // faccio movimento compensativo... in segno negativo risp alla posiz POST
- DataProxy.obj.taCartellini.stp_rettMovAs400(rigaUdcPost.Particolare, rigaUdcPost.UDC, rigaUdcPost.IdxPosizione.ToString(), rigaUdcPost.Qta, "UDC_NOQTY");
- }
answ = true;
}
catch (Exception e)
@@ -1007,7 +1001,7 @@ namespace GMW_data
Quantita = -rigaUdc.Qta;
}
// sposto UDC, e così facendo genero movimenti batch x AS400
- fatto = scaricaUDC(UDC, idxCellaFrom, idxPosizUdcDest);
+ fatto = scaricaUDC(UDC, idxCellaFrom, idxPosizUdcDest);
// sposto nella PRIMA cella di destinazione associata l'UDC
if (idxCellaTo > 0)
{
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index bcd657b0..1c80fcf1 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 bcd657b0..1c80fcf1 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 fe522cbd..d8ba2b5a 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:{8391B290-0F5F-41F0-A300-490F94C9E6DE}"
- "PackageCode" = "8:{F72157A1-30F2-4901-8A90-1F38739804EE}"
+ "ProductCode" = "8:{D8D1082F-BA7C-4166-B232-60B05475DCF7}"
+ "PackageCode" = "8:{411A7ABC-B8BA-45C9-90AB-5C236A0F08B4}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.330"
+ "ProductVersion" = "8:1.0.335"
"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"