diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 07260548..53d555da 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -55,6 +55,7 @@ + @@ -62,7 +63,7 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx index f8073b7e..e4606543 100644 --- a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx +++ b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_bolle4odette.ascx.cs" Inherits="GMW.WebUserControls.mod_bolle4odette" %> -
+
diff --git a/GMW/GMW/WebUserControls/mod_odette.ascx.cs b/GMW/GMW/WebUserControls/mod_odette.ascx.cs index ce230c08..7f5cbf91 100644 --- a/GMW/GMW/WebUserControls/mod_odette.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_odette.ascx.cs @@ -309,6 +309,7 @@ namespace GMW.WebUserControls { mod_bolle4odette1.Visible = false; // nascondo eventuali dettagli + memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); grView.SelectedIndex = -1; // aggiorno controllo corrente! updateOds(); @@ -403,6 +404,8 @@ namespace GMW.WebUserControls // mostro modulo per associazione etichette odette / bolla string codLista = grView.SelectedValue.ToString(); mod_bolle4odette1.Visible = CreaOdetteEnabled(codLista); + // salvo in session il valore selezionato... + memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, true); // aggiorno righe SE c'è almeno 1 odette... if (hasOdette(codLista)) { @@ -414,8 +417,6 @@ namespace GMW.WebUserControls /// private void aggiornaElencoRighe() { - // salvo in session il valore selezionato... - SteamWare.memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, true); // setto se sia possibile prelevare le righe (SOLO se iniziata) bool prelievoOk = false; bool cambioUdcOk = false; diff --git a/GMW/GMW/WebUserControls/mod_viewOdette.ascx b/GMW/GMW/WebUserControls/mod_viewOdette.ascx index f629a2b8..a7396103 100644 --- a/GMW/GMW/WebUserControls/mod_viewOdette.ascx +++ b/GMW/GMW/WebUserControls/mod_viewOdette.ascx @@ -2,10 +2,10 @@ Inherits="GMW.WebUserControls.mod_viewOdette" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="mod_selettore_ajax.ascx" TagName="mod_selettore_ajax" TagPrefix="uc1" %> - + @@ -28,51 +28,34 @@ ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
- - - - - - - - + + - + - - + + - + - - - - - + SelectMethod="getByCodLista" TypeName="GMW_data.DS_OdetteTableAdapters.OdetteTableAdapter"> - - - -    \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_viewOdette.ascx.cs b/GMW/GMW/WebUserControls/mod_viewOdette.ascx.cs index f6a8d3a3..6f33c5f6 100644 --- a/GMW/GMW/WebUserControls/mod_viewOdette.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_viewOdette.ascx.cs @@ -212,8 +212,7 @@ namespace GMW.WebUserControls protected void grView_RowUpdating(object sender, GridViewUpdateEventArgs e) { // carico l'idx dell'oggetto - string codLista = e.Keys["CodLista"].ToString(); - string UDC = e.Keys["UDC"].ToString(); + string UDC = e.Keys["CampoUDC"].ToString(); // quale comando? string _comando = ""; if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand")) @@ -224,6 +223,12 @@ namespace GMW.WebUserControls // verifico il tipo di richiesta (up/down level, clona o update normale switch (_comando) { + case "stampaOdette": + // lancia una singola etichetta odette + Odette.mgr.stampaEtichettaOdette(UDC); + // blocco update! + e.Cancel = true; + break; default: // faccio update! break; @@ -336,6 +341,26 @@ namespace GMW.WebUserControls { return _udc.ToString(); } + /// + /// salvo in session il prox comando + /// + /// + /// + protected void img_Click(object sender, ImageClickEventArgs e) + { + SteamWare.memLayer.ML.setSessionVal("nextObjCommand", ((ImageButton)sender).CommandArgument); + } + /// + /// (ri)stampa tutte le etichette della packing list + /// + /// + /// + protected void btnRistampaOdette_Click(object sender, EventArgs e) + { + Odette.mgr.stampaOdettePackingList(memLayer.ML.StringSessionObj("CodLista_sel")); + } + + #endregion diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 0f88045e..fe3690ff 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 5363f244..781a47dc 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll index 5cb896fd..a491b88b 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 7446b87c..4064f70c 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -7,7 +7,7 @@ - + @@ -57,6 +57,7 @@ + @@ -68,7 +69,6 @@ - @@ -81,6 +81,7 @@ + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 0f88045e..9bc793e0 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 5a54f4d0..a2436ec7 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index 2326d665..fe3690ff 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 a403fca5..ecfee807 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/Odette.cs b/GMW/GMW_data/Odette.cs index 230af739..9792e697 100644 --- a/GMW/GMW_data/Odette.cs +++ b/GMW/GMW_data/Odette.cs @@ -363,10 +363,15 @@ namespace GMW_data public bool stampaEtichettaOdette(string UDC) { bool answ = false; - //!!!FARE!!! - // chiamo il report... - + try + { + answ = reportPrinter.obj.stampaCartellino(tipoCartellino.cartOdette, UDC, ""); + } + catch + { + logger.lg.scriviLog(String.Format("Errore nella stmapa del cartellino per l'UDC {0}", UDC), tipoLog.ERROR); + } return answ; } diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 5363f244..a7af908c 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 84f6d323..781a47dc 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 122caa2d..a491b88b 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 5363f244..a7af908c 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.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 84f6d323..781a47dc 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/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache index c2cf2802..0d9d317c 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_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 7f77a025..63ffbc52 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll index b3f784f4..bf451d78 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll differ diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index 38eaa7c8..04a06065 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:{33571C57-DCDE-46D3-8BA4-37F8EB24358A}" - "PackageCode" = "8:{DAF22D52-4536-4384-B32C-352029F6C17C}" + "PackageCode" = "8:{76659B99-604B-442B-AE85-C2433B4C927D}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index 3880b920..8c789d6b 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ