Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-30 18:29:14 +01:00
parent 13f0759f02 71b83757c6
commit 2fc342c4d3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
NKC_WF/Controllers/BatchProcController.cs
+5 -1
View File
@@ -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";