1.干线bug修复

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);
 }
 

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);
+	}
+
 }

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()));