Merge branch 'Release/FixScrapCountAfterOdl_01'

MP-TAB3/Components/ControlsMan.razor

@@ -1,7 +1,5 @@
 <MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
 
-
-
 <ShowProcessing Message="Caricamento" IsProcessing="@isProcessing"></ShowProcessing>
 <div class="cardObj p-2 mt-2">
     <div class="mb-1 fs-6">
@@ -9,7 +7,7 @@
         {
             @if (RecMSE != null && RecMSE.IdxOdl > 0)
             {
-                <button class="btn btn-primary btn-lg text-light w-100 mb-1" @onclick="ToggleBtn">
+                <button class="btn btn-primary btn-lg text-light w-100 mb-1 fs-2 text-uppercase" @onclick="ToggleBtn">
                     <i class="fa fa-wrench"></i> @ConfTitle
                 </button>
             }
@@ -61,10 +59,10 @@
             {
                 <div class="row my-2">
                     <div class="col-6">
-                        <button class="btn btn-success w-100" @onclick="SaveOk">OK</button>
+                        <button class="btn btn-success w-100 fs-4 fw-bold" @onclick="SaveOk">OK</button>
                     </div>
                     <div class="col-6">
-                        <button class="btn btn-danger w-100" @onclick="ShowKo">KO</button>
+                        <button class="btn btn-danger w-100 fs-4 fw-bold" @onclick="ShowKo">KO</button>
                     </div>
                 </div>
             }

MP-TAB3/Components/OdlMan.razor.cs

@@ -103,7 +103,7 @@ namespace MP_TAB3.Components
         protected MailService MailServ { get; set; } = null!;
 
         [Inject]
-        protected StatusData MDataService { get; set; } = null!;
+        protected StatusData SDService { get; set; } = null!;
 
         [Inject]
         protected MessageService MsgServ { get; set; } = null!;
@@ -259,6 +259,9 @@ namespace MP_TAB3.Components
             if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi di voler annullare il setup ODL in corso, equivalente a registrare solo la fine produzione?"))
                 return;
 
+            // prima di tutto svuoto dati prod
+            SDService.MachProdStRem(IdxMaccSel);
+
             // preparo gestione progress display
             MaxVal = 10;
             isProcessing = true;
@@ -344,6 +347,9 @@ namespace MP_TAB3.Components
             if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi di voler riprendere in carico l'ODL precedente?"))
                 return;
 
+            // prima di tutto svuoto dati prod
+            SDService.MachProdStRem(IdxMaccSel);
+
             MaxVal = 3;
             int currStep = 0;
             await advStep(currStep);
@@ -381,6 +387,9 @@ namespace MP_TAB3.Components
             if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi di voler impostare lo stesso ODL dell'altra tavola?"))
                 return;
 
+            // prima di tutto svuoto dati prod
+            SDService.MachProdStRem(IdxMaccSel);
+
             MaxVal = 3;
             int currStep = 0;
             await advStep(currStep);
@@ -748,6 +757,7 @@ namespace MP_TAB3.Components
             gPeriodReopenOdlTav = SMServ.GetConfInt("gPeriodReopenOdlTav");
             approvTCEnabled = SMServ.GetConfBool("OptAdmApprTempiEnabled");
             string rawEmailDest = SMServ.GetConf("_adminEmail");
+            ShowAll = SMServ.GetConfBool("TAB_ShowAllPOdl");
             emailAdmDest = rawEmailDest.Split(',').ToList();
         }
 
@@ -789,6 +799,10 @@ namespace MP_TAB3.Components
             if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi fine produzione?"))
                 return;
 
+
+            // prima di tutto svuoto dati prod
+            SDService.MachProdStRem(IdxMaccSel);
+
             // preparo gestione progress display
             MaxVal = 7;
             isProcessing = true;
@@ -902,6 +916,9 @@ namespace MP_TAB3.Components
         {
             if (has2Refr)
             {
+                // prima di tutto svuoto dati prod
+                SDService.MachProdStRem(IdxMaccSel);
+
                 // update buttons...
                 checkAll();
                 // reset vari
@@ -919,7 +936,7 @@ namespace MP_TAB3.Components
             // refresh tabella dati tablet...
             RecMSE = null;
             // rileggo e salvo..
-            var ListMSE = await MDataService.MseGetAll(true);
+            var ListMSE = await SDService.MseGetAll(true);
             if (ListMSE != null)
             {
                 // salvo in LocalStorage...

MP-TAB3/MP-TAB3.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2405.2910</Version>
+      <Version>6.16.2405.3016</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>

MP-TAB3/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2405.2910</h4>
+    <h4>Versione: 6.16.2405.3016</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP-TAB3/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2405.2910
+6.16.2405.3016

MP-TAB3/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2405.2910</version>
+  <version>6.16.2405.3016</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

MP.Data/Services/StatusData.cs

@@ -248,6 +248,22 @@ namespace MP.Data.Services
             return answ;
         }
 
+        /// <summary>
+        /// Elimina info numPezzi x macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <returns></returns>
+        public bool MachProdStRem(string idxMacchina)
+        {
+            bool answ = false;
+            if (MachineProdStatus.ContainsKey(idxMacchina))
+            {
+                MachineProdStatus.Remove(idxMacchina);
+            }
+            answ = true;
+            return answ;
+        }
+
         public async Task<List<MappaStatoExpl>> MseGetAll(bool forceDb = false)
         {
             Stopwatch sw = new Stopwatch();