Merge branch 'Release/SpecFixClonePOdl'

2023-04-11 16:32:30 +02:00
parent 0118f6eb0f 9ed8159e35
commit da2c382452
7 changed files with 8 additions and 23 deletions
@@ -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;
        }
@@ -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;
            }
@@ -148,7 +148,6 @@ namespace MP.SPEC.Components
            await InvokeAsync(() =>
            {
                PagerResetReq.InvokeAsync(true);
-                //currPage = 1;
                Task task = UpdateData();
                StateHasChanged();
            });
@@ -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>
@@ -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>
@@ -1 +1 @@
-6.16.2304.609
+6.16.2304.1116
@@ -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>