Sic-Software
/
SicMultiplate
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
710 Commits 1 Branch 0 Tags 303 MiB
Commit Graph

150 Commits

Author SHA1 Message Date
SIC1016\caipeilun a7455bf1be Merge branch 'DevelopBase' of http://118.31.5.210:65000/Sic-Software/Sic08 into DevelopBase 
# 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/zh/Sicentury.Localization.resources.dll
 2024-02-28 14:33:07 +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
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 7995f7b764 控件模块是否在线禁用右击菜单和拖拽，修改模块PM1,PM1,Load,UnLoad 2024-01-15 17:23:32 +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
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 f9a1371a81 Editor选项卡RoutineConfig界面添加汉化 2024-01-09 10:57:55 +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
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
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
Liang Su 3908bef42b 更新库文件a4824c3，增加汉化内容。 2023-12-21 16:26:59 +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
HCL 636b560cfe 1.隐藏SystemConfig中VaccumPressureBase参数 
2.手动Purge各个模块不能修改SystemConfig相关参数值
 2023-12-15 14:25:02 +08:00
Han Qiang Qiang b08d9fa229 1更新dll,修改测温存储，PLC根据PM是否安装来初始化 
2TM主界面控件可见性，绑定是否安装属性
 2023-12-12 17:03:47 +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 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 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
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
HCL 8d89c35b5a 1.修改ROR M11配置文件的错误 
2.ROR时间间隔和基础压力可统一设置
 2023-10-31 14:20:48 +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
SIC1016\caipeilun fce4967a57 更新多用户登录机制： 
同时只允许一个用户登录操作A；
多个用户B登录时，有权限用户A将进行确认，若确认后操作权限转移到B,A变成ReadOnly模式，仅有只读权限；
目前ReadOnly模式禁用鼠标键盘功能，只能切换页面，无法操控页面内功能（滚动条、Log等无法点击查看）
 2023-10-06 09:50:11 +08:00