diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor index f200bbbf..3b724a16 100644 --- a/MP-TAB3/Components/ProdConfirm.razor +++ b/MP-TAB3/Components/ProdConfirm.razor @@ -14,7 +14,7 @@ @if (odlOk) {
-
@@ -80,90 +80,99 @@ {
-
-
-
Pz CONFERMATI (prod. tot.)
-
- -
+ @if (isProcessing) + { +
+
-
- @if (enablePzProdLasciati) - { -
Pz LASCIATI (prodotti)
-
- + } + else + { +
+
+
Pz CONFERMATI (prod. tot.)
+
+
- } - else - { - - } -
-
-
-
-
-
- @if (lblPz2RecBuoni > 0) - { - Pz Buoni - @lblPz2RecBuoni - } - else - { - Pz Buoni - @lblPz2RecBuoni - } -
-
- @if (lblPz2RecScarto > 0) - { - Pz scarto - @lblPz2RecScarto - } - else - { - Pz scarto - @lblPz2RecScarto - } -
-
- @if (lblCicliRilavorati > 0) - { - Cicli Rilav. - @lblCicliRilavorati - } - else - { - Cicli Rilav. - @lblCicliRilavorati - } -
-
-
- @($"{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}")
- @if (showConfirm && lblPz2RecBuoni >= 0) + @if (enablePzProdLasciati) { - - } - else if (showConfirm && lblPz2RecBuoni < 0 && !chkPzBuoniNeg) - { - - } - else if (showConfirm && lblPz2RecBuoni < 0 && chkPzBuoniNeg) - { -
Pezzi buoni negativi!
+
Pz LASCIATI (prodotti)
+
+ +
} else { - Completare le modifiche! + }
-
+
+
+
+
+ @if (lblPz2RecBuoni > 0) + { + Pz Buoni + @lblPz2RecBuoni + } + else + { + Pz Buoni + @lblPz2RecBuoni + } +
+
+ @if (lblPz2RecScarto > 0) + { + Pz scarto + @lblPz2RecScarto + } + else + { + Pz scarto + @lblPz2RecScarto + } +
+
+ @if (lblCicliRilavorati > 0) + { + Cicli Rilav. + @lblCicliRilavorati + } + else + { + Cicli Rilav. + @lblCicliRilavorati + } +
+
+
+ @($"{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}") +
+
+ @if (showConfirm && lblPz2RecBuoni >= 0) + { + + } + else if (showConfirm && lblPz2RecBuoni < 0 && !chkPzBuoniNeg) + { + + } + else if (showConfirm && lblPz2RecBuoni < 0 && chkPzBuoniNeg) + { +
Pezzi buoni negativi!
+ } + else + { + Completare le modifiche! + } +
+
+
+ }
} @@ -181,7 +190,7 @@
@if (isProcessing) { - + } else { @@ -198,7 +207,7 @@
@if (isProcessing) { - + } else { @@ -215,7 +224,7 @@
@if (isProcessing) { - + } else { @@ -232,7 +241,7 @@
@if (isProcessing) { - + } else { @@ -249,7 +258,7 @@
@if (isProcessing) { - + } else { diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index aada4a8b..afb98d99 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2506.3014 + 6.16.2507.113 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 8d295a3e..9b2b4419 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2506.3014

+

Versione: 6.16.2507.113


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index a612c160..83a85ff0 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2506.3014 +6.16.2507.113 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 0cf708bf..6521df99 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2506.3014 + 6.16.2507.113 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/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs index 028a0fcf..bd2eb46d 100644 --- a/MP.Data/Controllers/MpTabController.cs +++ b/MP.Data/Controllers/MpTabController.cs @@ -1,8 +1,8 @@ using Microsoft.Data.SqlClient; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; -using MP.Data.DbModels; using MP.Core.Objects; +using MP.Data.DbModels; using NLog; using System; using System.Collections.Generic; @@ -10,8 +10,6 @@ using System.Data; using System.Linq; using System.Threading.Tasks; using static MP.Core.Objects.Enums; -using System.Drawing.Drawing2D; -using ZXing; namespace MP.Data.Controllers {