diff --git a/Modules/Mainframe/PMs/PMModuleDevice.cs b/Modules/Mainframe/PMs/PMModuleDevice.cs
index ce237e8e..b4554a40 100644
--- a/Modules/Mainframe/PMs/PMModuleDevice.cs
+++ b/Modules/Mainframe/PMs/PMModuleDevice.cs
@@ -3226,14 +3226,6 @@ namespace SicModules.PMs
_sicServo.StopRamp();
}
- ///
- /// Wafer工艺完成时三色灯发出提示。
- ///
- public bool CreateProcessDoneSignal(out string reason)
- {
- return SignalTower.SwitchOnBuzzerForJobDone(out reason);
- }
-
public override bool CheckPreProcessCondition(Dictionary recipeCommands, out string reason)
{
reason = string.Empty;
diff --git a/SicRT/Config/STEvents.xml b/SicRT/Config/STEvents.xml
index 23d8af3c..ad0afb4f 100644
--- a/SicRT/Config/STEvents.xml
+++ b/SicRT/Config/STEvents.xml
@@ -11,7 +11,7 @@
-->
-
+
diff --git a/SicRT/Equipments/Schedulers/SchedulerCassette.cs b/SicRT/Equipments/Schedulers/SchedulerCassette.cs
index 05c8fe26..ed452acc 100644
--- a/SicRT/Equipments/Schedulers/SchedulerCassette.cs
+++ b/SicRT/Equipments/Schedulers/SchedulerCassette.cs
@@ -108,7 +108,8 @@ namespace SicRT.Modules.Schedulers
&& _lastTransferAction == TaskType.Place
&& WaferManager.Instance.CheckHasWafer(_module, _lastTransferSlot))
{
- EV.PostMessage(Module.ToString(), EventEnum.PJ_DONE, _module, (_lastTransferSlot + 1).ToString());
+ //EV.PostMessage(Module.ToString(), EventEnum.PJ_DONE, _module, (_lastTransferSlot + 1).ToString());
+ OP.DoOperation("System.AlertJobDone", _module, _lastTransferSlot + 1);
}
}
diff --git a/SicRT/Equipments/Systems/EquipmentManager.cs b/SicRT/Equipments/Systems/EquipmentManager.cs
index 3bb94727..b1672a1a 100644
--- a/SicRT/Equipments/Systems/EquipmentManager.cs
+++ b/SicRT/Equipments/Systems/EquipmentManager.cs
@@ -611,7 +611,23 @@ namespace SicRT.Equipments.Systems
//{
// return CheckToPostMessage((int)MSG.StartJob, args[0]);
//});
-
+
+ OP.Subscribe("System.AlertJobDone", (s, args) =>
+ {
+ var module = ModuleName.System.ToString();
+ var slot = 0;
+ if (args is { Length: 2 })
+ {
+ module = args[0].ToString();
+ int.TryParse(args[1].ToString(), out slot);
+ }
+
+ EV.PostMessage(module, EventEnum.PJ_DONE, module, slot);
+ _mainSignalTower.AlertJobDone();
+ return true;
+ });
+
+
#region Recipe Editor Lock Password Management
const string SC_PATH_REQ_RESET_PASS = "System.Recipe.ResetEditorPassword";
diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs
index 16592706..e20bea30 100644
--- a/SicRT/Properties/AssemblyInfo.cs
+++ b/SicRT/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
-[assembly: AssemblyVersion("1.1.4.12")]
+[assembly: AssemblyVersion("1.1.4.13")]
[assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")]
\ No newline at end of file
diff --git a/SicRT/ReleaseNotes.md b/SicRT/ReleaseNotes.md
index 97177d6b..b451956c 100644
--- a/SicRT/ReleaseNotes.md
+++ b/SicRT/ReleaseNotes.md
@@ -3,11 +3,22 @@
Auto-GE 自动通用版（适用有EFEM设备）
----
+
+## Version 1.1.4.13
+**2023-12-28**
+
+- Bug修复
+ - 修正工艺结束后，蜂鸣器提示无法自动关闭的问题
+ - 修正加载Interlock配置文件时，引发集合枚举时发生变化的异常的问题
+- 新特性
+ - VT阀添加Reset功能
+
+
## Version 1.1.4.12
**2023-12-28**
- Bug修复
- -
+ - 无
- 新特性
- VT阀添加Reset功能
diff --git a/SicSetup/Sic_Setup/SicSetup.csproj b/SicSetup/Sic_Setup/SicSetup.csproj
index e3e8bb5c..be995ad4 100644
--- a/SicSetup/Sic_Setup/SicSetup.csproj
+++ b/SicSetup/Sic_Setup/SicSetup.csproj
@@ -592,10 +592,12 @@ del "$(ProjectDir)..\Packages\*.exe"
del "$(ProjectDir)..\Packages\SicRT\Config\*.data"
del "$(ProjectDir)..\Packages\SicRT\Config\*.bak"
-echo 复制NSIS工程文件到输出目录。。。
-copy "$(TargetDir)CVD.nsi" "$(ProjectDir)..\Packages\CVD.nsi" /y
-copy "$(TargetDir)license.txt" "$(ProjectDir)..\Packages\license.txt" /y
-xcopy "$(ProjectDir)NSIS\*.*" "$(ProjectDir)..\Packages\NSIS\" /E
+echo 复制NSIS脚本 .....
+copy "$(TargetDir)CVD.nsi" "$(ProjectDir)..\Packages\CVD.nsi" /y
+echo 复制License文件 .....
+copy "$(TargetDir)license.txt" "$(ProjectDir)..\Packages\license.txt" /y
+echo 复制NSIS工程文件到输出目录 .....
+xcopy "$(ProjectDir)NSIS\*.*" "$(ProjectDir)..\Packages\NSIS\" /E /q
echo 开始执行NSIS打包程序。。。
cd "$(ProjectDir)..\Packages\NSIS"
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll
index 363be5b3..65fb5b18 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
index c5e6c0ed..c18c65e2 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
index 4206cf83..d7ed8075 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
index 7dbca47b..de9fac40 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
index cdddf8b8..80d16894 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
index 96217201..7dfa9aa3 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ
diff --git a/ThirdParty/MECF.Framework/Sicentury.Core.dll b/ThirdParty/MECF.Framework/Sicentury.Core.dll
index 6ae7553e..d2014e6e 100644
Binary files a/ThirdParty/MECF.Framework/Sicentury.Core.dll and b/ThirdParty/MECF.Framework/Sicentury.Core.dll differ
diff --git a/ThirdParty/MECF.Framework/Sicentury.Localization.dll b/ThirdParty/MECF.Framework/Sicentury.Localization.dll
new file mode 100644
index 00000000..b84c9c3c
Binary files /dev/null and b/ThirdParty/MECF.Framework/Sicentury.Localization.dll differ
diff --git a/ThirdParty/MECF.Framework/WPFLocalizeExtension.dll b/ThirdParty/MECF.Framework/WPFLocalizeExtension.dll
new file mode 100644
index 00000000..7c11498d
Binary files /dev/null and b/ThirdParty/MECF.Framework/WPFLocalizeExtension.dll differ
diff --git a/ThirdParty/MECF.Framework/en/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/en/Sicentury.Localization.resources.dll
new file mode 100644
index 00000000..bbc006e6
Binary files /dev/null and b/ThirdParty/MECF.Framework/en/Sicentury.Localization.resources.dll differ
diff --git a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
new file mode 100644
index 00000000..3595d3f3
Binary files /dev/null and b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll differ