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

45 Commits

Author SHA1 Message Date
Han Qiang Qiang 0000dfb862 更新dll [a5063fc]，侧壁加热切回到Pyro前，检测上一步是不是Pyro，不是Pyro，对L3进行温度赋值 2024-03-07 17:56:12 +08:00
Han Qiang Qiang 8632853aa0 更新dll [c0324fe]，侧壁Power模式修改 2024-03-06 16:59:06 +08:00
Han Qiang Qiang cbdc0f4de5 更新dll [6bb8dec],添加汉化，屏蔽上升沿对温度数据赋值 2024-03-06 14:04:17 +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
Han Qiang Qiang 0eebcc9c96 更新dll [8d28778]，修复Recipe快照保存时，报错问题 2024-02-29 10:10:10 +08:00
SIC1016\caipeilun 3a5efd9831 更新版本1.3.0.40229 更新库文件 2024-02-29 09:26:49 +08:00
SIC1016\caipeilun d6b9474049 修改maintain默认文件，更新库文件 2024-02-27 16:37:44 +08:00
Han Qiang Qiang 1958574a9a 更新dll [1e2fd70]，添加汉化内容 2024-02-26 15:21:49 +08:00
SIC1016\caipeilun 24290e71d9 更新库文件 2024-02-26 14:48:43 +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
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
SIC1016\caipeilun f3760c3799 维护保养界面 2024-02-26 09:32:39 +08:00
SIC1016\caipeilun 7bc1edd4e3 Merge branch 'feature/WCF测试' 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
 2024-02-26 09:15:38 +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 e2b4f9b083 1PM新增DI-73,AI-26,AI-27点位 
2监控加热带温区AI-26,AI-27超温报警
3增加配置控制报警输出等级
4仿真添加相应点位
 2024-02-21 11:12:42 +08:00
Han Qiang Qiang eaacb3ac4a 1修改PM加热界面 
2更新dll,更新汉化内容
3修改新建账户默认配置项
 2024-02-20 13:19:48 +08:00
SIC1016\caipeilun 74dbf1bac7 更新库文件，修复 数据库文件循环清理功能 2024-02-04 10:13:41 +08:00
Han Qiang Qiang e4d7fbae2a 更新dll测试汉化内容 2024-01-26 16:03:37 +08:00
Han Qiang Qiang 1fdab69946 更新dll测试汉化内容 2024-01-25 15:28:59 +08:00
Han Qiang Qiang 2bf1c99fa3 更新dll [3998a66]，测试Process历史记录查询 2024-01-16 17:07:33 +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
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 ad802b791a 测试界面菜单汉化 2024-01-10 15:20:21 +08:00
Han Qiang Qiang f10e9645c3 添加视图菜单汉化临时保存 2024-01-10 14:02:03 +08:00
SIC1016\caipeilun 6d5a9a013a 修改部分页面未汉化部分 2024-01-09 17:45:01 +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
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 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 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 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 f81f9c07bb 更新库文件bb4a30a，修正JobDone三色灯蜂鸣器无法自动关闭的问题；修正InterlockManager初始化时报集合枚举时发生变更的异常的问题。 
JobDone蜂鸣器鸣响循环次数默认值更改为3次。
EquipmentManager中新增"System.AlertJobDone"操作。
版本号更新至v1.1.4.13。
 2023-12-28 16:25:18 +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 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