Commit Graph

18 Commits

Author SHA1 Message Date
HCL 230e98b0da 1.Mfc Ror进度更新
2.修改Load和TM LeakRoutine
2023-07-03 09:12:26 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 1cc7d450e3 Merge branch 'develop' into 添加MFC+气阀测试功能
# 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
2023-06-30 08:47:44 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 9c615e9752 移植MFC测试功能 2023-06-28 17:26:01 +08:00
Liang Su ed53c7797e 优化PM发生Alarm时调用AbortRoutine()方法的位置。 2023-06-28 11:39:11 +08:00
Liang Su e961eb9715 修正PM执行Routine时如果发生Alaram,再次Home时会执行上次出错的Routine的Monitor()方法的问题。
更新库文件(Commit 57bb813),重新同步。
2023-06-28 11:32:10 +08:00
HQQ e4d56268f1 使用JSON格式传递数据,系统标记后依然不能传递 2023-06-27 20:02:45 +08:00
HQQ fc9f6c911e Merge branch 'develop' into 添加MFC+气阀测试功能 2023-06-27 19:10:00 +08:00
HCL 4564e1f39a 1.解决MFC ROR测试过程中的问题 2023-06-27 18:24:31 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 723778260f 1对象封装到dll中
2移植mfc测试功能
3添加module属性存储数据库
4重新添加和调整界面
2023-06-27 17:45:50 +08:00
HCL 1e784d816d Merge branch 'develop' into ROR功能开发
# Conflicts:
#	Modules/Mainframe/PMs/RecipeExecutions/PostProcess.cs
#	Modules/Mainframe/PMs/Routines/PMPostTransferRoutine.cs
#	Modules/Mainframe/PMs/Routines/PMToProcessIdleRoutine.cs
#	SicRT/Config/DBModel.sql
#	SicRT/Equipments/Systems/EquipmentManager.cs
#	SicRT/Instances/ToolLoader.cs
#	SicUI/Models/PMs/PMMfcRORView.xaml.cs
#	SicUI/Models/PMs/PMOperationViewModel.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
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
2023-06-13 10:03:08 +08:00
HCL 1a080eba34 1.MfcRor进度更新 2023-06-13 09:23:22 +08:00
HCL 8026d7e997 1.解决Process Abort后Process Routine仍在执行的BUG 2023-06-12 08:38:43 +08:00
HCL e028ed351f 1.MfcRor功能进度更新 2023-06-08 17:34:02 +08:00
HCL 224c1c3f6f 1.更新Ror 2023-06-05 17:30:39 +08:00
HCL b8ba550573 1.Ror进度更新 2023-06-05 14:39:23 +08:00
DESKTOP-1N1NK8A\auvkk db2074c578 修正PMModule配置为NotInstalled状态时,接收到Error状态机处理函数仍然执行程序的问题。 2023-04-23 17:30:12 +08:00
DESKTOP-1N1NK8A\auvkk a4a739128f 修改一些Routine的Start方法和Monitor方法,改为重载基类的StartBody方法和MonitorBody方法。 2023-04-20 16:52:42 +08:00
DESKTOP-GPE37UV\THINKAPD 5da921c88e Mainframe工程更名为SicModules。 2023-04-13 15:35:13 +08:00