From 2b6bd47b45468cf94e87d01879ac5110fcd459a8 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 2 Dec 2024 10:52:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/IDistributionParcelListClient.java             | 2 ++
 .../distribution/feign/DistributionParcelListClient.java | 9 +++++++++
 .../service/impl/TrunklineAdvanceServiceImpl.java        | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

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<String> findSignOrderPackageCodes(@RequestBody List<String> orderPackageCodes);
 
+	@PostMapping(API_PREFIX + "/findListZhaoBuDaoYuanYin")
+	List<DistributionParcelListEntity> 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<DistributionParcelListEntity> findListZhaoBuDaoYuanYin(FindParamterDTO findParamterD) {
+		QueryWrapper<DistributionParcelListEntity> 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<TrunklineAdvanc
 		FindParamterDTO findParamterD = new FindParamterDTO();
 		findParamterD.setOrderCodeSet(orderCodeSet);
 		findParamterD.setWarehouseId(warehouseId);
-		List<DistributionParcelListEntity> parcelListEntities = parcelListClient.findListByOrderCodesAndWarehouseId(findParamterD);
+		List<DistributionParcelListEntity> parcelListEntities = parcelListClient.findListZhaoBuDaoYuanYin(findParamterD);
 		Map<String, DistributionParcelListEntity> parcelListMap = new HashMap<>();
 		if (!parcelListEntities.isEmpty()) {
 			parcelListMap = parcelListEntities.stream().collect(Collectors.toMap(DistributionParcelListEntity::getOrderPackageCode, Function.identity()));