From b97664c5b736846716cb3092bb321ef38b6258e3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 19 Apr 2021 19:53:37 +0200 Subject: [PATCH 1/2] Iniziato modifica x UDC con codice PRE; non ancora OK casi errore --- MP-MAG/SMART/PLScanner.aspx | 2 +- MP-MAG/SMART/PLScanner.aspx.designer.cs | 16 +++++++-------- MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs | 21 ++++++++++---------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/MP-MAG/SMART/PLScanner.aspx b/MP-MAG/SMART/PLScanner.aspx index 927435ab..f6eead91 100644 --- a/MP-MAG/SMART/PLScanner.aspx +++ b/MP-MAG/SMART/PLScanner.aspx @@ -5,7 +5,7 @@
- +
\ No newline at end of file diff --git a/MP-MAG/SMART/PLScanner.aspx.designer.cs b/MP-MAG/SMART/PLScanner.aspx.designer.cs index 5ef1773f..447324e7 100644 --- a/MP-MAG/SMART/PLScanner.aspx.designer.cs +++ b/MP-MAG/SMART/PLScanner.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace MP_MAG.SMART @@ -15,11 +15,11 @@ namespace MP_MAG.SMART { /// - /// Controllo cmp_PLScanner. + /// cmp_PLScanner control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MP_MAG.WebUserControls.cmp_PLScanner cmp_PLScanner; } diff --git a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs index 93ee88c2..4fc2352e 100644 --- a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs @@ -212,7 +212,7 @@ namespace MP_MAG.WebUserControls case codeType.Pedana: case codeType.Udc: cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); - processSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + processSuggestion(decoData.codeType, decoData.rawData, decoData.code, decoData.codeInt); doRaiseEv = true; break; @@ -231,8 +231,9 @@ namespace MP_MAG.WebUserControls /// /// /// + /// /// - private void processSuggestion(codeType tipoCod, string rawData, int codeInt) + private void processSuggestion(codeType tipoCod, string rawData, string code, int codeInt) { bool allOk = false; // processo suggerimenti @@ -365,22 +366,22 @@ namespace MP_MAG.WebUserControls else { // verifico esista - var tabUDC = MagDataLayer.man.taEUdc.getByKey(rawData); + var tabUDC = MagDataLayer.man.taEUdc.getByKey(code); if (tabUDC.Rows.Count == 0) { - cmp_barcode.showOutput("badge badge-warning", $"Errore: UDC non trovato: {rawData}"); + cmp_barcode.showOutput("badge badge-warning", $"Errore: UDC non trovato: {code}"); } else { // ...e NON sia stato TRASFERITO if (tabUDC[0].IdxPosizione > 0) { - cmp_barcode.showOutput("badge badge-warning", $"Errore: UDC già trasferito: {rawData}"); + cmp_barcode.showOutput("badge badge-warning", $"Errore: UDC già trasferito: {code}"); } else { // cerco AL se sia quello selezionato... - var tabAL = MagDataLayer.man.taEAL.getByUdc(rawData); + var tabAL = MagDataLayer.man.taEAL.getByUdc(code); // se non trovo --> associo if (tabAL.Rows.Count == 0) { @@ -396,7 +397,7 @@ namespace MP_MAG.WebUserControls else { // se siamo in seconda lettura --> OK x spostamento - if (LastUDC == rawData) + if (LastUDC == code) { allOk = true; LastUDC = ""; @@ -411,8 +412,8 @@ namespace MP_MAG.WebUserControls // chiedo seconda lettura SE AL "libero" else { - cmp_barcode.showOutput("badge badge-info", $"Attenzione: UDC {rawData} già associato ad AL ({tabAL[0].AL}), rileggere per confermare ({SelPedana})"); - LastUDC = rawData; + cmp_barcode.showOutput("badge badge-info", $"Attenzione: UDC {code} già associato ad AL ({tabAL[0].AL}), rileggere per confermare ({SelPedana})"); + LastUDC = code; } } } @@ -421,7 +422,7 @@ namespace MP_MAG.WebUserControls // ...e seleziono udc if (allOk) { - SelUDC = rawData; + SelUDC = code; tryLinkAlUdc(); } } From 0c6301739a71753da46be47148ff3b09809fc887 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 20 Apr 2021 10:23:36 +0200 Subject: [PATCH 2/2] cleanup generale x barcode --- MP-MAG/Web.config | 7 ++- MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs | 56 ------------------- MP-MAG/WebUserControls/cmp_barcode.ascx | 2 +- MP-MAG/WebUserControls/cmp_barcode.ascx.cs | 11 ++-- .../cmp_barcode.ascx.designer.cs | 48 ++++++++-------- 5 files changed, 36 insertions(+), 88 deletions(-) diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config index 31edad0f..a86e94b2 100644 --- a/MP-MAG/Web.config +++ b/MP-MAG/Web.config @@ -36,7 +36,7 @@ - + @@ -73,8 +73,9 @@ - - + + + diff --git a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs index 4fc2352e..a8f7b160 100644 --- a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs @@ -130,7 +130,6 @@ namespace MP_MAG.WebUserControls // processo evento.. lastCmd = cmp_barcode.inputAcquired.ToUpper(); doRaiseEv = processLastCmd(doRaiseEv); - // reset comando cmp_barcode.inputAcquired = ""; // aggiorno... @@ -143,61 +142,6 @@ namespace MP_MAG.WebUserControls private void doUpdate() { -#if false - // reset grafico - icnCart.Attributes.Remove("class"); - icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); - icnBin.Attributes.Remove("class"); - icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); - icnSecOp.Attributes.Remove("class"); - icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); - - // in base al secondo mostro uno o altro... - if (showCart) - { - icnCart.Attributes.Remove("class"); - icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-success"); - lblMessage.Text = "Item recognized"; - // controllo SE HO cart - if (currCartTab.Count == 1) - { - var cartRow = currCartTab[0]; - // imposto OUT - lblDestination.Text = $"SEND TO CART C{cartRow.CartIndex} ({cartRow.CartDtmx})"; - } - else - { - lblDestination.Text = $"ERROR SEARCHING CART: {currCartTab.Count} found!"; - } - lblDestination.CssClass = "text-success"; - } - else if (showBin) - { - icnBin.Attributes.Remove("class"); - icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-primary"); - lblMessage.Text = "Item recognized"; - if (currBinTab.Count == 1) - { - var binRow = currBinTab[0]; - lblDestination.Text = $"SEND TO BIN B{binRow.BinIndex} ({binRow.BinDtmx})"; - } - else - { - lblDestination.Text = $"ERROR SEARCHING BIN: {currBinTab.Count} found!"; - } - lblDestination.CssClass = "text-primary"; - } - if (showSecOp) - { - icnSecOp.Attributes.Remove("class"); - icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-info"); - lblMessage.Text = "Item recognized"; - lblLastBCode.Text = $"DO SEC OP: {secOp}"; - lblLastBCode.CssClass = "text-info"; - } - // fix btn reset! - lbtResetSel.Visible = (itemIdSelected != 0); -#endif } private bool processLastCmd(bool doRaiseEv) diff --git a/MP-MAG/WebUserControls/cmp_barcode.ascx b/MP-MAG/WebUserControls/cmp_barcode.ascx index a30db529..37de3a76 100644 --- a/MP-MAG/WebUserControls/cmp_barcode.ascx +++ b/MP-MAG/WebUserControls/cmp_barcode.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_barcode.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_barcode" %>
- +
diff --git a/MP-MAG/WebUserControls/cmp_barcode.ascx.cs b/MP-MAG/WebUserControls/cmp_barcode.ascx.cs index 904b5a03..ec796086 100644 --- a/MP-MAG/WebUserControls/cmp_barcode.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_barcode.ascx.cs @@ -22,7 +22,7 @@ namespace MP_MAG.WebUserControls } set { - txtBarcode.Text = ""; + txtBarcode.Text = value; txtBarcode.Focus(); } } @@ -45,7 +45,10 @@ namespace MP_MAG.WebUserControls protected void txtBarcode_TextChanged(object sender, EventArgs e) { - raiseEvent(); + if (!string.IsNullOrEmpty(inputAcquired)) + { + raiseEvent(); + } } #endregion Protected Methods @@ -66,10 +69,10 @@ namespace MP_MAG.WebUserControls public void showOutput(string cssClass, string messaggio) { // In primis: mostro qualcosa SOLO SE ho del testo - lblOutput.Visible = !string.IsNullOrEmpty(messaggio); - lblOutput.Text = messaggio; lblOutput.Attributes.Remove("class"); lblOutput.Attributes.Add("class", cssClass); + lblOutput.Text = messaggio; + lblOutput.Visible = !string.IsNullOrEmpty(messaggio); } #endregion Public Methods diff --git a/MP-MAG/WebUserControls/cmp_barcode.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_barcode.ascx.designer.cs index db147147..1e86e9af 100644 --- a/MP-MAG/WebUserControls/cmp_barcode.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_barcode.ascx.designer.cs @@ -1,35 +1,35 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace MP_MAG.WebUserControls { - public partial class cmp_barcode - { + public partial class cmp_barcode + { - /// - /// Controllo txtBarcode. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.TextBox txtBarcode; + /// + /// txtBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtBarcode; - /// - /// Controllo lblOutput. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblOutput; - } + /// + /// lblOutput control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblOutput; + } }