diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index 96c5b0ac8..5090bf564 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -322,5 +322,7 @@ public interface IDistributionParcelListClient { @PostMapping(API_PREFIX + "/findSignOrderPackageCodes") List findSignOrderPackageCodes(@RequestBody List orderPackageCodes); + @PostMapping(API_PREFIX + "/findListZhaoBuDaoYuanYin") + List findListZhaoBuDaoYuanYin(FindParamterDTO findParamterD); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index 3192ac094..d89037ab0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -679,4 +679,13 @@ public class DistributionParcelListClient implements IDistributionParcelListClie return distributionParcelListService.findSignOrderPackageCodes(orderPackageCodeList); } + @Override + public List findListZhaoBuDaoYuanYin(FindParamterDTO findParamterD) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("order_code", findParamterD.getOrderCodeSet()) + .eq("warehouse_id", findParamterD.getWarehouseId()); + + return distributionParcelListService.list(queryWrapper); + } + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index a7b859361..e4822f3c3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -788,7 +788,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl parcelListEntities = parcelListClient.findListByOrderCodesAndWarehouseId(findParamterD); + List parcelListEntities = parcelListClient.findListZhaoBuDaoYuanYin(findParamterD); Map parcelListMap = new HashMap<>(); if (!parcelListEntities.isEmpty()) { parcelListMap = parcelListEntities.stream().collect(Collectors.toMap(DistributionParcelListEntity::getOrderPackageCode, Function.identity()));