From 1e9dad34d09ab161edc72e41dc2976d46b818bb3 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 16 Apr 2018 14:24:09 +0200
Subject: [PATCH] portato processing contapezzi con override & mode (nomr
 count...)

---
 IOB-WIN/IobFanuc.cs   | 2 +-
 IOB-WIN/IobGeneric.cs | 2 +-
 Jenkinsfile           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index 1031511f..1d58578d 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -159,7 +159,7 @@ namespace IOB_WIN
       if (currServerCount != "")
       {
         int.TryParse(currServerCount, out contapezzi);
-        lg.Info("Ricevuta lettura da server di {0} pezzi registrati per ODL (RAW:{1})", contapezzi, currServerCount);
+        lg.Info("Ricevuta conferma da server di {0} pezzi registrati per ODL", currServerCount);
       }
       else
       {
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index e6ff42a3..213e09cc 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -452,10 +452,10 @@ namespace IOB_WIN
               {
                 processMode();
                 processOverride();
+                processContapezzi();
               }
               else if (ciclo == gatherCycle.LF)
               {
-                processContapezzi();
                 processProgram();
               }
               else if (ciclo == gatherCycle.VLF)
diff --git a/Jenkinsfile b/Jenkinsfile
index b56d1547..b75f8e46 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=228']) {
+        withEnv(['NEXT_BUILD_NUMBER=229']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'