diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index 04a957c6..67a70b1e 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -214,6 +214,17 @@ else } + else + { +
+
+ Da Confermare +
+
+ @($"{datiProdAct.Pz2RecTot}") +
+
+ } @if (NumScartiConf > 0) {
diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs index 187adf45..8e9e633a 100644 --- a/MP-TAB3/Components/MachineBlock.razor.cs +++ b/MP-TAB3/Components/MachineBlock.razor.cs @@ -267,7 +267,7 @@ namespace MP_TAB3.Components // controllo SE ho variazioni cosė rileggo if (RecMSE != null) { - if (SDService.MachNumPzGet(RecMSE.IdxMacchina) != RecMSE.PezziProd || SDService.MachProdStGet(RecMSE.IdxMacchina).IdxOdl != RecMSE.IdxOdl) + if (SDService.MachNumPzGet(RecMSE.IdxMacchina) != RecMSE.PezziProd || SDService.MachProdStGet(RecMSE.IdxMacchina).IdxOdl != RecMSE.IdxOdl || (datiProdAct != null && datiProdAct.PzTotODL != RecMSE.PezziProd)) { datiProdAct = await TabDServ.StatoProdMacchina(RecMSE.IdxMacchina, adesso); SDService.MachProdStSet(RecMSE.IdxMacchina, datiProdAct); diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor index 51121c8d..f7518c93 100644 --- a/MP-TAB3/Components/ProdConfirm.razor +++ b/MP-TAB3/Components/ProdConfirm.razor @@ -122,27 +122,10 @@
Dati Globali ODL
-
-
-
- [A] NUOVI Pz.Prod -
-
- @if (isProcessing) - { - - } - else - { - @numPzProdotti2Rec - } -
-
-
- Cicli Prod [A+B+C+D] + Cicli Prod (ABCD)
@if (isProcessing) @@ -156,6 +139,23 @@
+
+
+
+ [A] Da Conf. +
+
+ @if (isProcessing) + { + + } + else + { + @numPzProdotti2Rec + } +
+
+
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index c9e8940b..b5bb274f 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2502.2107 - 6.16.2502.2107 + 6.16.2502.2416 + 6.16.2502.2416 true $(NoWarn);1591 en diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index d616213b..0dd73f73 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

Versione: 6.16.2502.2107

+

Versione: 6.16.2502.2416


Note di rilascio:
    diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index c018d67c..c58908f5 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2502.2107 +6.16.2502.2416 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index e631238e..46c2d7d9 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2502.2107 + 6.16.2502.2416 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false diff --git a/MP.Stats/appsettings.Production.json b/MP.Stats/appsettings.Production.json index 7a46be05..c5617311 100644 --- a/MP.Stats/appsettings.Production.json +++ b/MP.Stats/appsettings.Production.json @@ -11,6 +11,7 @@ "ConnectionStrings": { "Redis": "localhost:6379,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true", "DefaultConnection": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true", - "MP.Stats": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;" + "MP.Stats": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;", + "MP.Voc": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;" } } \ No newline at end of file diff --git a/MP.Stats/appsettings.Staging.json b/MP.Stats/appsettings.Staging.json index b8276080..a5aa627f 100644 --- a/MP.Stats/appsettings.Staging.json +++ b/MP.Stats/appsettings.Staging.json @@ -7,8 +7,9 @@ } }, "AllowedHosts": "*", - "ConnectionStrings": { - "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true", - "MP.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;" - } + "ConnectionStrings": { + "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true", + "MP.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;", + "MP.Voc": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;" + } } \ No newline at end of file