Altro spostamento object (in blocco, da spaccare)

IOB-UT-NEXT/IOB-UT-NEXT.csproj

@@ -220,7 +220,7 @@
     <Compile Include="Enums.cs" />
     <Compile Include="Services\Files\FileMover.cs" />
     <Compile Include="Logging.cs" />
-    <Compile Include="Objects.cs" />
+    <Compile Include="Objects\Objects.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\Files\utils.cs" />
   </ItemGroup>

IOB-UT-NEXT/Objects/Objects.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace IOB_UT_NEXT
+namespace IOB_UT_NEXT.Objects
 {
     /// <summary>
     /// informazioni di produzione

IOB-UT-NEXT/Services/Cache/RedisIobCache.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using IOB_UT_NEXT.Objects;
+using Newtonsoft.Json;
 using StackExchange.Redis;
 using System;
 using System.Collections.Generic;

IOB-UT-NEXT/Services/Protocols/Eurom63.cs

@@ -1,4 +1,5 @@
-using System;
+using IOB_UT_NEXT.Objects;
+using System;
 using System.Collections.Generic;
 
 namespace IOB_UT_NEXT.Services.Protocols

IOB-UT-NEXT/iobRefreshedEventArgs.cs

@@ -1,4 +1,5 @@
-using System;
+using IOB_UT_NEXT.Objects;
+using System;
 
 namespace IOB_UT_NEXT
 {

IOB-WIN-FANUC/Iob/Fanuc.cs

@@ -2,6 +2,7 @@
 using EgwProxy.MultiCncLib.CNC;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;

IOB-WIN-FILE/IobFile/FileEurom63.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Protocols;
 using MapoSDK;

IOB-WIN-FILE/IobFile/FileGen.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using MapoSDK;
 using System;
 using System.Collections.Generic;

IOB-WIN-FILE/IobFile/IobFileSoitaab.cs

@@ -3,6 +3,7 @@ using EgwProxy.SqlDb.DbModels;
 #endif
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using System;

IOB-WIN-FORM/AdapterForm.cs

@@ -1,6 +1,7 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Base;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Core;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Monitoring;

IOB-WIN-FORM/Iob/BaseObj.cs

@@ -1,4 +1,5 @@
 using IOB_UT_NEXT;
+using IOB_UT_NEXT.Objects;
 using NLog;
 using System;
 

IOB-WIN-FORM/Iob/Generic.cs

@@ -2,6 +2,7 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Mem;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Cache;
 using IOB_UT_NEXT.Services.Core;
 using IOB_UT_NEXT.Services.Data;
@@ -6189,7 +6190,7 @@ namespace IOB_WIN_FORM.Iob
                     var rawListPODL = await HttpService.CallUrlAsync(urlGetNextPODL);
                     if (!string.IsNullOrEmpty(rawListPODL))
                     {
-                        reqPOdlList = JsonConvert.DeserializeObject<List<PODLModel>>(rawListPODL) ?? new List<PODLModel>();
+                        reqPOdlList = JsonDeserialize<List<PODLModel>>(rawListPODL) ?? new List<PODLModel>();
                     }
                 })
                 .GetAwaiter()

IOB-WIN-FORM/Iob/PingWatchDog.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Data;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;

IOB-WIN-FORM/Iob/Simula.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;

IOB-WIN-FTP/Iob/Ftp.cs

@@ -3,6 +3,7 @@ using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Mem;
 using IOB_UT_NEXT.Config.Special;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Data;
 using IOB_UT_NEXT.Services.Utility;
 using MapoSDK;

IOB-WIN-KAWASAKI/Iob/Kawasaki.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;

IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs

@@ -2,7 +2,9 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Mem;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Core;
+using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Utility;
 using MapoSDK;
 using Newtonsoft.Json;

IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFrer.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using System;
 using System.Globalization;
 using System.IO;

IOB-WIN-OMRON/Iob/Omron.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
@@ -62,24 +63,6 @@ namespace IOB_WIN_OMRON.Iob
         /// </summary>
         public override void processContapezzi()
         {
-            if (utils.CRB("enableContapezzi"))
-            {
-#if false
-        try
-        {
-          // hard coded... !!!FARE!!! rivedere megio conf
-          contapezziPLC = pzCounter;
-          // verifico quale modalità sia richiesta: STD (6711) oppure BIT (Custom, con indicazione area)
-          if (cIobConf.optPar.Count > 0 && IOBConfFull.Device.PzCountMode != "")
-          {
-          }
-        }
-        catch (Exception exc)
-        {
-          lgError(exc, "Errore in contapezzi OMRON");
-        }
-#endif
-            }
         }
 
         /// <summary>
@@ -153,27 +136,6 @@ namespace IOB_WIN_OMRON.Iob
         public override bool setcontapezziPLC(int newPzCount, string codTav)
         {
             bool answ = false;
-#if false
-      // ...SE abilitato da conf IOB
-      if (cIobConf.optPar.Count > 0 && getOptPar("ENABLE_PZ_RESET") == "TRUE")
-      {
-        // scrivo valore 0 x il contapezzi
-        try
-        {
-          pzCounter = newPzCount;
-        }
-        catch (Exception exc)
-        {
-          lgError(exc, "Errore in SET contapezzi OMRON");
-          connectionOk = false;
-        }
-        answ = true;
-      }
-      else
-      {
-        lgError("Impossibile effettuare SET contapezzi OMRON, mancanza parametro OPT:ENABLE_PZ_RESET");
-      }
-#endif
             return answ;
         }
 

IOB-WIN-OPC-UA/IobOpc/OpcUa.cs

@@ -2,6 +2,7 @@
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Mem;
 using IOB_UT_NEXT.DataModel;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;

IOB-WIN-OSAI/Iob/OSAI.cs

@@ -2,6 +2,7 @@
 using EgwProxy.OsaiCncLib;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;

IOB-WIN-SHELLY/Iob/ShellyClientGen1.cs

@@ -3,6 +3,7 @@ using EgwProxy.Shelly.Clients;
 using EgwProxy.Shelly.Options;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Data;
 using MapoSDK;
 using Newtonsoft.Json;

IOB-WIN-SHELLY/Iob/ShellyClientGen2.cs

@@ -3,6 +3,7 @@ using EgwProxy.Shelly.Clients;
 using EgwProxy.Shelly.Options;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Data;
 using MapoSDK;
 using Newtonsoft.Json;

IOB-WIN-SIEMENS/IobSiemens/Siemens.cs

@@ -1,6 +1,7 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Mem;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using Newtonsoft.Json;

IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using System;

IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using System;

IOB-WIN-SQL/Iob/IobFileSoitaab.cs

@@ -3,6 +3,8 @@ using EgwProxy.SqlDb.DbModels;
 #endif
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
+using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using System;
 using System.Collections.Generic;

IOB-WIN-SQL/IobSql/IcoelDb.cs

@@ -1,6 +1,8 @@
 using EgwProxy.Icoel;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
+using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using System;
 using System.Collections.Generic;

IOB-WIN-SQL/IobSql/SqlServLantek.cs

@@ -2,6 +2,8 @@
 using EgwProxy.SqlDb.DbModels;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
+using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;

IOB-WIN-SQL/IobSql/SqlServPama.cs

@@ -2,6 +2,8 @@
 using EgwProxy.SqlDb.DbModels;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
+using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;

IOB-WIN-WS/IobWs/Citizen.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using Newtonsoft.Json;

IOB-WIN-WS/IobWs/EmmegiFPW.cs

@@ -1,6 +1,7 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Special;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using Newtonsoft.Json;

IOB-WIN-WS/IobWs/Gomba.cs

@@ -1,6 +1,7 @@
 using EgwProxy.Gomba.GombaServ;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using Newtonsoft.Json;

IOB-WIN-WS/IobWs/IcoelSoap.cs

@@ -2,6 +2,7 @@
 using EgwProxy.Icoel.SizerService;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using System;

IOB-WIN-WS/IobWs/RestBase.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
 using IOB_UT_NEXT.Services.Files;
 using MapoSDK;
 using Newtonsoft.Json;