diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index c1e19ff9..11a0cd91 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -94,7 +94,6 @@ else } else { -
@@ -106,24 +105,26 @@ else
@if (showCard) { -
- @*
*@ -
-
-
- @($"{RecMSE.PezziConf}") +
+
+
+
+  @($"{RecMSE.PezziConf}") +
+ @if (datiProdAct != null && datiProdAct.PzConfScarto > 0) + { +
+
+ @($"(- {datiProdAct.PzConfScarto})") +
+
+ }
-
- @if (datiProdAct != null && datiProdAct.PzConfScarto > 0) - { - @($"(- {datiProdAct.PzConfScarto})") - } -
- @*
*@ -
-
-
@($"{RecMSE.PezziProd}")
+
+
+  @($"{RecMSE.PezziProd}") +
@@ -158,10 +159,13 @@ else
-
-
-
-   @($"{RecMSE.PezziConf}") +
+ Pz.Confermati + +
+
+
+ @($"{RecMSE.PezziConf}")
@if (datiProdAct != null && datiProdAct.PzConfScarto > 0) @@ -172,13 +176,22 @@ else
-
+
+ Pz.Prodotti + +
@($"{RecMSE.PezziProd}")
-
-
-
@($"{RecMSE.extraVal}")
-
+ @if (RecMSE.extraVal > 0) + { +
+
+ Extra + +
+
@($"{RecMSE.extraVal}")
+
+ }
diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs index 9251f62b..c129bc10 100644 --- a/MP-TAB3/Components/MachineBlock.razor.cs +++ b/MP-TAB3/Components/MachineBlock.razor.cs @@ -175,14 +175,14 @@ namespace MP_TAB3.Components { DateTime adesso = DateTime.Now; isLoading = RecMSE == null; - // controllo SE avessi idxMacchSub --> rileggo! + // controllo SE ho variazioni cosė rileggo if (RecMSE != null) { - if (SDService.MachNumPzGet(RecMSE.IdxMacchina) != RecMSE.NumPezzi) + if (SDService.MachNumPzGet(RecMSE.IdxMacchina) != RecMSE.PezziProd) { datiProdAct = await TabDServ.StatoProdMacchina(RecMSE.IdxMacchina, adesso); SDService.MachProdStSet(RecMSE.IdxMacchina, datiProdAct); - SDService.MachNumPzSet(RecMSE.IdxMacchina, RecMSE.NumPezzi); + SDService.MachNumPzSet(RecMSE.IdxMacchina, RecMSE.PezziProd); } else { @@ -207,6 +207,11 @@ namespace MP_TAB3.Components if (RecMSE.PezziConf > 0) { innerCircleVals.Add(new CircleGaugeMulti.CircSegm() { Color = "#198754", Value = RecMSE.PezziConf }); + // se ho scarti aggiungo all'inizio + if (datiProdAct != null && datiProdAct.PzConfScarto > 0) + { + innerCircleVals.Add(new CircleGaugeMulti.CircSegm() { Color = "#CD1916", Value = datiProdAct.PzConfScarto }); + } } if (RecMSE.extraVal > 0) { diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs index 7fe2096d..df4b4d22 100644 --- a/MP-TAB3/Components/ProdConfirm.razor.cs +++ b/MP-TAB3/Components/ProdConfirm.razor.cs @@ -76,15 +76,11 @@ namespace MP_TAB3.Components get => numPzConfermati - numPzLasciati; } - //protected int lblPzBuo2Rec { get; set; } = 0; protected int lblPz2RecScarto { get => numPzScarto2Rec; } - [Inject] - protected StatusData MDataService { get; set; } = null!; - [Inject] protected MessageService MsgServ { get; set; } = null!; @@ -131,6 +127,9 @@ namespace MP_TAB3.Components get => (RecMSE != null && RecMSE.IdxOdl > 0); } + [Inject] + protected StatusData SDService { get; set; } = null!; + [Inject] protected SharedMemService SMServ { get; set; } = null!; @@ -210,7 +209,7 @@ namespace MP_TAB3.Components // refresh tabella dati tablet... await TabDServ.RicalcMse(IdxMaccSel, 0); // rileggo e salvo.. - var ListMSE = await MDataService.MseGetAll(true); + var ListMSE = await SDService.MseGetAll(true); if (ListMSE != null) { // salvo in LocalStorage... @@ -224,6 +223,8 @@ namespace MP_TAB3.Components confProdActive = false; numPzLasciati = 0; dtReqUpdate = DateTime.Now; + // azzero cache pezzi conf + SDService.MachNumPzSet(IdxMaccSel, -1); await DoUpdate(); await Task.Delay(1); await RefreshData(); @@ -318,7 +319,7 @@ namespace MP_TAB3.Components private async Task RefreshData() { - List ListMSE = await MDataService.MseGetAll(true); + List ListMSE = await SDService.MseGetAll(true); await MsgServ.SaveMse(ListMSE); await E_Updated.InvokeAsync(ListMSE); } diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 56bca35d..644f2716 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2401.817 + 6.16.2401.820 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 6795892e..fbef759e 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2401.817

+

Versione: 6.16.2401.820


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 4a3d088b..6b4cf5ee 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2401.817 +6.16.2401.820 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index dbbf728a..184126ca 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2401.817 + 6.16.2401.820 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