Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
6ea7aa3c
Commit
6ea7aa3c
authored
Jan 11, 2025
by
yanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 云效 JDAA-241: 2.NG2500008L 点击关联单,无需显示NG2500008L 的订单信息关联单
(cherry picked from commit
a3a9def4
)
parent
36984582
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
BoxServiceImpl.java
...der/yudao/module/shipment/service/box/BoxServiceImpl.java
+3
-2
BoxController.http
...yudao/module/shipment/controller/admin/BoxController.http
+1
-1
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @
6ea7aa3c
...
...
@@ -2298,11 +2298,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
List
<
Long
>
orderIdList2
=
guanlianList
.
stream
().
map
(
OrderGuanlianDO:
:
getRelateOrderId
).
collect
(
Collectors
.
toList
());
// 合并
orderIdList1
.
addAll
(
orderIdList2
);
// 去除orderId
orderIdList1
.
remove
(
orderId
);
// 去重
orderIdList1
=
orderIdList1
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
// 去除orderId
orderIdList1
.
remove
(
orderId
);
// 根据orderIdLists查询关联订单
List
<
BoxPreloadGoodsBackVO
>
goodsItemList
=
boxPreloadGoodsService
.
getGuanLianGoodItemList
(
orderIdList1
);
...
...
yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/BoxController.http
View file @
6ea7aa3c
...
...
@@ -7,7 +7,7 @@ Content-Type: application/json
### tallyListGuanlianOrder
POST {{baseUrl}}/shipment/box/tallyListGuanlianOrder?orderId=
3400
POST {{baseUrl}}/shipment/box/tallyListGuanlianOrder?orderId=
83785
Authorization: Bearer {{token}}
tenant-id: {{adminTenentId}}
Content-Type: application/json
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment