From 9e7939bb43f0601e44dca1fab8c2c768e4f1ad63 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 17 Dec 2019 14:07:35 +0100 Subject: [PATCH] Update fix contapezzi --- IOB-WIN/IobSimula.cs | 2 ++ Jenkinsfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs index a4643a92..4db5ae20 100644 --- a/IOB-WIN/IobSimula.cs +++ b/IOB-WIN/IobSimula.cs @@ -109,6 +109,8 @@ namespace IOB_WIN setParamPlc(); // ricarico da server i dati dei pezzi fatti... pzCntReload(true); + // imposto pezzi CNC ai pezzi contati da server... + lastCountCNC = contapezzi; } /// /// Effettua reset del contapezzi diff --git a/Jenkinsfile b/Jenkinsfile index da74e565..bd159c72 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=600']) { + withEnv(['NEXT_BUILD_NUMBER=601']) { // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'