diff --git a/Jenkinsfile b/Jenkinsfile index baf51673..e7cdb3b1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1019']) { + withEnv(['NEXT_BUILD_NUMBER=1020']) { // env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index 143a9e67..ac4b37f3 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -1493,7 +1493,8 @@ namespace MapoDb { // recupero con stored NUOVA... int taSP_ms_ant = memLayer.ML.cdvi("taStatoProd_ms_anticipo"); - var datiProdAct = DataLayer.obj.taStatoProd.GetData(idxMacchina, DateTime.Now.AddMilliseconds(-taSP_ms_ant)); + DateTime dataRif = DateTime.Now.AddMilliseconds(-taSP_ms_ant); + var datiProdAct = DataLayer.obj.taStatoProd.GetData(idxMacchina, dataRif); if (datiProdAct.Rows.Count > 0) { // solo SE ho idxODL (altrimenti loggo errore) @@ -1504,7 +1505,7 @@ namespace MapoDb else { // verifico se ho giĆ  questo errore attivo IN REDIS (altrimenti reinvio) - logger.lg.scriviLog("[pzCounterTC] Errore in currODL x idxMacchina " + idxMacchina + ": IdxOdl = 0"); + logger.lg.scriviLog(string.Format("[pzCounterTC] Errore in currODL x idxMacchina {0} | IdxOdl {1} | pzTot {2} | dataRif {3}", idxMacchina, datiProdAct[0].IdxOdl, datiProdAct[0].PzTotODL, dataRif)); } } else diff --git a/MapoDb/MapoDb.cs b/MapoDb/MapoDb.cs index 7f1094d7..f777ad94 100644 --- a/MapoDb/MapoDb.cs +++ b/MapoDb/MapoDb.cs @@ -436,14 +436,6 @@ namespace MapoDb logger.lg.scriviLog("[currODL] Errore in currODL x idxMacchina " + idxMacchina + ": IdxODL = 0"); } } -#if false - else - { - logger.lg.scriviLog("[currODL] Errore in currODL x idxMacchina " + idxMacchina + ": ODL vuota"); - } -#endif - - #if false // recupero con stored NUOVA... DS_ProdTempi.StatoProdDataTable datiProdAct = DataLayer.obj.taStatoProd.GetData(idxMacchina, DateTime.Now);