diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 3d1781eb..f3a4108e 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -60,8 +60,8 @@ - - + + @@ -91,12 +91,18 @@ - - + + + + + + + + @@ -119,36 +125,38 @@ + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx index f73ecc46..d9e1bb57 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx @@ -64,6 +64,7 @@
+
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs index b646c820..751ea015 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs @@ -47,13 +47,17 @@ namespace GMW.WebUserControls /// private void traduciObj() { + // labels lblPostazione.Text = string.Format("{2}: {0} ({1})", postazione_name, postazione_IP, traduci("postazione")); lblPrinter.Text = string.Format("{1}: {0}", postazione_printer, traduci("stampante")); lblNumTratt.Text = traduci("lblNumTratt"); lblQta.Text = traduci("lblQuantita"); lblNote.Text = traduci("lblNote"); lblAnno.Text = traduci("lblAnno"); + //txtBox + txtQta.Text = memLayer.ML.confReadString("QtaImballoLiquidi"); txtAnno.Text = DateTime.Now.Year.ToString(); + // buttons btnStampa.Text = traduci("btnStampa"); btnAdd.ToolTip = traduci("btnAdd"); btnSvuota.ToolTip = traduci("btnSvuota"); @@ -398,14 +402,29 @@ namespace GMW.WebUserControls string newUdcChild = ""; string newUdcParent = ""; bool UdcExists = false; - int anno = Convert.ToInt32(txtAnno.Text.Substring(txtAnno.Text.Trim().Length-2,2)); + int anno = Convert.ToInt32(txtAnno.Text.Substring(txtAnno.Text.Trim().Length - 2, 2)); + int qta = memLayer.ML.confReadInt("QtaImballoLiquidi"); + string noteTrim = txtNote.Text.Trim(); try { - // creo nuovo UDC del trattamento liquidi - newUdcChild = MagClass.magazzino.creaUdc("LI", "", currParticolare, "", "", "", "", "", 0, "", "U", "", 0, 0, 0, DateTime.Now, 0, "Fin", 5, true, "IdxPosNewFinito", "UDC_FINITO", txtNote.Text.Trim(), "", anno); // !!! "LI" HARD CODED x indicare flusso liquidi + qta = Convert.ToInt32(txtQta.Text); } catch { } + // costruisco stringa x note, inserendo i trattamenti associati + foreach (KeyValuePair kvp in elencoTrattamenti) + { + noteTrim += string.Format("{0}{1}: {2}", Environment.NewLine, traduci("lblNumTratt"), kvp.Key); + } + // genero cartellino liquidi + try + { + // creo nuovo UDC del trattamento liquidi + newUdcChild = MagClass.magazzino.creaUdc("LI", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoLiquidi"), "U", "", qta, 0, 0, DateTime.Now, 0, "Fin", memLayer.ML.confReadInt("IdxPosizioneLiquidi"), true, "IdxPosizioneLiquidi", "UDC_FINITO", noteTrim, "", anno); // !!! "LI" HARD CODED x indicare flusso liquidi + } + catch + { } + // se ho cart liquidi genero (se non ci sono) cart trattamenti if (newUdcChild != "") { // creo UDC dei trattamenti termici @@ -418,7 +437,7 @@ namespace GMW.WebUserControls if (!UdcExists) { // creo UDC - MagClass.magazzino.creaUdc("TR", "", currParticolare, "", "", "", "", "", 0, "", "U", "", 0, 0, 0, DateTime.Now, 0, "Wip", 5, false, "IdxPosNewWip", "UDC_WIP", "LI", newUdcParent, anno); + MagClass.magazzino.creaUdc("TR", "", currParticolare, "", "", "", "", "", 0, "", "U", "", 0, 0, 0, DateTime.Now, 0, "Wip", memLayer.ML.confReadInt("IdxPosizioneTrattamenti"), false, "IdxPosizioneTrattamenti", "UDC_WIP", "LI", newUdcParent, anno); } // associo tratt termici e liquidi MagClass.magazzino.associaUdcParent(newUdcChild, newUdcParent); @@ -431,6 +450,8 @@ namespace GMW.WebUserControls newUdcParent = ""; UdcExists = false; } + // ora stampo il nuovo cartellino!!! + MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartFin); } } diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx b/GMW/GMW/WebUserControls/mod_searchMag.ascx index 44725306..c6d7134c 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx @@ -8,64 +8,67 @@ <%@ Register Src="mod_SearchProvParticolari.ascx" TagName="mod_SearchProvParticolari" TagPrefix="uc5" %> <%@ Register Src="Mod_SearchProvImballi.ascx" TagName="Mod_SearchProvImballi" TagPrefix="uc6" %> -
-
- GMWmag -
-
- - - - - -
- - -
-
-
- -
- - - 		-   - - -
-
-
- - - - - - + + + + +
- -
- - -
- - <%--
+
+
+
+
+ GMWmag +
+
+ + + + + +
+ + +
+
+
+ +
+ + + 		+   + + +
+
+
+ + + + + + - - - - -
+ +
+ + +
+ + <%--

- --%> - - - -
- -
+ --%> + + +
+ +
+
+
diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs index f78d75f4..0e0ee2ba 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 29ab1c8b..16c726ca 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 5895414b..cf450f5d 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 de9f69b3..864cf219 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -8,14 +8,14 @@ - + - + @@ -36,12 +36,18 @@ - - - - - - + + + + + + + + + + + + @@ -51,50 +57,53 @@ - - + + - - + + - - - - - - + + + + + + + + - + - + - + - + - + - - - - - + + + + + + @@ -103,17 +112,17 @@ - + - - - + + + - + - + diff --git a/GMW/GMW/mazzAppSettingsSP.config b/GMW/GMW/mazzAppSettingsSP.config index 99d93515..819e5892 100644 --- a/GMW/GMW/mazzAppSettingsSP.config +++ b/GMW/GMW/mazzAppSettingsSP.config @@ -28,7 +28,7 @@ - + @@ -38,12 +38,18 @@ - + + + + + + + @@ -62,40 +68,42 @@ - + + + - + - + - + - + - + - - - - + + + + @@ -104,6 +112,7 @@ + diff --git a/GMW/GMW/mazzAppSettingsTK.config b/GMW/GMW/mazzAppSettingsTK.config index 7d90a84d..44f899da 100644 --- a/GMW/GMW/mazzAppSettingsTK.config +++ b/GMW/GMW/mazzAppSettingsTK.config @@ -28,7 +28,7 @@ - + @@ -38,12 +38,18 @@ - + + + + + + + @@ -66,31 +72,33 @@ + + - + - + - + - + - + - + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 29ab1c8b..16c726ca 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 9ffbcaa5..3fa09daf 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/MagClass.cs b/GMW/GMW_data/MagClass.cs index 9ec4172e..e6dee44f 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -550,6 +550,22 @@ namespace GMW_data { } return answ; } + /// + /// effettua la stampa di un dato UDC + /// + /// Codice UDC + /// stampante specifica (da postazioen o std da webconfig, a cura dell'utente + /// + public bool stampaUdc(string UDC, string printer, tipoCartellino tipoCart) + { + bool answ = false; + // controllo se esista UDC + if (checkUDC(UDC)) + { + answ = reportPrinter.obj.stampaCartellino(tipoCart, UDC, printer); + } + return answ; + } #endregion diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 5895414b..cf450f5d 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 5895414b..cf450f5d 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ