From bbabd64d007508a21fe9ea5d450978def8fcc8ee Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 12 Dec 2018 00:13:51 +0100 Subject: [PATCH] Fix log x Kawasaki... --- IOB-WIN/IobKawasaki.cs | 6 +++--- Jenkinsfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IOB-WIN/IobKawasaki.cs b/IOB-WIN/IobKawasaki.cs index 5b21628a..90a16491 100644 --- a/IOB-WIN/IobKawasaki.cs +++ b/IOB-WIN/IobKawasaki.cs @@ -766,7 +766,7 @@ namespace IOB_WIN B_input += (1 << 2); } // registro contapezzi - lgInfo(string.Format("Contapezzi SIEMENS: {0} | Contapezzi interno {1}", lastCountCNC, contapezzi)); + lgInfo(string.Format("Contapezzi KAWASAKI: {0} | Contapezzi interno {1}", lastCountCNC, contapezzi)); // invio a server contapezzi (aggiornato) string retVal = utils.callUrl(urlSetPzCount + contapezzi.ToString()); @@ -774,7 +774,7 @@ namespace IOB_WIN if (retVal != "OK") { // errore salvataggio contapezzi - lgInfo(string.Format("Errore salvataggio Contapezzi SIEMENS {0} | Contapezzi interno {1} | Errore salvataggio: {2}", lastCountCNC, contapezzi, retVal)); + lgInfo(string.Format("Errore salvataggio Contapezzi KAWASAKI {0} | Contapezzi interno {1} | Errore salvataggio: {2}", lastCountCNC, contapezzi, retVal)); } // resetto timer... lastPzCountSend = DateTime.Now; @@ -784,7 +784,7 @@ namespace IOB_WIN { if (DateTime.Now >= lastPzCountSend.AddMilliseconds(pzCountDelay)) { - lgInfo(string.Format("Attenzione: mancanza ODL non procedo con gestione contapezzi. Contapezzi SIEMENS {0} | Contapezzi interno {1}", lastCountCNC, contapezzi)); + lgInfo(string.Format("Attenzione: mancanza ODL non procedo con gestione contapezzi. Contapezzi KAWASAKI {0} | Contapezzi interno {1}", lastCountCNC, contapezzi)); // resetto timer... lastPzCountSend = DateTime.Now; } diff --git a/Jenkinsfile b/Jenkinsfile index 60d57ac0..46a8d4e4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=319']) { + withEnv(['NEXT_BUILD_NUMBER=320']) { // env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'