From fe9bdbfda5632ec41cedaf276d0d3bcac3ad3e8b Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 29 Oct 2024 22:17:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BA=93=E8=AE=A2=E5=8D=95=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockArticleServiceImpl.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index d66159d1c..b659fdc9c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -2852,7 +2852,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		List<TrunklineAdvanceDetailEntity> list = trunklineAdvanceDetailClient.selectByOrderCodeAndWarehouseId(orderCode,warehouseIdList.stream().map(String::valueOf).collect(Collectors.joining(",")));
 		if (!list.isEmpty()) {
 			List<String> orderPackageCodes = list.stream().map(TrunklineAdvanceDetailEntity::getOrderPackageCode).collect(Collectors.toList());
-			 info = handlePackageGroupByWarehouse(list,warehouseIdList,orderPackageCodes,Objects.isNull(myCurrentWarehouse),orderCode);
+		    info = handlePackageGroupByWarehouse(list,warehouseIdList,orderPackageCodes,Objects.isNull(myCurrentWarehouse),orderCode);
 
 			return R.data(info);
 		}
@@ -2908,6 +2908,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			DistributionParcelListVO distributionParcelListVO = new DistributionParcelListVO();
 			distributionParcelListVO.setWaybillNumber(trunklineAdvanceDetailEntity.getWaybillNo());
 			distributionParcelListVO.setOrderCode(trunklineAdvanceDetailEntity.getOrderCode());
+			distributionParcelListVO.setOrderPackageCode(trunklineAdvanceDetailEntity.getOrderPackageCode());
 			distributionParcelListVO.setWarehouse(trunklineAdvanceDetailEntity.getWarehouseName());
 			distributionParcelListVO.setOrderPackageStatusName(OrderPackageStatusConstant.weiruku.getName());
 			distributionParcelListVO.setFirsts(trunklineAdvanceDetailEntity.getFirstPackName());