Commit Graph

14 Commits

Author SHA1 Message Date
HCL d1c6a114a5 Merge branch 'develop' into feature/整理优化数据库代码
# 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-07-04 09:31:17 +08:00
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
HCL aa71b0daee Merge branch 'develop' into feature/整理优化数据库代码 2023-06-28 17:04:05 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 9dc3e5da26 修改Coating数据库脚本 2023-06-28 17:02:16 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 723778260f 1对象封装到dll中
2移植mfc测试功能
3添加module属性存储数据库
4重新添加和调整界面
2023-06-27 17:45:50 +08:00
HCL 213574e887 1.进度更新 2023-06-27 15:48:17 +08:00
HCL 26f56380e7 1.Mfc Ror功能进度更新 2023-06-14 17:40:00 +08:00
HCL 93eb100c35 1.Mfc Ror功能进度提交 2023-06-12 14:35:24 +08:00
HCL 41b78c54b9 1.Mfc Ror功能更新 2023-06-09 18:31:58 +08:00
HCL d34cbcada6 1.MfcRor功能Routine和数据库保存完成 2023-06-09 13:15:02 +08:00
HCL 820beda464 1.MfcRor功能进度更新 2023-06-07 17:41:20 +08:00
hanqiangqiang a3ff336357 添加Coating生长功能 2023-04-23 14:18:42 +08:00
DESKTOP-GPE37UV\THINKAPD f12ff6a6ca Add project files. 2023-03-03 15:42:13 +08:00