diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 58a0df6..f7d3788 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -178,6 +178,7 @@ namespace AppData { return user_std.UtSn.Traduci(lemma); } + #region conf posizioni redis public static string redOutPath = "NKC:SERV:BREQ"; @@ -191,7 +192,8 @@ namespace AppData public static string redProdAnsw = "NKC:PROD:BUNKS"; public static string redSecScreenReq = "NKC:SECSCREEN:REQ"; - + public static string redMachUnloadCount = "NKC:SERV:MACH_UNLOAD:COUNT"; + public static string redMachUnloadForce = "NKC:SERV:MACH_UNLOAD:FORCERELOAD"; #endregion @@ -1110,6 +1112,14 @@ namespace AppData #region metodi per PROD + /// + /// Salva per 5 sec la richiesta di reload delle pagine MachineUnload + /// + public static void setReloadMU() + { + memLayer.ML.setRSV(redMachUnloadForce, "true", 5); + } + /// /// Esegue richieste lettura da PROD /// @@ -1208,6 +1218,8 @@ namespace AppData memLayer.ML.setRSV(redFirstBunkKey, ""); // elimino TUTTI i next... memLayer.ML.redFlushKey(redAllNextBunkKey); + // imposto force reload UNLOAD + setReloadMU(); } } } diff --git a/Jenkinsfile b/Jenkinsfile index 3c31a73..3622c3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=320']) { + withEnv(['NEXT_BUILD_NUMBER=321']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs index 1aef1af..c903673 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs @@ -311,6 +311,7 @@ namespace NKC_WF.WebUserControls cmp_stackNextloading.doUpdate(); // segnalo avanzamento su redis x pagina unload ComLib.advaceSheetRevByBunk(BatchIdCurr); + ComLib.setReloadMU(); // controllo update stato BATCH/BUNK ComLib.updateBatchPosition(BatchIdCurr); raiseEvent(); diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index 1b959cd..f41d7a8 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -103,10 +103,15 @@ namespace NKC_WF int counter = numWaitSvg; doUpdate(); // ogni x cicli - if (counter % 10 == 0) + if (counter % 4 == 0) { cmp_MU_stats.doUpdate(); upnlStats.DataBind(); + // verifico se c'รจ richiesta reload UNLOAD... + if (!string.IsNullOrEmpty(memLayer.ML.getRSV(redProdForceReload))) + { + Response.Redirect(Request.RawUrl); + } } if (counter % 2 == 0) { @@ -124,7 +129,17 @@ namespace NKC_WF { get { - return $"NKC:SERV:MACH_UNLOAD:COUNT:{Session.SessionID}"; + return $"{ComLib.redMachUnloadCount}:{Session.SessionID}"; + } + } + /// + /// stringa x contatore refresh redis... + /// + protected string redProdForceReload + { + get + { + return ComLib.redMachUnloadForce; } }