Merge branch 'develop' into SDK

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
 
+        /// <summary>
+        /// Salva per 5 sec la richiesta di reload delle pagine MachineUnload
+        /// </summary>
+        public static void setReloadMU()
+        {
+            memLayer.ML.setRSV(redMachUnloadForce, "true", 5);
+        }
+
         /// <summary>
         /// Esegue richieste lettura da PROD
         /// </summary>
@@ -1208,6 +1218,8 @@ namespace AppData
                     memLayer.ML.setRSV(redFirstBunkKey, "");
                     // elimino TUTTI i next...
                     memLayer.ML.redFlushKey(redAllNextBunkKey);
+                    // imposto force reload UNLOAD
+                    setReloadMU();
                 }
             }
         }

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}')

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();

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}";
+            }
+        }
+        /// <summary>
+        /// stringa x contatore refresh redis...
+        /// </summary>
+        protected string redProdForceReload
+        {
+            get
+            {
+                return ComLib.redMachUnloadForce;
             }
         }