Commit Graph

5 Commits

Author SHA1 Message Date
SL 3edaba7171 Merge branch 'master' into hotfix/temp-raising-fast-alarm-sl
# Conflicts:
#	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
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-06-20 14:31:20 +08:00
HCL c07af68c2b 更新Common库文件[b7a1a2a]
1.RecipeEditorView和RecipeSelectView优化过滤功能
2024-05-24 11:29:49 +08:00
SL d600e2b833 fix(TC): 修正DataTrace中找不到PM.Temp.Inner/Middle/Outer数据的问题。
更新库文件至提交0abd925。
2024-05-11 17:47:40 +08:00
HCL fbc56d9f4f 1.修正Interlock有时不起作用的BUG 2024-04-28 15:42:32 +08:00
SL b064e627a8 更新库文件558af89d,优化三色灯控制逻辑;修正加载Interlock配置文件时引发集合改变异常的的问题。
优化修正JobDone信息输出的逻辑。
2023-12-27 16:25:59 +08:00