From 311abf6ed383cd127d2f7042bfc418b4bc30fa93 Mon Sep 17 00:00:00 2001
From: hanqiangqiang <1364346467@qq.com>
Date: Thu, 30 Jul 2026 13:30:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E6=B7=BB=E5=8A=A0=E7=94=B5=E6=B0=94=E9=81=97?=
 =?UTF-8?q?=E6=BC=8F=E6=B0=94=E5=8A=A8=E9=98=80=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=85=B3IO=E3=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=91=E5=AE=9A=EF=BC=8C=E4=BB=BF=E7=9C=9F=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=B1=9E=E6=80=A7=202=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B9=B2=E6=B3=B5=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=91=E5=AE=9A=E5=92=8C=E4=BB=BF=E7=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/PM/PM1/DeviceModelPM1.xml          | 13 +++--
 .../SicModules/Config/PM/PM1/_ioDefinePM1.xml | 29 ++++++++----
 App/SicSimulator/Config/DevicePM.xml          | 25 ++++------
 App/SicSimulator/Config/_ioDefinePM.xml       | 47 ++++++++++++-------
 App/SicUI/Models/PMs/PMOperationView.xaml     |  6 +--
 App/SicUI/Models/PMs/PMOperationViewModel.cs  | 16 +++++--
 .../Devices/IoPump.cs                         |  6 +--
 7 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
index d280dbd..0a9f042 100644
--- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
@@ -53,10 +53,11 @@
     <IoValve id="V58s" display="V58s" schematicId="V58s" unit="" isNc="false" isDefaultOpen="true"  diOpen="DI_SO2SourceCarrierFB(V58)" doOpen="DO_SO2SourceCarrier(V58)" diCloseSensor="" diOpenSensor="" />
     <IoValve id="V59"  display="V59"  schematicId="V59"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SO2RunVentFB(V59)" doOpen="DO_SO2RunVent(V59)" diCloseSensor="" diOpenSensor="" />
     <IoValve id="V59s" display="V59s" schematicId="V59s" unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SO2RunVentFB(V59)" doOpen="DO_SO2RunVent(V59)" diCloseSensor="" diOpenSensor="" />
-    
-    <!--<IoValve id="V61"  display="V61"  schematicId="V61"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SHPurgeH2FB(V61)" doOpen="DO_SHPurgeH2(V61)" diCloseSensor="" diOpenSensor="" />
-    <IoValve id="V62"  display="V62"  schematicId="V62"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SHPurgeH2FB(V62)" doOpen="DO_SHPurgeH2(V62)" diCloseSensor="" diOpenSensor="" />
-    <IoValve id="V63"  display="V63"  schematicId="V63"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SHPurgeH2FB(V63)" doOpen="DO_SHPurgeH2(V63)" diCloseSensor="" diOpenSensor="" />-->
+
+    <IoValve id="V60" display="V60" schematicId="V60" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_SO2VentFB(V60)"   doOpen="DO_SO2Vent(V60)" diCloseSensor="" diOpenSensor="" />
+    <IoValve id="V61" display="V61" schematicId="V61" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_Run1MoWFB(V61)"   doOpen="DO_Run1MoW(V61)" diCloseSensor="" diOpenSensor="" />
+    <IoValve id="V62" display="V62" schematicId="V62" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_Run2SSeFB(V62)"   doOpen="DO_Run2SSe(V62)" diCloseSensor="" diOpenSensor="" />
+    <IoValve id="V63" display="V63" schematicId="V63" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_Run3O2SO2FB(V63)" doOpen="DO_Run3O2SO2(V63)" diCloseSensor="" diOpenSensor="" />
     
     <IoValve id="V66"  display="V66"  schematicId="V66"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SHPurgeH2FB(V66)" doOpen="DO_SHPurgeH2(V66)" diCloseSensor="" diOpenSensor="" />
     <IoValve id="V67"  display="V67"  schematicId="V67"  unit="" isNc="false" isDefaultOpen="true"  diOpen="DI_SHPurgeN2FB(V67)" doOpen="DO_SHPurgeN2(V67)" diCloseSensor="" diOpenSensor="" />
@@ -134,4 +135,8 @@
 
   </IoPressures>
 
+  <IoPumps classType="Aitex.Core.RT.Device.Devices.IoPump" assembly="MECF.Framework.RT.EquipmentLibrary">
+    <IoPump id="Pump" module="" display="Pump" schematicId="Pump" unit="" aioType="" diDryPumpAlarm="DI_DryPump1Alarm" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" />
+  </IoPumps>
+
 </DeviceModelDefine>
\ No newline at end of file
diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
index 42032b9..eca950b 100644
--- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
@@ -4,12 +4,13 @@
   <Dig_In>
     <Block Index="0">
       <DI_ITEM Index="0" Name="DI_ChamberCloseDone" BufferOffset="0" Addr="0" Description="" />
-      <DI_ITEM Index="3" Name="DI_ChamCabDoorClosed" BufferOffset="3" Addr="3" Description="" />
+      <DI_ITEM Index="1" Name="DI_PMGasDetectorFault" BufferOffset="1" Addr="1" Description="" />
+      <DI_ITEM Index="2" Name="DI_GBGasDetectorFault" BufferOffset="2" Addr="2" Description="" />
       <DI_ITEM Index="4" Name="DI_ChamPressAboveATMSW" BufferOffset="4" Addr="4" Description="" />
       <DI_ITEM Index="5" Name="DI_ChamAtSafeProcessPressSW" BufferOffset="5" Addr="5" Description="" />
       <DI_ITEM Index="6" Name="DI_DORPressVac" BufferOffset="6" Addr="6" Description="" />
       <DI_ITEM Index="7" Name="DI_DORPressATM" BufferOffset="7" Addr="7" Description="" />
-      <DI_ITEM Index="8" Name="DI_PMH2SDetectorAlarm" BufferOffset="8" Addr="8" Description="" />
+      <DI_ITEM Index="8" Name="DI_PumpExhaustDPLowAlarm" BufferOffset="8" Addr="8" Description="" />
       <DI_ITEM Index="9" Name="DI_PMATMSW" BufferOffset="9" Addr="9" Description="" />
       <DI_ITEM Index="10" Name="DI_HeaterTempUpLimitAlarm" BufferOffset="10" Addr="10" Description="" />
       <DI_ITEM Index="11" Name="DI_HeaterTempLowLimitAlarm" BufferOffset="11" Addr="11" Description="" />
@@ -31,15 +32,15 @@
       <DI_ITEM Index="27" Name="DI_InletTotalFlowLowAlarm" BufferOffset="27" Addr="27" Description="" />
       <DI_ITEM Index="28" Name="DI_InletTotalFlowHighAlarm" BufferOffset="28" Addr="28" Description="" />
       <DI_ITEM Index="30" Name="DI_PMH2DetectorAlarm" BufferOffset="30" Addr="30" Description="" />
-      <DI_ITEM Index="31" Name="DI_GBH2SDetectorAlarm" BufferOffset="31" Addr="31" Description="" />
-      <DI_ITEM Index="32" Name="DI_GBExhaustDPLowAlarm" BufferOffset="32" Addr="32" Description="" />
+      <DI_ITEM Index="31" Name="DI_ArInletPressAlarm" BufferOffset="31" Addr="31" Description="" />
+      <DI_ITEM Index="32" Name="DI_GBSO2DetectorAlarm" BufferOffset="32" Addr="32" Description="" />
       <DI_ITEM Index="33" Name="DI_GBDoorCloseDone" BufferOffset="33" Addr="33" Description="" />
-      <DI_ITEM Index="34" Name="DI_GBSO2DetectorAlarm" BufferOffset="34" Addr="34" Description="" />
+      <DI_ITEM Index="34" Name="DI_GBExhaustDPLowAlarm" BufferOffset="34" Addr="34" Description="" />
       <DI_ITEM Index="35" Name="DI_GasPipeTempCtrlAlarm" BufferOffset="35" Addr="35" Description="" />
       <DI_ITEM Index="36" Name="DI_DryPump1Alarm" BufferOffset="36" Addr="36" Description="" />
       <DI_ITEM Index="38" Name="DI_PumpExhaustPressAlarm" BufferOffset="38" Addr="38" Description="" />
       <DI_ITEM Index="39" Name="DI_PMExhaustDPLowAlarm" BufferOffset="39" Addr="39" Description="" />
-      <DI_ITEM Index="40" Name="DI_PumpExhaustDPLowAlarm" BufferOffset="40" Addr="40" Description="" />
+      <DI_ITEM Index="40" Name="DI_PMH2SDetectorAlarm" BufferOffset="40" Addr="40" Description="" />
       <DI_ITEM Index="41" Name="DI_ScrubberIntlk" BufferOffset="41" Addr="41" Description="" />
       <DI_ITEM Index="42" Name="DI_FacilityIntlk" BufferOffset="42" Addr="42" Description="" />
       <DI_ITEM Index="45" Name="DI_RotaryMotorAlarm" BufferOffset="45" Addr="45" Description="" />
@@ -49,13 +50,15 @@
       <DI_ITEM Index="51" Name="DI_ReactorSuspectorCheck" BufferOffset="51" Addr="51" Description="" />
       <DI_ITEM Index="52" Name="DI_PMSO2DetectorAlarm" BufferOffset="52" Addr="52" Description="" />
       <DI_ITEM Index="55" Name="DI_GN2InletPressAlarm" BufferOffset="55" Addr="55" Description="" />
-      <DI_ITEM Index="56" Name="DI_ArInletPressAlarm" BufferOffset="56" Addr="56" Description="" />
-      <DI_ITEM Index="57" Name="DI_H2PressureAlarm" BufferOffset="57" Addr="57" Description="" />
+      <DI_ITEM Index="56" Name="DI_GBH2SDetectorAlarm" BufferOffset="56" Addr="56" Description="" />
+      <DI_ITEM Index="57" Name="DI_GBH2SeDetectorAlarm" BufferOffset="57" Addr="57" Description="" />
+      <DI_ITEM Index="58" Name="DI_GBSmokeDetectorAlarm" BufferOffset="58" Addr="58" Description="" />
       <DI_ITEM Index="59" Name="DI_GBH2DetectorAlarm" BufferOffset="59" Addr="59" Description="" />
       <DI_ITEM Index="60" Name="DI_GBWaterLeakAlarm" BufferOffset="60" Addr="60" Description="" />
-      <DI_ITEM Index="63" Name="DI_GBH2SeDetectorAlarm" BufferOffset="63" Addr="63" Description="" />
+      <DI_ITEM Index="63" Name="DI_H2PressureAlarm" BufferOffset="63" Addr="63" Description="" />
       <DI_ITEM Index="65" Name="DI_DryPump1Running" BufferOffset="65" Addr="65" Description="" />
       <DI_ITEM Index="67" Name="DI_DryPump1Warning" BufferOffset="67" Addr="67" Description="" />
+      <DI_ITEM Index="69" Name="DI_PMSmokeDetectorAlarm" BufferOffset="69" Addr="69" Description="" />
       <DI_ITEM Index="70" Name="DI_EMOStatusAlarm" BufferOffset="70" Addr="70" Description="" />
       <DI_ITEM Index="71" Name="DI_PumpCabDoorCloseDone" BufferOffset="71" Addr="71" Description="" />
       <DI_ITEM Index="72" Name="DI_FacilityWarning" BufferOffset="72" Addr="72" Description="" />
@@ -128,6 +131,7 @@
       <DI_ITEM Index="193" Name="DI_MoResrvCarrierOutletFB(V21)" BufferOffset="193" Addr="193" Description="" />
       <DI_ITEM Index="194" Name="DI_MoResrvBypassFB(V22)" BufferOffset="194" Addr="194" Description="" />
       <DI_ITEM Index="195" Name="DI_MoResrvInoutLeakTestFB(V23)" BufferOffset="195" Addr="195" Description="" />
+      <DI_ITEM Index="196" Name="DI_SO2VentFB(V60)" BufferOffset="196" Addr="196" Description="" />
       <DI_ITEM Index="197" Name="DI_SHPurgeH2FB(V66)" BufferOffset="197" Addr="197" Description="" />
       <DI_ITEM Index="198" Name="DI_SHPurgeN2FB(V67)" BufferOffset="198" Addr="198" Description="" />
       <DI_ITEM Index="199" Name="DI_PMPurgeN2FB(V68)" BufferOffset="199" Addr="199" Description="" />
@@ -142,8 +146,11 @@
       <DI_ITEM Index="208" Name="DI_DORVacuumFB(V75)" BufferOffset="208" Addr="208" Description="" />
       <DI_ITEM Index="209" Name="DI_DORPressureReliefFB(V76)" BufferOffset="209" Addr="209" Description="" />
       <DI_ITEM Index="210" Name="DI_SideLeakIsolateFB(V25)" BufferOffset="210" Addr="210" Description="" />
+      <DI_ITEM Index="211" Name="DI_Run1MoWFB(V61)" BufferOffset="211" Addr="211" Description="" />
       <DI_ITEM Index="212" Name="DI_PMLeakTestIsolateFB(V27)" BufferOffset="212" Addr="212" Description="" />
+      <DI_ITEM Index="213" Name="DI_Run2SSeFB(V62)" BufferOffset="213" Addr="213" Description="" />
       <DI_ITEM Index="214" Name="DI_FinalCarryGasFB(V97)" BufferOffset="214" Addr="214" Description="" />
+      <DI_ITEM Index="215" Name="DI_Run3O2SO2FB(V63)" BufferOffset="215" Addr="215" Description="" />
       <DI_ITEM Index="216" Name="DI_PSUEnableFB" BufferOffset="216" Addr="216" Description="" />
       <DI_ITEM Index="217" Name="DI_InnerHeaterEnableFB" BufferOffset="217" Addr="217" Description="" />
       <DI_ITEM Index="218" Name="DI_MiddleHeaterEnableFB" BufferOffset="218" Addr="218" Description="" />
@@ -326,6 +333,7 @@
       <DO_ITEM Index="33" Name="DO_MoResrvCarrierOutlet(V21)" BufferOffset="33" Addr="33" Description="" />
       <DO_ITEM Index="34" Name="DO_MoResrvBypass(V22)" BufferOffset="34" Addr="34" Description="" />
       <DO_ITEM Index="35" Name="DO_MoResrvInoutLeakTest(V23)" BufferOffset="35" Addr="35" Description="" />
+      <DO_ITEM Index="36" Name="DO_SO2Vent(V60)" BufferOffset="36" Addr="36" Description="" />
       <DO_ITEM Index="37" Name="DO_SHPurgeH2(V66)" BufferOffset="37" Addr="37" Description="" />
       <DO_ITEM Index="38" Name="DO_SHPurgeN2(V67)" BufferOffset="38" Addr="38" Description="" />
       <DO_ITEM Index="39" Name="DO_PMPurgeN2(V68)" BufferOffset="39" Addr="39" Description="" />
@@ -339,8 +347,11 @@
       <DO_ITEM Index="48" Name="DO_DORVacuum(V75)" BufferOffset="48" Addr="48" Description="" />
       <DO_ITEM Index="49" Name="DO_DORPressureRelief(V76)" BufferOffset="49" Addr="49" Description="" />
       <DO_ITEM Index="50" Name="DO_SideLeakIsolate(V25)" BufferOffset="50" Addr="50" Description="" />
+      <DO_ITEM Index="51" Name="DO_Run1MoW(V61)" BufferOffset="51" Addr="51" Description="" />
       <DO_ITEM Index="52" Name="DO_PMLeakTestIsolate(V27)" BufferOffset="52" Addr="52" Description="" />
+      <DO_ITEM Index="53" Name="DO_Run2SSe(V62)" BufferOffset="53" Addr="53" Description="" />
       <DO_ITEM Index="54" Name="DO_FinalCarryGas(V97)" BufferOffset="54" Addr="54" Description="" />
+      <DO_ITEM Index="55" Name="DO_Run3O2SO2(V63)" BufferOffset="55" Addr="55" Description="" />
       <DO_ITEM Index="56" Name="DO_PSUEnable" BufferOffset="56" Addr="56" Description="" />
       <DO_ITEM Index="57" Name="DO_InnerHeaterEnable" BufferOffset="57" Addr="57" Description="" />
       <DO_ITEM Index="58" Name="DO_MiddleHeaterEnable" BufferOffset="58" Addr="58" Description="" />
diff --git a/App/SicSimulator/Config/DevicePM.xml b/App/SicSimulator/Config/DevicePM.xml
index e0a658e..6298fdc 100644
--- a/App/SicSimulator/Config/DevicePM.xml
+++ b/App/SicSimulator/Config/DevicePM.xml
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DeviceModelDefine type="Sic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
-  <!--给IO数值初始值仿真--><!--
   <IoValveGroup classType="MECF.Framework.Simulator.Core.SimulatorIoDefault" assembly="MECF.Framework.Simulator.Core">
     <IoDefaults id="IoDefault" display="" schematicId="" unit="">
-      --><!--测试仿真功能配置用法示例，后期删除  --><!--
-      --><!--<IODefault type="AI" ioName="AI_ButterflyValveActualPressure" default="330"/>--><!--
-      --><!--<IODefault type="AO" ioName="AO_M2" default="2000"/>--><!--
-      --><!--测试仿真功能配置用法示例，后期删除--><!--
-      --><!--<IODefault type="AI" ioName="AI_ButterflyValveActualPressure" default="1030"/>--><!--
+
+      <IODefault type="DI" ioName="DI_DryPump1Alarm"      default="true"/>
+      <IODefault type="DI" ioName="DI_DryPump1Warning"    default="true"/>
+      <IODefault type="DI" ioName="DI_DryPump1Running"    default="true"/>
 
 
-
-
-      --><!--interlock默认值--><!--
-      
-      --><!--Interlock默认值--><!--
-      --><!--Alarm默认值--><!--
-     
-      --><!--Alarm默认值--><!--
     </IoDefaults>
   </IoValveGroup>
 
@@ -125,9 +115,10 @@
       <IoValve id="V59"  display="V59"  schematicId="V59"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SO2RunVentFB(V59)" doOpen="DO_SO2RunVent(V59)" diCloseSensor="" diOpenSensor="" />
       <IoValve id="V59s" display="V59s" schematicId="V59s" unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SO2RunVentFB(V59)" doOpen="DO_SO2RunVent(V59)" diCloseSensor="" diOpenSensor="" />
 
-      <!--<IoValve id="V61"  display="V61"  schematicId="V61"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SHPurgeH2FB(V61)" doOpen="DO_SHPurgeH2(V61)" diCloseSensor="" diOpenSensor="" />
-    <IoValve id="V62"  display="V62"  schematicId="V62"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SHPurgeH2FB(V62)" doOpen="DO_SHPurgeH2(V62)" diCloseSensor="" diOpenSensor="" />
-    <IoValve id="V63"  display="V63"  schematicId="V63"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SHPurgeH2FB(V63)" doOpen="DO_SHPurgeH2(V63)" diCloseSensor="" diOpenSensor="" />-->
+      <IoValve id="V60" display="V60" schematicId="V60" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_SO2VentFB(V60)"   doOpen="DO_SO2Vent(V60)" diCloseSensor="" diOpenSensor="" />
+      <IoValve id="V61" display="V61" schematicId="V61" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_Run1MoWFB(V61)"   doOpen="DO_Run1MoW(V61)" diCloseSensor="" diOpenSensor="" />
+      <IoValve id="V62" display="V62" schematicId="V62" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_Run2SSeFB(V62)"   doOpen="DO_Run2SSe(V62)" diCloseSensor="" diOpenSensor="" />
+      <IoValve id="V63" display="V63" schematicId="V63" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_Run3O2SO2FB(V63)" doOpen="DO_Run3O2SO2(V63)" diCloseSensor="" diOpenSensor="" />
 
       <IoValve id="V66"  display="V66"  schematicId="V66"  unit="" isNc="true"  isDefaultOpen="false" diOpen="DI_SHPurgeH2FB(V66)" doOpen="DO_SHPurgeH2(V66)" diCloseSensor="" diOpenSensor="" />
       <IoValve id="V67"  display="V67"  schematicId="V67"  unit="" isNc="false" isDefaultOpen="true"  diOpen="DI_SHPurgeN2FB(V67)" doOpen="DO_SHPurgeN2(V67)" diCloseSensor="" diOpenSensor="" />
diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml
index 5184125..e06e5e8 100644
--- a/App/SicSimulator/Config/_ioDefinePM.xml
+++ b/App/SicSimulator/Config/_ioDefinePM.xml
@@ -4,12 +4,13 @@
   <Dig_In>
     <Block Index="0">
       <DI_ITEM Index="0" Name="DI_ChamberCloseDone" BufferOffset="0" Addr="0" Description="" />
-      <DI_ITEM Index="3" Name="DI_ChamCabDoorClosed" BufferOffset="3" Addr="3" Description="" />
+      <DI_ITEM Index="1" Name="DI_PMGasDetectorFault" BufferOffset="1" Addr="1" Description="" />
+      <DI_ITEM Index="2" Name="DI_GBGasDetectorFault" BufferOffset="2" Addr="2" Description="" />
       <DI_ITEM Index="4" Name="DI_ChamPressAboveATMSW" BufferOffset="4" Addr="4" Description="" />
       <DI_ITEM Index="5" Name="DI_ChamAtSafeProcessPressSW" BufferOffset="5" Addr="5" Description="" />
       <DI_ITEM Index="6" Name="DI_DORPressVac" BufferOffset="6" Addr="6" Description="" />
       <DI_ITEM Index="7" Name="DI_DORPressATM" BufferOffset="7" Addr="7" Description="" />
-      <DI_ITEM Index="8" Name="DI_PMH2SDetectorAlarm" BufferOffset="8" Addr="8" Description="" />
+      <DI_ITEM Index="8" Name="DI_PumpExhaustDPLowAlarm" BufferOffset="8" Addr="8" Description="" />
       <DI_ITEM Index="9" Name="DI_PMATMSW" BufferOffset="9" Addr="9" Description="" />
       <DI_ITEM Index="10" Name="DI_HeaterTempUpLimitAlarm" BufferOffset="10" Addr="10" Description="" />
       <DI_ITEM Index="11" Name="DI_HeaterTempLowLimitAlarm" BufferOffset="11" Addr="11" Description="" />
@@ -31,15 +32,15 @@
       <DI_ITEM Index="27" Name="DI_InletTotalFlowLowAlarm" BufferOffset="27" Addr="27" Description="" />
       <DI_ITEM Index="28" Name="DI_InletTotalFlowHighAlarm" BufferOffset="28" Addr="28" Description="" />
       <DI_ITEM Index="30" Name="DI_PMH2DetectorAlarm" BufferOffset="30" Addr="30" Description="" />
-      <DI_ITEM Index="31" Name="DI_GBH2SDetectorAlarm" BufferOffset="31" Addr="31" Description="" />
-      <DI_ITEM Index="32" Name="DI_GBExhaustDPLowAlarm" BufferOffset="32" Addr="32" Description="" />
+      <DI_ITEM Index="31" Name="DI_ArInletPressAlarm" BufferOffset="31" Addr="31" Description="" />
+      <DI_ITEM Index="32" Name="DI_GBSO2DetectorAlarm" BufferOffset="32" Addr="32" Description="" />
       <DI_ITEM Index="33" Name="DI_GBDoorCloseDone" BufferOffset="33" Addr="33" Description="" />
-      <DI_ITEM Index="34" Name="DI_GBSO2DetectorAlarm" BufferOffset="34" Addr="34" Description="" />
+      <DI_ITEM Index="34" Name="DI_GBExhaustDPLowAlarm" BufferOffset="34" Addr="34" Description="" />
       <DI_ITEM Index="35" Name="DI_GasPipeTempCtrlAlarm" BufferOffset="35" Addr="35" Description="" />
       <DI_ITEM Index="36" Name="DI_DryPump1Alarm" BufferOffset="36" Addr="36" Description="" />
       <DI_ITEM Index="38" Name="DI_PumpExhaustPressAlarm" BufferOffset="38" Addr="38" Description="" />
       <DI_ITEM Index="39" Name="DI_PMExhaustDPLowAlarm" BufferOffset="39" Addr="39" Description="" />
-      <DI_ITEM Index="40" Name="DI_PumpExhaustDPLowAlarm" BufferOffset="40" Addr="40" Description="" />
+      <DI_ITEM Index="40" Name="DI_PMH2SDetectorAlarm" BufferOffset="40" Addr="40" Description="" />
       <DI_ITEM Index="41" Name="DI_ScrubberIntlk" BufferOffset="41" Addr="41" Description="" />
       <DI_ITEM Index="42" Name="DI_FacilityIntlk" BufferOffset="42" Addr="42" Description="" />
       <DI_ITEM Index="45" Name="DI_RotaryMotorAlarm" BufferOffset="45" Addr="45" Description="" />
@@ -49,13 +50,15 @@
       <DI_ITEM Index="51" Name="DI_ReactorSuspectorCheck" BufferOffset="51" Addr="51" Description="" />
       <DI_ITEM Index="52" Name="DI_PMSO2DetectorAlarm" BufferOffset="52" Addr="52" Description="" />
       <DI_ITEM Index="55" Name="DI_GN2InletPressAlarm" BufferOffset="55" Addr="55" Description="" />
-      <DI_ITEM Index="56" Name="DI_ArInletPressAlarm" BufferOffset="56" Addr="56" Description="" />
-      <DI_ITEM Index="57" Name="DI_H2PressureAlarm" BufferOffset="57" Addr="57" Description="" />
+      <DI_ITEM Index="56" Name="DI_GBH2SDetectorAlarm" BufferOffset="56" Addr="56" Description="" />
+      <DI_ITEM Index="57" Name="DI_GBH2SeDetectorAlarm" BufferOffset="57" Addr="57" Description="" />
+      <DI_ITEM Index="58" Name="DI_GBSmokeDetectorAlarm" BufferOffset="58" Addr="58" Description="" />
       <DI_ITEM Index="59" Name="DI_GBH2DetectorAlarm" BufferOffset="59" Addr="59" Description="" />
       <DI_ITEM Index="60" Name="DI_GBWaterLeakAlarm" BufferOffset="60" Addr="60" Description="" />
-      <DI_ITEM Index="63" Name="DI_GBH2SeDetectorAlarm" BufferOffset="63" Addr="63" Description="" />
+      <DI_ITEM Index="63" Name="DI_H2PressureAlarm" BufferOffset="63" Addr="63" Description="" />
       <DI_ITEM Index="65" Name="DI_DryPump1Running" BufferOffset="65" Addr="65" Description="" />
       <DI_ITEM Index="67" Name="DI_DryPump1Warning" BufferOffset="67" Addr="67" Description="" />
+      <DI_ITEM Index="69" Name="DI_PMSmokeDetectorAlarm" BufferOffset="69" Addr="69" Description="" />
       <DI_ITEM Index="70" Name="DI_EMOStatusAlarm" BufferOffset="70" Addr="70" Description="" />
       <DI_ITEM Index="71" Name="DI_PumpCabDoorCloseDone" BufferOffset="71" Addr="71" Description="" />
       <DI_ITEM Index="72" Name="DI_FacilityWarning" BufferOffset="72" Addr="72" Description="" />
@@ -128,6 +131,7 @@
       <DI_ITEM Index="193" Name="DI_MoResrvCarrierOutletFB(V21)" BufferOffset="193" Addr="193" Description="" />
       <DI_ITEM Index="194" Name="DI_MoResrvBypassFB(V22)" BufferOffset="194" Addr="194" Description="" />
       <DI_ITEM Index="195" Name="DI_MoResrvInoutLeakTestFB(V23)" BufferOffset="195" Addr="195" Description="" />
+      <DI_ITEM Index="196" Name="DI_SO2VentFB(V60)" BufferOffset="196" Addr="196" Description="" />
       <DI_ITEM Index="197" Name="DI_SHPurgeH2FB(V66)" BufferOffset="197" Addr="197" Description="" />
       <DI_ITEM Index="198" Name="DI_SHPurgeN2FB(V67)" BufferOffset="198" Addr="198" Description="" />
       <DI_ITEM Index="199" Name="DI_PMPurgeN2FB(V68)" BufferOffset="199" Addr="199" Description="" />
@@ -142,8 +146,11 @@
       <DI_ITEM Index="208" Name="DI_DORVacuumFB(V75)" BufferOffset="208" Addr="208" Description="" />
       <DI_ITEM Index="209" Name="DI_DORPressureReliefFB(V76)" BufferOffset="209" Addr="209" Description="" />
       <DI_ITEM Index="210" Name="DI_SideLeakIsolateFB(V25)" BufferOffset="210" Addr="210" Description="" />
+      <DI_ITEM Index="211" Name="DI_Run1MoWFB(V61)" BufferOffset="211" Addr="211" Description="" />
       <DI_ITEM Index="212" Name="DI_PMLeakTestIsolateFB(V27)" BufferOffset="212" Addr="212" Description="" />
+      <DI_ITEM Index="213" Name="DI_Run2SSeFB(V62)" BufferOffset="213" Addr="213" Description="" />
       <DI_ITEM Index="214" Name="DI_FinalCarryGasFB(V97)" BufferOffset="214" Addr="214" Description="" />
+      <DI_ITEM Index="215" Name="DI_Run3O2SO2FB(V63)" BufferOffset="215" Addr="215" Description="" />
       <DI_ITEM Index="216" Name="DI_PSUEnableFB" BufferOffset="216" Addr="216" Description="" />
       <DI_ITEM Index="217" Name="DI_InnerHeaterEnableFB" BufferOffset="217" Addr="217" Description="" />
       <DI_ITEM Index="218" Name="DI_MiddleHeaterEnableFB" BufferOffset="218" Addr="218" Description="" />
@@ -281,15 +288,15 @@
       <DI_ITEM Index="388" Name="DI_MFC38Offline" BufferOffset="388" Addr="388" Description="" />
       <DI_ITEM Index="389" Name="DI_MFC39Offline" BufferOffset="389" Addr="389" Description="" />
       <DI_ITEM Index="390" Name="DI_MFC40Offline" BufferOffset="390" Addr="390" Description="" />
-      <DI_ITEM Index="391" Name="DI_PC01Offline" BufferOffset="391" Addr="391" Description="" />
-      <DI_ITEM Index="392" Name="DI_PC02Offline" BufferOffset="392" Addr="392" Description="" />
-      <DI_ITEM Index="393" Name="DI_PC03Offline" BufferOffset="393" Addr="393" Description="" />
-      <DI_ITEM Index="394" Name="DI_PC04Offline" BufferOffset="394" Addr="394" Description="" />
-      <DI_ITEM Index="395" Name="DI_PC05Offline" BufferOffset="395" Addr="395" Description="" />
-      <DI_ITEM Index="396" Name="DI_PC06Offline" BufferOffset="396" Addr="396" Description="" />
-      <DI_ITEM Index="397" Name="DI_PC07Offline" BufferOffset="397" Addr="397" Description="" />
-      <DI_ITEM Index="398" Name="DI_PC08Offline" BufferOffset="398" Addr="398" Description="" />
-      <DI_ITEM Index="399" Name="DI_PC09Offline" BufferOffset="399" Addr="399" Description="" />
+      <DI_ITEM Index="391" Name="DI_PC1Offline" BufferOffset="391" Addr="391" Description="" />
+      <DI_ITEM Index="392" Name="DI_PC2Offline" BufferOffset="392" Addr="392" Description="" />
+      <DI_ITEM Index="393" Name="DI_PC3Offline" BufferOffset="393" Addr="393" Description="" />
+      <DI_ITEM Index="394" Name="DI_PC4Offline" BufferOffset="394" Addr="394" Description="" />
+      <DI_ITEM Index="395" Name="DI_PC5Offline" BufferOffset="395" Addr="395" Description="" />
+      <DI_ITEM Index="396" Name="DI_PC6Offline" BufferOffset="396" Addr="396" Description="" />
+      <DI_ITEM Index="397" Name="DI_PC7Offline" BufferOffset="397" Addr="397" Description="" />
+      <DI_ITEM Index="398" Name="DI_PC8Offline" BufferOffset="398" Addr="398" Description="" />
+      <DI_ITEM Index="399" Name="DI_PC9Offline" BufferOffset="399" Addr="399" Description="" />
       <DI_ITEM Index="400" Name="DI_PC10Offline" BufferOffset="400" Addr="400" Description="" />
     </Block>
   </Dig_In>
@@ -326,6 +333,7 @@
       <DO_ITEM Index="33" Name="DO_MoResrvCarrierOutlet(V21)" BufferOffset="33" Addr="33" Description="" />
       <DO_ITEM Index="34" Name="DO_MoResrvBypass(V22)" BufferOffset="34" Addr="34" Description="" />
       <DO_ITEM Index="35" Name="DO_MoResrvInoutLeakTest(V23)" BufferOffset="35" Addr="35" Description="" />
+      <DO_ITEM Index="36" Name="DO_SO2Vent(V60)" BufferOffset="36" Addr="36" Description="" />
       <DO_ITEM Index="37" Name="DO_SHPurgeH2(V66)" BufferOffset="37" Addr="37" Description="" />
       <DO_ITEM Index="38" Name="DO_SHPurgeN2(V67)" BufferOffset="38" Addr="38" Description="" />
       <DO_ITEM Index="39" Name="DO_PMPurgeN2(V68)" BufferOffset="39" Addr="39" Description="" />
@@ -339,8 +347,11 @@
       <DO_ITEM Index="48" Name="DO_DORVacuum(V75)" BufferOffset="48" Addr="48" Description="" />
       <DO_ITEM Index="49" Name="DO_DORPressureRelief(V76)" BufferOffset="49" Addr="49" Description="" />
       <DO_ITEM Index="50" Name="DO_SideLeakIsolate(V25)" BufferOffset="50" Addr="50" Description="" />
+      <DO_ITEM Index="51" Name="DO_Run1MoW(V61)" BufferOffset="51" Addr="51" Description="" />
       <DO_ITEM Index="52" Name="DO_PMLeakTestIsolate(V27)" BufferOffset="52" Addr="52" Description="" />
+      <DO_ITEM Index="53" Name="DO_Run2SSe(V62)" BufferOffset="53" Addr="53" Description="" />
       <DO_ITEM Index="54" Name="DO_FinalCarryGas(V97)" BufferOffset="54" Addr="54" Description="" />
+      <DO_ITEM Index="55" Name="DO_Run3O2SO2(V63)" BufferOffset="55" Addr="55" Description="" />
       <DO_ITEM Index="56" Name="DO_PSUEnable" BufferOffset="56" Addr="56" Description="" />
       <DO_ITEM Index="57" Name="DO_InnerHeaterEnable" BufferOffset="57" Addr="57" Description="" />
       <DO_ITEM Index="58" Name="DO_MiddleHeaterEnable" BufferOffset="58" Addr="58" Description="" />
diff --git a/App/SicUI/Models/PMs/PMOperationView.xaml b/App/SicUI/Models/PMs/PMOperationView.xaml
index 320029a..789c989 100644
--- a/App/SicUI/Models/PMs/PMOperationView.xaml
+++ b/App/SicUI/Models/PMs/PMOperationView.xaml
@@ -17,7 +17,7 @@
     xmlns:pm="clr-namespace:SicUI.Models.PMs"
     xmlns:system="clr-namespace:System;assembly=mscorlib"
     d:Background="#91b0cd"
-    d:DesignHeight="820"
+    d:DesignHeight="1000"
     d:DesignWidth="2560"
     lex:LocalizeDictionary.DesignCulture="."
     lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization"
@@ -4868,8 +4868,8 @@
 
                         <industrialcontrol:PipeLine
                             Canvas.Left="252"
-                            Canvas.Top="26"
-                            Width="226"
+                            Canvas.Top="16"
+                            Width="236"
                             Height="{StaticResource ResourceKey=Pipe_Height}"
                             CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
                             EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
diff --git a/App/SicUI/Models/PMs/PMOperationViewModel.cs b/App/SicUI/Models/PMs/PMOperationViewModel.cs
index d5a4a71..7462243 100644
--- a/App/SicUI/Models/PMs/PMOperationViewModel.cs
+++ b/App/SicUI/Models/PMs/PMOperationViewModel.cs
@@ -401,6 +401,18 @@ namespace SicUI.Models.PMs
         [Subscription("V59s.DeviceData")]
         public AITValveData V59s { get; set; }
 
+        [Subscription("V60.DeviceData")]
+        public AITValveData V60 { get; set; }
+
+        [Subscription("V61.DeviceData")]
+        public AITValveData V61 { get; set; }
+
+        [Subscription("V62.DeviceData")]
+        public AITValveData V62 { get; set; }
+
+        [Subscription("V63.DeviceData")]
+        public AITValveData V63 { get; set; }
+
         [Subscription("V66.DeviceData")]
         public AITValveData V66 { get; set; }
 
@@ -540,10 +552,8 @@ namespace SicUI.Models.PMs
 
         #region Pump
         [Subscription("Pump.DeviceData")]
-        public AITPumpData PumpData1 { get; set; }
+        public AITPumpData PumpData { get; set; }
 
-        [Subscription("Pump2.DeviceData")]
-        public AITPumpData PumpData2 { get; set; }
 
         //[Subscription("PMDRYVacuumPump.DeviceDataMP")]
         //public AITPumpData PumpDataMP { get; set; }
diff --git a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoPump.cs b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoPump.cs
index 8075621..108eec4 100644
--- a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoPump.cs
+++ b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoPump.cs
@@ -124,7 +124,7 @@ namespace Aitex.Core.RT.Device.Devices
                     //IsOverLoad = IsPumpOverloadAlarm,
                 };
                 data.AttrValue["DryPumpAlarm"] = _diDryPumpAlarm.Value;
-                data.AttrValue["PumpExhaustPress"] = _diPumpExhaustPress.Value;
+                //data.AttrValue["PumpExhaustPress"] = _diPumpExhaustPress.Value;
                 //data.AttrValue["PumpCabExhaustDP"] = _diPumpCabExhaustDP.Value;
                 //data.AttrValue["DryPumpFlow"] = _diDryPumpFlow.Value;
                 //data.AttrValue["PumpForelineTemp"] = _diPumpForelineTemp.Value;
@@ -145,7 +145,7 @@ namespace Aitex.Core.RT.Device.Devices
             DeviceID = node.GetAttribute("schematicId");
 
             _diDryPumpAlarm = ParseDiNode("diDryPumpAlarm", node, ioModule);
-            _diPumpExhaustPress = ParseDiNode("diPumpExhaustPress", node, ioModule);
+            //_diPumpExhaustPress = ParseDiNode("diPumpExhaustPress", node, ioModule);
             //_diPumpCabExhaustDP = ParseDiNode("diPumpCabExhaustDP", node, ioModule);
             //_diDryPumpFlow = ParseDiNode("diDryPumpFlow", node, ioModule);
             //_diPumpForelineTemp = ParseDiNode("diPumpForelineTemp", node, ioModule);
@@ -158,7 +158,7 @@ namespace Aitex.Core.RT.Device.Devices
         {
             DATA.Subscribe($"{Module}.{Name}.DeviceData", () => DeviceData);
             DATA.Subscribe($"{Module}.{Name}.DryPumpAlarm", () => DryPumpAlarm);
-            DATA.Subscribe($"{Module}.{Name}.PumpExhaustPress", () => PumpExhaustPress);
+            //DATA.Subscribe($"{Module}.{Name}.PumpExhaustPress", () => PumpExhaustPress);
             //DATA.Subscribe($"{Module}.{Name}.PumpCabExhaustDP", () => PumpCabExhaustDP);
             //DATA.Subscribe($"{Module}.{Name}.DryPumpFlow", () => DryPumpFlow);
             //DATA.Subscribe($"{Module}.{Name}.PumpForelineTemp", () => PumpForelineTemp);