diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index 6e13d85e..33c82e47 100644 Binary files a/CVCncLib/testSam.dll and b/CVCncLib/testSam.dll differ diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs index 5ebba171..ab5b26ab 100644 --- a/IOB-WIN/IobFanuc.cs +++ b/IOB-WIN/IobFanuc.cs @@ -491,7 +491,7 @@ namespace IOB_WIN } else { - lgInfo(string.Format("Fanuc | Lettura ODL, currODL{0} --> currIdxODL prec: {1}", currODL, currIdxODL)); + lgInfo(string.Format("Fanuc | Lettura ODL, currODL: {0} --> currIdxODL prec: {1}", currODL, currIdxODL)); // provo a salvare nuovo ODL int.TryParse(currODL, out currIdxODL); } diff --git a/IOB-WIN/IobKawasaki.cs b/IOB-WIN/IobKawasaki.cs index 3c0d78dc..ed9961dd 100644 --- a/IOB-WIN/IobKawasaki.cs +++ b/IOB-WIN/IobKawasaki.cs @@ -746,7 +746,7 @@ namespace IOB_WIN } else { - lgInfo(string.Format("Kawasaki | Lettura ODL, currODL{0} --> currIdxODL prec: {1}", currODL, currIdxODL)); + lgInfo(string.Format("Kawasaki | Lettura ODL, currODL: {0} --> currIdxODL prec: {1}", currODL, currIdxODL)); // provo a salvare nuovo ODL int.TryParse(currODL, out currIdxODL); } diff --git a/IOB-WIN/IobOSAI.cs b/IOB-WIN/IobOSAI.cs index 079d1a80..c9109c5b 100644 --- a/IOB-WIN/IobOSAI.cs +++ b/IOB-WIN/IobOSAI.cs @@ -351,7 +351,7 @@ namespace IOB_WIN } else { - lgInfo(string.Format("Osai | Lettura ODL, currODL{0} --> currIdxODL prec: {1}", currODL, currIdxODL)); + lgInfo(string.Format("Osai | Lettura ODL, currODL: {0} --> currIdxODL prec: {1}", currODL, currIdxODL)); // provo a salvare nuovo ODL int.TryParse(currODL, out currIdxODL); } diff --git a/IOB-WIN/IobSiemens.cs b/IOB-WIN/IobSiemens.cs index d3084841..154d62d3 100644 --- a/IOB-WIN/IobSiemens.cs +++ b/IOB-WIN/IobSiemens.cs @@ -657,7 +657,7 @@ namespace IOB_WIN } else { - lgInfo(string.Format("Siemens | Lettura ODL, currODL{0} --> currIdxODL prec: {1}", currODL, currIdxODL)); + lgInfo(string.Format("Siemens | Lettura ODL, currODL: {0} --> currIdxODL prec: {1}", currODL, currIdxODL)); // provo a salvare nuovo ODL int.TryParse(currODL, out currIdxODL); } diff --git a/IOB-WIN/IobSiemensFape.cs b/IOB-WIN/IobSiemensFape.cs index 5e633394..999e180c 100644 --- a/IOB-WIN/IobSiemensFape.cs +++ b/IOB-WIN/IobSiemensFape.cs @@ -190,7 +190,7 @@ namespace IOB_WIN } else { - lgInfo(string.Format("SiemensFape | Lettura ODL, currODL{0} --> currIdxODL prec: {1}", currODL, currIdxODL)); + lgInfo(string.Format("SiemensFape | Lettura ODL, currODL: {0} --> currIdxODL prec: {1}", currODL, currIdxODL)); // provo a salvare nuovo ODL int.TryParse(currODL, out currIdxODL); } diff --git a/IOB-WIN/IobSiemensTorri.cs b/IOB-WIN/IobSiemensTorri.cs index fac07cb4..e64866ea 100644 --- a/IOB-WIN/IobSiemensTorri.cs +++ b/IOB-WIN/IobSiemensTorri.cs @@ -696,7 +696,7 @@ namespace IOB_WIN } else { - lgInfo(string.Format("SiemensTorri | Lettura ODL, currODL{0} --> currIdxODL prec: {1}", currODL, currIdxODL)); + lgInfo(string.Format("SiemensTorri | Lettura ODL, currODL: {0} --> currIdxODL prec: {1}", currODL, currIdxODL)); // provo a salvare nuovo ODL int.TryParse(currODL, out currIdxODL); } diff --git a/Jenkinsfile b/Jenkinsfile index f81c8f3b..f8e88976 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=324']) { + withEnv(['NEXT_BUILD_NUMBER=325']) { // 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'