diff --git a/Jenkinsfile b/Jenkinsfile
index b51fa9d0..2024e86e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=1239']) {
+ withEnv(['NEXT_BUILD_NUMBER=1240']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs
index 332f3174..c9b8a594 100644
--- a/MP-IO/Controllers/IOBController.cs
+++ b/MP-IO/Controllers/IOBController.cs
@@ -258,9 +258,10 @@ namespace MP_IO.Controllers
if (currData.Count > 0)
{
// recupero da redis elenco stati
-
- // calcolo SE sia idle... !!!FIXME
- if (currData[0].IdxStato != 13)
+ DS_applicazione.AnagraficaStatiDataTable anagStati = DataLayer.AnagraficaStati();
+ DS_applicazione.AnagraficaStatiRow currStato = anagStati.FindByIdxStato(currData[0].IdxStato);
+ // calcolo SE sia idle... OVVERO SEMAFORO NON VERDE!!!
+ if (currStato.Semaforo != "sVe")
{
// calcolo durata...
answ = (int)DateTime.Now.Subtract(currData[0].InizioStato).TotalMinutes;
diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs
index e205dde0..80e6dc78 100644
--- a/MapoDb/DataLayer.cs
+++ b/MapoDb/DataLayer.cs
@@ -1096,6 +1096,14 @@ namespace MapoDb
return mHash(string.Format("CurrStatoMacc:{0}", idxMacchina));
}
///
+ /// Hash dati tabella AnagStati macchina
+ ///
+ ///
+ public static string currAnagStatiMacc()
+ {
+ return mHash(string.Format("Anag:StatiMacc"));
+ }
+ ///
/// Hash dati LIVE x la macchina specificata
///
///
@@ -1365,6 +1373,41 @@ namespace MapoDb
return answTab;
}
+ public static DS_applicazione.AnagraficaStatiDataTable AnagraficaStati()
+ {
+ DS_applicazione.AnagraficaStatiDataTable answTab = null;
+ // cerco in cache...
+ string rCall = "";
+ if (memLayer.ML.CRB("IOB_RedEnab"))
+ {
+ saveCallRec("hasAnagStati");
+ try
+ {
+ rCall = memLayer.ML.getRSV(currAnagStatiMacc());
+ if (!string.IsNullOrEmpty(rCall))
+ {
+ answTab = JsonConvert.DeserializeObject(rCall);
+ }
+ else
+ {
+ answTab = MapoDb.obj.taAnagSt.GetData();
+ // salvo in redis...
+ rCall = JsonConvert.SerializeObject(answTab);
+ int anagrCacheDur = memLayer.ML.CRI("anagrCacheDur");
+ memLayer.ML.setRSV(currAnagStatiMacc(), rCall, anagrCacheDur);
+ }
+ }
+ catch (Exception exc)
+ {
+ logger.lg.scriviLog($"Eccezione in recupero currODLRow{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
+ }
+ }
+ else
+ {
+ answTab = MapoDb.obj.taAnagSt.GetData();
+ }
+ return answTab;
+ }
#endregion