From 19b6cc5be6ed25a53ba747013bee00271b157b54 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Mon, 12 Dec 2022 18:20:51 +0100
Subject: [PATCH] inizio fix controllo x letto ext

---
 MP.Data/DatabaseModels/AnagLottiArca.cs     |  4 ++--
 MP.INVE/Components/InveSessionList.razor    |  2 +-
 MP.INVE/Components/InveSessionList.razor.cs |  4 ++--
 MP.INVE/Components/ProcSuggestion.razor.cs  | 19 +++++++++++--------
 MP.INVE/Data/MiDataService.cs               |  4 ++--
 MP.INVE/MP.INVE.csproj                      |  2 +-
 MP.INVE/Pages/Acquisizione.razor.cs         |  4 ++--
 MP.INVE/Resources/ChangeLog.html            |  2 +-
 MP.INVE/Resources/VersNum.txt               |  2 +-
 MP.INVE/Resources/manifest.xml              |  2 +-
 10 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/MP.Data/DatabaseModels/AnagLottiArca.cs b/MP.Data/DatabaseModels/AnagLottiArca.cs
index ca93f08a..e4440669 100644
--- a/MP.Data/DatabaseModels/AnagLottiArca.cs
+++ b/MP.Data/DatabaseModels/AnagLottiArca.cs
@@ -19,8 +19,8 @@ namespace MP.Data.DatabaseModels
         public string Cd_MGUbicazione { get; set; }
         public string Cd_ARLotto { get; set; }
         public string Cd_DoSottoCommessa { get; set; }
-        public decimal Quantita { get; set; }
-        public decimal Valore { get; set; }
+        public string Quantita { get; set; }
+        public string Valore { get; set; }
         public string IniQ { get; set; }
         public string IniV { get; set; }
         public string RetQ { get; set; }
diff --git a/MP.INVE/Components/InveSessionList.razor b/MP.INVE/Components/InveSessionList.razor
index c50b06f4..8c065481 100644
--- a/MP.INVE/Components/InveSessionList.razor
+++ b/MP.INVE/Components/InveSessionList.razor
@@ -94,7 +94,7 @@
                     {
                         <td>
                             <!-- Button trigger modal -->
-                            <button type="button" class="btn btn-dark" data-bs-toggle="modal" data-bs-target="#exampleModal" @onclick="()=> getCurrSess(item.InveSessID, item.AnagMagNav.MagID)" title="Apri qr per connettersi alla sessione">
+                            <button type="button" class="btn btn-dark" data-bs-toggle="modal" data-bs-target="#exampleModal" @onclick="()=> getCurrSess(item.InveSessID, item.AnagMagNav.CodMag)" title="Apri qr per connettersi alla sessione">
                                 <i class="fa-solid fa-qrcode"></i>
                             </button>
                         </td>
diff --git a/MP.INVE/Components/InveSessionList.razor.cs b/MP.INVE/Components/InveSessionList.razor.cs
index edf3bbdb..f4761bdd 100644
--- a/MP.INVE/Components/InveSessionList.razor.cs
+++ b/MP.INVE/Components/InveSessionList.razor.cs
@@ -111,7 +111,7 @@ namespace MP.INVE.Components
             }
         }
 
-        protected async Task getCurrSess(int idSess, int idMag)
+        protected async Task getCurrSess(int idSess, string idMag)
         {
             currIdSess = idSess;
             currIdMag = idMag;
@@ -190,7 +190,7 @@ namespace MP.INVE.Components
         [Parameter]
         public int currIdSess { get; set; }
         [Parameter]
-        public int currIdMag { get; set; }
+        public string currIdMag { get; set; }
 
         [Inject]
         private MiDataService MIDataservice { get; set; } = null!;
diff --git a/MP.INVE/Components/ProcSuggestion.razor.cs b/MP.INVE/Components/ProcSuggestion.razor.cs
index 10628f25..a9d96e13 100644
--- a/MP.INVE/Components/ProcSuggestion.razor.cs
+++ b/MP.INVE/Components/ProcSuggestion.razor.cs
@@ -35,7 +35,7 @@ namespace MP.INVE.Components
         [Parameter]
         public int sessID { get; set; } = 0;
         [Parameter]
-        public int magID { get; set; } = 0;
+        public string magID { get; set; } = "";
         [Inject]
         public IJSRuntime JSRuntime { get; set; } = null!;
         [Inject]
@@ -120,8 +120,16 @@ namespace MP.INVE.Components
                     }
                     else
                     {
-                        searchRecordsLottoInterni = MIService.ElencoLotti();
-                        lottoInterno = searchRecordsLottoInterni.Where(x => x.Lotto == lastScan).FirstOrDefault();
+                        if (lastScan.StartsWith("M") && lastScan.Length == 10)
+                        {
+                            searchRecordsLottoInterni = MIService.ElencoLotti();
+                            lottoInterno = searchRecordsLottoInterni.Where(x => (x.Lotto == lastScan) && x.Origine == "INT").FirstOrDefault();
+                        }
+                        else
+                        {
+                            searchRecordsLottoEsterni = MIService.ListLottiEsterni(articoloScan, lastScan, magID);
+                            lottoEsterno = searchRecordsLottoEsterni.FirstOrDefault();
+                        }
                         if (lottoInterno != null)
                         {
                             tipo = "LOTTO";
@@ -132,14 +140,9 @@ namespace MP.INVE.Components
                         }
                         else
                         {
-                            searchRecordsLottoEsterni = MIService.ListLottiEsterni(articoloScan, lastScan, magID.ToString());
-                            lottoEsterno = searchRecordsLottoEsterni.FirstOrDefault();
                             if (lottoEsterno != null)
                             {
                                 tipo = "LOTTO EXT";
-                                //currLotto = lottoEsterno;
-                                //lottoScan = lottoEsterno.Lotto;
-                                //articoloScan = lottoInterno.CodArt;
                                 quantitaScan = 0;
                             }
                             else
diff --git a/MP.INVE/Data/MiDataService.cs b/MP.INVE/Data/MiDataService.cs
index 7ec0145f..0b3b581e 100644
--- a/MP.INVE/Data/MiDataService.cs
+++ b/MP.INVE/Data/MiDataService.cs
@@ -634,8 +634,8 @@ namespace MP.INVE.Data
         private const string redisOperatoriBaseAddr = ":Operatore";
         private const string redisLottiBaseAddr = ":Lotti";
         private const string redisUdcBaseAddr = ":UDC";
-        private const string redisLottiInterni = redisLottiBaseAddr + ":LottiInterni";
-        private const string redisLottiEsterni = redisLottiBaseAddr + ":LottiEsterni";
+        private const string redisLottiInterni = redisBaseAddr + redisLottiBaseAddr + ":LottiInterni";
+        private const string redisLottiEsterni = redisBaseAddr + redisLottiBaseAddr + ":LottiEsterni";
         private const string redisConfigBaseAddr = ":Config";
         private const string redisScanBaseAddr = redisBaseAddr + ":Scan";
         private const string redisElencoOperatori = redisBaseAddr + redisOperatoriBaseAddr + ":ListOperatori";
diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj
index c1bcd4ce..2ebf9ef8 100644
--- a/MP.INVE/MP.INVE.csproj
+++ b/MP.INVE/MP.INVE.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.INVE</RootNamespace>
-    <Version>6.16.2212.1216</Version>
+    <Version>6.16.2212.1218</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.INVE/Pages/Acquisizione.razor.cs b/MP.INVE/Pages/Acquisizione.razor.cs
index 9729773e..5462ddde 100644
--- a/MP.INVE/Pages/Acquisizione.razor.cs
+++ b/MP.INVE/Pages/Acquisizione.razor.cs
@@ -37,7 +37,7 @@ namespace MP.INVE.Pages
         protected string rawScan { get; set; } = null!;
         protected string idOpr { get; set; } = null!;
         protected int sessionId { get; set; } = 0;
-        protected int magazzinoId { get; set; } = 0;
+        protected string magazzinoId { get; set; } = "";
         protected int nScansioniTot { get; set; } = 0;
 
         protected string descr { get; set; } = "";
@@ -53,7 +53,7 @@ namespace MP.INVE.Pages
             {
                 idOpr = _matrOpr;
                 sessionId = int.Parse(_inveSessionId);
-                magazzinoId = int.Parse(_idMag);
+                magazzinoId = _idMag;
                 eleScansioni = MIService.ScanBySession(sessionId);
 
                 nScansioniTot = eleScansioni.Count();
diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html
index 33478ca5..73878090 100644
--- a/MP.INVE/Resources/ChangeLog.html
+++ b/MP.INVE/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOINVE </i>
-    <h4>Versione: 6.16.2212.1216</h4>
+    <h4>Versione: 6.16.2212.1218</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt
index d14d8b7e..cf3500a2 100644
--- a/MP.INVE/Resources/VersNum.txt
+++ b/MP.INVE/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2212.1216
+6.16.2212.1218
diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml
index 1b662678..dea3958d 100644
--- a/MP.INVE/Resources/manifest.xml
+++ b/MP.INVE/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2212.1216</version>
+  <version>6.16.2212.1218</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>