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

36 Commits

Author SHA1 Message Date
HCL 8d71a00c90 1.SECS/Gem配置启用参数 2024-06-28 16:05:59 +08:00
HCL 45800b9210 1.调整位置，防止未安装GEM许可证机台有报错信息 2024-05-09 10:20:54 +08:00
HCL 96ce5c4c07 Merge branch 'KX_GEM' into GEM 
# Conflicts:
#	Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
#	Modules/SicModules/Config/PM/PM1/interlockPM1.xml
#	Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
#	Modules/SicModules/Config/PM/PM2/interlockPM2.xml
#	SicRT/Equipments/Systems/EquipmentManager.cs
#	SicRT/Instances/ToolLoader.cs
#	SicRT/SicRT.csproj
#	SicSimulator/Instances/SimulatorSystem.cs
#	SicUI/MainViewModel.cs
#	SicUI/SicUI.csproj
#	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-04-17 16:37:52 +08:00
SL aad1c3aee7 修正Interlock在PLC同步数据之前可能意外错误触发的问题 
调整ToolLoader中初始化各个管理器的顺序，以确保InterlockManager运行前PLC至少同步一次数据。
ToolLoader中增加IoProvider数据同步是否完成的检查。
修正和优化InterlockManager相关对象。
修正Module状态指示器的一些显示问题。
 2024-03-25 10:16:49 +08:00
SIC1016\caipeilun 472cb40e00 Merge branch 'feature/维保界面V1.0' into DevelopBase 
# Conflicts:
#	SicRT/Config/System.sccfg
#	SicRT/Instances/ToolLoader.cs
#	SicRT/SicRT.csproj
#	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/zh/Sicentury.Localization.resources.dll
 2024-02-23 10:52:55 +08:00
SIC1016\caipeilun 78582fc288 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into feature/维保界面V1.0 
# 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.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-02-23 09:01:35 +08:00
SIC1016\caipeilun 44ec8248ea Merge branch 'develop' into feature/WCF测试 
# 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-20 08:59:59 +08:00
SIC1016\caipeilun e11cf71b9a 更新库文件，修复 数据库文件循环清理功能 2024-02-04 10:18:20 +08:00
SIC1016\caipeilun a9c0f29980 更新库文件 2024-02-04 10:14:38 +08:00
SIC1016\caipeilun 8ab0519714 更新 2024-02-01 18:11:54 +08:00
SIC1016\caipeilun 6c04dc230a 新增MultiProcess wcf服务 测试版 2024-01-30 14:37:51 +08:00
SIC1016\caipeilun 74e1b6043e 更新维保界面测试版本V24.1.29.1 2024-01-29 18:15:39 +08:00
hanqiangqiang 4999a02be9 更新dll [3998a66]，测试Process历史记录查询 2024-01-16 17:10:01 +08:00
hanqiangqiang 4e2ee1a124 1更新dll [9a5bcb7],对测温部分进行重写 
2添加Common配置项，作为公共配置项
3在ToolLoader中初始化Common配置项
4修改SC配置项，整理测温配置层级，使用昂坤作为默认配置项
 2023-12-15 16:20:08 +08:00
hanqiangqiang 0ddd2e72a8 1更新dll [305b17a]，使用合并后的最新dll，添加ProcessHistory 
2添加ProcessHistory显示界面
3添加ProcessHistory配置的XML
4添加ProcessHistory配置的XML初始化解析
 2023-12-15 15:10:07 +08:00
hanqiangqiang 14fa1061d8 强制Recipe不保存到数据库 2023-11-07 15:57:00 +08:00
auvkk a6fc4b22e7 更新库文件094abb3，修正Recipe保存的一些问题。 
修正SicRT\Toolloader中IoManager对象的加载顺序，移至末尾加载，以避免IoManager中启动了InterlockManager，但InterlockManager使用的数据还未在DATA中注册，导致Poll数据失败的问题。
修正PM2启用后，无法触发任何报警的问题。
 2023-10-25 18:53:24 +08:00
HCL 0bf467c229 1.GEM增加Recipe新建、修改、删除通知事件 2023-10-25 17:04:36 +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 c4564700b4 1.更新 2023-09-19 08:52:05 +08:00
HCL ba79edafee 1.GemManager移植到Common库 2023-09-15 09:04:27 +08:00
HCL 9b3c0bc8e4 1.KX_GEM首次上传代码 2023-09-14 15:23:18 +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 210638e598 移除Toolader中无效的using。 2023-08-18 10:19:47 +08:00
SL d9ee21cde1 修正Toolloader中加载InterlockDaemon配置文件使用错误路径的问题。 
新增PM2的InterlockDaemon配置文件。
 2023-08-15 18:12:14 +08:00
SL 99e4e5b424 更新库文件（Commit 96630d9），新增ModuleStatusIndicator控件。 
将主视图上方的Module状态指示区域的控件替换为ModuleStatusIndicator控件。
移除MainViewModel未使用的属性。
修正Toolloader中初始化IoManager时未指定InterlockDaemon配置文件的问题。
 2023-08-15 12:41:23 +08:00
SL 4e861ec2da 修正Recipe相关数据没有记录到数据库的问题。 2023-08-02 22:57:00 +08:00
HCL b536215937 1.优化数据库代码进度更新 2023-07-18 17:22:12 +08:00
SL ffdca5a8bd 修正ToolLoader中初始化DatabaseManager时对象名称错误的问题。 2023-06-29 11:01:54 +08:00
SL a3921b8329 更新库文件（Commit 072e921），修正合并了错误分支的问题。 2023-06-29 10:59:49 +08:00
SL cfb102b633 修正EventManager实例构造顺序。 2023-06-21 16:37:35 +08:00
hanqiangqiang d143af7a40 从8号机移植，优化屏蔽模块后还有报警产生 
EquipmentManager的InitModules()方法中检测Module是否安装，如果没有安装，则将其下属的所有Device禁用，以节省RT资源，并避免产生不必要的报警信息
PMModuleDevice的InitDevice()方法中移除对IsInstalled的判断。
EquipmentManager中新增GenModule<T>()方法用于创建各个Module的实例。
 2023-06-13 17:19:52 +08:00
hanqiangqiang 7424dc09e7 1修改Wafer创建时，自动覆盖原位置GUID的BUG,更新dll 
2添加增长率自动计算
 2023-05-26 18:30:10 +08:00
DESKTOP-1N1NK8A\auvkk 7122536365 更新库文件（Commit 0fdcc1f）。 
更新和Recipe相关的一些对象。
 2023-05-11 10:49:45 +08:00
hanqiangqiang ffe2e41752 Repo Init 2023-05-10 10:26:01 +08:00