-
-
[A] NUOVI Pz.Prod
+@if (!confProdActive)
+{
+
+
+ Dati Globali ODL
+
+
+
+
+ [A] NUOVI Pz.Prod
+
+
+ @if (isProcessing)
+ {
+
+ }
+ else
+ {
+ @numPzProdotti2Rec
+ }
+
-
- @if (isProcessing)
- {
-
- }
- else
- {
- @numPzProdotti2Rec
- }
+
+
+
+
+ Pz Prodotti TOT [A+B+C]
+
+
+ @if (isProcessing)
+ {
+
+ }
+ else
+ {
+ @numPzProdotti
+ }
+
+
+
+
+
+
+ [B] Scarti VERS.
+
+
+ @if (isProcessing)
+ {
+
+ }
+ else
+ {
+ @numPzScaConf
+ }
+
+
+
+
+
+
+ [C] Pz Buoni VERS.
+
+
+ @if (isProcessing)
+ {
+
+ }
+ else
+ {
+ @numPzBuoniConf
+ }
+
-
-
-
- Pz Prodotti TOT [A+B+C]
-
-
- @if (isProcessing)
- {
-
- }
- else
- {
- @numPzProdotti
- }
-
-
-
-
-
-
- [B] Scarti VERS.
-
-
- @if (isProcessing)
- {
-
- }
- else
- {
- @numPzScaConf
- }
-
-
-
-
-
-
- [C] Pz Buoni VERS.
-
-
- @if (isProcessing)
- {
-
- }
- else
- {
- @numPzBuoniConf
- }
-
-
-
-
-
+}
@if (!string.IsNullOrEmpty(lblOut))
{
@@ -183,4 +184,8 @@
}
-
\ No newline at end of file
+
+@if (!confProdActive)
+{
+
+}
\ No newline at end of file
diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs
index e8369421..a8746515 100644
--- a/MP-TAB3/Components/ProdConfirm.razor.cs
+++ b/MP-TAB3/Components/ProdConfirm.razor.cs
@@ -38,7 +38,20 @@ namespace MP_TAB3.Components
}
[Parameter]
- public MappaStatoExpl? RecMSE { get; set; } = null;
+ public MappaStatoExpl? RecMSE
+ {
+ get => currRecMSE;
+ set
+ {
+ // salvo SOLO SE non sono in conferma
+ if (!confProdActive)
+ {
+ currRecMSE = value;
+ }
+ }
+ }
+
+ private MappaStatoExpl? currRecMSE { get; set; } = null;
#endregion Public Properties
@@ -46,16 +59,17 @@ namespace MP_TAB3.Components
protected string ConfBg
{
- get => showInnov ? "bg-warning text-dark" : "bg-success text-light";
+ get => confProdActive ? "bg-warning text-dark" : "bg-success text-light";
+ }
+
+ protected string ConfCssWidth
+ {
+ get => enableMagPrint ? "col-6" : "col-12";
}
protected string ConfTitle
{
- get => showInnov ? "Nascondi conferma" : "Mostra conferma";
- }
- protected string ConfCssWidth
- {
- get => enableMagPrint ? "col-6" : "col-12";
+ get => confProdActive ? "Nascondi conferma" : "Mostra conferma";
}
///
@@ -163,9 +177,12 @@ namespace MP_TAB3.Components
protected override async Task OnParametersSetAsync()
{
lblOut = "";
- numPzLasciati = 0;
if (RecMSE != null && string.IsNullOrEmpty(IdxMaccSel))
{
+ if (!confProdActive)
+ {
+ numPzLasciati = 0;
+ }
// verifico SE fosse doppia...
bool isMulti = false;
// verifico se la macchina sia configurata tra le MSFD...
@@ -206,8 +223,9 @@ namespace MP_TAB3.Components
// mostro output
lblOut = $"Confermata produzione {numPzConfermati - numPzLasciati} pezzi (+{numPzLasciati} pz lasciati, +{numPzScarto2Rec} pz scarto) |{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}";
// cambio button conferma...
- showInnov = false;
+ confProdActive = false;
numPzLasciati = 0;
+ dtReqUpdate = DateTime.Now;
await DoUpdate();
await Task.Delay(1);
await RefreshData();
@@ -235,7 +253,11 @@ namespace MP_TAB3.Components
///
protected async Task ToggleConfProd()
{
- showInnov = !showInnov;
+ confProdActive = !confProdActive;
+ if (confProdActive)
+ {
+ numPzLasc = 0;
+ }
dtReqUpdate = DateTime.Now;
await DoUpdate();
StateHasChanged();
@@ -245,12 +267,11 @@ namespace MP_TAB3.Components
#region Private Fields
+ private bool chkPzBuoniNeg = false;
private bool confRett = false;
- private bool enablePzProdLasciati = false;
private bool enableMagPrint = false;
- private bool chkPzBuoniNeg = false;
-
+ private bool enablePzProdLasciati = false;
private string lblOut = "";
private int modoConfProd = 0;
@@ -274,7 +295,7 @@ namespace MP_TAB3.Components
private bool showConfirm { get; set; } = true;
- private bool showInnov { get; set; } = false;
+ private bool confProdActive { get; set; } = false;
#endregion Private Properties
@@ -307,7 +328,5 @@ namespace MP_TAB3.Components
}
#endregion Private Methods
-
-
}
}
\ No newline at end of file
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 1ac9e97c..72ec7ae5 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2312.1908
+ 6.16.2312.1915
enable
MP_TAB3
diff --git a/MP-TAB3/Pages/MachineDetail.razor b/MP-TAB3/Pages/MachineDetail.razor
index a068cce3..86ccbfec 100644
--- a/MP-TAB3/Pages/MachineDetail.razor
+++ b/MP-TAB3/Pages/MachineDetail.razor
@@ -11,5 +11,4 @@ else
-
}
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 1d695333..8412ba83 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
-
Versione: 6.16.2312.1908
+
Versione: 6.16.2312.1915
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index d393ad2f..83057c07 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1908
+6.16.2312.1915
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index f3cd9ff7..cc4429f6 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2312.1908
+ 6.16.2312.1915
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