Sic-Software
/
Sic10
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
496 Commits 13 Branches 35 Tags 646 MiB
Commit Graph

111 Commits

Author SHA1 Message Date
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
hanqiangqiang fa97c4e223 1更新dll [027c078],添加Recipe快照压缩保存+历史数据选择对比 
2新增数据表recipe_history_data
 2023-11-27 14:21:44 +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
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
hanqiangqiang 1bb09587e1 更新dll [007352e],修改气柜检测 
添加SC配置
修改PM的Device配置
 2023-11-03 11:33:54 +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
auvkk bd646af09a 更新库文件acf1b19，增加禁用单会话登录模式功能，修正Recipe编辑视图的问题。 
系统配置中增加System.SingleSessionLoginMode配置项。
 2023-10-17 17:14:35 +08:00
SL 7ee92e08b3 更新库文件5dfe03b，优化IoGasBoxTemp报警逻辑，温度上限设定为0时不报警。 
优化系统配置中的LineHeaterTempHighLimit项目描述。
 2023-10-13 16:33:50 +08:00
SIC1016\caipeilun 2cee36908e 修复: 
1.TM purge时 vent延时绑定错误
2.vent延时默认值改为10s，与pump延时一致
 2023-10-09 17:09:09 +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
HCL 32bf6e3533 1.隐藏Load FastVent超时参数 2023-09-25 16:44:51 +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
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 ad1f13c3e0 更新库文件（Commit 704daa8），用户登录时首先发起登录请求，请求已登录客户端确认的功能。 2023-09-07 23:32:35 +08:00
hanqiangqiang f2bea34321 修改UPS相关现实内容（SC配置提示+DeviceView界面） 2023-09-01 16:07:03 +08:00
SL 4bdba1f354 Merge branch 'develop' into feature/single-session-login 
# 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-08-31 16:46:50 +08:00
SL d1e884cd57 Merge branch 'develop' into feature/bind-interlock-manager-to-module 
# Conflicts:
#	SicRT/Config/System.sccfg
#	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-08-31 15:43:03 +08:00
SL e68c28cf99 更新库文件（Commit 60c90f7），修正互锁旁路相关的一些问题。 
移除InterlockDaemon配置文件。
恢复InterlockPM配置文件到原版本。
系统配置中的PM和TM节点增加BypassEnableTable配置项。
修正MainView的Module状态显示控件警告逻辑，当BypassInterlock和BypassEnableTable任意一项为true时，显示警告图标，并动态生成警告信息。
 2023-08-31 15:30:44 +08:00
SL b9b52f09a1 更新库文件（Commit 52991fe）。 
优化UserLoggedOff和UserLoggedIn事件描述。
 2023-08-29 17:46:36 +08:00
SL 69143b0b87 恢复原始Develop分支。 2023-08-29 12:15:07 +08:00
SIC1016\caipeilun fb5d89fd65 系统配置中新增MFC60相关的配置参数，修正MFC60的Feedback和SetPoint差异超限后没有报警的问题。 
TMModule中注册MFC60，修正MFC60报警后TM Module没有报警的问题。
 2023-08-29 11:58:45 +08:00
hanqiangqiang ac357c02a7 修改加热带默认温度上限 
(cherry picked from commit d901382421)
 2023-08-29 11:55:26 +08:00
hanqiangqiang 7eb9dadba6 更新dll [52e48c6], 
修改加热带伴侣配置名称，修改配置项
 2023-08-29 11:55:16 +08:00
hanqiangqiang 68bb91a54a 修改SC配置项名称 
(cherry picked from commit 782373b761)
 2023-08-29 11:54:17 +08:00
SIC1016\caipeilun 3b9c1054e0 系统配置中新增MFC60相关的配置参数，修正MFC60的Feedback和SetPoint差异超限后没有报警的问题。 
TMModule中注册MFC60，修正MFC60报警后TM Module没有报警的问题。
 2023-08-28 15:08:44 +08:00
SIC1016\caipeilun 5657e9dddd 合并后system.sccfg配置文件被覆盖，<Load和Unload添加配项参数VentTimeOut，充气超时时间>的改动丢失，现重新上传。 2023-08-25 18:35:44 +08:00
hanqiangqiang f5a11e3c46 Load和Unload添加配项参数VentTimeOut，充气超时时间 2023-08-23 16:58:54 +08:00
SL bd5226971f 更新库文件（Commit c17d73a），合并Develop分支。 
PM DeviceModel配置文件中恢复IoInterlock定义。
系统配置中移除System.BypassInterlock和System.BypassEnableTable。
系统配置中的TM、PM1、PM2节点下增加BypassInterlock配置项。
 2023-08-17 23:55:37 +08:00
hanqiangqiang e5e86fa20e 修改提示信息 2023-08-17 14:50:49 +08:00
hanqiangqiang 3c16e1bdca 1更新dll [335a1f0] 
2添加加热伴侣超温检测硬件配置和参数配置
3修改AI名称
 2023-08-17 14:11:53 +08:00
hanqiangqiang 0f2e4ba380 修改SC中PM2配置的水温报警参数名称 2023-08-13 15:42:20 +08:00
hanqiangqiang 7b4e4fd620 修改PM2水温配置项 
修改SC中水温报警配置名称
 2023-08-13 15:27:23 +08:00
SIC1016\caipeilun b0848fc27b 新增关闭软件权限，需要修改配置才能Shutdown 2023-08-08 10:11:06 +08:00
HCL d830820e2c 1.修改PM MFC动态流量默认值 2023-08-07 13:29:28 +08:00
SL 6692e605e8 更新库文件（Commit 76d171a），移除PSU2控制量限制功能，温度波动问题直接通过2704配置解决。 
移除PSU2控制量限制功能。
 2023-08-03 14:05:19 +08:00
SL 1e33e864bf 更新库文件（Commit 73201c8），PM Process视图中的工艺数据统计中的耗电量小数位数改为3位。 
屏蔽Recipe控制PSU2输出功率幅度限制的功能。
 2023-08-03 09:46:21 +08:00
SL d8f29f3e1a 更新公共库（Commit 9a43416），IoPSU输出限幅支持手动设置和Recipe自动设置。 
Recipe模板增加PSU2 Output Limit High参数。
 2023-08-02 18:30:33 +08:00
SL 90a6977be4 更新库文件（Commit 6db5971），IoPSU中增加修改1600℃功能，可修改OutputLimitHigh生效温度。 2023-08-02 17:34:25 +08:00
SL 1e6f50eeaa 修正process_data_stat_per_run表没有recipe_name列的问题。 2023-08-01 18:26:08 +08:00
SL 0726c51c3a Merge branch 'develop' into feature/add-process-power-consumption-stat-support 2023-08-01 16:09:20 +08:00