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

613 Commits

Author SHA1 Message Date
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
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
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
Liang Su 3908bef42b 更新库文件a4824c3，增加汉化内容。 2023-12-21 16:26:59 +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
HCL 636b560cfe 1.隐藏SystemConfig中VaccumPressureBase参数 
2.手动Purge各个模块不能修改SystemConfig相关参数值
 2023-12-15 14:25:02 +08:00
Han Qiang Qiang f8c64c1030 Merge branch 'ProcessHistoryData' into feature/测温重构 
# Conflicts:
#	Modules/Mainframe/SicModules.csproj
#	SicRT/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-12-15 10:27:01 +08:00
Han Qiang Qiang 549898026b 修改ProcessDeviceItem注册项名称 2023-12-15 10:19:10 +08:00
Han Qiang Qiang 017f7de7b5 1更新dll, 
2添加ProcessDeviceItem注册项
 2023-12-15 10:12:12 +08:00
Han Qiang Qiang bf1f37b088 合并后使用最新dll 2023-12-15 09:47:47 +08:00
Han Qiang Qiang 7933292bce Merge branch 'Sic8ToSic6' into ProcessHistoryData 
# 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-15 09:47:21 +08:00
Han Qiang Qiang bd6e303ffe 修改PM中LineHeater配置的显示标签名称 2023-12-15 09:42:58 +08:00
Han Qiang Qiang ec0db0ed21 Merge branch 'Sic8ToSic6' into 添加DI-45 
# Conflicts:
#	SicUI/Properties/AssemblyInfo.cs
 2023-12-14 16:58:02 +08:00
Han Qiang Qiang 9403a242ae 更新dll 
PM2添加ProcessDeviceItemsPM2 XML配置
 2023-12-14 16:56:24 +08:00
Han Qiang Qiang 8c449e46e7 更新dll 
修改配置项单位名称
 2023-12-14 15:32:56 +08:00
Han Qiang Qiang 4e4b5cd48e 修改测温系统参数描述 2023-12-14 10:03:34 +08:00
Han Qiang Qiang 008083c798 更新版本号至## Version 1.1.5.9 2023-12-14 09:06:24 +08:00
Han Qiang Qiang d3fdcd88e4 Merge branch 'Sic8ToSic6' into feature/测温重构 2023-12-14 09:00:36 +08:00
HCL 6956f9622d 1.仿真改用HiwinRobot 2023-12-14 08:59:01 +08:00
Han Qiang Qiang 48e2320b07 更新dll 2023-12-14 08:48:53 +08:00