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

261 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
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
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
SIC1016\caipeilun 412a3e227b 更新库文件 2024-02-22 10:01:28 +08:00
SIC1016\caipeilun d11d47b687 更新MuitiProcess代码 2024-02-22 09:40:12 +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
HCL c110aa0778 1.隔热罩升起时检测TMRobot Extend Enable信号 2024-02-02 14:07:30 +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
HCL c9a0b06a00 1.更新Common库 2024-01-25 08:47:15 +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
Liang Su 7427ce521f 更新库文件3e310db，优化DataTraceManager的一些问题。 2024-01-17 10:04:44 +08:00
Liang Su 46f0ff7ff8 更新库文件3730cfab，优化DataTraceManager上机后报缓存数据频繁的问题；优化磁盘空间监测和报警逻辑；优化AO的ImmCache逻辑。 
修正系统配置中OpenLidCountDownTime重复的问题。
修正SimulatorSystem对象中错误创建DataManager实例的问题。
 2024-01-16 18:08:21 +08:00
Han Qiang Qiang 2bf1c99fa3 更新dll [3998a66]，测试Process历史记录查询 2024-01-16 17:07:33 +08:00
Liang Su 4802ab3fa2 更新库文件ee0f25e，允许通过系统配置禁用DO、AO跳变捕获功能。 
系统设置中新增AllowTraceAOHopping和AllowTraceDOHopping项。
 2024-01-15 19:42:07 +08:00
Liang Su 7adf7562b6 更新库文件c7513e1，合并Develop分支最新更改。 
三色灯的DO增加DisImmCache属性，禁止调用DataTrace的ImmediateCache()方法。
 2024-01-15 11:28:10 +08:00
Liang Su 43d74cbbd1 更新库文件88f6b89，DataRecorderManager更名为DataTraceManager. 
PJ_DONE事件等级变更为Information。
 2024-01-15 10:39:45 +08:00
Liang Su 59a05079bd 更新库文件0e5a5180，修正DataTrace过于频繁的问题；修正TM PLC模拟器的一些问题。 2024-01-12 18:16:21 +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 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 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