From f250dab4eff132d0de2cb596a70aa07969735041 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 19 Aug 2019 14:45:29 +0200 Subject: [PATCH] Ok test condizione num commessa.. --- C-TRACK/WebUserControls/mod_barcode.ascx.cs | 21 ++++++++++++++++---- C-TRACK/WebUserControls/mod_opr2post.ascx.cs | 2 ++ C-TRACK/barcode.aspx.cs | 11 ++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/C-TRACK/WebUserControls/mod_barcode.ascx.cs b/C-TRACK/WebUserControls/mod_barcode.ascx.cs index 433b890..7c00acd 100644 --- a/C-TRACK/WebUserControls/mod_barcode.ascx.cs +++ b/C-TRACK/WebUserControls/mod_barcode.ascx.cs @@ -1,4 +1,5 @@ -using SteamWare; +using AppData; +using SteamWare; using System; using System.Collections.Generic; using System.Web.UI; @@ -133,9 +134,21 @@ namespace C_TRACK.WebUserControls { txtVal2show = "---"; } - if (eh_comandoRegistrato != null) + // se è multi alzo ALTRO evento + if (mUtils.postIsMulti) { - eh_comandoRegistrato(this, new EventArgs()); + rawInput = BCodeVal; + if (eh_dataRead != null) + { + eh_dataRead(this, new EventArgs()); + } + } + else + { + if (eh_comandoRegistrato != null) + { + eh_comandoRegistrato(this, new EventArgs()); + } } } else @@ -161,7 +174,7 @@ namespace C_TRACK.WebUserControls comando.isValid = true; comando.valore = BCodeVal; _tabValori.TryGetValue(BCodeVal, out comando.valoreTrad); - } + } } /// /// verifica se il comando inserito sia valido diff --git a/C-TRACK/WebUserControls/mod_opr2post.ascx.cs b/C-TRACK/WebUserControls/mod_opr2post.ascx.cs index dfb23f4..1575b0f 100644 --- a/C-TRACK/WebUserControls/mod_opr2post.ascx.cs +++ b/C-TRACK/WebUserControls/mod_opr2post.ascx.cs @@ -137,6 +137,8 @@ namespace C_TRACK.WebUserControls Match testQta = Regex.Match(value, reQta); + // qui devo verificare SE SIA un oepratore... + #if false if (testReset.Success) { diff --git a/C-TRACK/barcode.aspx.cs b/C-TRACK/barcode.aspx.cs index a8bc73c..0e9462a 100644 --- a/C-TRACK/barcode.aspx.cs +++ b/C-TRACK/barcode.aspx.cs @@ -473,10 +473,17 @@ namespace C_TRACK void Mod_barcode_eh_dataRead(object sender, EventArgs e) { // controllo se sto leggendo un operatore o una commessa - + Match testNumTask = Regex.Match(mod_barcode1.comandoRegistrato.valore, reNumTask); + Match testOper = Regex.Match(mod_barcode1.comandoRegistrato.valore, reCodOper); // a seconda dei cari decido se far processare ai controlli oepratore o commessa in post multi... + if (testOper.Success) + { + } + else if (testNumTask.Success) + { + } } /// /// il barcode ha registrato un evento... @@ -564,7 +571,7 @@ namespace C_TRACK } //else if (mod_barcode1.comandoRegistrato.valore.Contains("OPR.")) else if (testOper.Success) - { + { // imposto operatore mUtils.CodOpr = mod_barcode1.comandoRegistrato.valore; // SE HO postazione...