Commit Graph

222 Commits

Author SHA1 Message Date
hanqiangqiang 98c38426f3 更新版本号至## Version 1.2.6.65 2023-11-03 12:25:28 +08:00
hanqiangqiang 1bb09587e1 更新dll [007352e],修改气柜检测
添加SC配置
修改PM的Device配置
2023-11-03 11:33:54 +08:00
HCL 703978676c 1.解决检测MFC流量报警时机偶尔不准确问题 2023-11-02 14:57:00 +08:00
HCL 34413f7065 1.补上日志 2023-10-31 10:29:43 +08:00
auvkk a6fc4b22e7 更新库文件094abb3,修正Recipe保存的一些问题。
修正SicRT\Toolloader中IoManager对象的加载顺序,移至末尾加载,以避免IoManager中启动了InterlockManager,但InterlockManager使用的数据还未在DATA中注册,导致Poll数据失败的问题。
修正PM2启用后,无法触发任何报警的问题。
2023-10-25 18:53:24 +08:00
HCL 2c86ce0c2b 1.解决MFC ROR测试重做上次MFC ROR流程的问题 2023-10-25 08:51:23 +08:00
SIC1016\caipeilun 4fd4dc881e Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into develop
# Conflicts:
#	SicRT/Properties/AssemblyInfo.cs
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.cs
2023-10-24 10:47:26 +08:00
SIC1016\caipeilun 0135510588 更新库文件,更新版本1.2.6.62
Bug修复
 - 未Install的PM腔不进行online offline操作
- 新特性
 - 新增config配置对比功能,当配置被修改时,可以在配置界面右上角查看和筛选修改内容,支持回退操作;并且下次开启软件有提示
2023-10-24 10:45:28 +08:00
HCL 30558a39ad 1.补加Vent修改 2023-10-24 09:52:35 +08:00
HCL 2b0464bfa0 1.修改TM Purge逻辑,在Vent最终压力的过程中检测是否开启快充流量 2023-10-24 09:43:48 +08:00
SIC1016\caipeilun 10b9b84b81 更新库文件,版本号1.2.5.61 2023-10-20 13:51:34 +08:00
SIC1016\caipeilun bf18edc1b5 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into develop 2023-10-20 13:42:31 +08:00
SIC1016\caipeilun 6bc7e74617 添加EATONUPS监控DEVICE 2023-10-20 13:42:21 +08:00
hanqiangqiang 6229c1af38 更新dll [35e381e]
1添加昂坤测温参数
2版本号更新至  1.2.5.60
2023-10-19 09:09:50 +08:00
SIC1016\caipeilun 2790ded5b5 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into develop 2023-10-18 13:25:52 +08:00
HCL 19bf9ab668 1.PM K阀组增加V111控制 2023-10-18 11:44:16 +08:00
SIC1016\caipeilun d2d569b2db Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into develop
# 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
2023-10-18 11:04:15 +08:00
SIC1016\caipeilun 3a297c915f 优化ITAUPS代码,更新库文件 2023-10-18 10:55:23 +08:00
auvkk a0d6d9c536 版本号更新至v1.2.4.58 2023-10-17 17:14:48 +08:00
auvkk bd646af09a 更新库文件acf1b19,增加禁用单会话登录模式功能,修正Recipe编辑视图的问题。
系统配置中增加System.SingleSessionLoginMode配置项。
2023-10-17 17:14:35 +08:00
SL 8a3c609b14 版本号更新至v1.2.3.57 2023-10-14 10:18:43 +08:00
SL 87a180568f 版本号更新至v1.2.2.56 2023-10-13 16:41:11 +08:00
SL 7ee92e08b3 更新库文件5dfe03b,优化IoGasBoxTemp报警逻辑,温度上限设定为0时不报警。
优化系统配置中的LineHeaterTempHighLimit项目描述。
2023-10-13 16:33:50 +08:00
SIC1016\caipeilun 207dacd32e 更新版本1.2.1.55 2023-10-13 14:54:50 +08:00
HCL 1f03a766e2 1.TM Purge检查功能优化 2023-10-12 11:59:33 +08:00
HCL 484932e024 1.TM增加DO_TMCyclePurgeRoutineSuccessed,TM Purge后置为true,TM开腔后该DO置为false,
TM Online时需检查该DO为true
2023-10-11 11:52:21 +08:00
SIC1016\caipeilun 4a7f3e3da7 版本更新1.2.1.52 2023-10-10 09:03:18 +08:00
SIC1016\caipeilun 2cee36908e 修复:
1.TM purge时 vent延时绑定错误
2.vent延时默认值改为10s,与pump延时一致
2023-10-09 17:09:09 +08:00
SIC1016\caipeilun dbeb1b37cb 更新版本号1.2.1.52 2023-10-07 14:53:34 +08:00
SL 8c71e7fc5b 版本号更新至v1.2.0.51 2023-10-03 10:09:33 +08:00
SL 1e72b66ab4 更新ReleaseNote。 2023-10-03 09:29:48 +08:00
SL 3531413790 Merge branch 'develop' into feature/single-session-login
# Conflicts:
#	SicRT/Properties/AssemblyInfo.cs
#	SicRT/ReleaseNotes.md
#	SicUI/MainView.xaml
#	SicUI/MainViewModel.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
2023-10-01 16:34:16 +08:00
SIC1016\caipeilun a6f5f4cfcb Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into develop 2023-09-25 17:21:21 +08:00
SIC1016\caipeilun dc74c330dc 更新库文件和版本号1.1.20.50 2023-09-25 17:03:12 +08:00
HCL 32bf6e3533 1.隐藏Load FastVent超时参数 2023-09-25 16:44:51 +08:00
SL 1add25b434 版本号更新至v2023.09.22.01 2023-09-22 17:53:22 +08:00
SL 433c16aa3a 版本号更新至v2023.09.22.01 2023-09-22 16:55:21 +08:00
SL ddcac6e3a5 优化安装脚本,删除WCF诊断文件。
关闭WCF诊断。
2023-09-22 16:55:06 +08:00
SL 40f3f783c1 Merge branch 'develop' into feature/single-session-login
# Conflicts:
#	SicRT/Properties/AssemblyInfo.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
2023-09-22 08:52:45 +08:00
SL 095dd1b03b MainView中增加账号异地登录确认和踢出逻辑。
新增UI启动时获取PC信息的逻辑,用于将UI登录信息传递给RT并保存于数据库中。
移除所有ViewModel中的Permission属性和IsPermission属性。
优化WCF诊断输出文件名。
2023-09-20 17:50:00 +08:00
SIC1016\caipeilun 63bc159222 1.修改V75V76和V72TVInterlock
2.版本号修改23.9.20.3
2023-09-20 17:05:18 +08:00
SIC1016\caipeilun 090e2887a4 更新库文件+更新版本23.9.20.1 2023-09-20 15:31:59 +08:00
SIC1016\caipeilun a9c42569a8 Merge branch 'develop' into feature/bind-interlock-manager-to-module
# Conflicts:
#	Modules/SicModules/Config/PM/PM1/interlockPM1.xml
#	Modules/SicModules/Config/PM/PM2/interlockPM2.xml
#	SicRT/Properties/AssemblyInfo.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
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
2023-09-20 15:12:42 +08:00
SL 2a2f44f733 数据库脚本中增加credentials_history表创建脚本。 2023-09-19 17:39:11 +08:00
SL f8d6332347 更新库文件41202af,优化Data History左侧列表的水温名称。
微调TM视图按钮位置。
2023-09-14 09:38:06 +08:00
SIC1016\caipeilun d570dbbc0f 更新 Version 23.9.8.2 2023-09-14 09:31:17 +08:00
SL ad1f13c3e0 更新库文件(Commit 704daa8),用户登录时首先发起登录请求,请求已登录客户端确认的功能。 2023-09-07 23:32:35 +08:00
SIC1016\caipeilun f1170da28b 更新版本23.9.4.1 2023-09-04 17:20:17 +08:00
hanqiangqiang 7b1655097f 版本号更新至1.1.19.49
更新dll,[f058af3]
2023-09-04 10:51:19 +08:00
SL a353a4c43a 更新库文件(Commit cbb7c73),增加LoginBySameUser事件测试按钮,并通过测试。 2023-09-02 00:59:55 +08:00