|
|
c8e93afd42
|
fix:线程阻塞问题处理3
|
2024-08-16 14:50:41 +08:00 |
|
|
|
65ffa06c5b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java
|
2024-08-16 10:19:50 +08:00 |
|
|
|
f008173066
|
fix:线程阻塞问题处理2
|
2024-08-16 10:18:40 +08:00 |
|
|
|
f2846779d8
|
rev：
|
2024-08-15 21:11:33 +08:00 |
|
|
|
a7afc40e8c
|
Merge remote-tracking branch 'origin/master'
|
2024-08-15 21:09:07 +08:00 |
|
|
|
4b63e7541b
|
add:新增字段展示以及优化监控信息展示
|
2024-08-15 21:08:13 +08:00 |
|
|
|
1c88c2267b
|
fix:线程阻塞问题处理
|
2024-08-15 13:46:05 +08:00 |
|
|
|
d95c863598
|
fix:高度等级报错
|
2024-08-09 13:57:37 +08:00 |
|
|
|
b9c81052a4
|
add:新增报警信息
|
2024-08-05 18:03:20 +08:00 |
|
|
|
1d7f51601a
|
fix:任务完成bug修改
|
2024-08-01 19:18:05 +08:00 |
|
|
|
522ac0f93e
|
fix:扫码位终点信号判断、信息提示
|
2024-08-01 08:52:51 +08:00 |
|
|
|
e191d4e5b9
|
fix:重复指令问题处理
|
2024-07-31 17:17:52 +08:00 |
|
|
|
188d4a1658
|
fix:解决agv任务下发失败问题
|
2024-07-31 15:16:31 +08:00 |
|
|
|
3ddc9a3bcb
|
fix:多次调用lms任务完成解决
|
2024-07-31 14:51:06 +08:00 |
|
|
|
7bc69d49eb
|
add:新增一楼立库任务类型以及行架报警信息
|
2024-07-30 17:46:15 +08:00 |
|
|
|
24c61f2fe5
|
fix: 断连等待时间过长处理、指令编号同步锁
|
2024-07-30 17:08:46 +08:00 |
|
|
|
73c0fee1b2
|
fix: kep断连处理
|
2024-07-29 17:02:20 +08:00 |
|
|
|
47c8789e57
|
Merge remote-tracking branch 'origin/master'
|
2024-07-27 08:19:33 +08:00 |
|
|
|
7eec47522f
|
fix: 堆垛机取货完成给任务号、叉车去动作块
|
2024-07-27 08:19:16 +08:00 |
|
USER-20220102CG\noblelift
|
c7d1367749
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-07-26 16:39:28 +08:00 |
|
USER-20220102CG\noblelift
|
b73c9e8c65
|
更新tlog支持
|
2024-07-26 16:38:50 +08:00 |
|
|
|
2b1ae71936
|
fix: 堆叠行架终点信号确认
|
2024-07-26 11:55:21 +08:00 |
|
|
|
9d432033c7
|
fix: 国际化报错
|
2024-07-26 10:40:07 +08:00 |
|
|
|
cfd1bdba5d
|
fix: 空指针异常
|
2024-07-25 18:52:43 +08:00 |
|
|
|
7ab645a22d
|
fix: 空指针异常
|
2024-07-25 18:35:53 +08:00 |
|
|
|
c312d3071d
|
Merge remote-tracking branch 'origin/master'
|
2024-07-25 16:25:53 +08:00 |
|
|
|
8f49489147
|
fix: 输送线筛掉行架、堆垛机策略开发测试
|
2024-07-25 16:25:24 +08:00 |
|
|
|
c40a00c93d
|
rev:优化废箔称重接口以及新增密集库到插拔轴工位行架任务逻辑
|
2024-07-25 16:00:20 +08:00 |
|
|
|
2237725716
|
fix: 堆垛机策略前段
|
2024-07-25 14:53:39 +08:00 |
|
|
|
98618cbf52
|
fix: 读空指针异常解决阻塞问题
|
2024-07-24 10:01:19 +08:00 |
|
|
|
fd9eef0191
|
fix: 读空指针异常解决阻塞问题
|
2024-07-24 09:01:30 +08:00 |
|
|
|
4a6c1c7af4
|
fix: 多次更新agv状态、阻塞测试
|
2024-07-23 09:06:41 +08:00 |
|
|
|
ccfb246c98
|
add:新增从密集库出气胀轴行架任务
|
2024-07-21 11:28:33 +08:00 |
|
|
|
6babb1980c
|
fix: 日志更新，取消任务和指令、创建人、配置文件线程数搞大
|
2024-07-19 13:26:19 +08:00 |
|
yanps
|
f971c83141
|
opt: 日志优化,依赖版本更新
|
2024-07-16 16:39:34 +08:00 |
|
|
|
467a9c94d1
|
fix: 扫码位报警重新下发plc、异步写lucence
|
2024-07-16 09:46:43 +08:00 |
|
|
|
484cfacee6
|
fix: 扫描码位生成指令优化、内包间优化、写信号优化、lucence注解
|
2024-07-14 17:15:45 +08:00 |
|
|
|
bd0177895e
|
rev:烘箱工序优化
|
2024-07-14 16:52:33 +08:00 |
|
|
|
ab5f7a82eb
|
rev:优化日志
|
2024-07-13 18:13:34 +08:00 |
|
USER-20220102CG\noblelift
|
2e3bbf7bbb
|
rev 更新设备同步默认最大线程数，按照PLC ip数配置线程数
|
2024-07-13 11:19:48 +08:00 |
|
USER-20220102CG\noblelift
|
b43a390a6f
|
rev 优化线程相关
|
2024-07-13 08:35:29 +08:00 |
|
|
|
3b4fdf64dd
|
fix: 单元测试
|
2024-07-11 09:33:48 +08:00 |
|
|
|
22944ce7ea
|
fix: 堆叠行架修改、日志优化、定时器优化
|
2024-07-11 08:42:17 +08:00 |
|
yanps
|
44ed477346
|
opt: 接口日志显示优化
|
2024-07-09 13:40:06 +08:00 |
|
|
|
d652148c1f
|
Merge remote-tracking branch 'origin/master'
|
2024-07-09 13:28:27 +08:00 |
|
|
|
6b82cc7967
|
fix: 异步循环依赖报错
|
2024-07-09 13:28:08 +08:00 |
|
|
|
b38e1152ac
|
add:新增agv交互逻辑
|
2024-07-09 10:29:46 +08:00 |
|
|
|
d9a12ca3df
|
fix: 配置文件修改
|
2024-07-09 08:57:03 +08:00 |
|
|
|
486a7708b1
|
fix: 日志优化，任务指令异步
|
2024-07-09 08:50:30 +08:00 |
|
|
|
da4d4c0352
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java
|
2024-07-08 17:26:18 +08:00 |
|
