Merge branch 'Master_ELK02_Release_Development' of http://git.jetplasma-oa.com/Jet/FurnaceELK into Master_ELK02_Release_Development

FrameworkLocal/Common/SubstrateTrackings/WaferManager.cs

@@ -6,6 +6,7 @@ using Aitex.Core.RT.DataCenter;
 using Aitex.Core.RT.Event;
 using Aitex.Core.RT.Log;
 using Aitex.Core.RT.OperationCenter;
+using Aitex.Core.RT.SCCore;
 using Aitex.Core.Util;
 using FabConnect.SecsGemInterface.Common;
 using MECF.Framework.Common.DataCenter;
@@ -69,21 +70,26 @@ namespace MECF.Framework.Common.SubstrateTrackings
         private PeriodicJob _thread;
         private bool _needSerialize;
         public Dictionary<string, bool> NeedUpdateModule = new Dictionary<string, bool>();
-
+        private bool _enableUpdateWafersNotify = false;
         public WaferManager()
         {
+            _enableUpdateWafersNotify = SC.GetValue<bool>("System.EnableUpdateWafersNotify");
         }
 
         public bool Serialize()
         {
-            if (NeedUpdateModule.Any(r => r.Value))
+            if (_enableUpdateWafersNotify)
             {
-                var modules = NeedUpdateModule.Where(r => r.Value).Select(r => r.Key).ToList();
-                Singleton<EventManager>.Instance.UpdateWafers(modules);
-                NeedUpdateModule.Clear();
+                if (NeedUpdateModule.Any(r => r.Value))
+                {
+                    var modules = NeedUpdateModule.Where(r => r.Value).Select(r => r.Key).ToList();
+                    Singleton<EventManager>.Instance.UpdateWafers(modules);
+                    NeedUpdateModule.Clear();
+                }
             }
+
             if (!_needSerialize) return true;
-            _needSerialize = false;          
+            _needSerialize = false;
             try
             {
                 if (_locationWafers != null)
@@ -175,7 +181,7 @@ namespace MECF.Framework.Common.SubstrateTrackings
                 }
             }
 
-            DATA.Subscribe(module.ToString(), "ModuleWaferList", () => _locationWafers[module].Values.ToArray());         
+            DATA.Subscribe(module.ToString(), "ModuleWaferList", () => _locationWafers[module].Values.ToArray());
         }
 
         public void WaferMoved(ModuleName moduleFrom, int slotFrom, ModuleName moduleTo, int slotTo, bool needHistory = true)

Furnace/FurnaceUI/Views/Operations/TransferMain/BoatModifyViewModel.cs

@@ -39,7 +39,7 @@ namespace FurnaceUI.Views.Operations
         public List<string> OriginModuleItems { get; set; } = new List<string>();
         public bool IsPermission { get => this.Permission == 3; }
 
-        public bool IsEnableManualOperation => IsPermission&&RtStatus != "AutoRunning";
+        public bool IsEnableManualOperation => IsPermission && RtStatus != "AutoRunning";
         private int? _boatSlotFrom = 1;
         public int? BoatSlotFrom
         {
@@ -236,7 +236,7 @@ namespace FurnaceUI.Views.Operations
                 UpperSDNum = BoatMapWafers.Where(x => x == "SD").Count();
                 LowerSDNum = BoatMapWafers.Where(x => x == "ED").Count();
 
-                ProductNum = BoatMapWafers.Where(x => x.StartsWith("P")).Count();
+                ProductNum = BoatMapWafers.Where(x => !string.IsNullOrEmpty(x) && x.StartsWith("P")).Count();
                 MonitorNum1 = BoatMapWafers.Where(x => x == "M1").Count();
                 MonitorNum2 = BoatMapWafers.Where(x => x == "M2").Count();
             }

Furnace/FurnaceUI/Views/Recipes/RecipeLayoutEditViewModel.cs

@@ -619,7 +619,7 @@ namespace FurnaceUI.Views.Recipes
                 UpperSDNum = listWafers.Where(x => x == "SD").Count();
                 LowerSDNum = listWafers.Where(x => x == "FD").Count();
 
-                ProductNum = listWafers.Where(x => x.StartsWith("P")).Count();
+                ProductNum = listWafers.Where(x => !string.IsNullOrEmpty(x) && x.StartsWith("P")).Count();
                 MonitorNum1 = listWafers.Where(x => x == "M1").Count();
                 MonitorNum2 = listWafers.Where(x => x == "M2").Count();
             }