From 25aa82adaa4276d3c92cc3a70cbe3c813429bb07 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 Feb 2025 11:40:20 +0100 Subject: [PATCH] Update display info su rilavorati in TAB --- MP-TAB3/Components/OdlMan.razor | 15 ++++++++-- MP-TAB3/Components/OdlMan.razor.cs | 12 ++++++++ MP-TAB3/Components/ProdConfirm.razor | 35 ++++++++++++++++++------ MP-TAB3/Components/ProdConfirm.razor.cs | 16 +++++++---- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- MP.Data/DatabaseModels/StatoProdModel.cs | 2 ++ 9 files changed, 67 insertions(+), 21 deletions(-) diff --git a/MP-TAB3/Components/OdlMan.razor b/MP-TAB3/Components/OdlMan.razor index 9cb46609..ca121849 100644 --- a/MP-TAB3/Components/OdlMan.razor +++ b/MP-TAB3/Components/OdlMan.razor @@ -52,9 +52,18 @@
Pezzi NC: @numPz2Conf
-
- Scarti NC: @numSca2Conf -
+ @if (numSca2Conf > 0) + { +
+ Scarti NC: @numSca2Conf +
+ } + @if (numRil2Conf > 0) + { +
+ Cicli Rilav NC: @numRil2Conf +
+ } diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index b7a9fc56..1f9318f0 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -1358,6 +1358,18 @@ namespace MP_TAB3.Components return answ; } } + private int numRil2Conf + { + get + { + int answ = -1; + if (datiProdAct != null) + { + answ = datiProdAct.Pz2RecRilav; + } + return answ; + } + } private bool setupActive { get; set; } = false; diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor index 5ad6fc06..894b35d6 100644 --- a/MP-TAB3/Components/ProdConfirm.razor +++ b/MP-TAB3/Components/ProdConfirm.razor @@ -122,10 +122,10 @@
Dati Globali ODL
-
+
- [A] NUOVI Pz.Prod + [A] NUOVI Pz.Prod
@if (isProcessing) @@ -139,10 +139,10 @@
-
+
- Pz Prodotti TOT [A+B+C] + Cicli Prod [A+B+C+D]
@if (isProcessing) @@ -156,10 +156,10 @@
-
-
+
+
- [B] Scarti VERS. + [B] Scarti Vers.
@if (isProcessing) @@ -173,10 +173,27 @@
-
+
+
+
+ [C] Rilav Vers. +
+
+ @if (isProcessing) + { + + } + else + { + @numPzRilavConf + } +
+
+
+
- [C] Pz Buoni VERS. + [D] Buoni Vers.
@if (isProcessing) diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs index 218c9f82..bb3363b2 100644 --- a/MP-TAB3/Components/ProdConfirm.razor.cs +++ b/MP-TAB3/Components/ProdConfirm.razor.cs @@ -63,6 +63,7 @@ namespace MP_TAB3.Components { get => confProdActive ? "Nascondi conferma" : "Mostra conferma"; } + protected string ConfTitleIcon { get => confProdActive ? "fa-chevron-up" : "fa-chevron-down"; @@ -105,6 +106,11 @@ namespace MP_TAB3.Components } } + protected int lblCicliRilavorati + { + get => numPzRilav2Rec; + } + protected int lblPz2RecBuoni { get => numPzConfermati - numPzLasciati; @@ -114,10 +120,6 @@ namespace MP_TAB3.Components { get => numPzScarto2Rec; } - protected int lblCicliRilavorati - { - get => 0; - } [Inject] protected MessageService MsgServ { get; set; } = null!; @@ -153,6 +155,8 @@ namespace MP_TAB3.Components protected int numPzProdotti2Rec { get; set; } = 0; + protected int numPzRilavConf{ get; set; } = 0; + protected int numPzRilav2Rec { get; set; } = 0; protected int numPzScaConf { get; set; } = 0; protected int numPzScarto2Rec { get; set; } = 0; @@ -216,9 +220,11 @@ namespace MP_TAB3.Components // aggiorno visualizzazione... numPzProdotti = datiProdAct.PzTotODL; numPz2Rec = datiProdAct.Pz2RecTot; - numPzScaConf = datiProdAct.PzConfScarto; numPzBuoniConf = datiProdAct.PzConfBuoni; + numPzRilavConf = datiProdAct.PzConfRilav; + numPzScaConf = datiProdAct.PzConfScarto; numPzProdotti2Rec = datiProdAct.Pz2RecTot; + numPzRilav2Rec = datiProdAct.Pz2RecRilav; numPzScarto2Rec = datiProdAct.Pz2RecScarto; dtInizio = RecMSE?.DataInizioOdl ?? DateTime.Today.AddMonths(-2); dtFine = dtReqUpdate; diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 8c2cef14..d379504c 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2502.1909 + 6.16.2502.2411 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index c4a1b297..0a610a6b 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2502.1909

+

Versione: 6.16.2502.2411


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 22981e78..503786c9 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2502.1909 +6.16.2502.2411 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 2f12edb0..990d7d7a 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2502.1909 + 6.16.2502.2411 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 diff --git a/MP.Data/DatabaseModels/StatoProdModel.cs b/MP.Data/DatabaseModels/StatoProdModel.cs index 18d6a72d..3f40892f 100644 --- a/MP.Data/DatabaseModels/StatoProdModel.cs +++ b/MP.Data/DatabaseModels/StatoProdModel.cs @@ -22,5 +22,7 @@ namespace MP.Data.DatabaseModels public int Pz2RecScarto { get; set; } = 0; public DateTime DataFrom { get; set; } = DateTime.Now; public DateTime DataTo { get; set; } = DateTime.Now; + public int PzConfRilav { get; set; } = 0; + public int Pz2RecRilav { get; set; } = 0; } }