From 369c8b5f4c3d45f800f1397961513fb0a30c9bb2 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 31 Jan 2020 19:10:29 +0100
Subject: [PATCH 1/4] Aggiunta prettyBin x IOB-MAN

---
 IOB-MAN/App.config      |  7 ++++---
 IOB-MAN/IOB-MAN.csproj  | 10 +++++++---
 IOB-MAN/packages.config |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/IOB-MAN/App.config b/IOB-MAN/App.config
index c199e591..22d976c6 100644
--- a/IOB-MAN/App.config
+++ b/IOB-MAN/App.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+  </startup>
   <appSettings>
     <add key="appName" value="IOB-MAN" />
     <add key="appNameExt" value="IOB-WIN" />
@@ -59,6 +59,7 @@
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
+      <probing privatePath="lib;libs" xmlns="" />
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/IOB-MAN/IOB-MAN.csproj b/IOB-MAN/IOB-MAN.csproj
index 27b83cd8..53fdf2f1 100644
--- a/IOB-MAN/IOB-MAN.csproj
+++ b/IOB-MAN/IOB-MAN.csproj
@@ -183,9 +183,7 @@
     <None Include="CONF\.placeholder">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="CONF\process.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="CONF\process.json" />
     <None Include="logs\.placeholder">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -226,4 +224,10 @@
   <Import Project="..\packages\Fody.6.0.5\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.5\build\Fody.targets')" />
   <Import Project="..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <MoveToLibFolder Include="$(OutputPath)*.dll ; $(OutputPath)*.pdb ; $(OutputPath)*.xml" />
+    </ItemGroup>
+    <Move SourceFiles="@(MoveToLibFolder)" DestinationFolder="$(OutputPath)lib" OverwriteReadOnlyFiles="true" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/IOB-MAN/packages.config b/IOB-MAN/packages.config
index 157942e9..253884f2 100644
--- a/IOB-MAN/packages.config
+++ b/IOB-MAN/packages.config
@@ -19,6 +19,7 @@
   <package id="NLog.Schema" version="4.6.8" targetFramework="net461" />
   <package id="PDFsharp" version="1.50.5147" targetFramework="net461" />
   <package id="Pipelines.Sockets.Unofficial" version="2.1.1" targetFramework="net461" />
+  <package id="PrettyBin" version="1.1.0" targetFramework="net461" />
   <package id="SharpCompress" version="0.24.0" targetFramework="net461" />
   <package id="SharpZipLib" version="1.2.0" targetFramework="net461" />
   <package id="Snappy.NET" version="1.1.1.8" targetFramework="net461" />

From adf493468e127661602d56f194fa5217953c69f7 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 31 Jan 2020 19:10:50 +0100
Subject: [PATCH 2/4] SNellito processo check IOB-MAN

---
 IOB-MAN/IOBManPanel.cs | 1 -
 IOB-MAN/iobAdapt.cs    | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs
index ee7db39a..5e920c25 100644
--- a/IOB-MAN/IOBManPanel.cs
+++ b/IOB-MAN/IOBManPanel.cs
@@ -412,7 +412,6 @@ namespace IOB_MAN
       {
         chekMult = utils.CRI("chekMult");
         checkRunningchild();
-        updateStatus();
       }
     }
 
diff --git a/IOB-MAN/iobAdapt.cs b/IOB-MAN/iobAdapt.cs
index a4f11c79..69d68fac 100644
--- a/IOB-MAN/iobAdapt.cs
+++ b/IOB-MAN/iobAdapt.cs
@@ -21,10 +21,10 @@ namespace IOB_MAN
       get
       {
         IobWinStatus answ = new IobWinStatus();
-        if (scadIobStatus > DateTime.Now)
+        if (scadIobStatus > DateTime.Now && lastIobStatus != null)
         {
-
-          answ = lastIobStatus != null ? lastIobStatus : redisMan.iobStatus;
+          answ = lastIobStatus;
+          //answ = lastIobStatus != null ? lastIobStatus : redisMan.iobStatus;
         }
         else
         {

From 75d3f4267c94c6a96b509ee7cac4e6d5f20618ee Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 31 Jan 2020 19:11:44 +0100
Subject: [PATCH 3/4] Note log pzCountReload + NO riconteggio SENZA eventi
 (cascata..)

---
 IOB-WIN/IobFanuc.cs    |  1 +
 IOB-WIN/IobGeneric.cs  | 12 +++++++-----
 IOB-WIN/IobKawasaki.cs |  1 +
 IOB-WIN/IobOSAI.cs     |  1 +
 IOB-WIN/IobSiemens.cs  |  1 +
 IOB-WIN/IobSimula.cs   |  1 +
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index 0ec13149..db321294 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -227,6 +227,7 @@ namespace IOB_WIN
           {
             if (getOptPar("PZCOUNT_MODE").StartsWith("STD"))
             {
+              lgInfo("Init contapezzi FANUC: pzCntReload(true)");
               pzCntReload(true);
               // refresh associazione Macchina - IOB
               sendM2IOB();
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index d9ecc457..9d041e0c 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -1017,7 +1017,7 @@ namespace IOB_WIN
         lastIdxODL = utils.callUrl(urlGetCurrODL);
         lgInfo("Lettura ODL dall'url {0} --> {1}", urlGetCurrODL, lastIdxODL);
         // se ho valori in coda da trasmettere uso dati REDIS
-        if (QueueIN.Count > 0 && !forceCountRec)
+        if (QueueIN.Count > 0 || !forceCountRec)
         {
           currServerCount = utils.callUrl(urlGetPzCount);
           lgInfo("Lettura contapezzi dall'url {0}", urlGetPzCount);
@@ -1250,8 +1250,9 @@ namespace IOB_WIN
               else if (ciclo == gatherCycle.VLF)
               {
                 if (utils.CRB("enableContapezzi"))
-                {
-                  // rilettura contapezzi da server...   SE ABILITATA
+                {
+                  // rilettura contapezzi da server...   SE ABILITATA
+                  lgInfo("Ciclo VLF: pzCntReload(false)");
                   pzCntReload(false);
                   // refresh associazione Macchina - IOB
                   sendM2IOB();
@@ -1413,6 +1414,7 @@ namespace IOB_WIN
 
     private void svuotaCodaContapezzi()
     {
+      lgInfo("Inizio svuotaCodaContapezzi");
       // se ho contapezzi OLTRE limite...
       while (lastCountCNC > contapezzi + minSendPzCountBlock)
       {
@@ -1421,8 +1423,6 @@ namespace IOB_WIN
         trySendPzCountBlock();
         // aspetto x dare tempo calcolo
         Thread.Sleep(300);
-        //// rileggo
-        //pzCntReload(true);
       }
     }
 
@@ -4167,6 +4167,7 @@ namespace IOB_WIN
                 // se oltre 1 min NON era online --> check pezzi!
                 if (DateTime.Now.Subtract(lastIobOnline).TotalMinutes > 1)
                 {
+                  lgInfo($"sendDataBlock --> offline timeaout ({lastIobOnline}) --> pzCntReload(true)");
                   pzCntReload(true);
                 }
                 lastIobOnline = DateTime.Now;
@@ -4239,6 +4240,7 @@ namespace IOB_WIN
             // se oltre 1 min NON era online --> check pezzi!
             if (DateTime.Now.Subtract(lastIobOnline).TotalMinutes > 1)
             {
+              lgInfo($"sendToMoonPro --> offline timeaout ({lastIobOnline}) --> pzCntReload(true)");
               pzCntReload(true);
             }
             lastIobOnline = DateTime.Now;
diff --git a/IOB-WIN/IobKawasaki.cs b/IOB-WIN/IobKawasaki.cs
index 34dfac94..833cf7b6 100644
--- a/IOB-WIN/IobKawasaki.cs
+++ b/IOB-WIN/IobKawasaki.cs
@@ -349,6 +349,7 @@ namespace IOB_WIN
             {
               if (getOptPar("PZCOUNT_MODE").StartsWith("STD"))
               {
+                lgInfo("Init contapezzi KAWASAKI: pzCntReload(true)");
                 pzCntReload(true);
                 // refresh associazione Macchina - IOB
                 sendM2IOB();
diff --git a/IOB-WIN/IobOSAI.cs b/IOB-WIN/IobOSAI.cs
index c7946623..61a0e57b 100644
--- a/IOB-WIN/IobOSAI.cs
+++ b/IOB-WIN/IobOSAI.cs
@@ -127,6 +127,7 @@ namespace IOB_WIN
           {
             if (getOptPar("PZCOUNT_MODE").StartsWith("OVAR"))
             {
+              lgInfo("Init contapezzi OSAI: pzCntReload(true)");
               pzCntReload(true);
               // refresh associazione Macchina - IOB
               sendM2IOB();
diff --git a/IOB-WIN/IobSiemens.cs b/IOB-WIN/IobSiemens.cs
index c4945a33..1cdc37dc 100644
--- a/IOB-WIN/IobSiemens.cs
+++ b/IOB-WIN/IobSiemens.cs
@@ -891,6 +891,7 @@ namespace IOB_WIN
               {
                 if (getOptPar("PZCOUNT_MODE").StartsWith("STD"))
                 {
+                  lgInfo("Init contapezzi SIEMENS: pzCntReload(true)");
                   pzCntReload(true);
                   // refresh associazione Macchina - IOB
                   sendM2IOB();
diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs
index 03a150bd..4d443ec7 100644
--- a/IOB-WIN/IobSimula.cs
+++ b/IOB-WIN/IobSimula.cs
@@ -122,6 +122,7 @@ namespace IOB_WIN
       }
       setParamPlc();
       // ricarico da server i dati dei pezzi fatti...
+      lgInfo("Init contapezzi SIMULA: pzCntReload(true)"); 
       pzCntReload(true);
       // imposto pezzi CNC ai pezzi contati da server...
       lastCountCNC = contapezzi;

From b0c394ae0f4703a3572c8b04b5cd53d3c9b5a6c6 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 31 Jan 2020 19:11:51 +0100
Subject: [PATCH 4/4] Refresh + new vers numb

---
 CVCncLib/testSam.dll | Bin 967680 -> 967680 bytes
 Jenkinsfile          |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll
index 2f9df248cd7f3bd47a89c66938c283159279ee8c..f38baf24cffa01c0e0bce20e44e67b909f8a2fd9 100644
GIT binary patch
delta 115
zcmV-(0F3{Dh&zCYJCKM2qiQsPi-n5;g^L1(ivxv=1ci$Qg^LD-iwA{^2!)FYg^LP>
ziwm`j3^Ab)tFlC*Xm&VAfVI@Z`vXE4hs>c2hs>c3x6Gjq{0;-6YBZP2unrjzkG22w
Vgqlu6tCh(3e1@v?xAd?M3=`u-GpPUo

delta 115
zcmZqZux{wEp3uSU`Cq-UyS1CKwVSE6o4K`{rL~*2wVSQAo4vK0qqUo}wVSK8n|o_F
zkKsZAj>y;+eZNnB6MVK`v)bkUwEfIN9w6r3er6%xA3l&#(@$^UlN2!MzrugEw#;eW
Su6)ZvhZSG8f7!stBMbn!*)c`{

diff --git a/Jenkinsfile b/Jenkinsfile
index b4032bea..5f6b7bf4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=649']) {
+        withEnv(['NEXT_BUILD_NUMBER=651']) {
           // env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'