Sic-Software
/
SicMultiplate
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
787 Commits 1 Branch 0 Tags 303 MiB
Commit Graph

787 Commits

Author SHA1 Message Date
Liang Su 193e3c39fd Merge branch 'develop' into feature/high-performance-data-collector 
# 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-23 08:50:53 +08:00
SIC1016\caipeilun a2c140192a 更新库文件，修复备份文件夹没有备份文件时无法对比的异常 2023-10-20 18:17:19 +08:00
SIC1016\caipeilun f1ab3707c8 更新库文件，更新版本1.1.31.51，合并分支： 
Bug修复
 - 修改部分data绑定不保存数据库
 - 修复Interlock项:  do-100 和 do-49触发前  di-9 必须为0
 - 修复 EFEM SlitValueRoutine 触发时提示文本缺失名称
- 新特性
  - 新增配置对比功能，每次开RT时提示配置修改项，并在配置界面显示修改过的内容，并可以回退配置
 - 每次配置文件变更都有备份，也可从本地进行修复
 - interlock表更新 不同腔体开门时需要判断两个腔体压差在范围内
 2023-10-20 16:45:19 +08:00
SIC1016\caipeilun 6b3d985945 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_configChangedV2 
# 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
 2023-10-20 16:32:28 +08:00
SIC1016\caipeilun dc724da94e 添加EATONUPS监控DEVICE，更新库文件，版本更新1.1.31.50 2023-10-20 14:34:16 +08:00
HCL e6e55a778c 1.Mfc Ror基准压力默认值改为100 2023-10-20 13:33:55 +08:00
Han Qiang Qiang 2d63ab61b4 版本号更新至 1.1.31.49 2023-10-19 09:26:55 +08:00
Han Qiang Qiang 999b9d8131 8号机正式版中，更新dll [35e381e],Develope库合并到昂坤双通道分支中， 
添加昂坤配置参数
 2023-10-19 09:21:21 +08:00
HCL d19fed6c29 Recipe中取消Pyro选项 2023-10-19 08:33:55 +08:00
HCL 6fba00b7bc 1.添加版本号 2023-10-18 17:13:23 +08:00
SIC1016\caipeilun bd60f6edcc 删除错误复制 2023-10-18 15:29:14 +08:00
Han Qiang Qiang 157dde3317 删除PM Interlock配置的DI-29 2023-10-18 13:27:01 +08:00
HCL 2e4e67fff6 1.PM K阀组增加V111控制 2023-10-18 11:46:15 +08:00
SIC1016\caipeilun 6bf63d4b06 优化: TM开闸板阀时腔体压力直接使用PT1的Feedback，不另外建立IoPressureMeter3s 
*错误：TM使用IoPressureMeter3s类，DATA会注册PM1.ChamberPressure.Value,树状图会覆盖掉PM1.ChamberPressure，从而数值不正确
 2023-10-12 17:28:57 +08:00
SIC1016\caipeilun d05b1dd1b5 Merge branch 'develop' into develop_configChangedV2 2023-10-11 11:14:50 +08:00
SIC1016\caipeilun cf015913b0 隐藏配置不进行比对 更新库文件 2023-10-11 08:59:36 +08:00
SIC1016\caipeilun 9019666f02 修复 TM purge时 vent延时绑定错误 2023-10-10 09:05:59 +08:00
SIC1016\caipeilun 3f3f66eced 修复: 
TM purge时 vent延时绑定错误
 2023-10-09 17:33:31 +08:00
Liang Su 099c0bfa42 更新库文件5521325，数据收集器改为DataRecorderManager。 2023-10-08 21:20:34 +08:00
SIC1016\caipeilun 06f090b185 版本号更新23.10.7.1 2023-10-07 13:44:56 +08:00
SIC1016\caipeilun 611d7b771b Merge branch 'develop_InterlockV1.3' into develop_configChangedV2 2023-10-07 13:38:35 +08:00
SIC1016\caipeilun dbda23b2ba 修复Interlock项: do-100 和 do-49触发前 di-9 必须为0 2023-10-07 13:38:03 +08:00
SIC1016\caipeilun 4d3b740167 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_InterlockV1.3 2023-10-07 13:31:13 +08:00
SIC1016\caipeilun fb96e5de9f 修复 EFEM SlitValueRoutine 触发时提示文本缺失名称 2023-10-07 13:23:58 +08:00
SIC1016\caipeilun 6a78fb6b43 合并develop后复原代码，更新库文件 2023-10-07 11:14:23 +08:00
SIC1016\caipeilun 648d8dd0c6 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_configChangedV2 
# Conflicts:
#	SicUI/MainViewModel.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
 2023-10-07 10:58:22 +08:00
SIC1016\caipeilun fce4967a57 更新多用户登录机制： 
同时只允许一个用户登录操作A；
多个用户B登录时，有权限用户A将进行确认，若确认后操作权限转移到B,A变成ReadOnly模式，仅有只读权限；
目前ReadOnly模式禁用鼠标键盘功能，只能切换页面，无法操控页面内功能（滚动条、Log等无法点击查看）
 2023-10-06 09:50:11 +08:00
SIC1016\caipeilun dda6fcbbf9 软件开启前确认配置是否有变化，有变化进行对话框提示 2023-10-04 16:13:34 +08:00
SIC1016\caipeilun c18ffff29d 修改 新增的data项 数据库不保存 
删除多余代码
版本更新23.9.28.2
 2023-10-03 09:08:02 +08:00
SIC1016\caipeilun d4a2d4b252 修改TM的interlock DO-47 48 17 8 10 12 14 16 
要求压差小于50
 2023-09-28 14:38:55 +08:00
SIC1016\caipeilun b770eefdaf 更新版本[assembly: AssemblyVersion("1.1.31.47")] 2023-09-25 17:27:48 +08:00
SIC1016\caipeilun 7a3ea0193b 修正--PM2面板状态丢失 2023-09-25 15:51:07 +08:00
SIC1016\caipeilun f7ac5439e9 更新库文件 2023-09-25 15:39:11 +08:00
SIC1016\caipeilun b8e3b8c030 Merge branch '_Bypass_InterLock_ReEdit' into develop 
# 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.Core.dll
 2023-09-25 15:23:25 +08:00
SIC1016\caipeilun aae3721283 1.PM2同步修改V75V76和V72TVInterlock 
2.删除PM DI0和DI7 (DO2、40、41、54、112-119、111的互锁 (为了开腔维护时间可以吹扫)
 2023-09-25 15:15:58 +08:00
SIC1016\caipeilun ca98256710 删除PM DI0和DI7 (DO2、40、41、54、112-119、111的互锁 (为了开腔维护时间可以吹扫) => DO-111漏删 2023-09-20 15:48:25 +08:00
SIC1016\caipeilun 480bb2eaa6 修改Scichart的曲线 新增(0,0)点 ，方便移动时对齐 2023-09-15 16:58:47 +08:00
Han Qiang Qiang ddf9e9bd42 发布新版本时，时间漏修改 2023-09-15 09:20:57 +08:00
Han Qiang Qiang 4defe04bef 更新版号至1.1.30.46 
更新dll [7d4eef2]
 2023-09-15 08:59:45 +08:00
SIC1016\caipeilun 9f07b93e30 修改scichart的tooltip显示，使得界面能显示更多tooltip，增加可读性 
从ChartDataLineX中复制修改ChartDataLineXV2文件，删除多余程序段
 2023-09-14 17:02:13 +08:00
Han Qiang Qiang e8bb923174 更新dll [41202af] 
修正IoSensorWaterFlowTemp注册数据的路径和名称，使DataLog\Data History视图的左侧列表中的名称更加直观。
 2023-09-14 09:44:23 +08:00
SIC1016\caipeilun d6fb25a9f2 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop 2023-09-14 09:22:24 +08:00
SIC1016\caipeilun 2c586a0e01 曲线列表新增时间、配方名称标签，增加界面可读性 2023-09-14 09:13:47 +08:00
SIC1016\caipeilun c2a25dae69 修改PMCharting界面，优化Charting功能 
1.搜索与图形整合到一个界面中
2.删除不常用功能，界面整理
3.选中曲线后点击图形，可修改曲线坐标
 2023-09-13 17:28:59 +08:00
Han Qiang Qiang 0e8d46ef76 电阻丝加热，当设置为Warning时Log不输出问题修改 2023-09-13 09:17:41 +08:00
Han Qiang Qiang 36730188c6 更新dll [66857dd]，修改气体流量统计公式 2023-09-11 14:45:32 +08:00
SIC1016\caipeilun 1df9607417 更新版本23.9.4.3 2023-09-08 14:45:26 +08:00
SIC1016\caipeilun 76d4a4e83c 1.取消v42v56v60Interlock 
2.修正V75Interlock
3.修改V46V50Interlock
4.修正TV触发Interlock无信息提示
 2023-09-08 10:26:47 +08:00
HCL 3f58922c10 1.取消Load Servo压力Pump延时 2023-09-06 15:48:27 +08:00
SIC1016\caipeilun 29da01537b 更新版本 23.9.4.2 2023-09-04 17:16:05 +08:00