diff --git a/Jenkinsfile b/Jenkinsfile index af5a4b9..2c21620 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=143']) { + withEnv(['NEXT_BUILD_NUMBER=145']) { // env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'NKC' diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index a566c81..2a102b0 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -217,7 +217,11 @@ namespace NKC_WF.Controllers // verifico IN CASO di validazione andata a buon fine --> valorizzo tabella! if (bStatus > 7) { - DataLayer.man.taIV.upsertQuery(rispStima.PartList[0].PartExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime); + // recupero ordine da batch + if (tabOrd.Count > 0) + { + DataLayer.man.taIV.upsertQuery(tabOrd[0].OrderExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime); + } } // registro OK answ = "OK";