Browse Source

fix 触发JobAutoStart后自动归0逻辑不明确,暂时撤销该部分逻辑

jiangjy 1 month ago
parent
commit
bdb7ddb763

+ 6 - 6
Furnace/FurnaceRT/Equipments/Jobs/AutoTransfer.cs

@@ -6131,7 +6131,7 @@ namespace FurnaceRT.Equipments.Jobs
                                     Singleton<EquipmentManager>.Instance.SDWaferTypeUseCountAlarm.Set(msg);
                                     Singleton<EquipmentManager>.Instance.SDWaferTypeUseCountAlarm.Set(msg);
                                     pm.TriggerJobAutoStart(maintenanceItemCarrierUseFreq.AssociationProcessRecipeName, RecipeExecEntryEnum.SDWaferRangeTrigger);
                                     pm.TriggerJobAutoStart(maintenanceItemCarrierUseFreq.AssociationProcessRecipeName, RecipeExecEntryEnum.SDWaferRangeTrigger);
                                     LOG.Info($"{msg} Trigger {maintenanceItemCarrierUseFreq.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemCarrierUseFreq.LimitValue} to 0");
                                     LOG.Info($"{msg} Trigger {maintenanceItemCarrierUseFreq.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemCarrierUseFreq.LimitValue} to 0");
-                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemCarrierUseFreq.Item, 0);
+                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemCarrierUseFreq.Item, 0, true);
                                     return false;
                                     return false;
 
 
                                 }
                                 }
@@ -6162,7 +6162,7 @@ namespace FurnaceRT.Equipments.Jobs
                                     pm.TriggerJobAutoStart(maintenanceItemWaferUserTime.AssociationProcessRecipeName, RecipeExecEntryEnum.SDWaferRangeTrigger);
                                     pm.TriggerJobAutoStart(maintenanceItemWaferUserTime.AssociationProcessRecipeName, RecipeExecEntryEnum.SDWaferRangeTrigger);
                                     LOG.Info($"{msg} Trigger {maintenanceItemWaferUserTime.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferUserTime.LimitValue} to 0");
                                     LOG.Info($"{msg} Trigger {maintenanceItemWaferUserTime.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferUserTime.LimitValue} to 0");
 
 
-                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferUserTime.Item, 0);
+                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferUserTime.Item, 0, true);
                                     return false;
                                     return false;
 
 
                                 }
                                 }
@@ -6194,7 +6194,7 @@ namespace FurnaceRT.Equipments.Jobs
                                     LOG.Info($"{msg} Trigger {maintenanceItemWaferThickness.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferThickness.LimitValue} to 0");
                                     LOG.Info($"{msg} Trigger {maintenanceItemWaferThickness.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferThickness.LimitValue} to 0");
 
 
 
 
-                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferThickness.Item, 0);
+                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferThickness.Item, 0, true);
                                     return false;
                                     return false;
 
 
                                 }
                                 }
@@ -6271,7 +6271,7 @@ namespace FurnaceRT.Equipments.Jobs
 
 
                            
                            
 
 
-                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemCarrierUseFreq.Item, 0);
+                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemCarrierUseFreq.Item, 0, true);
                                     return false;
                                     return false;
 
 
                                 }
                                 }
@@ -6304,7 +6304,7 @@ namespace FurnaceRT.Equipments.Jobs
                                     pm.TriggerJobAutoStart(maintenanceItemWaferUserTime.AssociationProcessRecipeName, RecipeExecEntryEnum.EDWaferRangeTrigger);
                                     pm.TriggerJobAutoStart(maintenanceItemWaferUserTime.AssociationProcessRecipeName, RecipeExecEntryEnum.EDWaferRangeTrigger);
                                     LOG.Info($"{msg} Trigger {maintenanceItemWaferUserTime.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferUserTime.LimitValue} to 0");
                                     LOG.Info($"{msg} Trigger {maintenanceItemWaferUserTime.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferUserTime.LimitValue} to 0");
 
 
-                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferUserTime.Item, 0);
+                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferUserTime.Item, 0, true);
                                     return false;
                                     return false;
 
 
                                 }
                                 }
@@ -6333,7 +6333,7 @@ namespace FurnaceRT.Equipments.Jobs
                                     LOG.Info($"{msg} Trigger {maintenanceItemWaferThickness.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferThickness.LimitValue} to 0");
                                     LOG.Info($"{msg} Trigger {maintenanceItemWaferThickness.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferThickness.LimitValue} to 0");
 
 
 
 
-                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferThickness.Item, 0);
+                                    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferThickness.Item, 0, true);
                                     return false;
                                     return false;
 
 
                                 }
                                 }

+ 25 - 13
Furnace/FurnaceRT/Equipments/PMs/PMScheduleMaintenance.cs

@@ -347,10 +347,12 @@ namespace FurnaceRT.Equipments.PMs
                         }
                         }
                         else
                         else
                         {
                         {
-                            LOG.Info($"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0");
+                            var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName}";
+                            // var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0";
+                            LOG.Info(logInfo);
                             RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeStepRangeTrigger;
                             RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeStepRangeTrigger;
                             CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
                             CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
-                            Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0);
+                            //Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0, true);
                         }
                         }
 
 
                     }
                     }
@@ -395,7 +397,7 @@ namespace FurnaceRT.Equipments.PMs
             if (isWarning)
             if (isWarning)
                 Singleton<EquipmentManager>.Instance.ReatorStepRunTimeWarning.Set(message);
                 Singleton<EquipmentManager>.Instance.ReatorStepRunTimeWarning.Set(message);
 
 
-        
+
             if (isAlarm)
             if (isAlarm)
             {
             {
                 Singleton<EquipmentManager>.Instance.ReatorStepRunTimeAlarm.Set(message);
                 Singleton<EquipmentManager>.Instance.ReatorStepRunTimeAlarm.Set(message);
@@ -407,10 +409,12 @@ namespace FurnaceRT.Equipments.PMs
                     }
                     }
                     else
                     else
                     {
                     {
-                        LOG.Info($"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0");
+                        var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName}";
+                        // var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0";
+                        LOG.Info(logInfo);
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeStepRangeTrigger;
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeStepRangeTrigger;
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
-                        Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0);
+                        //    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0, true);
                     }
                     }
                 }
                 }
                 isPause = true;
                 isPause = true;
@@ -456,10 +460,12 @@ namespace FurnaceRT.Equipments.PMs
                     }
                     }
                     else
                     else
                     {
                     {
-                        LOG.Info($"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0");
+                        var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName}";
+                        // var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0";
+                        LOG.Info(logInfo);
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeStepRangeTrigger;
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeStepRangeTrigger;
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
-                        Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0);
+                        //   Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0, true);
                     }
                     }
                 }
                 }
                 isPause = true;
                 isPause = true;
@@ -514,10 +520,12 @@ namespace FurnaceRT.Equipments.PMs
                     }
                     }
                     else
                     else
                     {
                     {
-                        LOG.Info($"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0");
+                        var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName}";
+                        // var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0";
+                        LOG.Info(logInfo);
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeRangeTrigger;
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeRangeTrigger;
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
-                        Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0);
+                        // Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0, true);
                     }
                     }
                 }
                 }
                 isPause = true;
                 isPause = true;
@@ -565,10 +573,12 @@ namespace FurnaceRT.Equipments.PMs
                     }
                     }
                     else
                     else
                     {
                     {
-                        LOG.Info($"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0");
+                        var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName}";
+                        // var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0";
+                        LOG.Info(logInfo);
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.BoatRecipeRangeTrigger;
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.BoatRecipeRangeTrigger;
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
-                        Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0);
+                        //    Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0, true);
                     }
                     }
 
 
                 }
                 }
@@ -616,10 +626,12 @@ namespace FurnaceRT.Equipments.PMs
                     }
                     }
                     else
                     else
                     {
                     {
-                        LOG.Info($"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0");
+                        var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName}";
+                        // var logInfo = $"{message} Trigger {item.AssociationProcessRecipeName} ,auto clear CurrentValue {item.LimitValue} to 0";
+                        LOG.Info(logInfo);
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeRangeTrigger;
                         RecipeExecEntryEnumValue = RecipeExecEntryEnum.RecipeRangeTrigger;
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
                         CheckToPostMessage((int)MSG.RunOtherRecipe, item.AssociationProcessRecipeName, "Process");
-                        Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0);
+                        // Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(item.Item, 0, true);
                     }
                     }
 
 
                 }
                 }

+ 7 - 7
Furnace/FurnaceRT/Equipments/PMs/RecipeExecutions/PreProcess.cs

@@ -152,7 +152,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
 
 
 
 
 
 
-                                            Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemCarrierUseFreq.Item, 0);
+                                           // Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemCarrierUseFreq.Item, 0, true);
                                             return Result.FAIL;
                                             return Result.FAIL;
 
 
                                         }
                                         }
@@ -186,7 +186,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
 
 
 
 
 
 
-                                            Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferUserTime.Item, 0);
+                                           // Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferUserTime.Item, 0, true);
                                             return Result.FAIL;
                                             return Result.FAIL;
 
 
                                         }
                                         }
@@ -217,7 +217,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                                             pm.TriggerJobAutoStart(maintenanceItemWaferThickness.AssociationProcessRecipeName, RecipeExecEntryEnum.SDWaferRangeTrigger);
                                             pm.TriggerJobAutoStart(maintenanceItemWaferThickness.AssociationProcessRecipeName, RecipeExecEntryEnum.SDWaferRangeTrigger);
                                             LOG.Info($"{msg} Trigger {maintenanceItemWaferThickness.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferThickness.LimitValue} to 0");
                                             LOG.Info($"{msg} Trigger {maintenanceItemWaferThickness.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferThickness.LimitValue} to 0");
 
 
-                                            Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferThickness.Item, 0);
+                                         //   Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferThickness.Item, 0, true);
                                             return Result.FAIL;
                                             return Result.FAIL;
 
 
                                         }
                                         }
@@ -293,7 +293,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                                             LOG.Info($"{msg} Trigger {maintenanceItemCarrierUseFreq.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemCarrierUseFreq.LimitValue} to 0");
                                             LOG.Info($"{msg} Trigger {maintenanceItemCarrierUseFreq.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemCarrierUseFreq.LimitValue} to 0");
 
 
 
 
-                                            Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemCarrierUseFreq.Item, 0);
+                                           // Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemCarrierUseFreq.Item, 0, true);
                                             return Result.FAIL;
                                             return Result.FAIL;
 
 
                                         }
                                         }
@@ -328,7 +328,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
 
 
 
 
 
 
-                                            Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferUserTime.Item, 0);
+                                          //  Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferUserTime.Item, 0, true);
                                             return Result.FAIL;
                                             return Result.FAIL;
 
 
                                         }
                                         }
@@ -356,7 +356,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                                             pm.TriggerJobAutoStart(maintenanceItemWaferThickness.AssociationProcessRecipeName, RecipeExecEntryEnum.EDWaferRangeTrigger);
                                             pm.TriggerJobAutoStart(maintenanceItemWaferThickness.AssociationProcessRecipeName, RecipeExecEntryEnum.EDWaferRangeTrigger);
                                             LOG.Info($"{msg} Trigger {maintenanceItemWaferThickness.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferThickness.LimitValue} to 0");
                                             LOG.Info($"{msg} Trigger {maintenanceItemWaferThickness.AssociationProcessRecipeName},auto clear CurrentValue {maintenanceItemWaferThickness.LimitValue} to 0");
 
 
-                                            Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferThickness.Item, 0);
+                                            //Singleton<ScheduleMaintenanceDataManager>.Instance.SetValue(maintenanceItemWaferThickness.Item, 0, true);
                                             return Result.FAIL;
                                             return Result.FAIL;
 
 
                                         }
                                         }
@@ -369,7 +369,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                             #endregion
                             #endregion
                         }
                         }
                     }
                     }
-                    pm.CheckBoatRecipeThicknessMoreThan( out var boatRecipeThicknessIsPause);
+                    pm.CheckBoatRecipeThicknessMoreThan(out var boatRecipeThicknessIsPause);
                     if (boatRecipeThicknessIsPause)
                     if (boatRecipeThicknessIsPause)
                         return Result.FAIL;
                         return Result.FAIL;