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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-03-11 17:27:20 +01:00
parent 08060caaa1 0577967c42
commit 5e7d2e8d66
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=265']) {
withEnv(['NEXT_BUILD_NUMBER=266']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Controllers/BatchProcController.cs
+2 -2
View File
@@ -104,11 +104,11 @@ namespace NKC_WF.Controllers
// deserializzo.
baseNestAnsw batchProcAnsw = JsonConvert.DeserializeObject<baseNestAnsw>(content);
// procedura idempotente: elimino eventuali dati della "busta" precedente...
DataLayer.man.taEL.deteteByParent("", batchProcAnsw.EnvNum);
// se ho errori inizio a salvarli...
if (batchProcAnsw.ErrorList.Count > 0)
{
// procedura idempotente: elimino eventuali dati della "busta" precedente...
DataLayer.man.taEL.deteteByParent("", batchProcAnsw.EnvNum);
// ora insert
foreach (var item in batchProcAnsw.ErrorList)
{