Sic-Software
/
Sic08
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity
705 Commits 19 Branches 30 Tags 693 MiB
Commit Graph

705 Commits

Author SHA1 Message Date
Liang Su 4c6ec95824 Merge branch 'develop' into feature/high-performance-data-collector 2024-01-15 10:40:28 +08:00
Liang Su 43d74cbbd1 更新库文件88f6b89，DataRecorderManager更名为DataTraceManager. 
PJ_DONE事件等级变更为Information。
 2024-01-15 10:39:45 +08:00
HCL 5ea1d7cef1 1.解决一些问题 2024-01-15 08:48:28 +08:00
Liang Su 59a05079bd 更新库文件0e5a5180，修正DataTrace过于频繁的问题；修正TM PLC模拟器的一些问题。 2024-01-12 18:16:21 +08:00
HCL 5fa163ee6a 1.启用取Wafer时判断Buffer和Cassette里是否有对应的Tray 2024-01-12 17:01:53 +08:00
HCL b724377249 1.取Wafer时判断Buffer和Cassette里是否有对应的Tray 2024-01-12 10:35:25 +08:00
Liang Su 4f1aa02d69 更新库文件92cd62b0，IO定义增加DisImmCache属性，用于禁止IO调用ImmediateCache()方法。 
PM1和PM2的AO-130（AO_HeartBeat）增加DisImmCache=false属性定义。
 2024-01-11 15:28:43 +08:00
Liang Su 4d3f6b6a22 修改模拟器的IO列表中，DO和AO的Hold CheckBox不起作用，导致无法在模拟器中修改DO和AO值的问题。 2024-01-11 15:26:36 +08:00
HCL 9b0bd30ceb 1.Cassette不存在由Warning改为Alarm 2024-01-11 14:55:22 +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 643cd1c09b PM CoolingWater U4配置项修改 2024-01-10 14:25: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 cc3d758c37 只更新dll，测试登录界面汉化 2024-01-09 14:33:39 +08:00
Han Qiang Qiang f9a1371a81 Editor选项卡RoutineConfig界面添加汉化 2024-01-09 10:57:55 +08:00
Liang Su 0917f747f7 Merge branch 'develop' into feature/high-performance-data-collector 2024-01-09 10:43:18 +08:00
Liang Su 3087988223 Merge tag 'fix-ui-lag-issue' into develop 
v1.1.4.15
 2024-01-09 10:39:37 +08:00
Liang Su 8df4e476eb Merge branch 'hotfix/fix-ui-lag-issue' 2024-01-09 10:39:37 +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
Liang Su eb8b0e4f46 更新库文件a0c00f02，继续优化数据Trace相关对象。 
SimulatorModulePlc对象中的IoManager变更为SimulatorIoManager。
初始化DataRecorderManager时指定数据表名前缀。
 2024-01-09 10:08:46 +08:00
Han Qiang Qiang e426ea56f7 汉化库中界面，更新测试dll 2024-01-08 16:42:37 +08:00
Han Qiang Qiang 6c3a9a5077 只更新dll测试 2024-01-08 14:37:18 +08:00
SIC1016\caipeilun 11e45460bc 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-08 11:29:59 +08:00
SIC1016\caipeilun 7dc50ab04c 更新库文件 2024-01-08 11:29:15 +08:00
Han Qiang Qiang fb982d4895 更新dll 2024-01-05 17:21:39 +08:00
Han Qiang Qiang 46a198aa40 更新合并dll 2024-01-05 17:09:21 +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
Liang Su 5252576ac0 更新库文件c8848e6，同步develop最新内容，AI、AO的Value属性统一使用float型数据。 
修正AI、AO读取值时使用的属性，以匹配最新更改。
 2024-01-05 14:39:12 +08:00
Liang Su aa702bdbe7 Merge branch 'develop' into feature/high-performance-data-collector 
# Conflicts:
#	SicRT/Instances/ToolLoader.cs
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
 2024-01-05 14:29:10 +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 eae7ae90ec 1.ReturnAll里Unload冷却时间定为300s 2024-01-03 16:31:28 +08:00
HCL 06dcf98382 1.HiwinRobotB Place后删除夹爪夹紧动作 2023-12-29 08:35:15 +08:00
Liang Su f81f9c07bb 更新库文件bb4a30a，修正JobDone三色灯蜂鸣器无法自动关闭的问题；修正InterlockManager初始化时报集合枚举时发生变更的异常的问题。 
JobDone蜂鸣器鸣响循环次数默认值更改为3次。
EquipmentManager中新增"System.AlertJobDone"操作。
版本号更新至v1.1.4.13。
 2023-12-28 16:25:18 +08:00
HCL ef74767e43 1.解决不能打包问题 2023-12-28 15:52:26 +08:00
HCL 4baba50d5f 1.UnloadServo超时时间可配置 2023-12-28 15:44:49 +08:00