Commit Graph

423 Commits

Author SHA1 Message Date
SIC1016\caipeilun 03c078bdd0 默认保养超时时用Info提示 2024-02-26 10:12:16 +08:00
SIC1016\caipeilun bd56d4881c 更新库文件 更新维保默认项 2024-02-26 09:53:37 +08:00
SIC1016\caipeilun 472cb40e00 Merge branch 'feature/维保界面V1.0' into DevelopBase
# Conflicts:
#	SicRT/Config/System.sccfg
#	SicRT/Instances/ToolLoader.cs
#	SicRT/SicRT.csproj
#	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/zh/Sicentury.Localization.resources.dll
2024-02-23 10:52:55 +08:00
SIC1016\caipeilun 6dbb9d623b 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-23 09:09:12 +08:00
SIC1016\caipeilun 78582fc288 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into feature/维保界面V1.0
# Conflicts:
#	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.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-02-23 09:01:35 +08:00
hanqiangqiang 76aea05399 Merge branch 'develop' 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
2024-02-22 09:57:57 +08:00
hanqiangqiang ab0a7a9d1d 版本更新至 1.2.10.75 2024-02-22 08:48:37 +08:00
hanqiangqiang c02e54dbb9 1PM新增DI-73,AI-26,AI-27点位
2监控加热带温区AI-26,AI-27超温报警
3增加配置控制报警输出等级
4仿真添加相应点位
2024-02-21 11:02:19 +08:00
hanqiangqiang 616209684b 修改默认账户配置项 2024-02-20 13:18:21 +08:00
SIC1016\caipeilun 44ec8248ea Merge branch 'develop' into feature/WCF测试
# 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-20 08:59:59 +08:00
SIC1016\caipeilun 9bcdc71064 更新逻辑 2024-02-19 10:06:46 +08:00
SIC1016\caipeilun e11cf71b9a 更新库文件,修复 数据库文件循环清理功能 2024-02-04 10:18:20 +08:00
SIC1016\caipeilun a9c0f29980 更新库文件 2024-02-04 10:14:38 +08:00
SIC1016\caipeilun bca006ba9e Merge remote-tracking branch 'origin/feature/WCF测试' into feature/WCF测试
# Conflicts:
#	SicRT/MultiProcess/ProcessCenter/MultiProcessServiceClient.cs
2024-02-01 18:13:59 +08:00
SIC1016\caipeilun 8ab0519714 更新 2024-02-01 18:11:54 +08:00
hanqiangqiang d9e71d9797 修改时间自动刷新问题 2024-02-01 16:19:12 +08:00
hanqiangqiang 77ff0b679c 1添加时间属性
2删除多余引用
2024-02-01 16:00:26 +08:00
HCL 388a2e50ad 1.日志修改 2024-02-01 14:24:06 +08:00
HCL 1a0cd1025a 1.添加TM DO09、DO11、DO13、DO15与DI-31的互锁 2024-02-01 14:23:15 +08:00
hanqiangqiang 87d6405f72 1删除无用using
2添加返回对象查询功能
2024-02-01 09:30:11 +08:00
SIC1016\caipeilun 062ce6ee2c client定时发送腔体状态;
手动Processidle前向服务器请求判断
2024-01-31 18:13:23 +08:00
hanqiangqiang b3c4acd0b5 修改加热基数累加 2024-01-31 13:50:38 +08:00
hanqiangqiang aa1e661396 DeviceManager删除测试项,模拟在RT中访问服务 2024-01-31 13:45:05 +08:00
hanqiangqiang 70fd69c079 调试服务器逻辑功能 2024-01-31 13:36:17 +08:00
HQQ 3c79392d87 添加RT访问MultiProcessService函数,未实现功能 2024-01-30 22:09:00 +08:00
hanqiangqiang 232231960c 添加PM模块加热实体类 2024-01-30 17:41:08 +08:00
SIC1016\caipeilun 6c04dc230a 新增MultiProcess wcf服务 测试版 2024-01-30 14:37:51 +08:00
SIC1016\caipeilun 74e1b6043e 更新维保界面测试版本V24.1.29.1 2024-01-29 18:15:39 +08:00
hanqiangqiang 32bbc38ab3 PM Interlock配置中移除DI-33 2024-01-25 13:15:50 +08:00
hanqiangqiang ce566bd2c1 修改测温配置提示内容 2024-01-23 17:09:12 +08:00
hanqiangqiang af0640912c 修改PM1测温配置项节点问题 2024-01-23 16:43:52 +08:00
hanqiangqiang 4999a02be9 更新dll [3998a66],测试Process历史记录查询 2024-01-16 17:10:01 +08:00
hanqiangqiang 10d52190b1 1修改PM加热界面控件绑定和显示
2修改PM界面相关汉化
2024-01-11 10:16:56 +08:00
hanqiangqiang 85a2825401 追加跟更新内容 2023-12-28 16:22:50 +08:00
SL 7b26b5ac59 更新库文件bb4a30a,同步最新develop分支编译版本。
修正发行日志。
2023-12-28 16:12:29 +08:00
HCL 5f671c2378 1.增加日志记录 2023-12-28 14:23:16 +08:00
HCL e02f58dcae Merge remote-tracking branch 'origin/feature/fix-job-done-buzzer-not-stop-issue' into develop
# Conflicts:
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.cs
2023-12-28 14:21:33 +08:00
HCL 5ea5b8a4ba 1.隐藏SystemConfig中VaccumPressureBase参数
2.手动Purge各个模块不能修改SystemConfig相关参数值
2023-12-28 09:10:23 +08:00
SL 0b97d91672 更新发型记录和版本号。 2023-12-27 16:39:18 +08:00
SL b064e627a8 更新库文件558af89d,优化三色灯控制逻辑;修正加载Interlock配置文件时引发集合改变异常的的问题。
优化修正JobDone信息输出的逻辑。
2023-12-27 16:25:59 +08:00
SL 4989867bff PJ_DONE事件的等级由修改为Information。
移除STEvent.xml中多余的事件。
2023-12-27 16:19:08 +08:00
hanqiangqiang 5b5eb587e2 更新dll [880652f],蝶阀StopRame改成将计时器停止
版本号更新至 ## Version 1.2.9.72
2023-12-22 15:38:39 +08:00
hanqiangqiang bbb267d47c 版本号未更改,追加更新内容 2023-12-15 16:21:54 +08:00
hanqiangqiang 4e2ee1a124 1更新dll [9a5bcb7],对测温部分进行重写
2添加Common配置项,作为公共配置项
3在ToolLoader中初始化Common配置项
4修改SC配置项,整理测温配置层级,使用昂坤作为默认配置项
2023-12-15 16:20:08 +08:00
hanqiangqiang 3604ea803f 版本号更新至 ## Version 1.2.9.71 2023-12-15 15:11:52 +08:00
hanqiangqiang 0ddd2e72a8 1更新dll [305b17a],使用合并后的最新dll,添加ProcessHistory
2添加ProcessHistory显示界面
3添加ProcessHistory配置的XML
4添加ProcessHistory配置的XML初始化解析
2023-12-15 15:10:07 +08:00
hanqiangqiang e8701bb61e 版本号更新至## Version 1.2.9.70 2023-12-14 10:22:34 +08:00
hanqiangqiang c66af16d95 修改升级提示内容错误问题 2023-12-14 10:18:04 +08:00
hanqiangqiang 57189a7daf - 新增配置默认值,根据百识现场情况来设定,MFC5安装、C3H8显示, 2023-12-08 15:01:03 +08:00
hanqiangqiang 4e61408058 更新dll [936f9ff],根据配置来读取显示内容,
更新版本号至 ## Version 1.2.8.69
2023-12-08 11:18:26 +08:00
hanqiangqiang a373257ebe Merge branch 'develop' into 兼容自动版本-MFC5-C2H4增加配置
# 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-12-08 10:49:42 +08:00
auvkk ebb61d6db7 更新发行记录。 2023-12-06 18:49:32 +08:00
hanqiangqiang 9d281b8f47 版本号更新至## Version 1.2.8.68 2023-11-27 14:44:45 +08:00
hanqiangqiang fa97c4e223 1更新dll [027c078],添加Recipe快照压缩保存+历史数据选择对比
2新增数据表recipe_history_data
2023-11-27 14:21:44 +08:00
auvkk 3003557d17 优化代码格式。 2023-11-23 16:22:14 +08:00
auvkk 0495f7f01a 修正AutoTransfer中,TM机械手操作还未完成,其传盘目标模组的等待状态会被立即清除的问题。 2023-11-23 16:20:56 +08:00
auvkk b78767fd31 更新库文件99c773a,修正DataLog查询时时间可能错乱的问题。 2023-11-23 16:18:50 +08:00
hanqiangqiang ec12b80bda 兼容配置项,设定默认值并不可见 2023-11-22 10:49:26 +08:00
hanqiangqiang 91647fae5e 1添加MFC5 配置参数
2在PM中修改MFC5配置的控制流程
3添加C2H4-C3H8配置参数和流量系数
4修改真值表系统配置流量系数
5更新dll
2023-11-22 10:43:52 +08:00
hanqiangqiang d77eda7214 隐藏Recipe保存到数据库配置项 2023-11-08 08:31:40 +08:00
hanqiangqiang 78e91dd1da 版本更新至 Version 1.2.7.67 2023-11-07 16:00:41 +08:00
hanqiangqiang 14fa1061d8 强制Recipe不保存到数据库 2023-11-07 15:57:00 +08:00
HCL 8715d180ca 1.修改Purge中Vent超时时间 2023-11-06 13:34:04 +08:00
hanqiangqiang 404b104a62 修改TM vent超时问题,由于Routine流程中不区分慢充超时和快充超时,因此统一系统配置参数超时时间VentTimeout 2023-11-06 11:32:16 +08:00
hanqiangqiang ea14fba22d 修改LineHeaterTemp节点名称
整理PMMotionView界面
2023-11-06 10:17:12 +08:00
hanqiangqiang 630d829164 修改加热带配置名称 2023-11-06 09:38:32 +08:00
hanqiangqiang 70c836ce84 添加Recipe对比界面加载 2023-11-06 09:22:59 +08:00
auvkk 932e016d83 版本号更新至v1.2.7.66 2023-11-03 17:51:45 +08:00
hanqiangqiang bd88c226aa 更新dll [b1c6da9],GaxBoxTemp注册温度数据
在调度器中使用Poll获取LineHeater状态
2023-11-03 16:56:25 +08:00
hanqiangqiang 33c1b595ae 启动前检测LineHeater
添加气柜温度显示
2023-11-03 16:18:56 +08:00
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 fd6add6bc9 1.ALCD改为0 2023-11-01 10:39:19 +08:00
HCL f6ec3ba6de 1.更新GEM Alarm相关代码 2023-11-01 10:21:39 +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 0bf467c229 1.GEM增加Recipe新建、修改、删除通知事件 2023-10-25 17:04:36 +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
HCL 283fa98ffa 1.解决KX_GEM未初始化报错问题 2023-10-23 09:01:54 +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
HCL 333cca27a8 1.增加自定义S7F7消息 2023-09-28 13:26:48 +08:00
HCL e7960867c1 1.Gem添加ProcessFinished和ProcessAbort事件 2023-09-28 09:54:48 +08:00
HCL 4eff1871cf 1.进度更新 2023-09-27 17:29:16 +08:00
HCL dd1448b7eb Merge branch 'develop' into KX_GEM
# Conflicts:
#	Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
#	Modules/SicModules/Config/PM/PM1/interlockPM1.xml
#	Modules/SicModules/Config/PM/PM2/interlockPM2.xml
#	SicUI/MainView.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
2023-09-27 09:20:57 +08:00
HCL 48ccdebe6c 1.GEM增加Event 2023-09-27 09:18:33 +08:00
HCL 762343f346 增加ABORT远程控制指令 2023-09-26 18:12:11 +08:00
HCL 67e815857e Merge branch 'develop' into KX_GEM01
# Conflicts:
#	Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
#	Modules/SicModules/Config/PM/PM1/interlockPM1.xml
#	Modules/SicModules/Config/PM/PM2/interlockPM2.xml
#	SicUI/MainView.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
2023-09-26 17:21:16 +08:00
HCL 6ecd4b63ef 1.修改配方界面显示为Sequence相关内容 2023-09-26 15:51:38 +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
HCL dade0274ae 1.增加CREATE-JOB指令 2023-09-25 16:04:48 +08:00
HCL ba801fa3ad 1.增加Gem远程指令程序,内部需要修改的部分还没完成 2023-09-25 11:25:10 +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
HCL 6f886ed0c2 增加显示Recipe内容功能 2023-09-22 16:37:30 +08:00
HCL a22a5b15fc 增加程序日志功能 2023-09-22 13:55:52 +08:00
HCL 59dd7da7c9 1.使用KX自带的Log类 2023-09-22 13:23:54 +08:00
HCL 6512edeaea 1.Secs增加日志保存 2023-09-22 11:39:38 +08:00
HCL 1253db686f 1.增加SECSLog功能 2023-09-22 10:39:10 +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
HCL 06ca14da52 1.添加Recipe相关功能 2023-09-21 11:24:06 +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
HCL 54a6ac6dd3 1.增加AlarmInfoList显示 2023-09-20 16:46:25 +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
HCL 6c4630ef7b 1.Alarm上报进度更新 2023-09-20 14:01:25 +08:00
HCL fff65153c8 1.修改名称括号导致GEM变量注册失败问题 2023-09-20 10:50:51 +08:00
HCL b9f67ac188 1.更新 2023-09-20 10:14:52 +08:00
SL 2a2f44f733 数据库脚本中增加credentials_history表创建脚本。 2023-09-19 17:39:11 +08:00
HCL 4d94f1896c 1.完成变量相关逻辑 2023-09-19 16:34:16 +08:00
HCL c9c547eab2 1.更新 2023-09-19 14:49:50 +08:00
HCL c4564700b4 1.更新 2023-09-19 08:52:05 +08:00
HCL 2541fb94ec 1.更新 2023-09-18 15:53:44 +08:00
HCL ba79edafee 1.GemManager移植到Common库 2023-09-15 09:04:27 +08:00
HCL 36c431f7bc 1.进度更新 2023-09-14 18:28:53 +08:00
HCL 9b3c0bc8e4 1.KX_GEM首次上传代码 2023-09-14 15:23:18 +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