From 9ed8159e351a3bc1ee6b2b3a41a05de18cd2f001 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 11 Apr 2023 16:27:46 +0200
Subject: [PATCH] SPEC: - Fix clone PODL, inclusione recipe

---
 MP.Data/Controllers/MpSpecController.cs | 16 ----------------
 MP.Data/Utils.cs                        |  6 ++++--
 MP.SPEC/Components/ListPODL.razor.cs    |  1 -
 MP.SPEC/MP.SPEC.csproj                  |  2 +-
 MP.SPEC/Resources/ChangeLog.html        |  2 +-
 MP.SPEC/Resources/VersNum.txt           |  2 +-
 MP.SPEC/Resources/manifest.xml          |  2 +-
 7 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index d7fc8f9f..f650bd96 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -637,24 +637,8 @@ namespace MP.Data.Controllers
                             .DbSetODLExp
                             .FromSqlRaw("EXEC stp_ODL_getByFiltSpec @InCorso, @CodArt, @KeyRich, @CodGruppo, @IdxMacchina, @DataFrom, @DataTo", InCorso, CodArt, KeyRich, CodGruppo, IdxMacc, DataFrom, DataTo)
                             .AsNoTracking()
-                            //.AsEnumerable()
                             .ToList();
 
-#if false
-                dbResult = dbCtx
-                        .DbSetODL
-                        .Where(x => ((inCorso && x.DataFine == null) || ((!inCorso && x.DataFine != null)
-                            && x.DataInizio >= startDate && x.DataInizio <= endDate))
-                            && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*")
-                            //&& (x.MachineNav.Contains(IdxMacchina) || Reparto == "*")
-                            && (x.IdxMacchina.Contains(IdxMacchina) || IdxMacchina == "*")
-                            && (codArt == "*" || x.CodArticolo.Contains(codArt)))
-                        .AsNoTracking()
-                        .Include(m => m.MachineNav)
-                        .Include(a => a.ArticoloNav)
-                        .OrderByDescending(x => x.IdxOdl)
-                        .ToList();
-#endif
             }
             return dbResult;
         }
diff --git a/MP.Data/Utils.cs b/MP.Data/Utils.cs
index 22baa93a..fd0a841b 100644
--- a/MP.Data/Utils.cs
+++ b/MP.Data/Utils.cs
@@ -180,7 +180,8 @@ namespace MP.Data
                     NumPezzi = selRec.NumPezzi,
                     Priorita = selRec.Priorita,
                     PzPallet = selRec.PzPallet,
-                    Tcassegnato = selRec.Tcassegnato
+                    Tcassegnato = selRec.Tcassegnato,
+                    Recipe = selRec.Recipe
                 };
                 return newRec;
             }
@@ -210,7 +211,8 @@ namespace MP.Data
                     NumPezzi = selRec.NumPezzi,
                     Priorita = selRec.Priorita,
                     PzPallet = selRec.PzPallet,
-                    Tcassegnato = selRec.Tcassegnato
+                    Tcassegnato = selRec.Tcassegnato,
+                    Recipe = selRec.Recipe
                 };
                 return newRec;
             }
diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs
index 28e8626e..b46cc52e 100644
--- a/MP.SPEC/Components/ListPODL.razor.cs
+++ b/MP.SPEC/Components/ListPODL.razor.cs
@@ -148,7 +148,6 @@ namespace MP.SPEC.Components
             await InvokeAsync(() =>
             {
                 PagerResetReq.InvokeAsync(true);
-                //currPage = 1;
                 Task task = UpdateData();
                 StateHasChanged();
             });
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index df89cb15..69e3de89 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2304.609</Version>
+    <Version>6.16.2304.1116</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 92fb0fde..7ae7fd87 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2304.609</h4>
+    <h4>Versione: 6.16.2304.1116</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 1d7042fe..e00dbeb0 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2304.609
+6.16.2304.1116
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 8a42876a..0191be95 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2304.609</version>
+  <version>6.16.2304.1116</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>