Commit Graph

287 Commits

Author SHA1 Message Date
Han Qiang Qiang dbc2b88af3 版本号更新至 ## Version 1.3.1.40315 2024-03-15 14:02:55 +08:00
Liang Su a3e9411692 版本号更新至v1.3.1.40314 2024-03-14 15:27:32 +08:00
Liang Su b1a6dfa152 版本号更新至v1.3.0.40314 2024-03-14 09:41:58 +08:00
Han Qiang Qiang db9a8bdf0e 版本号更新至 ## Version 1.3.0.40308 2024-03-08 08:49:13 +08:00
Han Qiang Qiang b2bfeaa6d4 版本号更新至 ## Version 1.3.0.40306 2024-03-06 14:13:09 +08:00
Han Qiang Qiang 69e41f1ffe Merge branch 'develop' into DevelopBase 2024-03-06 14:04:37 +08:00
Han Qiang Qiang cbdc0f4de5 更新dll [6bb8dec],添加汉化,屏蔽上升沿对温度数据赋值 2024-03-06 14:04:17 +08:00
HCL 8725f56530 1.修改默认值
2.WaferRobot和TrayRobot操作和对应Moudle Online绑定
2024-03-06 09:23:54 +08:00
HCL 34a63c62c4 1.删除无用ModuleWaferList 2024-03-05 10:40:23 +08:00
Han Qiang Qiang 4940d5a762 1更新dll [afa8538] ,修正PyroFollow模式下PSU1和PSU3没有跟随PSU2的问题
2更新版本号至## Version 1.3.0.40304
2024-03-04 13:22:50 +08:00
SIC1016\caipeilun 3a5efd9831 更新版本1.3.0.40229 更新库文件 2024-02-29 09:26:49 +08:00
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 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