SIC1016\caipeilun
|
afa85381a2
|
Merge branch 'DevelopBase' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into DevelopBase
|
2024-03-01 14:29:40 +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 |
 SL
|
83160aa632
|
修正HeaterControlMode枚举定义，增加必要的注释。（需当前版本测试完成后继续优化）
|
2024-03-01 14:23:04 +08:00 |
|
SL
|
fc7cbe3b53
|
修正PyroFollow模式下PSU1和PSU3没有跟随PSU2的问题。
|
2024-03-01 13:52:52 +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 |
|
hanqiangqiang
|
8d28778191
|
修复Recipe快照保存时，报错问题
|
2024-02-29 10:02:34 +08:00 |
|
SIC1016\caipeilun
|
6d375535d5
|
调整timeout时间为8s；触发按钮前提示当前Process腔体数量
|
2024-02-29 09:03:33 +08:00 |
|
hanqiangqiang
|
5323fb7ed5
|
[UI.Client]
Recipe对比界面添加刷新功能
|
2024-02-28 09:19:15 +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 |
|
hanqiangqiang
|
1e2fd705a6
|
1修改Coating菜单汉化内容
2添加维护界面菜单汉化
|
2024-02-26 15:19:20 +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 |
|
hanqiangqiang
|
18a505cc30
|
[RT.EquipmentLibrary]
加热带报警监控，正增加配置项，修改报警逻辑
|
2024-02-21 10:59:59 +08:00 |
|
hanqiangqiang
|
d91f3c5450
|
修改汉化内容
修改Recipe编辑界面漏汉化部分
|
2024-02-20 10:18:10 +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 |
|
SIC1016\caipeilun
|
a051cffce1
|
修改Process state状态
|
2024-02-18 10:09:35 +08:00 |
|
SIC1016\caipeilun
|
7b21a14c2f
|
Merge branch 'feature/MuitiProcess' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into feature/MuitiProcess
# Conflicts:
# MECF.Framework.Common/MECF/Framework/Common/MultiProcess/MultiProcessManager.cs
# MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessData.cs
# MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessStateManager.cs
|
2024-02-18 08:34:46 +08:00 |
|
SIC1016\caipeilun
|
b93826d3ec
|
更新
|
2024-02-18 08:33:49 +08:00 |
|
SIC1016\caipeilun
|
84c4f6996e
|
函数加锁 并提供连接状态
|
2024-02-07 10:07:47 +08:00 |
|
SIC1016\caipeilun
|
dc031629ef
|
修复 数据库循环清理功能不生效的异常：
1.单独提取数据库循环清理功能为Manager
2.原代码是初始化时判定一次，现改为数据库定期清理，配置后无需重启可生效
|
2024-02-04 10:11:26 +08:00 |
|
SIC1016\caipeilun
|
a4d361076d
|
加入IP断线判断
|
2024-02-02 17:10:15 +08:00 |
|
SIC1016\caipeilun
|
6328ae4c4a
|
更新传数字状态
|
2024-02-02 16:17:07 +08:00 |
|
hanqiangqiang
|
83c0fdfec7
|
1新增客户端IP记录
2新增断线提示
3修改加热基数
|
2024-02-02 14:54:28 +08:00 |
HCL
|
71d019a00b
|
1.隔热罩升起时检测TMRobot Extend Enable信号
|
2024-02-02 14:02:52 +08:00 |
|
SIC1016\caipeilun
|
a44e26dde2
|
移动文件夹位置
|
2024-02-01 19:05:50 +08:00 |
|
SIC1016\caipeilun
|
bface9947d
|
相关代码转移到FrameWork中
|
2024-02-01 18:32:23 +08:00 |
|
SIC1016\caipeilun
|
bef3e1529e
|
代码手动添加-4
保留原数据库表，新建数据库表
|
2024-01-30 08:54:51 +08:00 |
|
SIC1016\caipeilun
|
a2e9198669
|
代码手动添加-3
|
2024-01-29 14:03:56 +08:00 |
|
SIC1016\caipeilun
|
0d9d9d5779
|
代码手动添加-2
|
2024-01-29 11:18:07 +08:00 |
|
SIC1016\caipeilun
|
229da8a188
|
代码手动添加-1
|
2024-01-29 11:12:21 +08:00 |