From 716d5238bcf57a225e55f74cd9a95a2fd3d3bbb6 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 4 Nov 2024 20:13:28 +0100
Subject: [PATCH] Completo gestione lato IO + DB x art numerici

---
 MapoDb/DS_applicazione.xss |  4 +--
 MapoDb/DataLayer.cs        | 69 ++++++++++++++++++++++----------------
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/MapoDb/DS_applicazione.xss b/MapoDb/DS_applicazione.xss
index ec1ceaa0..856ee01b 100644
--- a/MapoDb/DS_applicazione.xss
+++ b/MapoDb/DS_applicazione.xss
@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="1206" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="941" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="31" X="553" Y="715" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:FamiglieMacchine" ZOrder="33" X="519" Y="1007" Height="115" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -36,7 +36,7 @@
     <Shape ID="DesignTable:AnagTags" ZOrder="10" X="336" Y="1347" Height="172" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:DiarioDichiarazioni" ZOrder="5" X="325" Y="1566" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:AlarmLog" ZOrder="2" X="1" Y="1672" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:DecNumArticoli" ZOrder="1" X="649" Y="1980" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:DecNumArticoli" ZOrder="1" X="823" Y="1868" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_AnagTags_DiarioDichiarazioni" ZOrder="9" LineWidth="11">
diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs
index 596ff17c..e8687ab3 100644
--- a/MapoDb/DataLayer.cs
+++ b/MapoDb/DataLayer.cs
@@ -47,6 +47,7 @@ namespace MapoDb
         public DS_ProdTempiTableAdapters.stp_repDonati_getDatiProdMacchinaTableAdapter taDatiProdMacch;
         public DS_ProdTempiTableAdapters.stp_repDonati_getDatiProdMacchinaPeriodoTableAdapter taDatiProdMacchPer;
         public DS_ProdTempiTableAdapters.stp_repDonati_getLastStatoDurataMacchinaTableAdapter taDatiStatoMacch;
+        public DS_applicazioneTableAdapters.DecNumArticoliTableAdapter taDecNA;
         public DS_applicazioneTableAdapters.DiarioDichiarazioniTableAdapter taDiarioDich;
         public DS_DossParTableAdapters.DossiersTableAdapter taDOSS;
         public DS_applicazioneTableAdapters.EventListTableAdapter taEventi;
@@ -379,16 +380,20 @@ namespace MapoDb
             return mHash($"PODLRow:{idxPODL}");
         }
 
-        /// <summary>
-        /// Hash dati relativi all'associazione macchina <--> IOB
-        /// </summary>
-        /// <param name="IdxMacchina">Macchina</param>
-        /// <returns></returns>
+        /// <summary> Hash dati relativi all'associazione macchina <--> IOB </summary> <param
+        /// name="IdxMacchina">Macchina</param> <returns></returns>
         public static string hIobDict(string IdxMacchina)
         {
             return mHash($"IOB:{IdxMacchina}:CurrInfo");
         }
 
+        /// <summary> Hash dati relativi all'associazione macchina <--> IOB </summary> <param
+        /// name="IdxMacchina">Macchina PRINCIPALE</param> <returns></returns>
+        public static string hM2IOB(string IdxMacchina)
+        {
+            return mHash(string.Format("hM2IOB:{0}", IdxMacchina));
+        }
+
         /// <summary>
         /// Hash dati relativi a macchina + IOB + conf speciali
         /// </summary>
@@ -399,16 +404,6 @@ namespace MapoDb
             return mHash($"IOB:{IdxMacchina}:MachIobConf");
         }
 
-        /// <summary>
-        /// Hash dati relativi all'associazione macchina <--> IOB
-        /// </summary>
-        /// <param name="IdxMacchina">Macchina PRINCIPALE</param>
-        /// <returns></returns>
-        public static string hM2IOB(string IdxMacchina)
-        {
-            return mHash(string.Format("hM2IOB:{0}", IdxMacchina));
-        }
-
         /// <summary>
         /// Hash dati Macchine Multi SM Ingressi
         /// </summary>
@@ -1938,6 +1933,34 @@ namespace MapoDb
             return answ;
         }
 
+        /// <summary>
+        /// Recupera ArtNum dato CodArt (per impianti che accettano solo INT in scrittura)
+        /// </summary>
+        /// <param name="CodArt">
+        /// CodArt richiesto, se vuoto restituisce TUTTI i valori in tabella di decodifica
+        /// </param>
+        /// <returns>Dizionario contenente le righe delle codifiche attive Articolo/Numero</returns>
+        public Dictionary<string, int> getArtNum(string codArt)
+        {
+            Dictionary<string, int> answ = new Dictionary<string, int>();
+            DS_applicazione.DecNumArticoliDataTable rawData;
+            // se vuoto --> leggo tabella
+            if (string.IsNullOrEmpty(codArt))
+            {
+                rawData = taDecNA.GetData();
+            }
+            // se non vuoto --> chiamo stored x recuperare info
+            else
+            {
+                rawData = taDecNA.getByKey(codArt);
+            }
+            foreach (var item in rawData)
+            {
+                answ.Add(item.CodArticolo, item.NumART);
+            }
+            return answ;
+        }
+
         /// <summary>
         /// GET elenco parametri correnti x IOB
         /// </summary>
@@ -4281,6 +4304,7 @@ namespace MapoDb
             taAnagTags = new DS_applicazioneTableAdapters.AnagTagsTableAdapter();
             taAs400 = new DS_IntServTableAdapters.ProduzioneAs400TableAdapter();
             taArcaGiac = new DS_ArcaTableAdapters.GiacenzeTableAdapter();
+            taDecNA = new DS_applicazioneTableAdapters.DecNumArticoliTableAdapter();
             taCalFF = new DS_ProdTempiTableAdapters.CalendFesteFerieTableAdapter();
             taComm = new DS_UtilityTableAdapters.CommentiTableAdapter();
             taConfFlux = new DS_DossParTableAdapters.ConfFluxTableAdapter();
@@ -4355,6 +4379,7 @@ namespace MapoDb
             taAnagTags.Connection.ConnectionString = connectionString;
             taAs400.Connection.ConnectionString = connectionStringIS;
             taArcaGiac.Connection.ConnectionString = connectionStringArca;
+            taDecNA.Connection.ConnectionString = connectionString;
             taCalFF.Connection.ConnectionString = connectionString;
             taConfig.Connection.ConnectionString = connectionString;
             taComm.Connection.ConnectionString = connectionString;
@@ -4875,20 +4900,6 @@ namespace MapoDb
             }
         }
 
-        /// <summary>
-        /// Recupera ArtNum dato CodArt (per impianti che accettano solo INT in scrittura)
-        /// </summary>
-        /// <param name="CodArt">CodArt richiesto, se vuoto restituisce TUTTI i valori in tabella di decodifica</param>
-        /// <returns>Dizionario contenente le righe delle codifiche attive Articolo/Numero</returns>
-        public Dictionary<string, int> getArtNum(string codArt)
-        {
-            Dictionary<string, int> answ = new Dictionary<string, int>();
-            // se vuoto --> leggo tabella
-
-            // se non vuoto --> chiamo stored x recuperare info
-            return answ;
-        }
-
         #endregion Private Methods
     }
 }
\ No newline at end of file