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

Furnace/FurnaceRT/Equipments/PMs/PMMethods.cs

@@ -488,7 +488,7 @@ namespace FurnaceRT.Equipments.PMs
                         if (maintenanceItemSDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
                             return true;
 
-                        pm.MaintenanceProcessingCommandExec(maintenanceItemSDCarrierUseFreq, new AlarmReportItem(Singleton<EquipmentManager>.Instance.SDWaferTypeUseCountAlarm.Set, $"more than {SDCountAlarm} 次"));
+                        pm.MaintenanceProcessingCommandExec(maintenanceItemSDCarrierUseFreq, new AlarmReportItem(Singleton<EquipmentManager>.Instance.SDWaferTypeUseCountAlarm.Set, $"more than {SDCountAlarm} 次"),"",false);
                         return false;
                     }
 
@@ -498,7 +498,7 @@ namespace FurnaceRT.Equipments.PMs
                             return true;
 
                         DateTimeUtil.ConvertSecondsToHoursAndMinutes(SDTimeAlarm, out var hours, out var minutes);
-                        pm.MaintenanceProcessingCommandExec(maintenanceItemSDWaferUserTime, new AlarmReportItem(Singleton<EquipmentManager>.Instance.SDWaferTypeUseTimeAlarm.Set, $"more than {hours} hour {minutes}"));
+                        pm.MaintenanceProcessingCommandExec(maintenanceItemSDWaferUserTime, new AlarmReportItem(Singleton<EquipmentManager>.Instance.SDWaferTypeUseTimeAlarm.Set, $"more than {hours} hour {minutes}"), "", false);
 
                         return false;
                     }
@@ -508,7 +508,7 @@ namespace FurnaceRT.Equipments.PMs
                         if (maintenanceItemSDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
                             return true;
 
-                        pm.MaintenanceProcessingCommandExec(maintenanceItemSDWaferThickness, new AlarmReportItem(Singleton<EquipmentManager>.Instance.SDWaferTypeThicknessAlarm.Set, $"more than {SDThicknessAlarm} nm"));
+                        pm.MaintenanceProcessingCommandExec(maintenanceItemSDWaferThickness, new AlarmReportItem(Singleton<EquipmentManager>.Instance.SDWaferTypeThicknessAlarm.Set, $"more than {SDThicknessAlarm} nm"), "", false);
 
                         return false;
                     }
@@ -560,7 +560,7 @@ namespace FurnaceRT.Equipments.PMs
                         if (maintenanceItemEDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
                             return true;
 
-                        pm.MaintenanceProcessingCommandExec(maintenanceItemEDCarrierUseFreq, new AlarmReportItem(Singleton<EquipmentManager>.Instance.EDWaferTypeUseCountAlarm.Set, $"more than {EDCountAlarm} 次"));
+                        pm.MaintenanceProcessingCommandExec(maintenanceItemEDCarrierUseFreq, new AlarmReportItem(Singleton<EquipmentManager>.Instance.EDWaferTypeUseCountAlarm.Set, $"more than {EDCountAlarm} 次"), "", false);
                         return false;
                     }
 
@@ -571,7 +571,7 @@ namespace FurnaceRT.Equipments.PMs
                             return true;
 
                         DateTimeUtil.ConvertSecondsToHoursAndMinutes(EDTimeAlarm, out var hours, out var minutes);
-                        pm.MaintenanceProcessingCommandExec(maintenanceItemEDWaferUserTime, new AlarmReportItem(Singleton<EquipmentManager>.Instance.EDWaferTypeUseTimeAlarm.Set, $"more than {hours} hour {minutes}"));
+                        pm.MaintenanceProcessingCommandExec(maintenanceItemEDWaferUserTime, new AlarmReportItem(Singleton<EquipmentManager>.Instance.EDWaferTypeUseTimeAlarm.Set, $"more than {hours} hour {minutes}"), "", false);
                         return false;
                     }
 
@@ -581,7 +581,7 @@ namespace FurnaceRT.Equipments.PMs
                         if (maintenanceItemEDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
                             return true;
 
-                        pm.MaintenanceProcessingCommandExec(maintenanceItemEDWaferThickness, new AlarmReportItem(Singleton<EquipmentManager>.Instance.EDWaferTypeThicknessAlarm.Set, $"more than {EDThicknessAlarm} nm"));
+                        pm.MaintenanceProcessingCommandExec(maintenanceItemEDWaferThickness, new AlarmReportItem(Singleton<EquipmentManager>.Instance.EDWaferTypeThicknessAlarm.Set, $"more than {EDThicknessAlarm} nm"), "", false);
                         return false;
                     }
                     #endregion

Furnace/FurnaceRT/Equipments/PMs/PMScheduleMaintenance.cs

@@ -120,7 +120,7 @@ namespace FurnaceRT.Equipments.PMs
 
         }
 
-        public void MaintenanceProcessingCommandExec(ScheduleMaintenanceDataItem item, AlarmReportItem alarmReportItem, string msg = "")
+        public void MaintenanceProcessingCommandExec(ScheduleMaintenanceDataItem item, AlarmReportItem alarmReportItem, string msg = "", bool isWarning = true)
         {
             string message = !string.IsNullOrEmpty(msg) ? msg : $"{item.Item}-{item.Display} {item.AdditionInformationDisplay}  {item.CurrentValue} limit is ({item.StartValue}~{item.LimitValue}) {item.Unit}";
             string nullMessage = $"{item.Display} No recipe file associated, unable to trigger JobAutoStart";
@@ -136,7 +136,10 @@ namespace FurnaceRT.Equipments.PMs
                         break;
 
                     case MaintenanceProcessingCommandEnum.JobAutoStart:
-
+                        if (isWarning)
+                        {
+                            return;
+                        }
                         if (string.IsNullOrEmpty(item.AssociationProcessRecipeName))
                         {
                             Singleton<EquipmentManager>.Instance.RecipeThicknessAlarm.Set(nullMessage);