diff --git a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx index d984e4e2..7c874d9a 100644 --- a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx +++ b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx @@ -1,12 +1,14 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ST_objCheck.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_ST_objCheck" %>
-
read
+
+ +
\ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs index 13cf83fd..fae3e69b 100644 --- a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs +++ b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs @@ -99,19 +99,44 @@ namespace MoonProTablet.WebUserControls if (trovatoEq != null && trovatoEq.Count() > 0) { // recupero record.. - var data = trovatoEq.FirstOrDefault(); + var datiEqCheck = trovatoEq.FirstOrDefault(); // registro trovato found = true; + lblMessage.Text = $"Parametro acquisito: {BCodeVal}"; + lblMessage.CssClass = "text-success"; // upsert controllo - DataLayerObj.taSTChk.upsertQuery(idxOdl, data.IdxST, data.Oggetto, data.Num, BCodeVal, BCodeVal, true, user_std.UtSn.utente); + DataLayerObj.taSTChk.upsertQuery(idxOdl, datiEqCheck.IdxST, datiEqCheck.Oggetto, datiEqCheck.Num, BCodeVal, BCodeVal, true, user_std.UtSn.utente); } // se non trovato if (!found) { - // controllo condizione tipo BATCH (speciale) + // controllo condizione tipo BATCH (speciale) - prima solo che CI SIA una richiesta di questo tipo + var trovatoBatch = tabRichieste.Where(x => x.CheckType == "BATCH"); + if (trovatoBatch != null && trovatoBatch.Count() > 0) + { + // recupero record.. cercando in giacenza il LOTTO... + var tabGiacenzeLotto = DataLayerObj.taArcaGiac.getBySearch(null, "", BCodeVal, "", false); + if (tabGiacenzeLotto != null && tabGiacenzeLotto.Count > 0) + { + var datiBatchCheck = trovatoBatch.FirstOrDefault(); + var datiLotto = tabGiacenzeLotto.FirstOrDefault(); + + // registro trovato + found = true; + lblMessage.Text = $"Parametro acquisito: {BCodeVal} --> {datiLotto.Cd_AR}"; + lblMessage.CssClass = "text-success"; + // upsert controllo + DataLayerObj.taSTChk.upsertQuery(idxOdl, datiBatchCheck.IdxST, datiBatchCheck.Oggetto, datiBatchCheck.Num, BCodeVal, datiLotto.Cd_AR, true, user_std.UtSn.utente); + } + } } } + else + { + lblMessage.Text = "Parametro non valido"; + lblMessage.CssClass = "text-secondary"; + } // sistemo visualizzaizone componente BCodeVal = ""; @@ -126,6 +151,12 @@ namespace MoonProTablet.WebUserControls protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + lblMessage.Text = "prego confermare parametri"; + lblMessage.CssClass = "text-dark"; + } + txtInput.Focus(); } /// @@ -139,50 +170,5 @@ namespace MoonProTablet.WebUserControls } #endregion Protected Methods - -#if false - /// - /// verifico se sia un valore compreso nell'elenco fornito - /// - private void isValore() - { - if (_tabValori.ContainsKey(BCodeVal)) // verifico se il comando digitato esista... - { - comando.isValid = true; - comando.valore = BCodeVal; - _tabValori.TryGetValue(BCodeVal, out comando.valoreTrad); - } - } - /// - /// verifica se il comando inserito sia valido - /// - private void isInputEvent() - { - if (_comandi.ContainsKey(BCodeVal)) // verifico se il comando digitato esista... - { - comando.isValid = true; - // salvo comando precedente (se c'è...) - comando.prevCmdIn = comando.currCmdIn; - comando.descrComandoPrev = comando.descrComando; - comando.currCmdIn = BCodeVal; - _comandi.TryGetValue(BCodeVal, out comando.descrComando); - } - } - /// - /// verifica quale browser usato e applica css corretto al div attorno al box - /// - private void DetectAgent() - { - System.Web.HttpBrowserCapabilities browser = Request.Browser; - if (browser.Browser == "IE") - { - pnlBarcodeBox.CssClass = "barcodeBoxIE"; - } - else - { - pnlBarcodeBox.CssClass = "barcodeBoxOther"; - } - } -#endif } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.designer.cs b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.designer.cs index 25f8d6b3..58b16661 100644 --- a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.designer.cs +++ b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.designer.cs @@ -41,6 +41,15 @@ namespace MoonProTablet.WebUserControls /// protected global::System.Web.UI.WebControls.LinkButton lbtCerca; + /// + /// Controllo lblMessage. + /// + /// + /// 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 lblMessage; + /// /// Controllo hfCodArticolo. /// diff --git a/MP-TAB/WebUserControls/cmp_ST_objView.ascx b/MP-TAB/WebUserControls/cmp_ST_objView.ascx index 5f6f3f09..c5fa4315 100644 --- a/MP-TAB/WebUserControls/cmp_ST_objView.ascx +++ b/MP-TAB/WebUserControls/cmp_ST_objView.ascx @@ -12,6 +12,7 @@
<%: hfValue.Value %> +
diff --git a/MP-TAB/WebUserControls/cmp_ST_objView.ascx.cs b/MP-TAB/WebUserControls/cmp_ST_objView.ascx.cs index e9ccbb70..0708a6d2 100644 --- a/MP-TAB/WebUserControls/cmp_ST_objView.ascx.cs +++ b/MP-TAB/WebUserControls/cmp_ST_objView.ascx.cs @@ -125,6 +125,19 @@ namespace MoonProTablet.WebUserControls } } + public bool showCheckedData + { + get + { + bool answ = false; + if (required && (dataValue == extCode)) + { + answ = true; + } + return answ; + } + } + public bool showMissingData { get @@ -158,6 +171,7 @@ namespace MoonProTablet.WebUserControls break; } lblError.Visible = showMissingData; + lblChecked.Visible = showCheckedData; } #endregion Private Methods diff --git a/MP-TAB/WebUserControls/cmp_ST_objView.ascx.designer.cs b/MP-TAB/WebUserControls/cmp_ST_objView.ascx.designer.cs index 15f26e58..069f94bf 100644 --- a/MP-TAB/WebUserControls/cmp_ST_objView.ascx.designer.cs +++ b/MP-TAB/WebUserControls/cmp_ST_objView.ascx.designer.cs @@ -77,6 +77,15 @@ namespace MoonProTablet.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblError; + /// + /// Controllo lblChecked. + /// + /// + /// 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 lblChecked; + /// /// Controllo divImg. /// diff --git a/MP-TAB/WebUserControls/cmp_disabled.ascx b/MP-TAB/WebUserControls/cmp_disabled.ascx new file mode 100644 index 00000000..b120d0f3 --- /dev/null +++ b/MP-TAB/WebUserControls/cmp_disabled.ascx @@ -0,0 +1,20 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_disabled.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_disabled" %> + +
+
+

+

+
+
+ +
+
+

+ + +

+ +
+
+
+
\ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_disabled.ascx.cs b/MP-TAB/WebUserControls/cmp_disabled.ascx.cs new file mode 100644 index 00000000..34f1ce33 --- /dev/null +++ b/MP-TAB/WebUserControls/cmp_disabled.ascx.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MoonProTablet.WebUserControls +{ + public partial class cmp_disabled : System.Web.UI.UserControl + { + #region Public Properties + + public string message + { + get + { + return lblMessage.Text; + } + set + { + lblMessage.Text = value.Trim(); + } + } + + public string subtitle + { + get + { + return lblSubtitle.Text; + } + set + { + lblSubtitle.Text = value.Trim(); + } + } + + public string title + { + get + { + return lblTitolo.Text; + } + set + { + lblTitolo.Text = value.Trim(); + } + } + + #endregion Public Properties + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_disabled.ascx.designer.cs b/MP-TAB/WebUserControls/cmp_disabled.ascx.designer.cs new file mode 100644 index 00000000..b1a0ba25 --- /dev/null +++ b/MP-TAB/WebUserControls/cmp_disabled.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MoonProTablet.WebUserControls +{ + + + public partial class cmp_disabled + { + + /// + /// Controllo lblTitolo. + /// + /// + /// 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 lblTitolo; + + /// + /// Controllo lblSubtitle. + /// + /// + /// 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 lblSubtitle; + + /// + /// Controllo lblMessage. + /// + /// + /// 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 lblMessage; + } +} diff --git a/MP-TAB/WebUserControls/cmp_sheetTech.ascx b/MP-TAB/WebUserControls/cmp_sheetTech.ascx index 35a2ef4a..465bb9b1 100644 --- a/MP-TAB/WebUserControls/cmp_sheetTech.ascx +++ b/MP-TAB/WebUserControls/cmp_sheetTech.ascx @@ -4,7 +4,14 @@
-

Scheda Tecnica

+
+
+

Scheda Tecnica

+
+
+ reset +
+
diff --git a/MP-TAB/WebUserControls/cmp_sheetTech.ascx.cs b/MP-TAB/WebUserControls/cmp_sheetTech.ascx.cs index 81a4345f..6bfd884a 100644 --- a/MP-TAB/WebUserControls/cmp_sheetTech.ascx.cs +++ b/MP-TAB/WebUserControls/cmp_sheetTech.ascx.cs @@ -37,8 +37,21 @@ namespace MoonProTablet.WebUserControls #region Protected Methods + protected void lbtClearOdl_Click(object sender, EventArgs e) + { + // chiamo stored x ripulire dati check già caricati + DataLayerObj.taSTChk.cleanByOdl(idxOdl); + // sollevo evento + repGroup.DataBind(); + reportUpdate(); + } + protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + lbtClearOdl.DataBind(); + } cmp_ST_objCheck.eh_doUpdate += cmp_ST_objCheck_eh_doUpdate; } diff --git a/MP-TAB/WebUserControls/cmp_sheetTech.ascx.designer.cs b/MP-TAB/WebUserControls/cmp_sheetTech.ascx.designer.cs index 5bd6fb11..16564bd2 100644 --- a/MP-TAB/WebUserControls/cmp_sheetTech.ascx.designer.cs +++ b/MP-TAB/WebUserControls/cmp_sheetTech.ascx.designer.cs @@ -14,6 +14,15 @@ namespace MoonProTablet.WebUserControls public partial class cmp_sheetTech { + /// + /// Controllo lbtClearOdl. + /// + /// + /// 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.LinkButton lbtClearOdl; + /// /// Controllo cmp_ST_objCheck. ///