From f370884f7de8bd966fc4fa8fca56a5de80549a45 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 15 Apr 2024 09:39:09 +0200 Subject: [PATCH] =?UTF-8?q?TAB3:=20-=20Fix=20condizione=20visibilit=C3=A0?= =?UTF-8?q?=20annulla=20ODL=20(disabilitato=20x=20doppia=20tav)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MP-TAB3/Components/OdlMan.razor | 2 +- MP-TAB3/Components/OdlMan.razor.cs | 29 ++++++++++++++++++++++++++++- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 6 files changed, 33 insertions(+), 6 deletions(-) diff --git a/MP-TAB3/Components/OdlMan.razor b/MP-TAB3/Components/OdlMan.razor index 3f9e8832..244ef543 100644 --- a/MP-TAB3/Components/OdlMan.razor +++ b/MP-TAB3/Components/OdlMan.razor @@ -88,7 +88,7 @@ } - @if (cancelSetupEnabled && RecMSE != null && RecMSE.PezziConf == 0) + @if (cancelSetupEnabled && annullaSetupVisible) {
diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index d03d34ba..c9336f3a 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -1186,7 +1186,34 @@ namespace MP_TAB3.Components private bool cancelSetupEnabled { - get => inAttr && enableSchedaTecnica && enableAnnullaSetup; + //get => inAttr && enableSchedaTecnica && enableAnnullaSetup; + get => inAttr && enableAnnullaSetup; + } + + private bool annullaSetupVisible + { + get + { + bool answ = inAttr && enableAnnullaSetup && RecMSE != null && RecMSE.PezziConf == 0; + // forzato: se è doppia tavola è SEMPRE false... + if (isMulti) + { + answ = false; + } + // 2024.04.15 deciso con Gian di togliere la possibilità di annullare su doppia tavola (problema di doppio reset con conferme aperte su altra tavola) + //DateTime adesso = DateTime.Now; + //if (isMulti) + //{ + // var pUpd = Task.Run(async () => + // { + // // controllo ANCHE che la tav correntemente selezionata NON abbia pezzi da confermare + // datiProdAct = await TabDServ.StatoProdMacchina(IdxMaccSel, adesso); + // answ = datiProdAct.PzConfBuoni == 0 && datiProdAct.Pz2RecScarto == 0; + // }); + // pUpd.Wait(); + //} + return answ; + } } private string cssDetailOdl diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 649c1921..d259ee90 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2404.1216 + 6.16.2404.1509 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 8972322b..25d26709 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2404.1216

+

Versione: 6.16.2404.1509


Note di rilascio: