新增MS6点位及其报警

FrameworkLocal/UIClient/CenterViews/Parameter/MainParameterEditViewModel.cs

@@ -110,7 +110,6 @@ namespace MECF.Framework.UI.Client.CenterViews.Parameter
             ParameterTree.Clear();
             ConfigNodes = SystemConfigProvider.Instance.GetConfigTree(SystemName).SubNodes;
             _rootNode = SystemConfigProvider.Instance.GetConfig(true);
-            InitTree();
             var node = SystemConfigProvider.Instance.GetConfigTree(SystemName).SubNodes;
             ParameterTree.Add(new ParamBase() { ID = 1, ParentID = 0, Name = "StepName", ConfigName = "StepName" });
             ParameterTree.Add(new ParamBase() { ID = 2, ParentID = 0, Name = "StepGroup", ConfigName = "StepGroup" });

Furnace/FurnaceRT/Config/DisplayReplace.xml

@@ -41,6 +41,7 @@
 		<Display Name="PM1.LoadingAreaExhaustMS5.Value"				  DisplayName="Pressure.LoadingAreaExhaustMS5.Actual"   />
 		<Display Name="PM1.RHCExhaustMS8.Value"						  DisplayName="Pressure.RHCExhaustMS8.Actual"   />
 		<Display Name="PM1.LoadingAreaExhaustMS321.Value"						  DisplayName="Pressure.LoadingAreaExhaustMS321.Actual"   />
+		<Display Name="PM1.MS6.Value"						  DisplayName="Pressure.MS6.Actual"   />
 
 
 		<Display Name="PM1.Tank1Pressure.Value" DisplayName="Pressure.PS132.Actual" />
@@ -722,6 +723,7 @@
 		<Display ColName="LoadingAreaExhaustMS5(act)" Name="PM1.LoadingAreaExhaustMS5.Value"				  DisplayName="Pressure.LoadingAreaExhaustMS5.Actual"   />
 		<Display ColName="RHCExhaustMS8(act)" Name="PM1.RHCExhaustMS8.Value"						  DisplayName="Pressure.RHCExhaustMS8.Actual"   />
 		<Display ColName="LoadingAreaExhaustMS321(act)" Name="PM1.LoadingAreaExhaustMS321.Value"						  DisplayName="Pressure.LoadingAreaExhaustMS321.Actual"   />
+		<Display ColName="MS6(act)" Name="PM1.MS6.Value"						  DisplayName="Pressure.MS6.Actual"   />
 
 
 	</DetailGroup>

Furnace/FurnaceRT/Config/IO/ELK/DeviceModelPM.xml

@@ -893,6 +893,8 @@
 		<IoPressureMeter id="Tank1Pressure" display="Tank1Pressure(PS132)"  schematicId="Tank1Pressure" unit="kPa" aiFeedback="AI_Tank1Pressure"  physical="1500,7500" scale="0,1" aioType="float"/>
 		<IoPressureMeter id="Tank2Pressure" display="Tank2Pressure(PS135)"  schematicId="Tank2Pressure" unit="kPa" aiFeedback="AI_Tank2Pressure"  physical="1500,7500" scale="0,1" aioType="float"/>
 
+		<IoPressureMeter id="MS6" display="MS6(MS6)"  schematicId="MS6" unit="kPa" aiFeedback="AI_MS6"  physical="1500,7500" scale="0,1" aioType="float"/>
+
 
 
 
@@ -1107,7 +1109,6 @@
 		<IoAlarmSignal id="AlarmSignalVG13HighAlarm"		diSignalsplay="VG13HighAlarm"			diSignal="DI_VG13HighAlarm"		alarmTrigValue="true"/>
 
 
-		<IoAlarmSignal id="AlarmSignalPS14OUT1"		diSignalsplay="PS14OUT1"			diSignal="DI_PS14OUT1"		alarmTrigValue="true"/>
 		<IoAlarmSignal id="AlarmSignalPS14OUT2"		diSignalsplay="PS14OUT2"			diSignal="DI_PS14OUT2"		alarmTrigValue="true"/>
 
 		<IoAlarmSignal id="AlarmSignalCoolingWaterPressureOut1"		diSignalsplay="CoolingWaterPressureOut1"			diSignal="DI_CoolingWaterPressureOut1"		alarmTrigValue="true"/>
@@ -1190,6 +1191,8 @@
 		<IoAlarmSignal id="AlarmSignalLDS2TankBlankAlarm"		diSignalsplay="LDS2 tank blank alarm"			diSignal="DI_LDS2TankBlankAlarm"		alarmTrigValue="true"/>
 
 		<IoAlarmSignal id="AlarmSignalSL05001LAdoorsw1" diSignalsplay="safe module:SL05001 LA door sw1" diSignal="DI_SL05001LAdoorsw1" alarmTrigValue="false" />
+		
+		<IoAlarmSignal id="AlarmSignalMS6" diSignalsplay="MS6 alarm" diSignal="DI_MS6" alarmTrigValue="true" />
 
 
 	</IoAlarmSignals>
@@ -1420,6 +1423,7 @@
 
 		<IoSensor id="SensorWTRinterlockreset" display="WTRinterlockreset" di="DI_WTRinterlockreset"/>
 		<IoSensor id="SensorFTRinterlockreset" display="FTRinterlockreset" di="DI_FTRinterlockreset"/>
+		<IoSensor id="SensorPS14OUT1" display="PS14OUT1" di="DI_PS14OUT1"/>
 
 
 	</IoSensors>

Furnace/FurnaceRT/Config/IO/ELK/_ioDefinePM.xml

@@ -330,6 +330,7 @@
 		<DI_ITEM Index="1191" Name="DI_ValveBoxExhaust2ndAlarmMS4" BufferOffset="1191" Addr="D74.7" Description="valve box exhaust 2nd alarm MS4(D74.7)" />
 		<DI_ITEM Index="1192" Name="DI_LoadingAreaExhaust1stAlarmMS5" BufferOffset="1192" Addr="D74.8" Description="loading area exhaust 1st alarm MS5(D74.8)" />
 		<DI_ITEM Index="1193" Name="DI_LoadingAreaExhaust2ndAlarmMS5" BufferOffset="1193" Addr="D74.9" Description="loading area exhaust 2nd alarm MS5(D74.9)" />
+		<DI_ITEM Index="1193" Name="DI_MS6" BufferOffset="1194" Addr="D74.10" Description="MS6 alarm(D74.10)" />
 		<DI_ITEM Index="1196" Name="DI_LAExhaust1stAlarmMS321" BufferOffset="1196" Addr="D74.12" Description="common exhaust 1st alarm MS321(D74.12)" />
 		<DI_ITEM Index="1197" Name="DI_LAExhaust2ndAlarmMS321" BufferOffset="1197" Addr="D74.13" Description="common exhaust 2nd alarm MS321(D74.13)" />
 		<DI_ITEM Index="1198" Name="DI_RHC1stAlarmMS8" BufferOffset="1198" Addr="D74.14" Description="RHC 1st alarm MS8(D74.14)" />
@@ -1544,6 +1545,7 @@
 		<AI_ITEM Index="64" Name="AI_HeatingExhaustMS1" BufferOffset="64" Addr="D5128" Description="Heating exhaust MS1(D5128)" />
 		<AI_ITEM Index="65" Name="AI_GasBoxExhaustMS2" BufferOffset="65" Addr="D5130" Description="gas box exhaust MS2(D5130)" />
 		<AI_ITEM Index="66" Name="AI_ScavengerExhaustMS3" BufferOffset="66" Addr="D5132" Description="scavenger exhaust MS3(D5132)" />
+		<AI_ITEM Index="67" Name="AI_MS6" BufferOffset="76" Addr="D5134" Description="MS6(D5134)" />
 		<AI_ITEM Index="68" Name="AI_LoadingAreaExhaustMS321" BufferOffset="68" Addr="D5136" Description="loading area Pressure MS321(D5136)" />
 		<AI_ITEM Index="69" Name="AI_LoadingAreaExhaustMS5" BufferOffset="69" Addr="D5138" Description="loading area exhaust MS5(D5138)" />
 		<AI_ITEM Index="71" Name="AI_LSCUpExhaustMS8" BufferOffset="71" Addr="D5142" Description="LSC-up exhaust MS8(D5142)" />

Furnace/FurnaceRT/Equipments/PMs/PMModuleAlarmDefine.cs

@@ -6661,7 +6661,21 @@ namespace FurnaceRT.Equipments.PMs
                 }, () => { AlarmSignalGLBoxPG31CNT2Alarm.Reset(); return true; });
                 AlarmSignalGLBoxPG31CNT2Alarm.AlarmTriggered = alarm;
             }
-
+            if (AlarmSignalMS6Alarm != null)
+            {
+                alarm = SubscribeAlarm(new AlarmEventItem()
+                {
+                    EventEnum = $"{Name}.AlarmSignalMS6Alarm",
+                    Description = $"MS6 alarm Trigger",
+                    Solution = "No information available. Press[Clear] to delete alarm message.",
+                    Explaination = "No information available.",
+                    AutoRecovery = false,
+                    Level = EventLevel.Alarm,
+                    Action = EventAction.Clear,
+                    Category = "TubeAlarm",
+                }, () => { AlarmSignalMS6Alarm.Reset(); return true; });
+                AlarmSignalMS6Alarm.AlarmTriggered = alarm;
+            }
             if (AlarmSignalGLBoxPG32CNT1Alarm != null)
             {
                 alarm = SubscribeAlarm(new AlarmEventItem()

Furnace/FurnaceRT/Equipments/PMs/PMModuleDevice.cs

@@ -866,7 +866,9 @@ namespace FurnaceRT.Equipments.PMs
         [Tag("AlarmSignalGLBoxPG31CNT1Alarm")]
         public IoAlarmSignal AlarmSignalGLBoxPG31CNT1Alarm { get; set; }
         [Tag("AlarmSignalGLBoxPG31CNT2Alarm")]
-        public IoAlarmSignal AlarmSignalGLBoxPG31CNT2Alarm { get; set; }
+        public IoAlarmSignal AlarmSignalGLBoxPG31CNT2Alarm { get; set; }   
+        [Tag("AlarmSignalMS6")]
+        public IoAlarmSignal AlarmSignalMS6Alarm { get; set; }
         [Tag("AlarmSignalGLBoxPG32CNT1Alarm")]
         public IoAlarmSignal AlarmSignalGLBoxPG32CNT1Alarm { get; set; }
         [Tag("AlarmSignalGLBoxPG32CNT2Alarm")]

Furnace/FurnaceSimulator/Config/ELK/_ioDefinePM.xml

@@ -330,6 +330,7 @@
 		<DI_ITEM Index="1191" Name="DI_ValveBoxExhaust2ndAlarmMS4" BufferOffset="1191" Addr="D74.7" Description="valve box exhaust 2nd alarm MS4(D74.7)" />
 		<DI_ITEM Index="1192" Name="DI_LoadingAreaExhaust1stAlarmMS5" BufferOffset="1192" Addr="D74.8" Description="loading area exhaust 1st alarm MS5(D74.8)" />
 		<DI_ITEM Index="1193" Name="DI_LoadingAreaExhaust2ndAlarmMS5" BufferOffset="1193" Addr="D74.9" Description="loading area exhaust 2nd alarm MS5(D74.9)" />
+		<DI_ITEM Index="1193" Name="DI_MS6" BufferOffset="1194" Addr="D74.10" Description="MS6 alarm(D74.10)" />
 		<DI_ITEM Index="1196" Name="DI_LAExhaust1stAlarmMS321" BufferOffset="1196" Addr="D74.12" Description="common exhaust 1st alarm MS321(D74.12)" />
 		<DI_ITEM Index="1197" Name="DI_LAExhaust2ndAlarmMS321" BufferOffset="1197" Addr="D74.13" Description="common exhaust 2nd alarm MS321(D74.13)" />
 		<DI_ITEM Index="1198" Name="DI_RHC1stAlarmMS8" BufferOffset="1198" Addr="D74.14" Description="RHC 1st alarm MS8(D74.14)" />
@@ -1544,6 +1545,7 @@
 		<AI_ITEM Index="64" Name="AI_HeatingExhaustMS1" BufferOffset="64" Addr="D5128" Description="Heating exhaust MS1(D5128)" />
 		<AI_ITEM Index="65" Name="AI_GasBoxExhaustMS2" BufferOffset="65" Addr="D5130" Description="gas box exhaust MS2(D5130)" />
 		<AI_ITEM Index="66" Name="AI_ScavengerExhaustMS3" BufferOffset="66" Addr="D5132" Description="scavenger exhaust MS3(D5132)" />
+		<AI_ITEM Index="67" Name="AI_MS6" BufferOffset="76" Addr="D5134" Description="MS6(D5134)" />
 		<AI_ITEM Index="68" Name="AI_LoadingAreaExhaustMS321" BufferOffset="68" Addr="D5136" Description="loading area Pressure MS321(D5136)" />
 		<AI_ITEM Index="69" Name="AI_LoadingAreaExhaustMS5" BufferOffset="69" Addr="D5138" Description="loading area exhaust MS5(D5138)" />
 		<AI_ITEM Index="71" Name="AI_LSCUpExhaustMS8" BufferOffset="71" Addr="D5142" Description="LSC-up exhaust MS8(D5142)" />

Furnace/FurnaceSimulator/Config/_ioDefinePM.xml

@@ -330,6 +330,7 @@
 		<DI_ITEM Index="1191" Name="DI_ValveBoxExhaust2ndAlarmMS4" BufferOffset="1191" Addr="D74.7" Description="valve box exhaust 2nd alarm MS4(D74.7)" />
 		<DI_ITEM Index="1192" Name="DI_LoadingAreaExhaust1stAlarmMS5" BufferOffset="1192" Addr="D74.8" Description="loading area exhaust 1st alarm MS5(D74.8)" />
 		<DI_ITEM Index="1193" Name="DI_LoadingAreaExhaust2ndAlarmMS5" BufferOffset="1193" Addr="D74.9" Description="loading area exhaust 2nd alarm MS5(D74.9)" />
+		<DI_ITEM Index="1193" Name="DI_MS6" BufferOffset="1194" Addr="D74.10" Description="MS6 alarm(D74.10)" />
 		<DI_ITEM Index="1196" Name="DI_LAExhaust1stAlarmMS321" BufferOffset="1196" Addr="D74.12" Description="common exhaust 1st alarm MS321(D74.12)" />
 		<DI_ITEM Index="1197" Name="DI_LAExhaust2ndAlarmMS321" BufferOffset="1197" Addr="D74.13" Description="common exhaust 2nd alarm MS321(D74.13)" />
 		<DI_ITEM Index="1198" Name="DI_RHC1stAlarmMS8" BufferOffset="1198" Addr="D74.14" Description="RHC 1st alarm MS8(D74.14)" />
@@ -1544,6 +1545,7 @@
 		<AI_ITEM Index="64" Name="AI_HeatingExhaustMS1" BufferOffset="64" Addr="D5128" Description="Heating exhaust MS1(D5128)" />
 		<AI_ITEM Index="65" Name="AI_GasBoxExhaustMS2" BufferOffset="65" Addr="D5130" Description="gas box exhaust MS2(D5130)" />
 		<AI_ITEM Index="66" Name="AI_ScavengerExhaustMS3" BufferOffset="66" Addr="D5132" Description="scavenger exhaust MS3(D5132)" />
+		<AI_ITEM Index="67" Name="AI_MS6" BufferOffset="76" Addr="D5134" Description="MS6(D5134)" />
 		<AI_ITEM Index="68" Name="AI_LoadingAreaExhaustMS321" BufferOffset="68" Addr="D5136" Description="loading area Pressure MS321(D5136)" />
 		<AI_ITEM Index="69" Name="AI_LoadingAreaExhaustMS5" BufferOffset="69" Addr="D5138" Description="loading area exhaust MS5(D5138)" />
 		<AI_ITEM Index="71" Name="AI_LSCUpExhaustMS8" BufferOffset="71" Addr="D5142" Description="LSC-up exhaust MS8(D5142)" />