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

717 Commits

Author SHA1 Message Date
SIC1016\caipeilun 207dacd32e 更新版本1.2.1.55 2023-10-13 14:54:50 +08:00
SIC1016\caipeilun 0bc0dba996 优化: TM开闸板阀时腔体压力直接使用PT1的Feedback，不另外建立IoPressureMeter3s 
*错误：TM使用IoPressureMeter3s类，DATA会注册PM1.ChamberPressure.Value,树状图会覆盖掉PM1.ChamberPressure，从而数值不正确
 2023-10-13 14:51:09 +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 04d384d2ff PM UI界面 泄压阀标识位置变更 2023-10-11 08:57:48 +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
SIC1016\caipeilun d2de10a6ef 修复 EFEM SlitValueRoutine 触发时提示文本缺失名称 2023-10-07 14:49:49 +08:00
SIC1016\caipeilun 80e6472050 修复Interlock项: do-100 和 do-49触发前 di-9 必须为0 2023-10-07 14:43:41 +08:00
SIC1016\caipeilun 275b922308 新增 TM的interlock DO-47 48 17 8 10 12 14 16 
要求对应腔体压差小于50
 2023-10-07 14:40:28 +08:00
SL 8c71e7fc5b 版本号更新至v1.2.0.51 2023-10-03 10:09:33 +08:00
SL 946ee8d088 更新库文件0b643ac，singla-session-login分支合并到develop分支。 2023-10-03 09:38:20 +08:00
SL 79d1eff4c6 Merge branch 'feature/single-session-login' into develop 2023-10-03 09:36:17 +08:00
SL 1e72b66ab4 更新ReleaseNote。 2023-10-03 09:29:48 +08:00
hanqiangqiang 22747b9389 修改PM1水温报警配置DO输出项 2023-10-02 14:00:15 +08:00
SL f131f3b270 修正合并Develop分支后的一些问题。 
PMModule对象中订阅的DI206EqualsTrue_OR_DO177EqualsTrue数据标记为忽略保存到数据库。
 2023-10-02 10:17:19 +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
SL 98316b6498 更新库文件10636be，修正登录请求对话框的一些问题。 
修正远端登录请求取消后登录确认对话框没有自动关闭的问题。
 2023-09-30 17:31:49 +08:00
HCL 38b01c2475 1.增加终端消息功能 2023-09-28 17:34:25 +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
DESKTOP-OKMOOJ9\MK 32c05e864d 修正MainViewModel中远端申请取消后，LoginRequestConfirmationDialog对话框没有自动关闭的问题。 2023-09-27 23:59:37 +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 afd74f3343 1.修改远程指令显示 2023-09-26 17:21:45 +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
HCL ea2747e5a0 修改显示描述 2023-09-26 08:30:01 +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
SIC1016\caipeilun a327f9dc0c 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
 2023-09-25 16:57:44 +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
DESKTOP-OKMOOJ9\MK 831a34801d 整理MainViewModel.cs代码格式。 2023-09-24 12:01:13 +08:00
SL 1add25b434 版本号更新至v2023.09.22.01 2023-09-22 17:53:22 +08:00
SL 711c90a0cc 更新库文件c4605ac，优化登录请求和等待窗体。 
当进入ReadOnly模式时，MainView屏蔽键盘输入，其它视图不在针对ReadOnly模式专门屏蔽键盘输入问题。
 2023-09-22 17:50:40 +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
SL 6861161b33 更新库文件30cdf4e，持续优化和修正账号、角色相关的问题。 
MainViewModel中当进入ReadOnly模式时，广播事件，通知RecipeEditor和PMProcess视图立即锁定Recipe，并禁用解锁窗口。
 2023-09-22 16:26:33 +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
SL bd591809e7 更新库文件63b88cb，修正RecipeEditor和PMProcess视图中Recipe编辑表格的行不随权限变更实时变化的问题。 
修正一些权限判断语句，使用MenuPermissionEnum进行权限判断。
 2023-09-21 14:17:05 +08:00