Commit 6fed31e2 authored by yanghao's avatar yanghao

fix: 云效 JDAA-241: 2.NG2500008L 点击关联单,无需显示NG2500008L 的订单信息关联单

(cherry picked from commit a3a9def4)
parent 36984582
...@@ -2298,11 +2298,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements ...@@ -2298,11 +2298,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
List<Long> orderIdList2 = guanlianList.stream().map(OrderGuanlianDO::getRelateOrderId).collect(Collectors.toList()); List<Long> orderIdList2 = guanlianList.stream().map(OrderGuanlianDO::getRelateOrderId).collect(Collectors.toList());
// 合并 // 合并
orderIdList1.addAll(orderIdList2); orderIdList1.addAll(orderIdList2);
// 去除orderId
orderIdList1.remove(orderId);
// 去重 // 去重
orderIdList1 = orderIdList1.stream().distinct().collect(Collectors.toList()); orderIdList1 = orderIdList1.stream().distinct().collect(Collectors.toList());
// 去除orderId
orderIdList1.remove(orderId);
// 根据orderIdLists查询关联订单 // 根据orderIdLists查询关联订单
List<BoxPreloadGoodsBackVO> goodsItemList = boxPreloadGoodsService.getGuanLianGoodItemList(orderIdList1); List<BoxPreloadGoodsBackVO> goodsItemList = boxPreloadGoodsService.getGuanLianGoodItemList(orderIdList1);
......
...@@ -7,7 +7,7 @@ Content-Type: application/json ...@@ -7,7 +7,7 @@ Content-Type: application/json
### tallyListGuanlianOrder ### tallyListGuanlianOrder
POST {{baseUrl}}/shipment/box/tallyListGuanlianOrder?orderId=3400 POST {{baseUrl}}/shipment/box/tallyListGuanlianOrder?orderId=83785
Authorization: Bearer {{token}} Authorization: Bearer {{token}}
tenant-id: {{adminTenentId}} tenant-id: {{adminTenentId}}
Content-Type: application/json Content-Type: application/json
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment