diff --git a/MP-TAB3/Components/ProdConfMan.razor b/MP-TAB3/Components/ProdConfMan.razor index 7f31da2f..92057919 100644 --- a/MP-TAB3/Components/ProdConfMan.razor +++ b/MP-TAB3/Components/ProdConfMan.razor @@ -29,15 +29,31 @@
- - - - + + + @* + + @if (ShowRilav) { - + } - + *@ @@ -45,7 +61,46 @@ { var actOdl = ActiveOdl(item.DataTo); - + @* + *@ } diff --git a/MP-TAB3/Components/ProdConfMan.razor.cs b/MP-TAB3/Components/ProdConfMan.razor.cs index 7107bc56..e7277a39 100644 --- a/MP-TAB3/Components/ProdConfMan.razor.cs +++ b/MP-TAB3/Components/ProdConfMan.razor.cs @@ -316,29 +316,6 @@ namespace MP_TAB3.Components return answ; } -#if false - private MarkupString OperDto(int matr) - { - string answ = $"[{matr}]"; - // cerco in dizionario - if (DictOpr.ContainsKey(matr)) - { - answ = DictOpr[matr]; - } - else - { - // altrimenti cerco da lista e inserisco in dizionario - var recOpr = ListaOper.Where(x => x.MatrOpr == matr).FirstOrDefault(); - if (recOpr != null) - { - answ = $"{recOpr.Cognome} {recOpr.Nome}{matr}"; - } - DictOpr.Add(matr, answ); - } - return (MarkupString)answ; - } -#endif - /// /// Rileggo anagrafiche di base /// diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs index be23a241..74aeb9b4 100644 --- a/MP-TAB3/Components/ProdConfirm.razor.cs +++ b/MP-TAB3/Components/ProdConfirm.razor.cs @@ -53,6 +53,7 @@ namespace MP_TAB3.Components { datiProdAct = null; confTimer.Elapsed -= ConfTimer_Elapsed; + confTimer.Close(); } #endregion Public Methods @@ -248,8 +249,10 @@ namespace MP_TAB3.Components confRett = SMServ.GetConfBool("confRett"); enableMagPrint = SMServ.GetConfBool("enableMagPrint"); modoConfProd = SMServ.GetConfInt("modoConfProd"); - int tOutConfProd = SMServ.GetConfInt("TAB_TimeOutConfProd"); - confTimer = new System.Timers.Timer(tOutConfProd); + tOutConfProd = SMServ.GetConfInt("TAB_TimeOutConfProd"); + // petto periodo a 100ms x controllare scadenze + confTimer = new System.Timers.Timer(100); + //confTimer = new System.Timers.Timer(tOutConfProd); confTimer.Elapsed += ConfTimer_Elapsed; } @@ -294,6 +297,8 @@ namespace MP_TAB3.Components // effettua conferma con conf da DB del tipo (giorni / turni / periodo bool fatto = effettuaConfermaProd(); await TabDServ.FlushCache("StatoProd"); + await TabDServ.FlushCache("ODL"); + await TabDServ.FlushCache("ElConfProd"); // refresh tabella dati tablet... await TabDServ.RicalcMse(IdxMaccSel, 0); // rileggo e salvo.. @@ -320,12 +325,13 @@ namespace MP_TAB3.Components SDService.MachNumPzSet(IdxMaccSel, -1); await DoUpdate(); await RefreshData(); - TabDServ.NotifyDataInvalidated(IdxMaccSel); - isProcessing = false; // imposto visualizzazione conferma effettuata showConfirmResult = true; - // avvio timer x nascondere... + // imposto timeout display + avvio timer x nascondere... + scadConfPezzi = dtReqUpdate.AddMilliseconds(tOutConfProd); confTimer.Start(); + TabDServ.NotifyDataInvalidated(IdxMaccSel); + isProcessing = false; } protected void setConfirmBtn(bool newVal) @@ -397,7 +403,9 @@ namespace MP_TAB3.Components private int modoConfProd = 0; + private DateTime scadConfPezzi = DateTime.Today; private bool showConfirmResult = false; + private int tOutConfProd = 2000; #endregion Private Fields @@ -435,12 +443,17 @@ namespace MP_TAB3.Components /// private void ConfTimer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e) { - confTimer.Stop(); - showConfirmResult = false; - // resetto - lastPzBuoni = 0; - lastPzRilav = 0; - lastPzScarto = 0; + DateTime adesso = DateTime.Now; + // controllo se sia ascaduto il periodo di display + if (adesso > scadConfPezzi) + { + confTimer.Stop(); + showConfirmResult = false; + // resetto + lastPzBuoni = 0; + lastPzRilav = 0; + lastPzScarto = 0; + } } /// diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 465f0f0b..0d55c2f5 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2507.2909 + 6.16.2507.3108 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 704a5c33..1b5c0eb8 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2507.2909

+

Versione: 6.16.2507.3108


Note di rilascio:
Art/ODL# Pz Buoni# Pz Scarto
+
+ Art/ODL +
+
+
+
# Buoni
+
# Scarto
+ @if (ShowRilav) + { +
# Rilav
+ } +
+
+
Operatore
+ 		Art/ODL# Buoni# Scarto# Pz Rilav# RilavOperatoreOperatore
+ +
+
Art: @actOdl.CodArticolo
+
ODL: @($"ODL{actOdl.IdxOdl:000000000}")
+ +
+
+
+
@item.PezziConf
+
@item.PezziScar
+ @if (ShowRilav) + { +
@item.PezziDaRilav
+ } +
+
+
+
@($"{item.DataOraConf:ddd yyyy-MM-dd HH:mm:ss}")
+
@OperDto(item.MatrApp)
+ +
+ @if (ShowExtCode || ShowArtDescr) + { +
+ @if (ShowExtCode) + { +
@item.CommessaEsterna
+ } +
+
+ @if (ShowArtDescr) + { +
+
@actOdl.DescArticolo
+
+ } +
+ } +
Art: @actOdl.CodArticolo
ODL: @($"ODL{actOdl.IdxOdl:000000000}")
@if (ShowExtCode) @@ -64,9 +119,11 @@
@OperDto(item.MatrApp)
@if (ShowArtDescr) { -
@actOdl.DescArticolo
+
+
@actOdl.DescArticolo
+
} -