|
@@ -264,9 +264,9 @@ namespace FurnaceRT.Equipments.PMs
|
|
|
var isEnable = SC.GetValue<bool>("BufferPurge.IsEnable");
|
|
|
if (isEnable)
|
|
|
{
|
|
|
- var sequence= SC.GetStringValue("BufferPurge.OperationOrder")?.Split(';');
|
|
|
+ var sequence = SC.GetStringValue("BufferPurge.OperationOrder")?.Split(';');
|
|
|
string[] names = SC.GetStringValue("BufferPurge.NameList")?.Split(';');
|
|
|
- if (sequence?.Length > 0&&names?.Length>0)
|
|
|
+ if (sequence?.Length > 0 && names?.Length > 0)
|
|
|
{
|
|
|
List<PurgeParameter> purge = new List<PurgeParameter>();
|
|
|
foreach (string p in sequence)
|
|
@@ -779,9 +779,9 @@ namespace FurnaceRT.Equipments.PMs
|
|
|
reason = string.Empty;
|
|
|
if (param.Length > 0 && param[0] is List<PurgeParameter> purge)
|
|
|
{
|
|
|
- reason= SetBufferPurge(purge);
|
|
|
- if (!string.IsNullOrEmpty(reason)) return false;
|
|
|
- SC.SetItemValue("BufferPurge.OperationOrder", $"{purge[0].Name},{purge[0].Speed},Time({purge[0].Time}),{(purge[0].IsOpen ? "Open" : (purge[0].IsClose?"Close":""))}");
|
|
|
+ reason = SetBufferPurge(purge);
|
|
|
+ if (!string.IsNullOrEmpty(reason)) return false;
|
|
|
+ SC.SetItemValue("BufferPurge.OperationOrder", $"{purge[0].Name},{purge[0].Speed},Time({purge[0].Time}),{(purge[0].IsOpen ? "Open" : (purge[0].IsClose ? "Close" : ""))}");
|
|
|
}
|
|
|
return true;
|
|
|
});
|
|
@@ -1262,11 +1262,15 @@ namespace FurnaceRT.Equipments.PMs
|
|
|
{
|
|
|
return N2PurgeModeEnum.ATMMode.ToString();
|
|
|
}
|
|
|
- if ((str == N2PurgeModeEnum.N2PurgeMode.ToString()) || (str == N2PurgeModeEnum.N2PurgeMode.ToDescription()) || (str.StartsWith("N2")))
|
|
|
+ else if ((str == N2PurgeModeEnum.N2PurgeMode.ToString()) || (str == N2PurgeModeEnum.N2PurgeMode.ToDescription()) || (str.StartsWith("N2")))
|
|
|
{
|
|
|
return N2PurgeModeEnum.N2PurgeMode.ToString();
|
|
|
}
|
|
|
- return N2PurgeModeEnum.ManualMode.ToString();
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return SC.ContainsItem("PM1.SelectN2PurgeMode") ? SC.GetStringValue("PM1.SelectN2PurgeMode") : N2PurgeModeEnum.ManualMode.ToString();
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
private bool FsmStartContinue(object[] param)
|
|
|
{
|