diff --git a/GMW/Web.config b/GMW/Web.config index 2014b484..c3edb756 100644 --- a/GMW/Web.config +++ b/GMW/Web.config @@ -61,7 +61,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -225,14 +225,14 @@ - + - + - + diff --git a/GMW/WebUserControls/mod_consumoFusi.ascx.cs b/GMW/WebUserControls/mod_consumoFusi.ascx.cs index 3e9359e2..70f9d1e7 100644 --- a/GMW/WebUserControls/mod_consumoFusi.ascx.cs +++ b/GMW/WebUserControls/mod_consumoFusi.ascx.cs @@ -52,7 +52,7 @@ namespace GMW.WebUserControls lblPrinter.Text = string.Format("{1}: {0}", postazione_printer, traduci("stampante")); lblCurrentPage.Text = traduci(PagCorrente); // buttons - btnConsuma.Text = traduci("btnConsumaUdcF10"); + btnConsuma.Text = traduci("btnConsumaUdc"); } /// /// restituisce il nome della pagina corrente @@ -252,6 +252,7 @@ namespace GMW.WebUserControls { } // salvo UDC from currUdcFrom = barcodeIn; + pnlAll.CssClass = "stileAttesa"; } break; default: @@ -297,10 +298,17 @@ namespace GMW.WebUserControls { // consumo UDC MagClass.magazzino.scaricaUdcMpWip(currUdcFrom, Request.UserHostName); + // indico UDC consumato! + lblMessaggi.Text = string.Format("{0} {1}", traduci("effettuatoConsumoUDC"), currUdcFrom); + currUdcFrom = ""; + pnlAll.CssClass = "stileComandoOk"; + } + else + { + // indico UDC consumato! + lblMessaggi.Text = string.Format("{0} {1}", traduci("UDC_giaConsumato"), currUdcFrom); + pnlAll.CssClass = "stileComandoKo"; } - // indico UDC consumato! - lblMessaggi.Text = string.Format("{0} {1}", traduci("effettuatoConsumoUDC"), currUdcFrom); - currUdcFrom = ""; lblGitterBoxAttivo.Text = ""; } } diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index de07c109..0850eada 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index b3af9f5e..5448eaa1 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 82b22709..b9b72431 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/images/sfondo.png b/GMW/images/sfondo.png index 5fcffdde..98ec9641 100644 Binary files a/GMW/images/sfondo.png and b/GMW/images/sfondo.png differ diff --git a/GMW/logs/20120823.txt.zip b/GMW/logs/20120823.txt.zip deleted file mode 100644 index 9460fb6c..00000000 Binary files a/GMW/logs/20120823.txt.zip and /dev/null differ