Commit Graph

316 Commits

Author SHA1 Message Date
HCL 8054177491 1.合并GemManager 2024-04-17 14:51:38 +08:00
HCL 35e0b61a1d 1.PJInfo增加属性 2024-04-12 15:13:01 +08:00
HCL 6e10bb8fd8 Merge branch 'WaferTrayInfo' into develop 2024-04-07 10:26:38 +08:00
SL 2a0cbd0ad8 [Common]
修正LOG日志信息中没有Module名的问题。

(cherry picked from commit 3e26b0428df1a39923e010b088d7e4290e6dc1c4)
2024-03-27 15:51:30 +08:00
HCL ee7edd1ddb Merge branch 'develop' into WaferTrayInfo 2024-03-27 13:27:55 +08:00
SIC1016\caipeilun 72b4dd0b25 修改Maintain布局 2024-03-26 15:33:40 +08:00
SL f564cd138a 修正InterlockManager问题
修正InterlockManagerBase对象中的_rTrigMonitorError字段为初始化的问题。
2024-03-25 08:36:50 +08:00
SL e37613e256 [Common]
修正InterlockManagerTests中调用InterlockManager的Initialize方法时传入参数错误的问题。
修正一些书写错误。
2024-03-24 12:11:24 +08:00
SL 2dd2854ecd 修正Interlock可能过早触发的问题。
优化IIoBuffer接口和IoManager对象
- 增加DOMap、DIMap等属性,使私有的_doMap等字段可以被外部对象访问,准备好分离IoManager和InterlockManager。
- 移除初始化InterlockManager的代码。
- 移除OnTimer方法,以及调用OnTimer的后台县城。

优化IIoProvider接口、IoProvider对象
- 新增IsSynced属性,用于检查IoProvider对象是否已经和PLC进行了数据同步。
- 优化IoProvider对象的OnTimer方法中的代码,整理结构并删除多余的代码。

优化IoProviderManager对象
- 新增WaitFirstSync方法,用于检测是否所有的IoProvider均同步了PLC数据。

优化InterlockManagerBase和InterlockManager对象
- Initialize方法返回值由bool变更为void。
- Initialize方法参数表中的doMap、diMap等参数变更为IIoBuffer对象。
- 新增OnTimer方法以及PeriodicJob变量,用于背景线程中执行互锁检查。

优化代码格式
- IoDataCache对象中增加一些注释。
2024-03-24 12:09:11 +08:00
SL 07534546d8 [Common]
IoProvider后台通讯周期改为50ms一次。
2024-03-22 14:28:27 +08:00
SL fe9ce19617 [Common]
修正Credential对象的IsEmpty方法中没有判断cred参数是否为null的问题。
2024-03-18 14:09:26 +08:00
SIC1016\caipeilun 518dfe2a9c 修改错误英文单词Maintainance;添加wcf传输注册类 2024-03-16 10:29:09 +08:00
SIC1016\caipeilun a4620a986f 添加UI端界面代码 2024-03-15 19:31:25 +08:00
SIC1016\caipeilun 19c8e6f5e7 添加RT端代码和UI端代码 2024-03-15 19:17:00 +08:00
SIC1016\caipeilun d70506ffad 删除Maintain 在wcf服务中的代码 2024-03-15 19:06:08 +08:00
HCL fc30d4021c 1.AutoRun传盘信息异常处理 2024-03-13 13:33:25 +08:00
HCL 6ce8e90f5d 1.解决删除Wafer导致Tray也删除的问题
2.Sequence显示问题
2024-03-12 15:51:34 +08:00
HCL be92a68f1e TrayState改为TrayStatus 2024-03-12 14:10:07 +08:00
HCL 56f9dfb963 1.整理Cassette CreateDeleteWaferTray 2024-03-12 10:56:26 +08:00
HCL de3ef38c6c 1.整理WaferManager类 2024-03-12 09:10:00 +08:00
HCL 7198c49b1a 1.整理WaferManager,未完成 2024-03-11 17:23:07 +08:00
HCL 48d301595a 1.重新整理WaferTrayRt类 2024-03-11 11:20:51 +08:00
HCL 342f2f68bb 1.去除WaferManager未调用的函数 2024-03-11 09:27:34 +08:00
SIC1016\caipeilun 382071ea15 更新Maintain数据传递代码
Merge branch 'feature/维保界面V1.0' into DevelopBase

# Conflicts:
#	MECF.Framework.Common/MECF/Framework/Common/OperationCenter/IInvokeService.cs
#	MECF.Framework.Common/Properties/Resources.Designer.cs
2024-03-01 14:25:02 +08:00
SIC1016\caipeilun 34464774b7 修改底层代码,Maintain数据传递与其他数据单独分离出来 2024-03-01 13:23:34 +08:00
SIC1016\caipeilun f48ee93ec7 暂时屏蔽MultiProcess功能 2024-02-29 16:50:34 +08:00
hanqiangqiang 1c8346ca8c 1修改单步历史记录查询问题
2修改WCF服务器断联问题
2024-02-29 16:48:36 +08:00
hanqiangqiang 79a7ab6069 修改在线监控逻辑 2024-02-29 15:30:05 +08:00
SIC1016\caipeilun 585d2e64b2 MultiProcess每次更新服务器数据前清空列表 2024-02-29 13:10:58 +08:00
SIC1016\caipeilun 6d375535d5 调整timeout时间为8s;触发按钮前提示当前Process腔体数量 2024-02-29 09:03:33 +08:00
hanqiangqiang aafcb170da [Common]
1多腔体Run时,WCF服务检测断线,超过3次断联提示断线
2WCF服务记录连接和断开日志
2024-02-27 17:37:42 +08:00
SIC1016\caipeilun 107ebbff72 修复Wcf服务无法传递TimeUnit类的bug 2024-02-27 14:12:06 +08:00
SIC1016\caipeilun 78e91cd606 修复WCF服务无法传递TimeUnit类 2024-02-27 14:10:46 +08:00
SIC1016\caipeilun 70f4f33e13 删除多余代码 2024-02-26 16:52:36 +08:00
SIC1016\caipeilun 5d662c66f6 修改断线判定 2024-02-26 14:41:44 +08:00
SIC1016\caipeilun 2374bbf5d3 Merge branch 'feature/MuitiProcess' into DevelopBase
# Conflicts:
#	MECF.Framework.Common/Properties/Resources.Designer.cs
2024-02-26 13:44:06 +08:00
SIC1016\caipeilun bbe389ac78 更新注释 2024-02-26 13:43:15 +08:00
SIC1016\caipeilun a11a833581 修改MultiProcess定时触发方式 2024-02-26 11:26:35 +08:00
SL 6c727478a7 Merge branch 'feature/high-performance-data-collector' into DevelopBase
# Conflicts:
#	MECF.Framework.Common/Aitex/Core/RT/IOCore/AIAccessor.cs
#	MECF.Framework.Common/Aitex/Core/RT/IOCore/AOAccessor.cs
#	MECF.Framework.Common/Aitex/Core/RT/IOCore/DIAccessor.cs
#	MECF.Framework.Common/Aitex/Core/RT/IOCore/DOAccessor.cs
#	MECF.Framework.Common/Aitex/Core/RT/IOCore/IOAccessor.cs
#	MECF.Framework.Common/Aitex/Core/RT/IOCore/Interfaces/IIOAccessor.cs
#	MECF.Framework.Common/MECF/Framework/Common/IOCore/IoManager.cs
#	MECF.Framework.RT.EquipmentLibrary/Devices/IoLineHeater.cs
#	MECF.Framework.RT.EquipmentLibrary/Devices/IoMFC.cs
#	MECF.Framework.RT.EquipmentLibrary/Devices/IoTC.cs
#	SimulatorCore/IoProviders/SimulatorIO.cs
2024-02-26 09:18:51 +08:00
SIC1016\caipeilun 59e4936e11 Merge branch 'feature/MuitiProcess' into DevelopBase 2024-02-23 08:56:47 +08:00
SIC1016\caipeilun 6593d9be42 Merge branch 'feature/维保界面V1.0' into DevelopBase 2024-02-23 08:56:24 +08:00
SIC1016\caipeilun e0f6745779 Merge branch 'develop' into feature/维保界面V1.0 2024-02-23 08:51:06 +08:00
hanqiangqiang 6a144422eb Merge branch 'develop' into feature/localization
# Conflicts:
#	MECF.Framework.RT.EquipmentLibrary/Devices/IoLineHeater.cs
2024-02-22 10:31:08 +08:00
SIC1016\caipeilun 2e00fd229b heartbeat状态修改 2024-02-22 09:54:21 +08:00
SIC1016\caipeilun 5b90f62193 Merge branch 'develop' into feature/MuitiProcess 2024-02-20 08:51:38 +08:00
hanqiangqiang 963baa4a42 优化心跳时,记录的状态变化 2024-02-19 17:34:55 +08:00
hanqiangqiang f455d5bab9 添加通讯日志提示 2024-02-19 11:15:27 +08:00
SIC1016\caipeilun 0f20e56eb3 更新client逻辑 2024-02-19 10:06:01 +08:00
SIC1016\caipeilun bff7f0c802 修改multiProcess客户端逻辑,取消processidle判断 2024-02-19 08:43:09 +08:00
hanqiangqiang 4c7e1e2c82 1添加日志输出
2修改加热基数判断逻辑
3添加离线设备复位加热数量
2024-02-18 17:39:42 +08:00