yanps
|
4439cc6313
|
opt: 行架-agv对接位优化写入信号方法
|
2024-06-24 14:01:58 +08:00 |
|
|
|
507a440b1e
|
fix:修复拔前行架任务下发出错
|
2024-06-24 13:14:08 +08:00 |
|
|
|
595d426c15
|
rev：代码优化
|
2024-06-24 11:25:18 +08:00 |
|
|
|
eaefddd34d
|
rev:现场测试优化
|
2024-06-24 11:20:43 +08:00 |
|
|
|
8134ecbe96
|
fix: bug修改
|
2024-06-24 11:12:42 +08:00 |
|
|
|
4422f305a4
|
add: 当前指令信息
|
2024-06-24 08:59:30 +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 |
|
|
|
c86ee18d3a
|
feat: 内包间不套轴业务
|
2024-06-23 14:50:50 +08:00 |
|
|
|
e862d69a16
|
add:新增二楼ndc驱动日志以及优化拔前行架测试问题
|
2024-06-23 11:30:51 +08:00 |
|
|
|
74db7e79e0
|
fix: 修复分切下料AGV任务没校验禁用点位
|
2024-06-22 17:26:10 +08:00 |
|
zhouz
|
c11f1ed3af
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-22 10:48:49 +08:00 |
|
zhouz
|
23a1787e7e
|
fix:发货任务优化
|
2024-06-22 10:48:42 +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 |
|
|
|
5a70b02fc3
|
rev：合并修改
|
2024-06-21 18:29:43 +08:00 |
|
|
|
3a9e0275e9
|
Merge branch 'b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
|
2024-06-21 18:14:34 +08:00 |
|
|
|
387f5a77f8
|
add:发货新增扩展字段
|
2024-06-21 18:04:20 +08:00 |
|
|
|
1ae38d6d86
|
rev：修改
|
2024-06-21 14:07:27 +08:00 |
|
|
|
6aa375f195
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-21 11:40:28 +08:00 |
|
|
|
a9d3f7d1cc
|
add:增加二次分配代码逻辑
|
2024-06-21 11:40:03 +08:00 |
|
zhouz
|
d95ecd0405
|
fix:出入库代码优化
|
2024-06-21 11:01:02 +08:00 |
|
|
|
7bb3955a40
|
主分支合并
|
2024-06-21 10:32:26 +08:00 |
|
|
|
413f876247
|
Merge branch 'master' into master_merge
|
2024-06-21 10:30:00 +08:00 |
|
wangsong
|
a46c59ac48
|
rev 拔前行架
|
2024-06-21 10:26:32 +08:00 |
|
|
|
c6214fa0fa
|
分支合并
|
2024-06-21 10:25:34 +08:00 |
|
|
|
b8620f0973
|
Merge branch 'b_lms' into master_merge
|
2024-06-21 10:24:13 +08:00 |
|
|
|
cbfec25a9f
|
rev：发货区修改
|
2024-06-21 10:23:38 +08:00 |
|
|
|
43baf68a46
|
rev： 改切出库修改
|
2024-06-21 10:04:42 +08:00 |
|
yanps
|
be809d4132
|
opt:烘箱监控页面优化
|
2024-06-21 09:48:28 +08:00 |
|
yanps
|
0be3799d6d
|
opt: 国际化,页面优化
|
2024-06-21 09:45:04 +08:00 |
|
|
|
769d08d77b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
|
2024-06-21 09:05:59 +08:00 |
|
|
|
c7dd36d940
|
fix: 叉车二次分配
|
2024-06-21 08:56:49 +08:00 |
|
|
|
cdd51816fc
|
rev:优化拔前行架任务下发以及手动创建指令
|
2024-06-20 20:01:27 +08:00 |
|
|
|
06e7f163e2
|
Merge remote-tracking branch 'origin/master'
|
2024-06-20 18:36:36 +08:00 |
|
|
|
542ad5c293
|
fix: 26
|
2024-06-20 18:35:59 +08:00 |
|
|
|
1ae9b12cdc
|
Merge branch 'master' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
|
2024-06-20 17:16:42 +08:00 |
|
|
|
ee7a406d81
|
add：1.新增木箱称重校验功能2.输送任务反馈执行中更新木箱毛重
|
2024-06-20 17:07:40 +08:00 |
|
|
|
a6be1338da
|
Merge branch 'b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java
|
2024-06-20 11:00:39 +08:00 |
|
|
|
d04e626131
|
rev:发货区修改
|
2024-06-20 10:57:11 +08:00 |
|
|
|
5ce8b8a022
|
分支合并
|
2024-06-20 09:41:01 +08:00 |
|
|
|
de4d79e4a7
|
Merge branch 'b_lms' into master_merge
|
2024-06-20 09:40:21 +08:00 |
|
|
|
3c2da9058f
|
rev：发货任务二次分配修改
|
2024-06-20 09:39:22 +08:00 |
|
yanps
|
9a6afe1c2f
|
opt: 输送机称重驱动优化
|
2024-06-19 17:10:20 +08:00 |
|
yanps
|
8037d14a47
|
opt: 立库输送机写入信号判断优化,添加输送机称重驱动
|
2024-06-19 15:44:50 +08:00 |
|
|
|
e4e4dd6fa3
|
rev：分支合并
|
2024-06-19 15:02:15 +08:00 |
|
|
|
807a0af359
|
Merge branch 'b_lms' into master_merge
|
2024-06-19 15:01:02 +08:00 |
|
|
|
5bb695619e
|
rev：发货区修改
|
2024-06-19 14:59:15 +08:00 |
|
|
|
dc356bf29e
|
Merge remote-tracking branch 'origin/master'
|
2024-06-19 10:54:34 +08:00 |
|
|
|
2724907920
|
fix: 报错信息显示
|
2024-06-19 10:54:14 +08:00 |
|
