diff --git a/GMW/GMW_Term/GMW_Term.Publish.xml b/GMW/GMW_Term/GMW_Term.Publish.xml index 8c7bfd67..6903d649 100644 --- a/GMW/GMW_Term/GMW_Term.Publish.xml +++ b/GMW/GMW_Term/GMW_Term.Publish.xml @@ -1,128 +1,128 @@ + - - - - + + + - + - + - - - + + - + - + - - - - - + - + - - + + - - + - + - + - - + + - + - + + - + - + - + - - + - - + + + + - + - + + + - - - + + + - + + - + + + - - + - + - - - + + + - - + + - - - + + + - + - + - + \ No newline at end of file diff --git a/GMW/GMW_Term/Style.css b/GMW/GMW_Term/Style.css index 43b44bf0..74dff557 100644 --- a/GMW/GMW_Term/Style.css +++ b/GMW/GMW_Term/Style.css @@ -554,6 +554,15 @@ white-space: pre; font-size: 9pt; } +.btnBarcodeLarge +{ + width: 120px; + height: 40px; + border: solid 2px blue; + background-color: #AAFFFF; + white-space: pre; + font-size: 9pt; +} .btnPrendiInCarico { @@ -567,9 +576,15 @@ .errore { + font-size: small; color: Red; font-weight: bold; } +.erroreMid +{ + font-size: small; + color: Red; +} .clearAll { clear: both; diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 39e6e6b1..8e930ce0 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -58,7 +58,7 @@ - + @@ -118,7 +118,7 @@ - + diff --git a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs index ecb42414..687f980c 100644 --- a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs @@ -203,9 +203,23 @@ namespace GMW_Term.WebUserControls if (isUserList) { // chiudo! - GMW_data.MagClass.magazzino.completaListaPrelievo(memLayer.ML.StringSessionObj("CodCS"), codLista, MagClass.magazzino.CodSoggCurrUser); - // indico che la lista indicata è stata chiusa - lblData.Text = string.Format("{0}: {1}", traduci("ListClosed"), codLista); + esitoOperazione esitoCompleta = GMW_data.MagClass.magazzino.completaListaPrelievo(memLayer.ML.StringSessionObj("CodCS"), codLista, MagClass.magazzino.CodSoggCurrUser); + if (esitoCompleta == esitoOperazione.ok) + { + // indico che la lista indicata è stata chiusa + lblData.Text = string.Format("{0}: {1}", traduci("ListClosed"), codLista); + } + else if (esitoCompleta == esitoOperazione.errore_noUdc) + { + GMW_data.MagClass.magazzino.attivaListaPrelievo(memLayer.ML.StringSessionObj("CodCS"), codLista, MagClass.magazzino.CodSoggCurrUser); + logger.lg.scriviLog(string.Format("Lista di prelievo {0} rilasciata poiché senza UDC prelevati da parte dell'opertore {1}", codLista, MagClass.magazzino.CodSoggCurrUser), tipoLog.INFO); + // tolgo dalla session la lista prelievo attuale... + memLayer.ML.emptySessionVal("CodLista_sel"); + memLayer.ML.emptySessionVal("CodListaAttiva"); + memLayer.ML.emptySessionVal("activeTask"); + // indico che la lista indicata è stata rimessa in stato "attiva" + lblData.Text = string.Format("{0}: {1}", traduci("ListReActivated"), codLista); + } // svuoto cache! memLayer.ML.emptySessionVal("UDC_sel"); } diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx index fc4bef20..42f629b1 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx @@ -29,15 +29,13 @@ - +
-
- - - +
+

@@ -101,7 +99,6 @@
- --%> +
diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs index 1da67940..30747363 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs @@ -85,15 +85,6 @@ namespace GMW_Term.WebUserControls { /// protected global::System.Web.UI.WebControls.Panel pnlDetail; - /// - /// btnBarcode control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button btnBarcode; - /// /// btnCloseDet control. /// @@ -121,6 +112,15 @@ namespace GMW_Term.WebUserControls { /// protected global::System.Web.UI.WebControls.Button btnShowPeriodo; + /// + /// btnBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnBarcode; + /// /// grViewDetail control. /// diff --git a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx index 8a044b02..d2dd4904 100644 --- a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_makeMov.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_makeMov" %>
-
+

@@ -16,9 +16,7 @@
-
-
-
+
@@ -28,9 +26,7 @@
-
-
-
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_menuMov.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_menuMov.ascx.cs index ab043731..90cc873c 100644 --- a/GMW/GMW_Term/WebUserControls/mod_menuMov.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_menuMov.ascx.cs @@ -33,18 +33,30 @@ namespace GMW_Term.WebUserControls protected void btn1_Click(object sender, EventArgs e) { - memLayer.ML.emptySessionVal("codCella4det_sel"); - memLayer.ML.emptySessionVal("UDC4det_sel"); + resetAllData(); Response.Redirect("interrMov.aspx"); } + /// + /// resetta dati barcode + /// + private static void resetAllData() + { + memLayer.ML.emptySessionVal("IdxCella_sel"); + memLayer.ML.emptySessionVal("codCella_sel"); + memLayer.ML.emptySessionVal("codCella4det_sel"); + memLayer.ML.emptySessionVal("UDC4det_sel"); + memLayer.ML.emptySessionVal("UDC_sel"); + } protected void btn2_Click(object sender, EventArgs e) { + resetAllData(); Response.Redirect("Home.aspx"); } protected void btn3_Click(object sender, EventArgs e) { + resetAllData(); Response.Redirect("makeMov.aspx"); } } diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 0cd726c2..ba020392 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index 0ba21ef8..f951ff5b 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/bin/SteamWare.dll b/GMW/GMW_Term/bin/SteamWare.dll index 71c329f2..9b7df415 100644 Binary files a/GMW/GMW_Term/bin/SteamWare.dll and b/GMW/GMW_Term/bin/SteamWare.dll differ diff --git a/GMW/GMW_Term/interrMov.aspx.cs b/GMW/GMW_Term/interrMov.aspx.cs index eb112b50..2de44ed9 100644 --- a/GMW/GMW_Term/interrMov.aspx.cs +++ b/GMW/GMW_Term/interrMov.aspx.cs @@ -46,10 +46,8 @@ namespace GMW_Term /// void mod_barcode1_eh_scannedUdc(object sender, EventArgs e) { + memLayer.ML.emptySessionVal("IdxCella_sel"); memLayer.ML.emptySessionVal("codCella_sel"); - //Response.Redirect("~/interrMov.aspx"); - //mod_barcode1.showHeaderText = false; - //mod_barcode1.showNoteText = false; mod_barcode1.Visible = false; mod_interrMov1.showUdcDetail(mod_barcode1.valoreScan); } @@ -61,9 +59,6 @@ namespace GMW_Term void mod_barcode1_eh_scannedCella(object sender, EventArgs e) { memLayer.ML.emptySessionVal("UDC_sel"); - //Response.Redirect("~/interrMov.aspx"); - //mod_barcode1.showHeaderText = false; - //mod_barcode1.showNoteText = false; mod_barcode1.Visible = false; mod_interrMov1.showCellaDetail(mod_barcode1.valoreScan); } diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index 837ec3ee..1cdfb831 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/mazzAppSettingsSP.config b/GMW/GMW_Term/mazzAppSettingsSP.config index 19251889..1ce07fae 100644 --- a/GMW/GMW_Term/mazzAppSettingsSP.config +++ b/GMW/GMW_Term/mazzAppSettingsSP.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/mazzAppSettingsTK.config b/GMW/GMW_Term/mazzAppSettingsTK.config index eb09d8fc..d59a3f69 100644 --- a/GMW/GMW_Term/mazzAppSettingsTK.config +++ b/GMW/GMW_Term/mazzAppSettingsTK.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/mazzAppSettingsTK_test.config b/GMW/GMW_Term/mazzAppSettingsTK_test.config index dcfddcde..483d4adc 100644 --- a/GMW/GMW_Term/mazzAppSettingsTK_test.config +++ b/GMW/GMW_Term/mazzAppSettingsTK_test.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 8772694d..4aae7c67 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index dec724da..e6d5c370 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index c3c71ce7..161995ba 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMWT" - "ProductCode" = "8:{CFD2CC0D-5168-49AD-94BD-C9E6BE392983}" - "PackageCode" = "8:{1D4F0A02-7163-4363-AED0-DEE90899086E}" + "ProductCode" = "8:{C860CE0C-0113-4035-B96D-9DB18A75A179}" + "PackageCode" = "8:{C9D6FFE9-4074-473E-B403-ACF54DF6B4E2}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.429" + "ProductVersion" = "8:1.1.430" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi index 59d00340..c748f9db 100644 Binary files a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi differ diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 1df6b088..019a028a 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 0ba21ef8..f951ff5b 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 817eda1f..9b7df415 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 1df6b088..019a028a 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/Release/GMW_data.csproj.FileListAbsolute.txt b/GMW/GMW_data/obj/Release/GMW_data.csproj.FileListAbsolute.txt index d92d0e1a..ded4b9c7 100644 --- a/GMW/GMW_data/obj/Release/GMW_data.csproj.FileListAbsolute.txt +++ b/GMW/GMW_data/obj/Release/GMW_data.csproj.FileListAbsolute.txt @@ -7,12 +7,12 @@ c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\ c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\ResolveAssemblyReference.cache c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.dll c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.pdb -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.dll.config -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.dll -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.pdb -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\SteamWare.dll -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\Flesk.ViewState.dll -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\ICSharpCode.SharpZipLib.dll -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\ResolveAssemblyReference.cache -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.dll -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.pdb +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.dll.config +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.dll +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.pdb +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\SteamWare.dll +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\Flesk.ViewState.dll +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\ICSharpCode.SharpZipLib.dll +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\ResolveAssemblyReference.cache +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.dll +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.pdb diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 0ba21ef8..f951ff5b 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 e7052d71..0106ac15 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 dd973157..8ec18d85 100644 Binary files a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache differ