zhouz
|
32188cc4fe
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-26 21:49:24 +08:00 |
|
zhouz
|
2fad0075c6
|
fix:MES相关优化
|
2024-06-26 21:49:19 +08:00 |
|
|
|
35d18e93b0
|
remove: 去除备注
|
2024-06-26 17:46:19 +08:00 |
|
|
|
0473d9529e
|
rev：空木箱入库：优先将相同木箱规格的木箱放在同一深浅货位
|
2024-06-26 17:13:34 +08:00 |
|
|
|
ea8b70ec38
|
fix:修复前端子卷规格无法显示问题
|
2024-06-26 14:17:15 +08:00 |
|
|
|
4d729392c9
|
fix:修复前端子卷规格无法显示问题，装箱对接位子卷装箱数量问题
|
2024-06-26 12:46:51 +08:00 |
|
|
|
a0a7240975
|
fix: 堆垛机command顺序修改
|
2024-06-26 10:31:34 +08:00 |
|
|
|
bd153c9044
|
add:增加二次分配代码逻辑
|
2024-06-25 19:06:07 +08:00 |
|
|
|
fb6fe5f0b5
|
Merge remote-tracking branch 'remotes/origin/b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
# lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
# lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js
|
2024-06-25 17:41:06 +08:00 |
|
|
|
2f396a9a71
|
add：仓位页面新增 巷道管理
|
2024-06-25 17:10:06 +08:00 |
|
|
|
968e2540a6
|
fix: 堆垛机command顺序修改
|
2024-06-25 15:13:13 +08:00 |
|
|
|
18cc9ccb61
|
fix: 诺宝修改
|
2024-06-25 14:59:13 +08:00 |
|
|
|
a52386ddcb
|
fix: 诺宝修改
|
2024-06-25 14:58:37 +08:00 |
|
|
|
43d4d66d61
|
Merge remote-tracking branch 'origin/master'
|
2024-06-25 14:56:08 +08:00 |
|
|
|
036f38c00e
|
fix: 诺宝修改
|
2024-06-25 14:55:40 +08:00 |
|
|
|
94aa93b096
|
Merge branch 'b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
|
2024-06-24 17:47:15 +08:00 |
|
|
|
0814124414
|
rev：二次分配修改
|
2024-06-24 17:39:45 +08:00 |
|
zhouz
|
431ceba003
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-24 16:25:46 +08:00 |
|
zhouz
|
87ebb39603
|
fix:MES对接相关代码优化
|
2024-06-24 16:25:41 +08:00 |
|
|
|
55cd804fa1
|
fix: 分切对接位区分区域
|
2024-06-24 15:29:49 +08:00 |
|
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 |
|
