Merge branch 'Release/UpdateGestOdlPodl'

Fix x test gesiotne ODL (manca vera gestione SE ODL aperto)

MP.Data/Controllers/MpSpecController.cs

@@ -741,6 +741,47 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
+        /// <summary>
+        /// Recupero Odl CORRENTE x macchina (SE c'è)
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <returns></returns>
+        public ODLModel OdlGetCurrentByMacc(string idxMacchina)
+        {
+            ODLModel dbResult = new ODLModel();
+
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                            .DbSetODL
+                            .FirstOrDefault(x => x.IdxMacchina == idxMacchina && x.DataInizio != null && x.DataFine == null);
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Statistiche ODL calcolate (da stored stp_STAT_ODL)
+        /// </summary>
+        /// <returns></returns>
+        public async Task<List<StatODLModel>> OdlStart(int IdxOdl)
+        {
+            List<StatODLModel> dbResult = new List<StatODLModel>();
+            if (IdxOdl > 0)
+            {
+                using (var dbCtx = new MoonProContext(_configuration))
+                {
+                    var IdxODL = new SqlParameter("@IdxODL", IdxOdl);
+
+                    dbResult = await dbCtx
+                        .DbSetStatOdl
+                        .FromSqlRaw("EXEC stp_STAT_ODL @IdxODL", IdxODL)
+                        .AsNoTracking()
+                        .ToListAsync();
+                }
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Elenco parametri validi x una data macchina
         /// </summary>
@@ -762,6 +803,33 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
+        /// <summary>
+        /// Recupero PODL da chiave
+        /// </summary>
+        /// <param name="idxPODL"></param>
+        /// <returns></returns>
+        public async Task<PODLModel> PODL_getByKey(int idxPODL)
+        {
+            PODLModel dbResult = new PODLModel();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    dbResult = dbCtx
+                                    .DbSetPODL
+                                    .AsNoTracking()
+                                    .Where(x => x.IdxPromessa == idxPODL)
+                                    .FirstOrDefault();
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante PODL_getByKey{Environment.NewLine}{exc}");
+                }
+            }
+            await Task.Delay(1);
+            return dbResult;
+        }
+
         /// <summary>
         /// Avvio setup ODL da PODL
         /// </summary>
@@ -771,17 +839,19 @@ namespace MP.Data.Controllers
         /// <param name="pzPallet"></param>
         /// <param name="note"></param>
         /// <returns></returns>
-        public async Task<ODLModel> PODL_startSetup(PODLModel editRec, int matrOpr, double tcRich, int pzPallet, string note)
+        public async Task<bool> PODL_startSetup(PODLModel editRec, int matrOpr, double tcRich, int pzPallet, string note)
         {
-            ODLModel dbResult = new ODLModel();
+            bool answ = false;
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 try
                 {
                     var currRec = dbCtx
                                     .DbSetPODL
+                                    .AsNoTracking()
                                     .Where(x => x.IdxPromessa == editRec.IdxPromessa)
                                     .FirstOrDefault();
+
                     if (currRec != null)
                     {
                         // eseguo stored attrezzaggio
@@ -793,13 +863,9 @@ namespace MP.Data.Controllers
                         var Note = new SqlParameter("@Note", note);
                         var callResult = await dbCtx
                                         .Database
-                                        .ExecuteSqlRawAsync("EXEC stp_ODL_inizioSetupPromessa @idxPromessa, @MatrOpr, @IdxMacchina @TCRichAttr, @PzPallet, @Note", IdxPromessa, MatrOpr, IdxMacchina, TCRichAttr, PzPallet, Note);
+                                        .ExecuteSqlRawAsync("EXEC stp_ODL_inizioSetupPromessa @idxPromessa, @MatrOpr, @IdxMacchina, @TCRichAttr, @PzPallet, @Note", IdxPromessa, MatrOpr, IdxMacchina, TCRichAttr, PzPallet, Note);
 
-                        // recupero info su ODL corrente
-                        dbResult = await dbCtx
-                                        .DbSetODL
-                                        .Where(x => x.IdxMacchina == editRec.IdxMacchina && x.DataInizio != null && x.DataFine == null)
-                                        .FirstOrDefaultAsync();
+                        answ = true;
                     }
                 }
                 catch (Exception exc)
@@ -808,7 +874,7 @@ namespace MP.Data.Controllers
                 }
             }
             await Task.Delay(1);
-            return dbResult;
+            return answ;
         }
 
         /// <summary>
@@ -911,29 +977,6 @@ namespace MP.Data.Controllers
             return answ;
         }
 
-        /// <summary>
-        /// Statistiche ODL calcolate (da stored stp_STAT_ODL)
-        /// </summary>
-        /// <returns></returns>
-        public async Task<List<StatODLModel>> StatOdl(int IdxOdl)
-        {
-            List<StatODLModel> dbResult = new List<StatODLModel>();
-            if (IdxOdl > 0)
-            {
-                using (var dbCtx = new MoonProContext(_configuration))
-                {
-                    var IdxODL = new SqlParameter("@IdxODL", IdxOdl);
-
-                    dbResult = await dbCtx
-                        .DbSetStatOdl
-                        .FromSqlRaw("EXEC stp_STAT_ODL @IdxODL", IdxODL)
-                        .AsNoTracking()
-                        .ToListAsync();
-                }
-            }
-            return dbResult;
-        }
-
         /// <summary>
         /// Stato prod macchina
         /// </summary>

MP.SPEC/Components/ListODL.razor.cs

@@ -90,6 +90,9 @@ namespace MP.SPEC.Components
         /// <returns></returns>
         protected async Task chiudiOdl()
         {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sei sicuro di voler chiudere l'ODL corrente?"))
+                return;
+
             if (currRecord != null)
             {
                 // effettua chiusura sul DB

MP.SPEC/Components/ListPODL.razor.cs

@@ -144,6 +144,9 @@ namespace MP.SPEC.Components
 
         protected async Task startOdl(PODLModel selRec)
         {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sei sicuro di voler avviare PODL selezionato?"))
+                return;
+
             if (selRec != null)
             {
                 int idxEvento = 0;
@@ -154,9 +157,12 @@ namespace MP.SPEC.Components
                     await callStartSetup(selRec.IdxMacchina);
                     await Task.Delay(1);
                     // chiamo stored stp_ODL_inizioSetupPromessa e recupero ODL corrente
-                    var newOdl = await MDService.POdlDoSetup(selRec);
-                    if (newOdl != null)
+                    bool fatto = await MDService.POdlDoSetup(selRec);
+                    if (fatto)
                     {
+                        var currPOdl = await MDService.PODL_getByKey(selRec.IdxPromessa);
+                        var newOdl = await MDService.OdlGetByKey(currPOdl.IdxOdl);
+
                         // registro evento...
                         idxEvento = 2;
                         evMess = $"Inizio Setup | PODL {selRec.IdxPromessa}";
@@ -244,7 +250,13 @@ namespace MP.SPEC.Components
         {
             // compongo URL e chiamo
             string restUrl = $"IOB/addTask2Exe/{idxMacc}?taskName={taskName}&taskVal={taskVal}";
-            var response = await MpIoApiCall.callMpIoUrlGet(restUrl);
+            try
+            {
+                var response = await MpIoApiCall.callMpIoUrlGet(restUrl);
+            }
+            catch(Exception exc)
+            {
+            }
         }
 
         /// <summary>
@@ -292,8 +304,8 @@ namespace MP.SPEC.Components
         /// <returns></returns>
         private bool canStartOdl(string idxMacchina)
         {
-            // fare!!!
-            bool answ = idxMacchina.Contains("BAG");
+            var currOdl = MDService.OdlGetCurrentByMacc(idxMacchina);
+            bool answ = currOdl == null;
             return answ;
         }
 
@@ -326,7 +338,10 @@ namespace MP.SPEC.Components
             if (string.IsNullOrEmpty(codArticolo))
             {
                 var currOdl = await MDService.OdlGetByKey(idxODL);
-                codArticolo = currOdl.CodArticolo;
+                if (currOdl != null)
+                {
+                    codArticolo = currOdl.CodArticolo;
+                }
             }
 
             // scrivo evento scriviRigaEventoBarcode

MP.SPEC/Data/MpDataService.cs

@@ -664,6 +664,18 @@ namespace MP.SPEC.Data
             return dbResult;
         }
 
+        /// <summary>
+        /// ODL corrente x macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <returns></returns>
+        public ODLModel OdlGetCurrentByMacc(string idxMacchina)
+        {
+            // cache REDIS...
+            var dbResult = dbController.OdlGetCurrentByMacc(idxMacchina);
+            return dbResult;
+        }
+
         /// <summary>
         /// Elenco di tutti i parametri filtrati x macchina
         /// </summary>
@@ -700,6 +712,16 @@ namespace MP.SPEC.Data
             return result;
         }
 
+        /// <summary>
+        /// Recupero PODL da chiave
+        /// </summary>
+        /// <param name="idxPODL"></param>
+        /// <returns></returns>
+        public async Task<PODLModel> PODL_getByKey(int idxPODL)
+        {
+            return await dbController.PODL_getByKey(idxPODL);
+        }
+
         /// <summary>
         /// Eliminazione record selezionato
         /// </summary>
@@ -715,7 +737,7 @@ namespace MP.SPEC.Data
         /// </summary>
         /// <param name="currRec"></param>
         /// <returns></returns>
-        public async Task<ODLModel> POdlDoSetup(PODLModel currRec)
+        public async Task<bool> POdlDoSetup(PODLModel currRec)
         {
             return await dbController.PODL_startSetup(currRec, 0, 1, 1, "");
         }
@@ -736,7 +758,7 @@ namespace MP.SPEC.Data
         /// <returns></returns>
         public Task<List<StatODLModel>> StatOdl(int IdxOdl)
         {
-            return dbController.StatOdl(IdxOdl);
+            return dbController.OdlStart(IdxOdl);
         }
 
         public async Task<bool> updateDossierValue(Dossiers currDoss, FluxLogDTO editFL)

MP.SPEC/MP.SPEC.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2210.1808</Version>
+    <Version>6.16.2210.1809</Version>
   </PropertyGroup>
 
   <ItemGroup>

MP.SPEC/Resources/ChangeLog.html

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

MP.SPEC/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2210.1808
+6.16.2210.1809

MP.SPEC/Resources/manifest.xml

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