diff --git a/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx b/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx index 6e8289c9..ff777cc3 100644 --- a/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx +++ b/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx @@ -1,47 +1,50 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_spostaDataMatrix.ascx.cs" Inherits="GMW.WebUserControls.mod_spostaDataMatrix" %> -
-
- -
-
- -
-
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - -
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
diff --git a/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.cs b/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.cs index da2aac88..54e5a3ed 100644 --- a/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.cs @@ -25,6 +25,7 @@ namespace GMW.WebUserControls pnlAll.CssClass = "gitterBoxAttesa"; } checkBarcode(); + lblPezziGitterbox.Text = string.Format("{0} pz.", pezziGitterbox); if (currGitterBox != "") { lblGitterBoxAttivo.Text = string.Format("Gitterbox selezionato {0}", currGitterBox); @@ -35,6 +36,23 @@ namespace GMW.WebUserControls } } /// + /// num pezzi del gitterbox + /// + public int pezziGitterbox + { + get + { + int answ = 0; + try + { + answ = (int)MagClass.magazzino.taElencoCartellini.getByUdc(currGitterBox)[0].Qta; + } + catch + { } + return answ; + } + } + /// /// indica il gitterbox correntemente selezionato /// protected string currGitterBox @@ -257,7 +275,7 @@ namespace GMW.WebUserControls /// /// indica se i caratteri vadano forzati a maiuscoli /// - public bool forceUppsercase + public bool forceUppercase { get { diff --git a/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.designer.cs index 2632c697..08715bc4 100644 --- a/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.designer.cs @@ -75,5 +75,14 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// lblPezziGitterbox control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblPezziGitterbox; } } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 3eb32b55..23e728e1 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 78ffe0a6..eed944b7 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index 3eb32b55..23e728e1 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 68b446dd..c0a350e3 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index a7e1b378..248efeaf 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -196,8 +196,6 @@ Settings.Designer.cs - - diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index 78ffe0a6..eed944b7 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/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 78ffe0a6..eed944b7 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/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Release/Refactor/GMW_data.dll index 2328be27..48288035 100644 Binary files a/GMW/GMW_data/obj/Release/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Release/Refactor/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache index 6c120205..e1f9d411 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_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index 3a0ba41c..df36f426 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -350,7 +350,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" "ProductCode" = "8:{4CB59469-16ED-4876-9B3A-C521C608927F}" - "PackageCode" = "8:{FB916AE8-61FC-47ED-851C-CCEBA33A2744}" + "PackageCode" = "8:{F06DA73C-172D-45BD-9C9C-AD0862B7D0A0}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:FALSE" diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index cf92b03f..e540125d 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ diff --git a/GMW/GMW_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj index 93096e97..539093c0 100644 --- a/GMW/GMW_test_installer/GMW_test_installer.vdproj +++ b/GMW/GMW_test_installer/GMW_test_installer.vdproj @@ -302,7 +302,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_test" "ProductCode" = "8:{657D16D4-B3E6-4307-868B-3BE8E732C46D}" - "PackageCode" = "8:{A5FBDCFB-DDDE-4562-B78C-77D41CFB9349}" + "PackageCode" = "8:{3689D6EB-2830-4354-A460-761F805B11D7}" "UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" diff --git a/GMW/GMW_test_installer/Release/GMW_test_installer.msi b/GMW/GMW_test_installer/Release/GMW_test_installer.msi index a0acf558..e2d2d906 100644 Binary files a/GMW/GMW_test_installer/Release/GMW_test_installer.msi and b/GMW/GMW_test_installer/Release/GMW_test_installer.msi differ