Han Qiang Qiang
|
bbfc64c13b
|
根据南京百识现场更新Process单步历史记录查询数据
|
2024-03-15 13:50:33 +08:00 |
Liang Su
|
a15974dca2
|
修正PostProcess、PMPostTransferRoutine和PMToProcessIdleRoutine中未正确设置PSU、SCR加热模式的问题。
|
2024-03-14 15:26:03 +08:00 |
Han Qiang Qiang
|
5a97b64a51
|
Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop
|
2024-03-14 09:52:58 +08:00 |
Han Qiang Qiang
|
8fb1afb227
|
PM腔体和管道压差,在工艺过程中检测,报警等级可配置
|
2024-03-14 09:52:29 +08:00 |
Liang Su
|
dbbca86ee8
|
修正PM进入ProcessIdle时,PSU和SCR加热模式可能错误的问题。
|
2024-03-14 09:41:36 +08:00 |
HCL
|
1f86e5195b
|
1.保留小数后两位
|
2024-03-11 17:43:22 +08:00 |
Han Qiang Qiang
|
66f77567e5
|
启用屏蔽的Coating生长方法
|
2024-03-01 14:28:43 +08:00 |
SIC1016\caipeilun
|
6f24a0e7c3
|
修改PMmodule连接判定
|
2024-02-28 14:37:34 +08:00 |
Han Qiang Qiang
|
72715f0811
|
Merge branch 'develop' into DevelopBase
|
2024-02-27 17:40:19 +08:00 |
HCL
|
2c035c23c1
|
1.Process Exit信息打印
|
2024-02-27 11:17:21 +08:00 |
Liang Su
|
da35b442a8
|
优化SiemensIoProvider.cs代码格式。
|
2024-02-27 09:50:44 +08:00 |
Liang Su
|
88b21801a3
|
恢复SicModules项目中的SiemensIoProvider对象。
RT的TM PLC配置恢复为SicModules.Devices.SiemensIoProvider。
|
2024-02-27 09:45:04 +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
|
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
|
15f96f1ada
|
PM2 Alarm13 修改为 Warning15
|
2024-02-22 09:48:26 +08:00 |
SIC1016\caipeilun
|
d11d47b687
|
更新MuitiProcess代码
|
2024-02-22 09:40:12 +08:00 |
Han Qiang Qiang
|
b3439a2fdb
|
PM1 Alarm13 修改为 Warning15
|
2024-02-22 09:21:32 +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 |
HCL
|
4a4148254e
|
1.ProcessIdle前增加闸板阀关闭检查
|
2024-02-02 13:28:04 +08:00 |
HCL
|
492828e470
|
1.Process前增加闸板阀关闭检查
|
2024-02-02 11:10:57 +08:00 |
HCL
|
00d6356c1b
|
1.do改为di
|
2024-02-01 14:20:00 +08:00 |
HCL
|
2c60ed107f
|
1.添加TM DO09、DO11、DO13、DO15与DI-31的互锁
|
2024-02-01 14:13:40 +08:00 |
Liang Su
|
89cbf91264
|
版本号更新至v1.2.0.40115-preview。
|
2024-01-15 11:28:30 +08:00 |
Liang Su
|
7adf7562b6
|
更新库文件c7513e1,合并Develop分支最新更改。
三色灯的DO增加DisImmCache属性,禁止调用DataTrace的ImmediateCache()方法。
|
2024-01-15 11:28:10 +08:00 |
Liang Su
|
4c6ec95824
|
Merge branch 'develop' into feature/high-performance-data-collector
|
2024-01-15 10:40:28 +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 |
Liang Su
|
4f1aa02d69
|
更新库文件92cd62b0,IO定义增加DisImmCache属性,用于禁止IO调用ImmediateCache()方法。
PM1和PM2的AO-130(AO_HeartBeat)增加DisImmCache=false属性定义。
|
2024-01-11 15:28:43 +08:00 |
HCL
|
9b0bd30ceb
|
1.Cassette不存在由Warning改为Alarm
|
2024-01-11 14:55:22 +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
|
643cd1c09b
|
PM CoolingWater U4配置项修改
|
2024-01-10 14:25:21 +08:00 |
Liang Su
|
5252576ac0
|
更新库文件c8848e6,同步develop最新内容,AI、AO的Value属性统一使用float型数据。
修正AI、AO读取值时使用的属性,以匹配最新更改。
|
2024-01-05 14:39:12 +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
|
4baba50d5f
|
1.UnloadServo超时时间可配置
|
2023-12-28 15:44:49 +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 |
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 |
HCL
|
c4cf0978c6
|
1.PM进入Service不在检查Offline提示
|
2023-12-18 17:05:11 +08:00 |
Han Qiang Qiang
|
726e067b19
|
更新测试版本号
|
2023-12-15 14:43:12 +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
|
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 |