|
|
@@ -662,7 +662,7 @@ namespace FurnaceRT.Equipments.PMs
|
|
|
item.FilterCheckerAlarm.Monitor(sensorItem.Value);
|
|
|
|
|
|
if (item.FilterCheckerAlarm.Trig)
|
|
|
- ProcessAlarmConditionErrorCommand(item.DIParameter.Command, () => alarmItem.Set());
|
|
|
+ ProcessAlarmConditionErrorCommand(item.DIParameter.Command, () => alarmItem.Set(), sensorItem.Name);
|
|
|
}
|
|
|
}
|
|
|
private void MonitorAPCAlarmCondition()
|
|
|
@@ -962,7 +962,7 @@ namespace FurnaceRT.Equipments.PMs
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- private void ProcessAlarmConditionErrorCommand(string command, Action eventHandler = null)
|
|
|
+ private void ProcessAlarmConditionErrorCommand(string command, Action eventHandler = null, string sensorName = "")
|
|
|
{
|
|
|
var recipe = "";
|
|
|
var recipeType = "";
|
|
|
@@ -977,7 +977,12 @@ namespace FurnaceRT.Equipments.PMs
|
|
|
recipeType = "Reset";
|
|
|
RecipeExecEntryEnumValue = RecipeExecEntryEnum.AlarmConditonTrigger;
|
|
|
CheckToPostMessage((int)MSG.RunOtherRecipe, recipe, recipeType);
|
|
|
- LOG.Write($"Alarm condition: command={command} recipe={recipe}");
|
|
|
+
|
|
|
+ var log = $"Alarm condition: command={command} recipe={recipe}";
|
|
|
+ if (!string.IsNullOrEmpty(sensorName))
|
|
|
+ log = $"{log} ,sensorName={sensorName}";
|
|
|
+
|
|
|
+ LOG.Write(log);
|
|
|
break;
|
|
|
case "End":
|
|
|
if (_isAlarmConditionHasRecipeCommand)
|
|
|
@@ -1002,26 +1007,39 @@ namespace FurnaceRT.Equipments.PMs
|
|
|
CheckToPostMessage((int)MSG.AlarmConditionJumpStep, RecipeRunningInfo.RecipeStepList.Count - 1);
|
|
|
}
|
|
|
|
|
|
- LOG.Write($"Alarm condition: command={command} step name={RecipeRunningInfo.RecipeStepList[RecipeRunningInfo.RecipeStepList.Count - 1].StepName}");
|
|
|
+ log = $"Alarm condition: command={command} step name={RecipeRunningInfo.RecipeStepList[RecipeRunningInfo.RecipeStepList.Count - 1].StepName}";
|
|
|
+ if (!string.IsNullOrEmpty(sensorName))
|
|
|
+ log = $"{log} ,sensorName={sensorName}";
|
|
|
+
|
|
|
+ LOG.Write(log);
|
|
|
break;
|
|
|
case "Hold":
|
|
|
if (_isAlarmConditionHasRecipeCommand)
|
|
|
break;
|
|
|
_isAlarmConditionHasRecipeCommand = true;
|
|
|
_processRoutine.PauseRecipe();
|
|
|
- LOG.Write($"Alarm condition: command={command}");
|
|
|
+ log = $"Alarm condition: command={command}";
|
|
|
+ if (!string.IsNullOrEmpty(sensorName))
|
|
|
+ log = $"{log} ,sensorName={sensorName}";
|
|
|
+ LOG.Write(log);
|
|
|
break;
|
|
|
case "Monitor"://蜂鸣器不需要响
|
|
|
eventHandler?.Invoke();
|
|
|
DEVICE.GetDevice<SignalTowerBase>("System.SignalTower")?.SwitchOffBuzzer(true);
|
|
|
Singleton<EquipmentManager>.Instance.IsAlarmConditionBuzzerOn = false;
|
|
|
- LOG.Write($"Alarm condition: command={command}");
|
|
|
+ log = $"Alarm condition: command={command}";
|
|
|
+ if (!string.IsNullOrEmpty(sensorName))
|
|
|
+ log = $"{log} ,sensorName={sensorName}";
|
|
|
+ LOG.Write(log);
|
|
|
break;
|
|
|
case "Buzzer"://蜂鸣器需要响且报警
|
|
|
eventHandler?.Invoke();
|
|
|
DEVICE.GetDevice<SignalTowerBase>("System.SignalTower")?.SwitchOffBuzzer(false);
|
|
|
Singleton<EquipmentManager>.Instance.IsAlarmConditionBuzzerOn = true;
|
|
|
- LOG.Write($"Alarm condition: command={command}");
|
|
|
+ log = $"Alarm condition: command={command}";
|
|
|
+ if (!string.IsNullOrEmpty(sensorName))
|
|
|
+ log = $"{log} ,sensorName={sensorName}";
|
|
|
+ LOG.Write(log);
|
|
|
break;
|
|
|
default:
|
|
|
if (_isAlarmConditionHasRecipeCommand)
|