Sic-Software
/
Sic08
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity
727 Commits 19 Branches 30 Tags 693 MiB
Commit Graph

155 Commits

Author SHA1 Message Date
Han Qiang Qiang cbdc0f4de5 更新dll [6bb8dec],添加汉化，屏蔽上升沿对温度数据赋值 2024-03-06 14:04:17 +08:00
HCL 8725f56530 1.修改默认值 
2.WaferRobot和TrayRobot操作和对应Moudle Online绑定
 2024-03-06 09:23:54 +08:00
Liang Su 7964858133 修正RT数据库创建脚本中丢失recipe_cell_access_permission_whitelist表的问题。 2024-03-05 10:55:43 +08:00
SIC1016\caipeilun 3a5efd9831 更新版本1.3.0.40229 更新库文件 2024-02-29 09:26:49 +08:00
Liang Su 88b21801a3 恢复SicModules项目中的SiemensIoProvider对象。 
RT的TM PLC配置恢复为SicModules.Devices.SiemensIoProvider。
 2024-02-27 09:45:04 +08:00
SIC1016\caipeilun 7e38106528 Merge branch 'feature/维保界面V1.0' into DevelopBase 
# Conflicts:
#	SicRT/Config/System.sccfg
#	SicRT/Instances/ToolLoader.cs
#	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/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-02-26 11:02:43 +08:00
SIC1016\caipeilun b5a0e2925a 更新维护代码 2024-02-26 10:47:35 +08:00
Liang Su 7ec1499c61 Merge branch 'feature/high-performance-data-collector' into DevelopBase 
# Conflicts:
#	Modules/Mainframe/Devices/IoInterLock.cs
#	Modules/Mainframe/Devices/SiemensIoProvider.cs
#	SicRT/Config/System.sccfg
#	SicRT/Properties/AssemblyInfo.cs
#	SicSimulator/Config/_ioDefinePM.xml
#	SicSimulator/Instances/SimulatorModulePlc.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
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-02-26 09:35:22 +08:00
SIC1016\caipeilun f3760c3799 维护保养界面 2024-02-26 09:32:39 +08:00
SIC1016\caipeilun 7bc1edd4e3 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-26 09:15:38 +08:00
Han Qiang Qiang 1382f61302 Merge branch 'develop' into feature/localization 
# Conflicts:
#	SicUI/Models/Maintenances/TM/EFEMView.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
 2024-02-22 10:16:49 +08:00
SIC1016\caipeilun 819aa574cd 配置项隐藏，在后台修改 2024-02-22 09:53:39 +08:00
SIC1016\caipeilun d11d47b687 更新MuitiProcess代码 2024-02-22 09:40:12 +08:00
Han Qiang Qiang e2b4f9b083 1PM新增DI-73,AI-26,AI-27点位 
2监控加热带温区AI-26,AI-27超温报警
3增加配置控制报警输出等级
4仿真添加相应点位
 2024-02-21 11:12:42 +08:00
Han Qiang Qiang eaacb3ac4a 1修改PM加热界面 
2更新dll,更新汉化内容
3修改新建账户默认配置项
 2024-02-20 13:19:48 +08:00
Han Qiang Qiang 8c523e3856 修改测温配置提示内容 2024-01-23 17:11:21 +08:00
Han Qiang Qiang 6698acaa24 PC报警无输出内容，添加配置项 2024-01-23 15:43:08 +08:00
Liang Su 46f0ff7ff8 更新库文件3730cfab，优化DataTraceManager上机后报缓存数据频繁的问题；优化磁盘空间监测和报警逻辑；优化AO的ImmCache逻辑。 
修正系统配置中OpenLidCountDownTime重复的问题。
修正SimulatorSystem对象中错误创建DataManager实例的问题。
 2024-01-16 18:08:21 +08:00
Liang Su 4802ab3fa2 更新库文件ee0f25e，允许通过系统配置禁用DO、AO跳变捕获功能。 
系统设置中新增AllowTraceAOHopping和AllowTraceDOHopping项。
 2024-01-15 19:42:07 +08:00
Liang Su 43d74cbbd1 更新库文件88f6b89，DataRecorderManager更名为DataTraceManager. 
PJ_DONE事件等级变更为Information。
 2024-01-15 10:39:45 +08:00
Han Qiang Qiang 4521da4813 Merge branch 'develop' into feature/localization 
# Conflicts:
#	Modules/Mainframe/Config/PM/PM1/_ioDefinePM1.xml
#	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/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-01-10 15:25:47 +08:00
Han Qiang Qiang ad802b791a 测试界面菜单汉化 2024-01-10 15:20:21 +08:00
Liang Su eb8b0e4f46 更新库文件a0c00f02，继续优化数据Trace相关对象。 
SimulatorModulePlc对象中的IoManager变更为SimulatorIoManager。
初始化DataRecorderManager时指定数据表名前缀。
 2024-01-09 10:08:46 +08:00
Liang Su f81f9c07bb 更新库文件bb4a30a，修正JobDone三色灯蜂鸣器无法自动关闭的问题；修正InterlockManager初始化时报集合枚举时发生变更的异常的问题。 
JobDone蜂鸣器鸣响循环次数默认值更改为3次。
EquipmentManager中新增"System.AlertJobDone"操作。
版本号更新至v1.1.4.13。
 2023-12-28 16:25:18 +08:00
Han Qiang Qiang f99d64a376 删除无用的创建数据表 2023-12-27 13:03:56 +08:00
Liang Su 56377b695d Merge branch 'Sic8ToSic6' into feature/io-name-chinese-support 
# 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
 2023-12-19 16:28:48 +08:00
Liang Su 7fe8acc0d6 更新库文件13674dc，优化IoManager及IOAccessor。 
修正AOAccessor和AIAccessor的FloatValue属性，统一使用Value属性获取AO、AI数据。AOAccessor和AIAccessor不再支持short型Value属性。
移除SicRT中的SiemensIoProvider.cs，统一使用RT.EquipmenLibrary中的相关对象。
 2023-12-19 16:25:57 +08:00
Han Qiang Qiang 71f13ea50c Merge branch 'Sic8ToSic6' into feature/测温重构 
# Conflicts:
#	SicRT/Instances/ToolLoader.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
 2023-12-15 15:54:46 +08:00
Han Qiang Qiang 9316c9f0ca Merge branch 'ProcessHistoryData' into Sic8ToSic6 2023-12-15 15:02:02 +08:00
HCL 636b560cfe 1.隐藏SystemConfig中VaccumPressureBase参数 
2.手动Purge各个模块不能修改SystemConfig相关参数值
 2023-12-15 14:25:02 +08:00
Han Qiang Qiang f8c64c1030 Merge branch 'ProcessHistoryData' into feature/测温重构 
# Conflicts:
#	Modules/Mainframe/SicModules.csproj
#	SicRT/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-12-15 10:27:01 +08:00
Han Qiang Qiang 7933292bce Merge branch 'Sic8ToSic6' into ProcessHistoryData 
# 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
 2023-12-15 09:47:21 +08:00
Han Qiang Qiang ec0db0ed21 Merge branch 'Sic8ToSic6' into 添加DI-45 
# Conflicts:
#	SicUI/Properties/AssemblyInfo.cs
 2023-12-14 16:58:02 +08:00
Han Qiang Qiang 4e4b5cd48e 修改测温系统参数描述 2023-12-14 10:03:34 +08:00
Han Qiang Qiang a33609de36 测试dll 2023-12-13 16:27:12 +08:00
Han Qiang Qiang 17e1128fae Merge branch 'Sic8ToSic6' into feature/测温重构 
# 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
 2023-12-12 13:58:34 +08:00
Han Qiang Qiang c6ce558b71 1TM和仿真添加DI-45,添加DI-45对应的Seneor 
2在UnLoadSeparateRoutine中添加DI-45检测逻辑
3在SC UnLoad中配置SeparationLog报警等级
 2023-12-11 11:00:23 +08:00
HCL 800e65cdb0 Merge branch 'Sic8ToSic6' into feature/Sunway 
# 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 13:41:14 +08:00
Han Qiang Qiang 753953e4b2 新增配置默认值，根据百识现场情况来设定，MFC5安装、C3H8显示， 2023-12-08 11:30:07 +08:00
Han Qiang Qiang e9d30a47fd 1添加Process查询界面配置 
2使用XML作为查询默认配置项
 2023-12-05 08:52:41 +08:00
HCL 5deaf92b5c 1.进度更新 2023-12-01 10:27:17 +08:00
HCL ad5c4ddd46 1.进度更新 2023-11-30 18:01:35 +08:00
Han Qiang Qiang 4be189fb27 Merge branch 'Sic8ToSic6' into 整理机台兼容内容 
# Conflicts:
#	Modules/Mainframe/Config/PM/PM1/interlockPM1.xml
#	Modules/Mainframe/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
 2023-11-28 15:47:31 +08:00
Han Qiang Qiang c88d794afe 1更新dll [027c078],添加Recipe快照压缩保存+历史数据选择对比 
2新增数据表recipe_history_data
3追加更新内容
 2023-11-27 16:28:33 +08:00
Han Qiang Qiang be325b67f9 Merge branch 'Sic8ToSic6' into 添加C2H4-C3H8可配置 
# 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
 2023-11-23 17:29:24 +08:00
Liang Su d0a1234053 SignalTower配置文件STEvent.xml中增加使用说明注释。 2023-11-23 15:39:28 +08:00
Liang Su 7344a58549 MFC5是否安装的系统配置默认值改为true。 2023-11-22 17:26:27 +08:00
Han Qiang Qiang 68c5f3f7c4 更新版本号至 ## Version 1.1.1.4 
修改C2H4_C3H8FlowRatio配置名称
 2023-11-22 15:58:31 +08:00
Han Qiang Qiang d4f99dff5e 1添加C2H4-C3H8配置项，在PM1 PM2主配置中 
2修改PM界面相关显示
3修改真值表，气体流统计显示界面，更新dll
4修改IO名称
 2023-11-22 10:22:06 +08:00
Han Qiang Qiang 8fb7a84308 更新dll [2cdf762]，修改MFC5控制流程逻辑 
1.PM Device配置中使用库中类实例化MFC5控制流程
2.SC配置中添加参数，是否安装MFC5，  PM.{module}.MFC.Mfc5.IsInstalled
3.修改PM主界面显示，根据配置是否显示MFC5
 2023-11-21 17:20:54 +08:00