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

730 Commits

Author SHA1 Message Date
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
Han Qiang Qiang 63fd0f7a10 版本号更新至 ## Version 1.1.4.12 2023-12-28 15:42:22 +08:00
Han Qiang Qiang c14ce74e09 PM添加DI-346 Apc_ButterflyError，绑定IoSensor提示 2023-12-28 15:35:06 +08:00
Han Qiang Qiang 0a7e5e5cc9 1.PM添加DO_TVReset，TV阀右键时通过控制DO来进行复位 
2.PM主界面添加按钮事件触发TVReset
 2023-12-28 11:07:22 +08:00
Han Qiang Qiang f99d64a376 删除无用的创建数据表 2023-12-27 13:03:56 +08:00
HCL b7b077770d 1.增加弹框提醒 2023-12-27 09:16:26 +08:00
Liang Su 5a880f8655 修正Setup脚本中拷贝NSIS文件夹时，输出信息太多的问题。 
修正CommandLine.dll没有加入版本管理的问题。
 2023-12-26 16:20:39 +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
Han Qiang Qiang 4a73486116 更新dll [1bb929f]，ProcessHistory默认显示对象集合，标记不存储到数据库，优化PM process取消查询功能 2023-12-20 10:36:46 +08:00
Liang Su b3002ce01f Bootstrapper中增加语言切换的测试程序。 2023-12-20 08:56:17 +08:00
Liang Su b321982975 Merge branch 'Sic8ToSic6' into feature/io-name-chinese-support 2023-12-19 16:30:20 +08:00
Liang Su 9de6e39724 修正CommandLine.dll丢失的问题。 2023-12-19 16:29:57 +08:00
Liang Su 56377b695d Merge branch 'Sic8ToSic6' into feature/io-name-chinese-support 
# 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-19 16:28:48 +08:00
Liang Su 7fe8acc0d6 更新库文件13674dc，优化IoManager及IOAccessor。 
修正AOAccessor和AIAccessor的FloatValue属性，统一使用Value属性获取AO、AI数据。AOAccessor和AIAccessor不再支持short型Value属性。
移除SicRT中的SiemensIoProvider.cs，统一使用RT.EquipmenLibrary中的相关对象。
 2023-12-19 16:25:57 +08:00
Han Qiang Qiang 4923b77709 更新dll [7846249]，优化Reset，AE设备未启用时调用_connection对象。 2023-12-19 14:05:39 +08:00
HCL c4cf0978c6 1.PM进入Service不在检查Offline提示 2023-12-18 17:05:11 +08:00
Han Qiang Qiang 17f48e1d09 版本号未更新，追加更新内容 2023-12-15 16:35:24 +08:00
Han Qiang Qiang c7f25dcecd 合并后使用最新dll [9a5bcb7] 2023-12-15 16:33:54 +08:00
Han Qiang Qiang 2c099122ff 在ToolLoader中初始化Common配置项 2023-12-15 16:23:03 +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 9316c9f0ca Merge branch 'ProcessHistoryData' into Sic8ToSic6 2023-12-15 15:02:02 +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