Commit Graph

187 Commits

Author SHA1 Message Date
Han Qiang Qiang c7f25dcecd 合并后使用最新dll [9a5bcb7] 2023-12-15 16:33:54 +08:00
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 cd2ebe3907 1更新dll [305b17a],使用合并后的最新dll,添加ProcessHistory
2修改ProcessHistory配置的XML初始化解析
2023-12-15 15:01:32 +08:00
Han Qiang Qiang 093a2b9d91 1更新dll,重新整理ProcessHistory数据
2修改ProcessHistory配置的XML初始化方式
2023-12-15 14:47:12 +08:00
Han Qiang Qiang 726e067b19 更新测试版本号 2023-12-15 14:43:12 +08:00
Han Qiang Qiang f8c64c1030 Merge branch 'ProcessHistoryData' into feature/测温重构
# Conflicts:
#	Modules/Mainframe/SicModules.csproj
#	SicRT/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
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
2023-12-15 10:27:01 +08:00
Han Qiang Qiang 017f7de7b5 1更新dll,
2添加ProcessDeviceItem注册项
2023-12-15 10:12:12 +08:00
Han Qiang Qiang bf1f37b088 合并后使用最新dll 2023-12-15 09:47:47 +08:00
Han Qiang Qiang 7933292bce Merge branch 'Sic8ToSic6' into ProcessHistoryData
# 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-12-15 09:47:21 +08:00
Han Qiang Qiang 9403a242ae 更新dll
PM2添加ProcessDeviceItemsPM2 XML配置
2023-12-14 16:56:24 +08:00
Han Qiang Qiang 8c449e46e7 更新dll
修改配置项单位名称
2023-12-14 15:32:56 +08:00
Han Qiang Qiang 48e2320b07 更新dll 2023-12-14 08:48:53 +08:00
Han Qiang Qiang a33609de36 测试dll 2023-12-13 16:27:12 +08:00
Han Qiang Qiang 24e299dbe7 更新dll,Offect根据PM来初始化,增加延时启动, 2023-12-13 13:50:03 +08:00
Han Qiang Qiang e7d4c5806a 测试dll 2023-12-13 10:13:16 +08:00
Han Qiang Qiang 2c300de65f 更新dll,优化温度数据在数据库中的注册项 2023-12-12 17:36:44 +08:00
Han Qiang Qiang b08d9fa229 1更新dll,修改测温存储,PLC根据PM是否安装来初始化
2TM主界面控件可见性,绑定是否安装属性
2023-12-12 17:03:47 +08:00
Han Qiang Qiang 17e1128fae Merge branch 'Sic8ToSic6' into feature/测温重构
# 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-12-12 13:58:34 +08:00
Han Qiang Qiang d2e5fcffc5 整理ProcessHistory配置的XML信息,测试dll 2023-12-11 15:22:57 +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 d6336744bb 1.进度修改 2023-12-08 09:30:11 +08:00
HCL 96c3eb2eae 1.Sunway Robot Place和Vac功能 2023-12-07 15:10:55 +08:00
HCL fdea850063 1.完善SunwayRobot Pick 2023-12-07 10:27:01 +08:00
Liang Su 25763c26b6 更新库文件c0337f1,修正和优化Sequence编辑器、Recipe编辑器的一些问题。
移除MainView中注册的Dialog_Notity事件,修正Recipe编辑器中删除和SaveAs操作后弹出空的Information对话框的问题。
更新发行记录。
2023-12-06 18:57:13 +08:00
HCL 7a90cd5569 1.PICK功能进度更新 2023-12-06 17:43:23 +08:00
Han Qiang Qiang 74e628354e 1保存Process配置的XML信息
2更新dll
2023-12-06 17:24:28 +08:00
HCL ceed0d5f20 1.SunwayRobot Map功能完善 2023-12-06 11:07:10 +08:00
HCL 23be22ae3f 1.测试Home和RQ LOAD指令完成 2023-12-05 15:54:07 +08:00
Han Qiang Qiang e4be178599 添加XML配置的默认项 2023-12-05 14:01:23 +08:00
Han Qiang Qiang e9d30a47fd 1添加Process查询界面配置
2使用XML作为查询默认配置项
2023-12-05 08:52:41 +08:00
HCL 5deaf92b5c 1.进度更新 2023-12-01 10:27:17 +08:00
HCL ad5c4ddd46 1.进度更新 2023-11-30 18:01:35 +08:00
Han Qiang Qiang 4be189fb27 Merge branch 'Sic8ToSic6' into 整理机台兼容内容
# Conflicts:
#	Modules/Mainframe/Config/PM/PM1/interlockPM1.xml
#	Modules/Mainframe/Config/PM/PM2/interlockPM2.xml
#	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-28 15:47:31 +08:00
Han Qiang Qiang c88d794afe 1更新dll [027c078],添加Recipe快照压缩保存+历史数据选择对比
2新增数据表recipe_history_data
3追加更新内容
2023-11-27 16:28:33 +08:00
Han Qiang Qiang b8225bf422 使用合并后的dll [1854fcf] 2023-11-23 17:30:38 +08:00
Liang Su 938e03d951 更新库文件99c773a,修正DataLog查询时时间可能错乱的问题。 2023-11-23 16:09:57 +08:00
Liang Su 7ed58e96f1 同步最新的公共库。 2023-11-23 15:37:09 +08:00
Liang Su dafd1f3d76 修正TrayRobot、LL、PM、TM仅有Tray时,Tray无法拖放的问题。 2023-11-22 17:23:24 +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
Han Qiang Qiang b77f8f5112 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-11-20 13:21:57 +08:00
HCL 6bdcb0b68d 1.更新Common库 2023-11-17 14:29:51 +08:00
Liang Su c6bcaeeb34 修正Recipe中的C3H8设置项识别错误,全部默认到Purge的问题。
版本号更新至v1.1.1.1
2023-11-17 14:13:53 +08:00
Han Qiang Qiang 3c7374dfc9 更新dll [ed25f36],优化PM右键菜单选项 2023-11-16 14:34:09 +08:00
Han Qiang Qiang 55f6602cd9 更新dll [bdaa90e],PM腔体添加右键菜单功能 2023-11-15 21:38:16 +08:00
Han Qiang Qiang 493a3f6499 1更新dll [d2bcfff],上银机械手注册真空开关,夹爪开关控制
2修改按钮界面显示
2023-11-15 14:57:48 +08:00
HCL 76664e49c3 1.启用Cassette下降沿信号删除Wafer信息功能 2023-11-15 14:41:55 +08:00
Han Qiang Qiang b70314fedd 1添加机械手真空
2还原PM DI-6 InterLock
2023-11-15 13:23:35 +08:00
Han Qiang Qiang 45094de4f7 更新dll [5ff6400],IoValue类中,添加BypassEnableTable实时生效 2023-11-08 11:31:12 +08:00
Han Qiang Qiang 04803b365f 1修改配置注释,修改三铯测温无数据问题(配置名称不一致导致) 2023-11-07 14:02:24 +08:00