Commit Graph

9 Commits

Author SHA1 Message Date
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