Commit Graph

384 Commits

Author SHA1 Message Date
Han Qiang Qiang 4a914ac1ad 添加输入点移动 2024-02-28 14:10:08 +08:00
Han Qiang Qiang 5ab4ba564d 版本号修改为 1.3.0.40226 2024-02-26 15:29:23 +08:00
SIC1016\caipeilun 7e38106528 Merge branch 'feature/维保界面V1.0' into DevelopBase
# Conflicts:
#	SicRT/Config/System.sccfg
#	SicRT/Instances/ToolLoader.cs
#	SicUI/Bootstrapper.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
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-02-26 11:02:43 +08:00
SIC1016\caipeilun b5a0e2925a 更新维护代码 2024-02-26 10:47:35 +08:00
Liang Su 7ec1499c61 Merge branch 'feature/high-performance-data-collector' into DevelopBase
# Conflicts:
#	Modules/Mainframe/Devices/IoInterLock.cs
#	Modules/Mainframe/Devices/SiemensIoProvider.cs
#	SicRT/Config/System.sccfg
#	SicRT/Properties/AssemblyInfo.cs
#	SicSimulator/Config/_ioDefinePM.xml
#	SicSimulator/Instances/SimulatorModulePlc.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
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-02-26 09:35:22 +08:00
Han Qiang Qiang 1382f61302 Merge branch 'develop' into feature/localization
# Conflicts:
#	SicUI/Models/Maintenances/TM/EFEMView.xaml
#	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
2024-02-22 10:16:49 +08:00
Han Qiang Qiang eaacb3ac4a 1修改PM加热界面
2更新dll,更新汉化内容
3修改新建账户默认配置项
2024-02-20 13:19:48 +08:00
HCL c110aa0778 1.隔热罩升起时检测TMRobot Extend Enable信号 2024-02-02 14:07:30 +08:00
HCL 2c60ed107f 1.添加TM DO09、DO11、DO13、DO15与DI-31的互锁 2024-02-01 14:13:40 +08:00
HCL c0e4cadc94 1.添加版本号 2024-01-25 08:49:16 +08:00
SIC1016\caipeilun 04703f24ab 更新版本V1.1.4.18 2024-01-23 16:49:26 +08:00
SIC1016\caipeilun c556b86df0 更新测试版24.1.23.1,更新库文件
修改EFEM界面Aligner功能按钮,并能显示相关数据
2024-01-23 13:33:09 +08:00
SIC1016\caipeilun 3b0cd8e2f1 更新EFEM界面,使hw寻边器功能按钮生效 2024-01-22 17:41:30 +08:00
Han Qiang Qiang 0c6a9f13ba 1控件模块是否在线禁用右击菜单和拖拽,修改模块PM1,PM1,Load,UnLoad,添加或逻辑,条件为Rt.Status == "Idle"
2EFEM界面追加此功能
2024-01-19 08:57:24 +08:00
Han Qiang Qiang e14f17139c 版本号更新至## Version 1.1.4.17 2024-01-18 09:21:21 +08:00
Liang Su 9682bedf1f 版本号更新至v1.2.1.40117。 2024-01-17 10:14:53 +08:00
Han Qiang Qiang 7995f7b764 控件模块是否在线禁用右击菜单和拖拽,修改模块PM1,PM1,Load,UnLoad 2024-01-15 17:23:32 +08:00
Liang Su 89cbf91264 版本号更新至v1.2.0.40115-preview。 2024-01-15 11:28:30 +08:00
HCL 5fa163ee6a 1.启用取Wafer时判断Buffer和Cassette里是否有对应的Tray 2024-01-12 17:01:53 +08:00
Han Qiang Qiang b24ca17e69 更新dll测试汉化内容 2024-01-11 14:29:51 +08:00
SIC1016\caipeilun 8805031272 更新库文件 2024-01-11 14:04:23 +08:00
Han Qiang Qiang 4521da4813 Merge branch 'develop' into feature/localization
# Conflicts:
#	Modules/Mainframe/Config/PM/PM1/_ioDefinePM1.xml
#	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
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-01-10 15:25:47 +08:00
Han Qiang Qiang ad802b791a 测试界面菜单汉化 2024-01-10 15:20:21 +08:00
Han Qiang Qiang f10e9645c3 添加视图菜单汉化临时保存 2024-01-10 14:02:03 +08:00
SIC1016\caipeilun 18711c4eb3 Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic08 into feature/localization
# 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.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-01-09 17:47:21 +08:00
SIC1016\caipeilun 6d5a9a013a 修改部分页面未汉化部分 2024-01-09 17:45:01 +08:00
Han Qiang Qiang c500629575 1更新dll,测试汉化
2调整ROR测试界面
2024-01-09 17:26:47 +08:00
SIC1016\caipeilun 1d0f0735dc Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic08 into feature/localization
# 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.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-01-09 15:55:49 +08:00
SIC1016\caipeilun 1a22e28abc datalogviews汉化完成 2024-01-09 15:37:09 +08:00
Han Qiang Qiang ab568df2ec 更新dll,
添加锁屏界面汉化
2024-01-09 15:25:02 +08:00
Han Qiang Qiang f9a1371a81 Editor选项卡RoutineConfig界面添加汉化 2024-01-09 10:57:55 +08:00
Liang Su 80a236b53f 版本号更新至v1.1.4.15 2024-01-09 10:38:57 +08:00
Liang Su 078e0368ac 修正多次Logout、Login后,UI会变卡顿的问题。 2024-01-09 10:34:42 +08:00
Han Qiang Qiang 60318f4877 Merge branch 'feature/localization' into 添加汉化
# 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.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-01-05 17:09:03 +08:00
Han Qiang Qiang 6312608a92 1测试PM界面汉化
2修改ROR测试界面
3测试Alarm界面汉化
2024-01-05 17:06:50 +08:00
SIC1016\caipeilun 7390e5aff1 更新TM_Leakcheck汉化界面 2024-01-05 16:23:18 +08:00
SIC1016\caipeilun b3fb33ebe0 Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic08 into feature/localization
# 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
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-01-05 15:08:57 +08:00
SIC1016\caipeilun 020209a51b TM/EFEM/DEVICE/IO界面汉化完成 2024-01-05 15:07:27 +08:00
HCL 8b12920442 1.修改TMRobot Pick Buffer1层条件判断的BUG 2024-01-05 14:43:27 +08:00
Han Qiang Qiang 9edbcd092a 修改PM界面汉化, 2024-01-04 17:36:32 +08:00
Han Qiang Qiang d7c56cc43e 更新dll,添加语言配置文件
修改PM   Motion和Heart语言绑定
2024-01-04 14:59:26 +08:00
HCL 4baba50d5f 1.UnloadServo超时时间可配置 2023-12-28 15:44:49 +08:00
Han Qiang Qiang 63fd0f7a10 版本号更新至 ## Version 1.1.4.12 2023-12-28 15:42:22 +08:00
Han Qiang Qiang 0a7e5e5cc9 1.PM添加DO_TVReset,TV阀右键时通过控制DO来进行复位
2.PM主界面添加按钮事件触发TVReset
2023-12-28 11:07:22 +08:00
HCL b7b077770d 1.增加弹框提醒 2023-12-27 09:16:26 +08:00
Han Qiang Qiang 932db7307f 更新dll [880652f],蝶阀StopRame改成将计时器停止
版本号更新至 ## Version 1.1.4.11
2023-12-22 15:32:35 +08:00
Liang Su 3908bef42b 更新库文件a4824c3,增加汉化内容。 2023-12-21 16:26:59 +08:00
Liang Su b3002ce01f Bootstrapper中增加语言切换的测试程序。 2023-12-20 08:56:17 +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 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
SIC1016\caipeilun 4d3b740167 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_InterlockV1.3 2023-10-07 13:31:13 +08:00
SIC1016\caipeilun 6a78fb6b43 合并develop后复原代码,更新库文件 2023-10-07 11:14:23 +08:00
SIC1016\caipeilun fce4967a57 更新多用户登录机制:
同时只允许一个用户登录操作A;
多个用户B登录时,有权限用户A将进行确认,若确认后操作权限转移到B,A变成ReadOnly模式,仅有只读权限;
目前ReadOnly模式禁用鼠标键盘功能,只能切换页面,无法操控页面内功能(滚动条、Log等无法点击查看)
2023-10-06 09:50:11 +08:00
SIC1016\caipeilun c18ffff29d 修改 新增的data项 数据库不保存
删除多余代码
版本更新23.9.28.2
2023-10-03 09:08:02 +08:00
Han Qiang Qiang 4f69f3ba27 更新dll断点调试用
添加传盘动作
2023-09-27 09:34:30 +08:00
Han Qiang Qiang e85c2611b2 backup 2023-09-26 16:30:13 +08:00
Han Qiang Qiang 9f0de14a5c 添加测试动画按钮
修改界面控件
2023-09-26 08:35:10 +08:00
SIC1016\caipeilun b770eefdaf 更新版本[assembly: AssemblyVersion("1.1.31.47")] 2023-09-25 17:27:48 +08:00
SIC1016\caipeilun 7a3ea0193b 修正--PM2面板状态丢失 2023-09-25 15:51:07 +08:00
SIC1016\caipeilun b8e3b8c030 Merge branch '_Bypass_InterLock_ReEdit' into develop
# 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
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
2023-09-25 15:23:25 +08:00
Han Qiang Qiang 24765b01b3 测试界面整体大概效果 2023-09-25 08:38:08 +08:00
Han Qiang Qiang a3416d142d 1修改Tray图片
2修改界面布局,使得小Wafer适应Tray
2023-09-21 10:29:06 +08:00
Han Qiang Qiang dbd80a3f2f 动画属性测试 2023-09-19 16:13:42 +08:00
Han Qiang Qiang 689dafcb90 添加测试动作 2023-09-18 16:42:50 +08:00
SIC1016\caipeilun 480bb2eaa6 修改Scichart的曲线 新增(0,0)点 ,方便移动时对齐 2023-09-15 16:58:47 +08:00
Han Qiang Qiang 4defe04bef 更新版号至1.1.30.46
更新dll [7d4eef2]
2023-09-15 08:59:45 +08:00
SIC1016\caipeilun 9f07b93e30 修改scichart的tooltip显示,使得界面能显示更多tooltip,增加可读性
从ChartDataLineX中复制修改ChartDataLineXV2文件,删除多余程序段
2023-09-14 17:02:13 +08:00
SIC1016\caipeilun 2c586a0e01 曲线列表新增时间、配方名称标签,增加界面可读性 2023-09-14 09:13:47 +08:00
SIC1016\caipeilun c2a25dae69 修改PMCharting界面,优化Charting功能
1.搜索与图形整合到一个界面中
2.删除不常用功能,界面整理
3.选中曲线后点击图形,可修改曲线坐标
2023-09-13 17:28:59 +08:00
Han Qiang Qiang 37a6a42e3d 动画测试,添加去CB中的动画按钮 2023-09-12 17:44:04 +08:00
SIC1016\caipeilun 1df9607417 更新版本23.9.4.3 2023-09-08 14:45:26 +08:00
SIC1016\caipeilun 29da01537b 更新版本 23.9.4.2 2023-09-04 17:16:05 +08:00
SIC1016\caipeilun cb6582f549 更新版本23.9.4.1 2023-09-04 15:27:02 +08:00
SIC1016\caipeilun c29389314a 更新版本号Version 23.9.1.1 2023-09-01 18:40:23 +08:00
Han Qiang Qiang cb5997212d 修改UPS相关现实内容(SC配置提示+DeviceView界面) 2023-09-01 16:11:18 +08:00
SIC1016\caipeilun ce868c2b14 1.删除EquipmentManager中Engmode相关程序段
2.优化上界面interlockbypass显示tips提示
2023-08-31 17:26:43 +08:00
SIC1016\caipeilun 97e4412900 新增ModuleStatusIndicator控件,完善Interlock_Bypass功能。
1.全局Interlock_Bypass改为TM/PM1/PM2三组独立
2.Interlock_bypass时界面三角提示
3.bypass时,无法online,无法进行process,但可以进入processidle
2023-08-31 15:43:26 +08:00
SIC1016\caipeilun ada42c6aca 将主视图代码删除 2023-08-31 14:19:15 +08:00
SIC1016\caipeilun ac6bf3488e 将主视图上方的Module状态指示区域的控件代码删除 2023-08-31 14:13:28 +08:00
SIC1016\caipeilun a3285fb89a 将主视图上方的Module状态指示区域的控件删除,准备替换为ModuleStatusIndicator控件。
移除MainViewModel未使用的属性。
2023-08-31 14:04:13 +08:00
SIC1016\caipeilun 9b047d37db 删除IsEngMode相关 2023-08-31 11:39:55 +08:00
Liang Su fe00356166 恢复Develop发布版本号。 2023-08-29 12:20:37 +08:00
HCL 81c75b3b96 Merge branch 'feature/可编辑Routine' 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
2023-08-24 11:26:21 +08:00
HCL d5ca57c6cc 1.进度更新 2023-08-24 11:00:41 +08:00
HCL 4ab0c94f3f 1.更新进度 2023-08-23 14:41:54 +08:00
Liang Su eec1f6cc75 更新库文件(Commit 90fa346),优化HiWin Aligner执行命令错误后的信息。
更改HiWin Aligner对象的所属Module,由EFEM改为Aligner,解决Aligner异常后Aligner Module没有Alarm,导致WaferRobot从Aligner取盘失败的问题。
2023-08-22 17:56:16 +08:00
HCL 6b706287e7 1.进度更新 2023-08-22 17:29:58 +08:00
HCL 5c03bea704 1.进度更新 2023-08-22 16:57:27 +08:00
HCL b8735f453c 1.修改版本号 2023-08-15 15:59:08 +08:00
HCL 492f0eee51 Merge branch '优化Mfc' 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
2023-08-15 15:56:26 +08:00
HCL 56eee036a1 1.优化Mfc Ror功能,增加一次选多个MFC Ror测试功能 2023-08-15 15:46:44 +08:00
Liang Su 09ba470108 移除PMOperation视图中多余的样式定义。 2023-08-14 18:05:31 +08:00
Liang Su ae9b1bb329 更新库文件(Commit 9967ac9),PM Operation视图水温显示使用UI库中的CoolingWaterDataPresenter控件。
更正点表中的拼写错误,TMPumpFIow更正为TMPumpFlow。
模拟器新增水温模拟。
修正PMModule在InitDevices方法中初始化设备时,如果设备不存在,异常导致PMModule初始化失败的问题。
2023-08-14 17:55:17 +08:00
SIC1016\caipeilun 975f2ed13b 新增关闭软件权限,需要修改配置才能ShutDown 2023-08-14 11:51:22 +08:00
HCL 9237c3262d 1.整理WaferInfoRt类 2023-08-10 15:56:27 +08:00
Han Qiang Qiang 937cad5b84 更新dll[5078b39],优化气体流量查询
实时获取系统配置参数修改
2023-08-09 17:28:39 +08:00
Liang Su da283c819e 版本号升级至v1.1.29.43 2023-08-04 16:18:20 +08:00
Liang Su b1865ad948 移除PM Heater视图中配置PSU2输出限制的功能。
PMModule对象中增加统计工艺数据累积量的功能。
DBModel.sql脚本中移除创建表process_flow_data的语句,新增创建表process_data_stat_per_run的语句。
恢复System.sccfg中删除的项目,修正缺失配置项导致程序运行异常的问题。
更新库文件(Commit 724cbaa)
2023-08-04 16:08:55 +08:00
Liang Su 63cfea8d71 版本号更新至v1.1.28.42 2023-08-01 15:49:13 +08:00
Liang Su 55a8dbd323 更新公共库(Commit 678767e),增加PSU2输出限幅功能。 2023-08-01 13:28:46 +08:00
Liang Su e513872f3c 更新库文件(Commit 9c181aa),更新IoPSU和IoSCR对象。
PM Operation视图增加加热器电阻值显示。
优化PM Process过程中监测加热器电阻阻值的逻辑。
优化系统配置中加热器电阻检测相关的配置项的名称。
2023-07-28 11:37:26 +08:00
HCL 9c2b04885f 1.解决保存新列产生的问题 2023-07-24 11:19:40 +08:00