瀏覽代碼

空字符串无法上报问题

jiangjy 1 周之前
父節點
當前提交
ad86bde48d

+ 2 - 2
Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -1809,8 +1809,8 @@ namespace FurnaceRT.Equipments.PMs
         {
             DATA.Subscribe($"DryClearCount", () => _dryClearCount);
             DATA.Subscribe($"BoatCurrentFilmThickness", () => _currentFilmThickness);
-            DATA.Subscribe($"ProcessRecipeStepNumber", () => IsProcessing ? _processRecipeStepNumber : "");
-            DATA.Subscribe($"ProcessRecipeStepName", () => IsProcessing ? _processRecipeStepName : "");
+            DATA.Subscribe($"ProcessRecipeStepNumber", () => IsProcessing ? _processRecipeStepNumber : "None");
+            DATA.Subscribe($"ProcessRecipeStepName", () => IsProcessing ? _processRecipeStepName : "None");
             DATA.Subscribe($"SubRecipeStepName", () => _subRecipeStepName);
             DATA.Subscribe($"SubRecipeStepNumber", () => _subRecipeStepNumber);
             //DATA.Subscribe($"IsInSubProcessing", () => _isInSubProcessing);

+ 12 - 5
Furnace/FurnaceRT/Equipments/PMs/PMScheduleMaintenance.cs

@@ -242,16 +242,17 @@ namespace FurnaceRT.Equipments.PMs
             if (item != null && item.Item == MaintenanceItemEnum.BoatRecipeThickness1.ToString())
             {
                 var currentValue = Singleton<ScheduleMaintenanceDataManager>.Instance.GetItem(item.Item).CurrentValue;
-                if ((currentValue + thickness) <= 0)
+                var newData = (currentValue + thickness);
+                if (newData <= 0)
                 {
                     Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0);
                     currentValue = 0;
                 }
                 else
                 {
-                    Singleton<ScheduleMaintenanceDataManager>.Instance.Increase(item.Item, thickness);
+                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, newData);
                 }
-                SetCurrentFilmThickness(currentValue);
+                SetCurrentFilmThickness(newData);
 
             }
         }
@@ -262,7 +263,7 @@ namespace FurnaceRT.Equipments.PMs
         /// <param name="recipeName"></param>
         public void UpdateRecipeStepGroupThickness(string stepName, float thickness)
         {
-            if (string.IsNullOrEmpty(stepName) )
+            if (string.IsNullOrEmpty(stepName))
                 return;
             var stepNo = stepName.Split(':').FirstOrDefault();
             var list = _dbRecords
@@ -338,8 +339,14 @@ namespace FurnaceRT.Equipments.PMs
                     continue;
 
                 Singleton<ScheduleMaintenanceDataManager>.Instance.Increase(item.Item);
-            }
+                if (item.Item == MaintenanceItemEnum.RecipeStepExecuteFreq2.ToString())
+                {
+                    var currentValue = Singleton<ScheduleMaintenanceDataManager>.Instance.GetItem(item.Item).CurrentValue;
+                    SetDryClearCount(currentValue);
+
+                }
 
+            }
         }
         /// <summary>
         /// 根据RecipeName统计 Recipe执行 累计次数

+ 1 - 0
Furnace/FurnaceRT/Equipments/PMs/RecipeExecutions/Process.cs

@@ -316,6 +316,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
 
             WaferManager.Instance.UpdateWaferProcessStatus(ModuleHelper.Converter(Module), 0, EnumWaferProcessStatus.InProcess);
 
+            PMModule.InitScheduleData();
             PMModule.ResetFDCRecipeStepName();
             PMModule.HeaterEnable(true);