From 52efe52221a20fc83b6ed90765972fb9f686ed40 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 9 Apr 2024 16:41:24 +0200 Subject: [PATCH] Update gestione ODL: - non permessoa ttrezzaggio se ci sono pz scarto oltre che z da confermare --- MP-TAB3/Components/OdlMan.razor | 9 +++++++-- MP-TAB3/Components/OdlMan.razor.cs | 15 ++++++++++++++- 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, 25 insertions(+), 7 deletions(-) diff --git a/MP-TAB3/Components/OdlMan.razor b/MP-TAB3/Components/OdlMan.razor index 9f588487..3f9e8832 100644 --- a/MP-TAB3/Components/OdlMan.razor +++ b/MP-TAB3/Components/OdlMan.razor @@ -48,8 +48,13 @@
@lblWarnHead
@lblWarnBody -
- Pezzi NC: @numPz2Conf +
+
+ Pezzi NC: @numPz2Conf +
+
+ Scarti NC: @numSca2Conf +
diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index 3b8aa9ac..3238146f 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -1214,6 +1214,19 @@ namespace MP_TAB3.Components } } + private int numSca2Conf + { + get + { + int answ = -1; + if (datiProdAct != null) + { + answ = datiProdAct.Pz2RecScarto; + } + return answ; + } + } + private bool setupActive { get; set; } = false; /// @@ -1337,7 +1350,7 @@ namespace MP_TAB3.Components needConfProd = RecMSE != null && datiProdAct != null; if (datiProdAct != null) { - needConfProd = datiProdAct.Pz2RecTot > 0 && !isSlave; + needConfProd = (datiProdAct.Pz2RecTot > 0 || datiProdAct.Pz2RecScarto != 0) && !isSlave; if (needConfProd) { StateHasChanged(); diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 6462dae8..c9bdc38d 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2403.2214 + 6.16.2404.916 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index e7a4c943..07b69375 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2403.2214

+

Versione: 6.16.2404.916


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 0228d7f9..8fa25dd6 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2403.2214 +6.16.2404.916 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 5001ae8a..6f7df21b 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2403.2214 + 6.16.2404.916 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false