Commit Graph

228 Commits

Author SHA1 Message Date
Han Qiang Qiang 71f13ea50c Merge branch 'Sic8ToSic6' into feature/测温重构
# Conflicts:
#	SicRT/Instances/ToolLoader.cs
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.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
2023-12-15 15:54:46 +08:00
Han Qiang Qiang 468ea8aa74 版本号更新至## Version 1.1.4.10 2023-12-15 15:06:48 +08:00
Han Qiang Qiang 726e067b19 更新测试版本号 2023-12-15 14:43:12 +08:00
HCL 636b560cfe 1.隐藏SystemConfig中VaccumPressureBase参数
2.手动Purge各个模块不能修改SystemConfig相关参数值
2023-12-15 14:25:02 +08:00
Han Qiang Qiang 008083c798 更新版本号至## Version 1.1.5.9 2023-12-14 09:06:24 +08:00
Han Qiang Qiang b08d9fa229 1更新dll,修改测温存储,PLC根据PM是否安装来初始化
2TM主界面控件可见性,绑定是否安装属性
2023-12-12 17:03:47 +08:00
HCL 800e65cdb0 Merge branch 'Sic8ToSic6' into feature/Sunway
# 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-12-08 13:41:14 +08:00
Han Qiang Qiang bdabd01b3c Merge branch 'Sic8ToSic6' into 整理机台兼容内容
# Conflicts:
#	SicRT/ReleaseNotes.md
#	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-12-08 11:20:20 +08:00
HCL 96c3eb2eae 1.Sunway Robot Place和Vac功能 2023-12-07 15:10:55 +08:00
Liang Su 25763c26b6 更新库文件c0337f1,修正和优化Sequence编辑器、Recipe编辑器的一些问题。
移除MainView中注册的Dialog_Notity事件,修正Recipe编辑器中删除和SaveAs操作后弹出空的Information对话框的问题。
更新发行记录。
2023-12-06 18:57:13 +08:00
Han Qiang Qiang e3cf692db9 Merge branch 'Sic8ToSic6' into 整理机台兼容内容
# Conflicts:
#	SicUI/Models/Maintenances/TM/EFEMViewModel.cs
#	SicUI/Properties/AssemblyInfo.cs
2023-11-30 15:01:05 +08:00
HCL d8f57ef65a 1.版本添加 2023-11-29 15:38:04 +08:00
HCL 4ed2c569f0 1.TrayRobot手动Pick和Place增加目标Online检查 2023-11-29 15:37:27 +08:00
HCL 455f1b12d0 1.TrayRobot手动Pick和Place增加目标Online检查 2023-11-29 13:27:54 +08:00
Han Qiang Qiang 3613a84232 版本号更新至## Version 1.1.4.7 2023-11-27 16:11:14 +08:00
Han Qiang Qiang 8823e59394 更新版本号至## Version 1.1.3.7 2023-11-23 17:52:53 +08:00
Han Qiang Qiang be325b67f9 Merge branch 'Sic8ToSic6' into 添加C2H4-C3H8可配置
# Conflicts:
#	SicRT/Properties/AssemblyInfo.cs
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.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
2023-11-23 17:29:24 +08:00
Liang Su b2330b68d8 版本号更新至v1.1.3.6 2023-11-23 16:12:57 +08:00
Liang Su 476ce88438 版本号更新为v1.1.3.5
补充:当前公共库版本dff6e7d
2023-11-23 15:47:53 +08:00
Liang Su 5d64c604ba 版本号更新至v1.1.2.4 2023-11-22 17:29:45 +08:00
Liang Su dafd1f3d76 修正TrayRobot、LL、PM、TM仅有Tray时,Tray无法拖放的问题。 2023-11-22 17:23:24 +08:00
Han Qiang Qiang 68c5f3f7c4 更新版本号至 ## Version 1.1.1.4
修改C2H4_C3H8FlowRatio配置名称
2023-11-22 15:58:31 +08:00
Han Qiang Qiang 8c322bf438 真值表添加配置项 2023-11-22 15:25:48 +08:00
Han Qiang Qiang b20d34d4dc 1更新dll,重新整理LineHeater数据输出
2修改LineHeater配置和界面及后台绑定
2023-11-22 13:12:12 +08:00
Han Qiang Qiang d4f99dff5e 1添加C2H4-C3H8配置项,在PM1 PM2主配置中
2修改PM界面相关显示
3修改真值表,气体流统计显示界面,更新dll
4修改IO名称
2023-11-22 10:22:06 +08:00
Han Qiang Qiang 8fb7a84308 更新dll [2cdf762],修改MFC5控制流程逻辑
1.PM Device配置中使用库中类实例化MFC5控制流程
2.SC配置中添加参数,是否安装MFC5,  PM.{module}.MFC.Mfc5.IsInstalled
3.修改PM主界面显示,根据配置是否显示MFC5
2023-11-21 17:20:54 +08:00
HQQ e2dd90b0ca 版本号更新至## Version 1.1.1.3 2023-11-19 12:19:13 +08:00
Han Qiang Qiang 1f814517bf 删除PM2多余Interlock配置项
更新版本号至## Version 1.1.1.2
2023-11-17 20:51:03 +08:00
Liang Su c6bcaeeb34 修正Recipe中的C3H8设置项识别错误,全部默认到Purge的问题。
版本号更新至v1.1.1.1
2023-11-17 14:13:53 +08:00
Han Qiang Qiang 8c62eed8a8 6号机版本号更新至 ## Version 1.1.0.0 2023-11-16 14:45:27 +08:00
Han Qiang Qiang 493a3f6499 1更新dll [d2bcfff],上银机械手注册真空开关,夹爪开关控制
2修改按钮界面显示
2023-11-15 14:57:48 +08:00
Han Qiang Qiang 1e74ce3893 修改PM 单向阀额定压力值 2023-11-15 14:32:09 +08:00
Han Qiang Qiang 389e3f377f 修改Tray机械手夹爪关闭按钮名称 2023-11-15 14:08:33 +08:00
Han Qiang Qiang b70314fedd 1添加机械手真空
2还原PM DI-6 InterLock
2023-11-15 13:23:35 +08:00
Han Qiang Qiang 4ba9b6b3e1 1修改界面布局
2隐藏Recipe保存到数据库
2023-11-15 11:25:58 +08:00
Han Qiang Qiang 307e9a3ed7 修改气体流量C2H4配置
修改SC对应的气体流量配置
删除DI-33门报警InterLock
2023-11-14 14:03:18 +08:00
HCL 1e2fc7b36f 1.增加MFC5控制 2023-11-14 10:38:38 +08:00
Han Qiang Qiang b324fbd620 修改PMHeaterView界面标签名称 2023-11-07 15:00:51 +08:00
Han Qiang Qiang a5936c017e 1修改加热带配置名称,
2添加启动前检测LineHeater
3添加气柜温度显示
2023-11-06 11:07:48 +08:00
Han Qiang Qiang 1a434f3a6d 版本号更新至## Version 1.1.32.53 2023-11-03 12:35:23 +08:00
HCL 8d89c35b5a 1.修改ROR M11配置文件的错误
2.ROR时间间隔和基础压力可统一设置
2023-10-31 14:20:48 +08:00
Han Qiang Qiang ffdd54e802 版本号更新至## Version 1.1.32.52 2023-10-26 14:58:13 +08:00
SIC1016\caipeilun f1ab3707c8 更新库文件,更新版本1.1.31.51,合并分支:
Bug修复
 - 修改部分data绑定不保存数据库
 - 修复Interlock项:  do-100 和 do-49触发前  di-9 必须为0
 - 修复 EFEM SlitValueRoutine 触发时提示文本缺失名称
- 新特性
  - 新增配置对比功能,每次开RT时提示配置修改项,并在配置界面显示修改过的内容,并可以回退配置
 - 每次配置文件变更都有备份,也可从本地进行修复
 - interlock表更新 不同腔体开门时需要判断两个腔体压差在范围内
2023-10-20 16:45:19 +08:00
SIC1016\caipeilun 6b3d985945 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_configChangedV2
# Conflicts:
#	SicRT/Properties/AssemblyInfo.cs
#	SicUI/Properties/AssemblyInfo.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
2023-10-20 16:32:28 +08:00
SIC1016\caipeilun dc724da94e 添加EATONUPS监控DEVICE,更新库文件,版本更新1.1.31.50 2023-10-20 14:34:16 +08:00
HCL e6e55a778c 1.Mfc Ror基准压力默认值改为100 2023-10-20 13:33:55 +08:00
Han Qiang Qiang 2d63ab61b4 版本号更新至 1.1.31.49 2023-10-19 09:26:55 +08:00
HCL 6fba00b7bc 1.添加版本号 2023-10-18 17:13:23 +08:00
SIC1016\caipeilun 06f090b185 版本号更新23.10.7.1 2023-10-07 13:44:56 +08:00
SIC1016\caipeilun 611d7b771b Merge branch 'develop_InterlockV1.3' into develop_configChangedV2 2023-10-07 13:38:35 +08:00