|
|
2cc00c2c06
|
opt:
1.子卷装箱增加子卷质检生成包装关系，去除临时包装关系；
2.修改最后一个子卷判断方式；
3.恢复装箱毛重推送，优化装箱页面；
|
2024-07-31 13:53:18 +08:00 |
|
zhouz
|
fd528f4109
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-31 09:39:24 +08:00 |
|
zhouz
|
7907a8493c
|
fix：对接位分配查询优化
|
2024-07-31 09:38:45 +08:00 |
|
|
|
c100af51e3
|
fix：一期子卷包装页面新增【是否入库】查询条件
|
2024-07-30 17:50:26 +08:00 |
|
zhouz
|
2525a8955e
|
fix:接口日志维护
|
2024-07-30 13:50:38 +08:00 |
|
|
|
b4f28a15cd
|
fix: 工单显示重量
|
2024-07-23 19:02:20 +08:00 |
|
|
|
4f27e7c1dc
|
add: 木箱库存查询
|
2024-07-22 14:19:36 +08:00 |
|
|
|
d21648c6e9
|
rev：子卷装箱
|
2024-07-20 11:25:26 +08:00 |
|
|
|
18184c37df
|
rev：木箱信息新增搜索框
|
2024-07-17 16:03:34 +08:00 |
|
|
|
b533348e65
|
opt:优化装箱最后一个子卷临时计数方式
|
2024-07-14 10:47:49 +08:00 |
|
|
|
dd39ac725a
|
opt:优化装箱区——>待检区送空载具逻辑
|
2024-07-13 23:57:07 +08:00 |
|
|
|
ee2561a19b
|
fix:修改点位库存修改问题
|
2024-07-12 14:18:56 +08:00 |
|
|
|
62774053a3
|
fix:增加桁架任务及二次分配任务完成情况校验
|
2024-07-11 19:26:58 +08:00 |
|
|
|
e3da38f4f9
|
Merge branch 'b_lms' into master_merge
|
2024-07-11 14:50:10 +08:00 |
|
|
|
23cd49cfb3
|
add：木箱信息页面
|
2024-07-11 14:47:17 +08:00 |
|
|
|
ed493f29fa
|
Merge branch 'master' into master_merge
|
2024-07-10 13:58:56 +08:00 |
|
|
|
93c1c11f04
|
rev:出库报表新增原销售订单
|
2024-07-10 08:51:07 +08:00 |
|
|
|
c8004cf002
|
fix: 定时任务新增指定调度IP
|
2024-07-09 23:14:59 +08:00 |
|
|
|
254b4f4a65
|
rev：返检/改切出库回传删除子卷包装关系，成品入库报表新增查询条件
|
2024-07-09 14:42:54 +08:00 |
|
|
|
2d53076a8f
|
add:增加不对接MES包装关系逻辑
|
2024-07-03 08:32:44 +08:00 |
|
|
|
9838e9da98
|
add:增加不对接MES包装关系逻辑
|
2024-07-03 00:39:49 +08:00 |
|
|
|
5870a48fe4
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-07-02 22:45:29 +08:00 |
|
|
|
71f320e158
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-07-02 22:44:23 +08:00 |
|
|
|
74decb66f7
|
fix: pc可修改分切计划信息-前端
|
2024-07-02 22:44:13 +08:00 |
|
|
|
c3a8cd70bd
|
add:增加子卷规格校验
|
2024-07-02 17:13:27 +08:00 |
|
|
|
3faf1b65c1
|
add:增加装箱区库存页面
|
2024-07-02 16:30:19 +08:00 |
|
|
|
1cf2e6305d
|
fix: 删除子卷包装关系，异常包裹
|
2024-07-01 22:00:58 +08:00 |
|
|
|
4c07bdbfca
|
Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java
|
2024-07-01 13:58:54 +08:00 |
|
|
|
9ecc870369
|
opt:优化子卷装箱校验逻辑
|
2024-06-30 18:10:59 +08:00 |
|
|
|
7caf3d0f97
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-06-30 16:05:34 +08:00 |
|
zhouz
|
35ccff0564
|
fix:重量校验
|
2024-06-30 15:18:44 +08:00 |
|
|
|
17032c858a
|
opt: 备货区与气胀轴库优化-前端
|
2024-06-30 14:24:14 +08:00 |
|
zhouz
|
9e32eca116
|
fix:WQL修改
|
2024-06-29 17:55:59 +08:00 |
|
zhouz
|
2e69177359
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-29 16:50:20 +08:00 |
|
zhouz
|
946857d454
|
fix:问题优化
|
2024-06-29 10:48:17 +08:00 |
|
|
|
830a523d56
|
rev：木箱类型
|
2024-06-28 16:31:32 +08:00 |
|
|
|
956e6c99df
|
add：木箱类型
|
2024-06-28 15:13:10 +08:00 |
|
|
|
c053f7a2dd
|
fix：二期出库完成报错bug修复
|
2024-06-28 10:13:23 +08:00 |
|
|
|
217e8d86d2
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
|
2024-06-28 09:19:18 +08:00 |
|
|
|
a9ef3d8f69
|
fix:增加二次分配任务重复校验
|
2024-06-28 01:30:03 +08:00 |
|
|
|
e88415bada
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-06-27 16:00:57 +08:00 |
|
zhouz
|
cab08052ec
|
代码合并
|
2024-06-27 15:23:15 +08:00 |
|
|
|
a714b8e2d6
|
fix:修复前端子卷号重复校验
|
2024-06-27 15:11:31 +08:00 |
|
zhouz
|
d1a269d284
|
fix:优化
|
2024-06-27 09:27:01 +08:00 |
|
|
|
2ae476a67a
|
Merge pull request 'b_lms_master_merge' (#3) from b_lms into master_merge
Reviewed-on: http://121.40.234.130:8899/root/lanzhouhailiang_one/pulls/3
|
2024-06-27 08:54:19 +08:00 |
|
zhouz
|
6240eb9a72
|
代码合并
|
2024-06-26 23:09:09 +08:00 |
|
|
|
ea8b70ec38
|
fix:修复前端子卷规格无法显示问题
|
2024-06-26 14:17:15 +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 |
|
