Commit Graph

60 Commits

Author SHA1 Message Date
f614e469cb fix: 日志更新 2024-06-28 10:37:15 +08:00
b31a10bb5d Merge remote-tracking branch 'origin/master' 2024-06-24 08:57:21 +08:00
b905eacba9 fix: 日志bug修改 2024-06-24 08:56:54 +08:00
e862d69a16 add:新增二楼ndc驱动日志以及优化拔前行架测试问题 2024-06-23 11:30:51 +08:00
420ff2fe98 Merge remote-tracking branch 'origin/master' 2024-06-22 09:13:21 +08:00
6c201406e2 fix: 仙宫更新 2024-06-22 09:12:48 +08:00
yanps
0be3799d6d opt: 国际化,页面优化 2024-06-21 09:45:04 +08:00
cdd51816fc rev:优化拔前行架任务下发以及手动创建指令 2024-06-20 20:01:27 +08:00
41fea50b24 Merge remote-tracking branch 'origin/master' 2024-06-15 15:10:09 +08:00
01a0ebfb4e add: 诺宝agv、诺宝叉车调试开发 2024-06-15 15:09:22 +08:00
b035da2cca fix:修复设备监控页面报错问题 2024-06-14 09:37:38 +08:00
wangsong
5f6e0f61b5 add 2024-06-13 14:29:00 +08:00
32f2a07c91 fix: 出库大批量测试、入库测试 2024-06-03 18:35:07 +08:00
12b38767a5 fix: 联调修改 2024-06-01 16:41:39 +08:00
dddfe51684 rev:优化路由报错信息 2024-05-31 13:38:39 +08:00
7de225053e rev:设备驱动国际化以及设备监控国际化 2024-05-13 14:22:29 +08:00
a6a6f4d7e2 fix: 现场联调 2024-04-29 18:26:29 +08:00
01637beba9 fix: 入库异常口任务校验 2024-04-24 14:03:36 +08:00
513d16a8f6 fix: 大屏监控显示修复 2024-04-23 16:30:37 +08:00
4592e16ddf add:新增手持接口 2024-04-03 14:13:26 +08:00
yanps
a46b4877d5 add: NDC下发日志增加 2024-04-01 09:13:10 +08:00
yanps
2757ee6655 opt: AGV下发任务优化 2024-04-01 09:00:48 +08:00
d1571b8284 fix: 现场联调加堆垛机修改 2024-03-21 16:53:49 +08:00
yanps
6da0f596bc add: 增加二楼NDC日志 2024-03-20 14:26:44 +08:00
2fa7a54247 add: 行架缓存为页面 2024-03-18 10:59:44 +08:00
5303bf4828 Merge remote-tracking branch 'origin/master' 2024-03-18 08:46:07 +08:00
0783af09c2 fix: 堆垛机联调 2024-03-18 08:45:37 +08:00
5ad7a02093 rev:解决联调问题 2024-03-14 18:02:00 +08:00
e19fa045a3 rev:设备监控优化 2024-03-11 14:08:36 +08:00
4d18c231b9 fix: 行架对接位添加 2024-03-11 13:55:10 +08:00
0b7945a149 rev:新增请求接口,驱动代码优化 2024-03-07 18:12:53 +08:00
bf36bed276 fix :判断光电信号 2024-03-04 16:23:02 +08:00
d4593bbf8f fix :国际化修改 2024-03-01 14:05:31 +08:00
36155bac2e fix :国际化修改 2024-02-29 14:45:10 +08:00
881ade414e Merge remote-tracking branch 'origin/master' 2024-02-29 13:14:05 +08:00
864990b446 fix :修改 2024-02-29 13:13:32 +08:00
f278b71ca0 rev:优化 2024-02-29 10:38:29 +08:00
1608d34733 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java
#	acs2/nladmin-ui/src/views/system/monitor/device/index.vue
2024-02-29 10:37:12 +08:00
544e5dfaea add:新增后端二楼驱动国际化 2024-02-29 10:30:48 +08:00
c010166c28 add :堆垛机异样处理 2024-02-28 16:14:34 +08:00
42e572a003 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
2024-02-26 16:33:08 +08:00
2f85b23948 fix :lms联调 2024-02-26 16:31:33 +08:00
yanps
7282a6ef66 opt: 设备优化 2024-02-23 16:37:01 +08:00
6c42abffde Merge remote-tracking branch 'origin/master' 2024-02-22 17:59:25 +08:00
ff04f40bbc fix :测试、对接点位 2024-02-22 17:55:13 +08:00
5b096969a2 rev:优化kep信号读取 2024-02-21 09:11:29 +08:00
7c97cb116e add :设备国际化 2024-02-20 17:16:58 +08:00
USER-20220102CG\noblelift
e2cfc536bb rev 去除loki 2024-02-02 16:32:30 +08:00
9f25ba7b59 add:新增行架-agv对接位驱动 2024-02-02 15:17:31 +08:00
bf368ec156 fix : 申请任务先找指令 2024-02-01 16:37:50 +08:00