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

430 Commits

Author SHA1 Message Date
HCL 0bf467c229 1.GEM增加Recipe新建、修改、删除通知事件 2023-10-25 17:04:36 +08:00
HCL 72086eb464 1.GEM增加ClearAlarm功能 2023-10-24 17:27:15 +08:00
HCL 283fa98ffa 1.解决KX_GEM未初始化报错问题 2023-10-23 09:01:54 +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
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
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
HCL 06ca14da52 1.添加Recipe相关功能 2023-09-21 11:24:06 +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 ee98866418 删除PM DI0和DI7 (DO2、40、41、54、112-119、111的互锁 (为了开腔维护时间可以吹扫) => DO-111漏删 2023-09-20 15:34:32 +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
SIC1016\caipeilun 6d66ed33dd 删除PM DI0和DI7 (DO2、40、41、54、112-119、111的互锁 (为了开腔维护时间可以吹扫) 2023-09-20 15:09:34 +08:00
SIC1016\caipeilun 018b6e7c45 更新库文件 2023-09-20 14:31:23 +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 de7cd35df1 Merge branch 'develop_RemoveCharacter' into feature/KX_GEM 2023-09-20 10:18:29 +08:00
HCL b9f67ac188 1.更新 2023-09-20 10:14:52 +08:00
SIC1016\caipeilun 560d8cb75a 1.IO名称删除斜杠和括号 
2.元件标号转移到描述Description中
 2023-09-20 10:09:50 +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 53bfe6cea0 Merge branch 'develop' into feature/KX_GEM 2023-09-18 10:31:34 +08:00
HCL 1c85d7c451 1.更新 2023-09-18 10:31:17 +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
SIC1016\caipeilun f5a07626ad 修改scichart的tooltip显示，使得界面能显示更多tooltip，增加可读性 
从ChartDataLineX中复制修改ChartDataLineXV2文件，删除多余程序段
 2023-09-14 17:25:29 +08:00
HCL df45552e72 1.增加GemView界面 2023-09-14 17:11:36 +08:00
HCL 9b3c0bc8e4 1.KX_GEM首次上传代码 2023-09-14 15:23:18 +08:00
SIC1016\caipeilun 9aa4b488a8 修改PMCharting界面，优化Charting功能 
1.搜索与图形整合到一个界面中
2.删除不常用功能，界面整理
3.选中曲线后点击图形，可修改曲线坐标
4.曲线列表新增时间、配方名称标签，增加界面可读性
 2023-09-14 09:56:35 +08:00