diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
index 2c5ed3af..edb5f975 100644
--- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj
+++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
@@ -220,7 +220,7 @@
-
+
diff --git a/IOB-UT-NEXT/Objects.cs b/IOB-UT-NEXT/Objects/Objects.cs
similarity index 99%
rename from IOB-UT-NEXT/Objects.cs
rename to IOB-UT-NEXT/Objects/Objects.cs
index f7ab65e4..5a2ca465 100644
--- a/IOB-UT-NEXT/Objects.cs
+++ b/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
{
///
/// informazioni di produzione
diff --git a/IOB-UT-NEXT/Services/Cache/RedisIobCache.cs b/IOB-UT-NEXT/Services/Cache/RedisIobCache.cs
index a020f48c..f0abbb2d 100644
--- a/IOB-UT-NEXT/Services/Cache/RedisIobCache.cs
+++ b/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;
diff --git a/IOB-UT-NEXT/Services/Protocols/Eurom63.cs b/IOB-UT-NEXT/Services/Protocols/Eurom63.cs
index f5bf860f..abe7e751 100644
--- a/IOB-UT-NEXT/Services/Protocols/Eurom63.cs
+++ b/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
diff --git a/IOB-UT-NEXT/iobRefreshedEventArgs.cs b/IOB-UT-NEXT/iobRefreshedEventArgs.cs
index 7b7b9d4a..abd513f5 100644
--- a/IOB-UT-NEXT/iobRefreshedEventArgs.cs
+++ b/IOB-UT-NEXT/iobRefreshedEventArgs.cs
@@ -1,4 +1,5 @@
-using System;
+using IOB_UT_NEXT.Objects;
+using System;
namespace IOB_UT_NEXT
{
diff --git a/IOB-WIN-FANUC/Iob/Fanuc.cs b/IOB-WIN-FANUC/Iob/Fanuc.cs
index cc69ed8d..14716a33 100644
--- a/IOB-WIN-FANUC/Iob/Fanuc.cs
+++ b/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;
diff --git a/IOB-WIN-FILE/IobFile/FileEurom63.cs b/IOB-WIN-FILE/IobFile/FileEurom63.cs
index 9db34630..8dda8c5b 100644
--- a/IOB-WIN-FILE/IobFile/FileEurom63.cs
+++ b/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;
diff --git a/IOB-WIN-FILE/IobFile/FileGen.cs b/IOB-WIN-FILE/IobFile/FileGen.cs
index 3cc15258..928ffcf4 100644
--- a/IOB-WIN-FILE/IobFile/FileGen.cs
+++ b/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;
diff --git a/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs b/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs
index 2d5fc113..49e8a916 100644
--- a/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs
+++ b/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;
diff --git a/IOB-WIN-FORM/AdapterForm.cs b/IOB-WIN-FORM/AdapterForm.cs
index 594f2ab3..7e67bab7 100644
--- a/IOB-WIN-FORM/AdapterForm.cs
+++ b/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;
diff --git a/IOB-WIN-FORM/Iob/BaseObj.cs b/IOB-WIN-FORM/Iob/BaseObj.cs
index 1fb37ed3..d5800620 100644
--- a/IOB-WIN-FORM/Iob/BaseObj.cs
+++ b/IOB-WIN-FORM/Iob/BaseObj.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Objects;
using NLog;
using System;
diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs
index 68eec222..dbccbe43 100644
--- a/IOB-WIN-FORM/Iob/Generic.cs
+++ b/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>(rawListPODL) ?? new List();
+ reqPOdlList = JsonDeserialize>(rawListPODL) ?? new List();
}
})
.GetAwaiter()
diff --git a/IOB-WIN-FORM/Iob/PingWatchDog.cs b/IOB-WIN-FORM/Iob/PingWatchDog.cs
index c53e2ed4..c1cc77e8 100644
--- a/IOB-WIN-FORM/Iob/PingWatchDog.cs
+++ b/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;
diff --git a/IOB-WIN-FORM/Iob/Simula.cs b/IOB-WIN-FORM/Iob/Simula.cs
index 1d710b31..a1d089fe 100644
--- a/IOB-WIN-FORM/Iob/Simula.cs
+++ b/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;
diff --git a/IOB-WIN-FTP/Iob/Ftp.cs b/IOB-WIN-FTP/Iob/Ftp.cs
index b8de9248..4c5a2a6b 100644
--- a/IOB-WIN-FTP/Iob/Ftp.cs
+++ b/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;
diff --git a/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs b/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs
index d5ca203b..e75c3600 100644
--- a/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs
+++ b/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;
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs
index cdac1693..a24aac2a 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs
+++ b/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;
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFrer.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFrer.cs
index 00cc7cf9..26fa5647 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFrer.cs
+++ b/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;
diff --git a/IOB-WIN-OMRON/Iob/Omron.cs b/IOB-WIN-OMRON/Iob/Omron.cs
index 6baa06d5..4ce1f9e2 100644
--- a/IOB-WIN-OMRON/Iob/Omron.cs
+++ b/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
///
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
- }
}
///
@@ -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;
}
diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
index 4dcc7518..3c7913a8 100644
--- a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
+++ b/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;
diff --git a/IOB-WIN-OSAI/Iob/OSAI.cs b/IOB-WIN-OSAI/Iob/OSAI.cs
index 86382e4c..3ca99a89 100644
--- a/IOB-WIN-OSAI/Iob/OSAI.cs
+++ b/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;
diff --git a/IOB-WIN-SHELLY/Iob/ShellyClientGen1.cs b/IOB-WIN-SHELLY/Iob/ShellyClientGen1.cs
index 1bc443e9..092bddad 100644
--- a/IOB-WIN-SHELLY/Iob/ShellyClientGen1.cs
+++ b/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;
diff --git a/IOB-WIN-SHELLY/Iob/ShellyClientGen2.cs b/IOB-WIN-SHELLY/Iob/ShellyClientGen2.cs
index 5947a641..56777586 100644
--- a/IOB-WIN-SHELLY/Iob/ShellyClientGen2.cs
+++ b/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;
diff --git a/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs b/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs
index b0c8fe7a..379eaadd 100644
--- a/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs
+++ b/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;
diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs
index c6de9d0d..089890c3 100644
--- a/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs
+++ b/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;
diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs
index 7f9cfb8f..dac4568b 100644
--- a/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs
+++ b/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;
diff --git a/IOB-WIN-SQL/Iob/IobFileSoitaab.cs b/IOB-WIN-SQL/Iob/IobFileSoitaab.cs
index b18b422d..a9bc1b2f 100644
--- a/IOB-WIN-SQL/Iob/IobFileSoitaab.cs
+++ b/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;
diff --git a/IOB-WIN-SQL/IobSql/IcoelDb.cs b/IOB-WIN-SQL/IobSql/IcoelDb.cs
index adac4967..4630a9f3 100644
--- a/IOB-WIN-SQL/IobSql/IcoelDb.cs
+++ b/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;
diff --git a/IOB-WIN-SQL/IobSql/SqlServLantek.cs b/IOB-WIN-SQL/IobSql/SqlServLantek.cs
index 56731f8d..3dced9b0 100644
--- a/IOB-WIN-SQL/IobSql/SqlServLantek.cs
+++ b/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;
diff --git a/IOB-WIN-SQL/IobSql/SqlServPama.cs b/IOB-WIN-SQL/IobSql/SqlServPama.cs
index 3666cd3f..9ef490bd 100644
--- a/IOB-WIN-SQL/IobSql/SqlServPama.cs
+++ b/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;
diff --git a/IOB-WIN-WS/IobWs/Citizen.cs b/IOB-WIN-WS/IobWs/Citizen.cs
index a0274c52..da764e01 100644
--- a/IOB-WIN-WS/IobWs/Citizen.cs
+++ b/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;
diff --git a/IOB-WIN-WS/IobWs/EmmegiFPW.cs b/IOB-WIN-WS/IobWs/EmmegiFPW.cs
index 83292f1a..b88e895a 100644
--- a/IOB-WIN-WS/IobWs/EmmegiFPW.cs
+++ b/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;
diff --git a/IOB-WIN-WS/IobWs/Gomba.cs b/IOB-WIN-WS/IobWs/Gomba.cs
index 0144c208..d21984c5 100644
--- a/IOB-WIN-WS/IobWs/Gomba.cs
+++ b/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;
diff --git a/IOB-WIN-WS/IobWs/IcoelSoap.cs b/IOB-WIN-WS/IobWs/IcoelSoap.cs
index 9fd720e0..d79c69ba 100644
--- a/IOB-WIN-WS/IobWs/IcoelSoap.cs
+++ b/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;
diff --git a/IOB-WIN-WS/IobWs/RestBase.cs b/IOB-WIN-WS/IobWs/RestBase.cs
index 931343c0..aff50844 100644
--- a/IOB-WIN-WS/IobWs/RestBase.cs
+++ b/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;