Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/MoS2 into develop

# Conflicts:
#	App/SicRT/Config/System.sccfg
This commit is contained in:
SIC1016\caipeilun
2026-08-27 16:44:45 +08:00
5 changed files with 16 additions and 18 deletions
@@ -373,9 +373,6 @@
<IoGasBoxTemp id="HeatoutsidePanelTemp" display="outsidePanelTemp(ATC-4)" aiHeatTMA="AI_HeatoutsidePanel" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区4" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatoutsideSHTemp" display="outsideSHTemp(ATC-5)" aiHeatTMA="AI_HeatoutsideSH" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区5" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatLeakBypassTemp" display="LeakBypassTemp(ATC-6)" aiHeatTMA="AI_HeatLeakBypass" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区6" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<!--<IoGasBoxTemp id="HeatTailFilter" display="HeatTailFilter" aiHeatTMA="AI_HeatTailFilter" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="PumpLineTempLimt" scWarningLog="PumpLineTempAlarm" doLineHeaterEnable="" />
<IoGasBoxTemp id="HeatTailPipe" display="HeatTailPipe" aiHeatTMA="AI_HeatTailPipe" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="PumpLineTempLimt" scWarningLog="PumpLineTempAlarm" doLineHeaterEnable=""/>-->
</IoGasBoxTemps>
<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_DryPumpAlarm" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" />
@@ -217,9 +217,6 @@
<IoGasBoxTemp id="HeatoutsidePanelTemp" display="outsidePanelTemp(ATC-4)" aiHeatTMA="AI_HeatoutsidePanel" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区4" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatoutsideSHTemp" display="outsideSHTemp(ATC-5)" aiHeatTMA="AI_HeatoutsideSH" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区5" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatLeakBypassTemp" display="LeakBypassTemp(ATC-6)" aiHeatTMA="AI_HeatLeakBypass" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区6" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<!--<IoGasBoxTemp id="HeatTailFilter" display="HeatTailFilter" aiHeatTMA="AI_HeatTailFilter" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="PumpLineTempLimt" scWarningLog="PumpLineTempAlarm" doLineHeaterEnable="" />
<IoGasBoxTemp id="HeatTailPipe" display="HeatTailPipe" aiHeatTMA="AI_HeatTailPipe" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="PumpLineTempLimt" scWarningLog="PumpLineTempAlarm" doLineHeaterEnable=""/>-->
</IoGasBoxTemps>
<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_DryPumpAlarm" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" />