|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c86ee18d3a
|
feat: 内包间不套轴业务
|
2024-06-23 14:50:50 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
810e8bb510
|
add:增加子卷质检接口
|
2024-06-18 20:53:13 +08:00 |
|
|
|
daa1a8a64e
|
fix:修复区域问题
|
2024-06-18 18:20:29 +08:00 |
|
|
|
87dca36386
|
fix:修复区域问题
|
2024-06-18 18:19:23 +08:00 |
|
|
|
bee8457496
|
opt:只显示存在点位的子卷信息
|
2024-06-18 17:19:56 +08:00 |
|
|
|
ceb0bac497
|
opt:只显示存在点位的子卷信息
|
2024-06-18 17:17:57 +08:00 |
|
|
|
1c440c1085
|
rev：按钮显示
|
2024-06-18 16:51:54 +08:00 |
|
|
|
05312a9f8a
|
rev：分支合并
|
2024-06-18 16:38:41 +08:00 |
|
|
|
ec5279cf93
|
Merge commit '9186ce137f2a67a4d8d7bb1cbfcc40cf69729d22' into master_merge
|
2024-06-18 16:37:40 +08:00 |
|
|
|
2c208789ce
|
代码合并
|
2024-06-18 16:35:05 +08:00 |
|
|
|
c8e55ca772
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-18 16:34:32 +08:00 |
|
|
|
9186ce137f
|
rev：1.出库六个位置在一个出库单上一起出库的时候 报错：‘仓位不足’
2.出库捆扎的时候要进行判断此规格是否只有一个箱子，如果是直接调用acs接口放行
3.捆扎的时候捆扎位如果有一个相同规格的箱子 要优先放在这个位置上
4.生成转库任务时 需要提前确定巷道的位置
|
2024-06-18 16:34:21 +08:00 |
|
