Merge branch 'hotfix/temp-raising-fast-alarm-sl'

# Conflicts:
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.cs
#	ThirdParty/MECF.Framework/MECF.Framework.Common.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
#	ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll

SicRT/Config/System.sccfg

@@ -567,7 +567,7 @@
 				<config default="Warning" name="InProcessResistanceFailAlarmLevel"   description="工艺过程中检测到电阻超限时产生报警的等级"  max="" min="" paramter="Alarm;Warning" tag="ReadOnlySelection" unit="" type="String" />
 				<config default="1" name="InProcessResistanceMonitorIgnoreDuration" description="工艺启动后和结束前的指定时间内忽略电阻超限检查" max="100" min="0" paramter="" tag="" unit="s" type="Double" />
 
-				<config default="true" visible="false" name="AETempRasingFastIsAlarm" description="AETemp温度上升过快报警类型为Alarm" max="" min="" paramter="" tag="" unit=""  type="Bool" />
+				<config default="true" name="AETempRasingFastIsAlarm" description="AETemp温度上升过快报警类型为Alarm" max="" min="" paramter="" tag="" unit=""  type="Bool" />
 				<config default="100" visible="false" name="SCRTempRasingRate" description="SCRTemp每秒的上升速率,超过此范围报警" max="2000" min="0" paramter="" tag="" unit="℃" type="Double" />
 				<config default="20" name="AETempMiddleRasingRate" description="AETemp Middle每秒的上升速率,超过此范围报警" max="2000" min="0" paramter="" tag="" unit="℃" type="Double" />
 				<config default="20" name="AETempOuterRasingRate" description="AETemp Outer每秒的上升速率,超过此范围报警" max="2000" min="0" paramter="" tag="" unit="℃" type="Double" />
@@ -1131,7 +1131,7 @@
 				<config default="Warning" name="InProcessResistanceFailAlarmLevel"   description="工艺过程中检测到电阻超限时产生报警的等级"  max="" min="" paramter="Alarm;Warning" tag="ReadOnlySelection" unit="" type="String" />
 				<config default="1" name="InProcessResistanceMonitorIgnoreDuration" description="工艺启动后和结束前的指定时间内忽略电阻超限检查" max="100" min="0" paramter="" tag="" unit="s" type="Double" />
 
-				<config default="true" visible="false" name="AETempRasingFastIsAlarm" description="AETemp温度上升过快报警类型为Alarm" max="" min="" paramter="" tag="" unit=""  type="Bool" />
+				<config default="true" name="AETempRasingFastIsAlarm" description="AETemp温度上升过快报警类型为Alarm" max="" min="" paramter="" tag="" unit=""  type="Bool" />
 				<config default="100" visible="false" name="SCRTempRasingRate" description="SCRTemp每秒的上升速率,超过此范围报警" max="2000" min="0" paramter="" tag="" unit="℃" type="Double" />
 				<config default="20" name="AETempMiddleRasingRate" description="AETemp Middle每秒的上升速率,超过此范围报警" max="2000" min="0" paramter="" tag="" unit="℃" type="Double" />
 				<config default="20" name="AETempOuterRasingRate" description="AETemp Outer每秒的上升速率,超过此范围报警" max="2000" min="0" paramter="" tag="" unit="℃" type="Double" />

SicRT/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 
-[assembly: AssemblyVersion("1.2.11.78")]
+[assembly: AssemblyVersion("1.2.12.82")]
 [assembly: AssemblyInformationalVersion("手动通用版（无EFEM）")]
 
 

SicRT/ReleaseNotes.md

@@ -3,14 +3,23 @@
 Manual-GE 手动通用版（适用无EFEM设备）
 
 ------
-## Version 1.2.10.82
+
+## Version 1.2.12.82
 **2024-06-24**
 
 - Bug修复
-	- 
+	- 无
 - 新特性
-	- 1.添加打开程序需要管理员权限
-	- 
+	- 添加打开程序需要管理员权限
+
+## Version 1.2.11.81
+**2024-06-20**
+
+- Bug修复
+	- 无
+- 新特性
+	- 增加工艺过程中升温过快的报警功能
+
 ## Version 1.2.10.80
 **2024-05-31**
 

SicUI/Properties/AssemblyInfo.cs

@@ -55,6 +55,6 @@ using System.Windows;
 // by using the '*' as shown below:
 
 
-[assembly: AssemblyVersion("1.2.11.82")]
+[assembly: AssemblyVersion("1.2.12.82")]
 [assembly: AssemblyInformationalVersion("手动通用版（无EFEM）")]