From ad866665355a93ed8afcbd29e3308a8ee8cfaf30 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 31 Mar 2022 19:00:25 +0200 Subject: [PATCH] fix rilettura dati prod ODL in caso di selezione stampa --- MP-MAG/SMART/printCartOdl.aspx.cs | 4 ++++ MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs | 9 ++------- MP-MAG/WebUserControls/cmp_currODL.ascx.cs | 3 ++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MP-MAG/SMART/printCartOdl.aspx.cs b/MP-MAG/SMART/printCartOdl.aspx.cs index d3ee580e..95a5caad 100644 --- a/MP-MAG/SMART/printCartOdl.aspx.cs +++ b/MP-MAG/SMART/printCartOdl.aspx.cs @@ -18,6 +18,10 @@ namespace MP_MAG.SMART // di conseguenza mostro stampa oppure selezione ODL... divOdl.Visible = missingOdl; divPrint.Visible = !missingOdl; + if (divPrint.Visible) + { + cmp_currODL.forceReload(); + } } private void Cmp_printODL_eh_addNew(object sender, EventArgs e) diff --git a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs index 690f61c3..d411662a 100644 --- a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs @@ -351,21 +351,16 @@ namespace MP_MAG.WebUserControls // se uguale OK else if (tabAL[0].AL == SelPedana) { - // se siamo in seconda lettura --> OK x spostamento + // 2022.03.31 se siamo in seconda lettura IMMEDIATA tutto ok if (ProcUDC == code) { allOk = true; - //LastUDC = ""; } + // 2022.03.25 modifica: se è già associato --> giallo! else { - // 2022.03.25 modifica: se è già associato --> giallo! cmp_barcode.showOutput("badge badge-warning", $"Attenzione: UDC già caricato su Pedana/AL ({tabAL[0].AL})"); } -#if false - // tutto ok - allOk = true; -#endif } else { diff --git a/MP-MAG/WebUserControls/cmp_currODL.ascx.cs b/MP-MAG/WebUserControls/cmp_currODL.ascx.cs index 42956579..ddbcf1b5 100644 --- a/MP-MAG/WebUserControls/cmp_currODL.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_currODL.ascx.cs @@ -18,8 +18,9 @@ namespace MP_MAG.WebUserControls Response.Redirect(titolo); } - protected void Page_Load(object sender, EventArgs e) + public void forceReload() { + resetProdData(); } #endregion Protected Methods