diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index 3b4ffa7c..aff3261f 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -62,7 +62,7 @@
-
+
diff --git a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs
index 29fe8143..1ec7ed3a 100644
--- a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs
@@ -19,6 +19,21 @@ namespace GMW.WebUserControls
/// evento generale di reset
///
public event EventHandler eh_reset;
+ ///
+ /// gestisce controllo se l'UDC sia già consumato
+ ///
+ public bool udcConsumato
+ {
+ get
+ {
+ return memLayer.ML.BoolSessionObj("UdcConsumato");
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("UdcConsumato", value, false);
+ }
+ }
+
protected void Page_Load(object sender, EventArgs e)
{
@@ -36,7 +51,7 @@ namespace GMW.WebUserControls
mod_execUDC1.eh_nuovoValore += new EventHandler(mod_execUDC1_eh_nuovoValore);
if (memLayer.ML.BoolSessionObj("RicercaUdcAttiva"))
{
- mod_execUDC1.Visible = true;
+ mod_execUDC1.Visible = !udcConsumato;
mod_detailUDC1.Visible = true;
}
else
@@ -83,6 +98,17 @@ namespace GMW.WebUserControls
void mod_listUDC1_eh_selValore(object sender, EventArgs e)
{
+ // controllo se l'UDC sia o meno già consumato...
+ string UDC = memLayer.ML.StringSessionObj("UDC_sel");
+ GMW_data.DS_magazzino.v_UdcDetailRow rigaUdc = (GMW_data.DS_magazzino.v_UdcDetailRow)GMW_data.MagClass.magazzino.taDettUDC.getByFullUdc(UDC, memLayer.ML.confReadString("CodCS"))[0];
+ if (rigaUdc.IdxPosizione < 0)
+ {
+ udcConsumato = true;
+ }
+ else
+ {
+ udcConsumato = false;
+ }
memLayer.ML.setSessionVal("RicercaUdcAttiva", true, false);
aggiornaDettaglio();
}
@@ -93,7 +119,7 @@ namespace GMW.WebUserControls
{
mod_detailUDC1.Visible = true;
mod_detailUDC1.doUpdate();
- mod_execUDC1.Visible = true;
+ mod_execUDC1.Visible = !udcConsumato;
// salvo dati UDC selezionato... UDC_sel c'è già...
string UDC = memLayer.ML.StringSessionObj("UDC_sel");
GMW_data.DS_magazzino.v_UdcDetailRow rigaUdc = (GMW_data.DS_magazzino.v_UdcDetailRow)GMW_data.MagClass.magazzino.taDettUDC.getByFullUdc(UDC, memLayer.ML.confReadString("CodCS"))[0];
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index ccc9f993..0856c3cb 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 d4c4385b..d6ae31c9 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 74a6499a..ab7e569b 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 3f6d4bc3..0856c3cb 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 cf457a28..54a31f6b 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj
index 343c9bd1..62e6a55b 100644
--- a/GMW/GMW_data/GMW_data.csproj
+++ b/GMW/GMW_data/GMW_data.csproj
@@ -159,6 +159,7 @@
SettingsSingleFileGenerator
Settings.Designer.cs
+
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index a96b7e22..d6ae31c9 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 a96b7e22..d6ae31c9 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 0608e718..5519f991 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:{D7F7C2FF-375F-4F53-B83A-C4BEFE85D278}"
- "PackageCode" = "8:{0CAA1CA8-DF44-4E0F-A00E-114EC66ABD0C}"
+ "ProductCode" = "8:{A6F41B4E-B884-4F5E-9EA6-1333CD7240D7}"
+ "PackageCode" = "8:{7094794B-00A2-43B5-92C3-829C663C3E3B}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.285"
+ "ProductVersion" = "8:1.0.286"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"