diff --git a/IOB-WIN-NEXT/App.config b/IOB-WIN-NEXT/App.config index a3743cb8..3985bdbf 100644 --- a/IOB-WIN-NEXT/App.config +++ b/IOB-WIN-NEXT/App.config @@ -1,165 +1,174 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_003.ini b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_003.ini index 88a328a2..1e4925d1 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_003.ini +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_003.ini @@ -10,8 +10,8 @@ VENDOR=ICOEL MODEL=Impianto Ciliegie Turi [CNC] -IP=192.168.137.50 -PORT=8001 +IP=192.168.137.11 +PORT=1443 GETPRGNAME=false [SERVER] diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini index cb0aa7c3..9722b51a 100644 --- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini +++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini @@ -79,6 +79,7 @@ CLI_INST=SteamWareSim ;STARTLIST=VL25 ;STARTLIST=SIMUL_03 ;STARTLIST=GIACO_CEDAX_01 -STARTLIST=GIACO_ICOEL_002 +;STARTLIST=GIACO_ICOEL_002 +STARTLIST=GIACO_ICOEL_003 MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj index 5772b53a..1be1e006 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -1,5 +1,6 @@  + @@ -101,6 +102,12 @@ ..\packages\EgwProxy.OsaiCncLib.3.6.2205.2015\lib\EgwProxy.OsaiCncLib.XmlSerializers.dll + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + False ExtLib\krcc.dll @@ -147,6 +154,7 @@ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + @@ -316,8 +324,12 @@ PreserveNewest - - + + PreserveNewest + + + PreserveNewest + Always @@ -919,9 +931,12 @@ + + + \ No newline at end of file diff --git a/IOB-WIN-NEXT/IobIcoelDb.cs b/IOB-WIN-NEXT/IobIcoelDb.cs index b30a41e8..436dbb56 100644 --- a/IOB-WIN-NEXT/IobIcoelDb.cs +++ b/IOB-WIN-NEXT/IobIcoelDb.cs @@ -3,6 +3,7 @@ using IOB_UT_NEXT; using MapoSDK; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Net.NetworkInformation; namespace IOB_WIN_NEXT @@ -39,6 +40,7 @@ namespace IOB_WIN_NEXT string connSyncState = $"data source={SyncStateDb};initial catalog=MoonPro_ISF;persist security info=True;user id={SyncStateUser};password={SyncStatePwd};MultipleActiveResultSets=True;App=IOB-WIN-NEXT"; + // eccezione: NON TROVA EntityFramework 6.0.0 o successivo... why?!? dbProxy = new DbProxy(connSyncState); lastPING = DateTime.Now.AddHours(-1); @@ -122,13 +124,26 @@ namespace IOB_WIN_NEXT { lgInfo($"Richiesto processCustomTaskLF"); - // fare processing DB secondo il seguente scehma: + var elencoSyncStatePre = dbProxy.DataController.SyncStateGetAll(); + Stopwatch sw = new Stopwatch(); + sw.Start(); + var elencoSyncState = dbProxy.DataController.SyncStateDoImportAll(); + sw.Stop(); + lgInfo($"DB: esecuzione task dbProxy.DataController.SyncStateGetAll() in {sw.ElapsedMilliseconds} ms"); + + if (elencoSyncState != null) + { + foreach (var item in elencoSyncState) + { + lgTrace($"TAB: {item.TableName} | IdxIN / IdxLocal {item.LastIdxIn} / {item.LastIdx} | NumIn / NumLocal {item.NumRecIn} / {item.NumRec}"); + // verifico se serva redo.. + } + } + + // fare processing DB secondo il seguente schema: /* * - EgwProxy.Icoel.DbProxy dbProxy = new DbProxy(ReadSetting("EntrataFrontiera"), ReadSetting("TrackerLotti"), ReadSetting("ExportIcoel"), ReadSetting("SyncState")); - Console.WriteLine(); - Console.WriteLine("--- SyncState ---"); bool needRedo = true; var elencoSyncState = dbProxy.DataController.SyncStateGetAll(); while (needRedo) @@ -201,6 +216,11 @@ namespace IOB_WIN_NEXT { B_input = 1; currDispData.semIn = Semaforo.SV; + + if (dbProxy != null) + { + B_input = 3; + } #if false if (currBatchList == null) { @@ -256,6 +276,10 @@ namespace IOB_WIN_NEXT { // ora provo connessione... parentForm.commPlcActive = true; + if (dbProxy != null) + { + connectionOk = true; + } #if false // recupero elenco batch... se != vuoto -_> connesso! var batchList = IcoelSizer.GetCurrentBatch(); diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config index 697ab200..f2672e05 100644 --- a/IOB-WIN-NEXT/packages.config +++ b/IOB-WIN-NEXT/packages.config @@ -6,6 +6,8 @@ + +