Commit Graph

310 Commits

Author SHA1 Message Date
HCL 9ddfe2ae76 1.PM界面DI_DORPressATMSW改为DI_DORPressVacSW 2023-06-27 11:35:28 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang bd8e198d74 修复Monitor界面无法打开问题 2023-06-27 10:48:40 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 1f6f0fbfca 修改真值表配置内容 2023-06-27 09:14:52 +08:00
Liang Su 59b27ea0e0 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop 2023-06-26 16:58:11 +08:00
Liang Su 22841f2094 修正PMMotionView视图无法打开的问题。
调整PMMotionView中反应腔控件的位置。
2023-06-26 16:57:53 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang c2f5927f6e 修改Ar和H2真值表逻辑 2023-06-26 15:36:38 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 88b110da52 修改Ar和H2显示逻辑 2023-06-26 14:21:53 +08:00
Liang Su fdafc26f0e 修改PMProcessView视图的历史流量查询表格中显示的流量数值保留小数点后3位。 2023-06-26 13:46:18 +08:00
Liang Su 3b7de52609 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop 2023-06-26 11:42:29 +08:00
Liang Su 1339313a0d 修改三色灯报警响应和未响应时的闪烁模式。未响应时灯常亮,响应后灯闪烁。 2023-06-26 11:13:07 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang f8f4c13b31 1修改Run状态绑定的值
2修改真实表配置内容
2023-06-26 10:50:33 +08:00
Liang Su 532d98d9a5 更新库文件(Commit 4c76dc4),修正三色灯配置为常亮时仍然会闪烁的问题。 2023-06-25 16:55:33 +08:00
Liang Su ac98afdb39 移除Event Diagnosis视图。 2023-06-25 16:39:49 +08:00
Liang Su 6f2f50802a Merge branch 'feature/add-alarm-mute-support' into develop 2023-06-25 16:25:31 +08:00
Liang Su 8999220c6a 更新库文件(Commit d5633f5),合并到Develop分支。 2023-06-25 16:25:19 +08:00
Liang Su 3b439ba3c3 PMProcessView视图中的Recipe界面增加锁定功能。
修正PMProcessView视图对话框消息的一些错误。
2023-06-25 16:18:46 +08:00
Liang Su 6e646ad3db 更新库文件(Commit ccea5a5),支持报警响应前和响应后三色灯呈现不同状态。
修正Buzzer Off按钮事件,变更为System.AckAllAlarms。
Wafer回到Cassette时,触发PJ_DONE事件,而不是直接调用三色灯。
修改三色灯实体判断逻辑,系统初始化时判断三色灯连接在哪个PLC,其它PLC的三色灯实例自动禁用。
TM点表中增加三色灯DO定义。
Recipe模板文件中增加StepUid列。
EventDefine.xml中新增50,PJ_DONE事件。
修正一些描述错误。
2023-06-25 16:04:34 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang d2c2a44682 Merge branch 'develop' into MfcCalculation
# 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-25 11:30:24 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang ee4ca0cf5b 使用库Develop[98ed05b]分支更新dll
1:优化气体体积统计算法
2023-06-25 11:27:35 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 6e2841e103 1修改界面控件显示不全问题 2023-06-21 11:25:07 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang c6f05e5516 更新dll,真值表分支合并到develope分支 2023-06-21 11:13:41 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang b811ed8dcd Merge branch 'MfcCalculation' into develop
# 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.Core.dll
2023-06-21 11:07:23 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang b024d389f6 1合并时解决冲突,丢弃真实表数据,现在重新移植真值表界面和数据
2更新合并后的dll
2023-06-21 11:06:28 +08:00
HCL e0e66048ec 1.更新Common库 2023-06-20 11:39:53 +08:00
HCL 0aad8d9f23 1:控制V94和V96阀时,对应的控制MFC设置为0 2023-06-20 11:09:36 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 239fff5200 Merge branch 'develop' into MfcCalculation
# Conflicts:
#	Modules/Mainframe/Config/PM/PM1/DeviceModelPM1.xml
#	SicUI/Models/PMs/PMProcessView.xaml
#	SicUI/Models/PMs/PMProcessViewModel.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-20 09:14:39 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 3f1710e308 库中develop内容合并到MfcCalculation,更新dll 2023-06-20 09:07:53 +08:00
Liang Su 6d51c5eaad 更新库文件(Commit 604fdab)
合并到Develop分支。

SicUI的PMProcess视图使10号机软件视图,并恢复原8号机的流量历史记录查询框。
2023-06-20 08:52:06 +08:00
Liang Su 5f3b6957d1 更新库文件(Commit 95195e4)
公共库整理主题样式文件。
Recipe编辑视图移至UI库。
完善Recipe编辑器各项功能。
PMProcess视图使用新的Recipe编辑器控件。
从SicUI中移除Recipe编辑器视图。
2023-06-19 18:52:48 +08:00
HCL e9c4761e49 1.优化参数一键传盘功能 2023-06-19 13:59:45 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang cc5b2f14cd 1修改真值表逻辑,添加TAM_VentT条件,V43=1
2更新Dll,气体流量系数设置后实时生效
2023-06-15 16:53:38 +08:00
HCL 26f56380e7 1.Mfc Ror功能进度更新 2023-06-14 17:40:00 +08:00
HCL 150cd61ae9 1.MfcRor进度提交 2023-06-13 11:23:42 +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
Liang Su 4f2aee6cee 更新库文件(Commit 137b760)
EquipmentManager中当触发设备报警时,重新使能三色灯的Buzzer。
2023-06-12 14:43:23 +08:00
HCL 7d9eeae030 1.添加电阻检测时间参数 2023-06-12 14:38:34 +08:00
HCL 93eb100c35 1.Mfc Ror功能进度提交 2023-06-12 14:35:24 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang de94e4c3a6 develop合并到MfcCalculation 2023-06-12 14:27:56 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 011fca9989 1修改PN2真值表
2修改PN2_Vent特殊绑定
3更新dll,添加PN2特殊处理机制
2023-06-12 10:18:17 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang c4856a5443 1修改PN2真值表
2修改PN2_Vent特殊绑定
3更新dll,添加PN2特殊处理机制
2023-06-12 10:16:36 +08:00
HCL cdac3c26a7 1.消除PLC无法访问已释放的对象Alarm 2023-06-12 09:03:47 +08:00
HCL 8026d7e997 1.解决Process Abort后Process Routine仍在执行的BUG 2023-06-12 08:38:43 +08:00
HCL 41b78c54b9 1.Mfc Ror功能更新 2023-06-09 18:31:58 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 34e72002d5 1拆分Coating数据表,Tray和PM分别使用自己对应的数据表,方便以后扩展功能
2更新Dll,添加PM对应的数据库操作
2023-06-09 17:49:00 +08:00
HCL d34cbcada6 1.MfcRor功能Routine和数据库保存完成 2023-06-09 13:15:02 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 5cf59d332b 1修改真实表
2修改流量显示逻辑
2023-06-09 10:59:22 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 5be5a9279f 1修改xml配置数据
2修改绑定
2023-06-09 09:53:25 +08:00
HCL e028ed351f 1.MfcRor功能进度更新 2023-06-08 17:34:02 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 099946ee2c 删除测试代码 2023-06-08 17:00:04 +08:00