From d66cbd5a076f019d5154312fc727f3410fab5e51 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 15 May 2024 17:03:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=9C=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionStockupServiceImpl.java  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index a4793d66e..016e60c65 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -3215,17 +3215,29 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			);//预约信息
 			if (!list.isEmpty()) {
 				DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId());
-				mallId = byId.getMallId();
-				mallName = byId.getMallName();
+				if (!Func.isEmpty(byId)){
+					BasicdataClientEntity byName = basicdataClientClient.findByName(byId.getMallName());
+					if (!Func.isEmpty(byName)){
+						mallId = byId.getMallId();
+						mallName = byId.getMallName();
+					}
+				}
+
 
 			}
 
 		} else {
 			// 查询预约单上的商城
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
-			mallId = distributionReservationEntity.getMallId();
-			mallName = distributionReservationEntity.getMallName();
-
+			if (!Func.isEmpty(distributionReservationEntity)){
+				BasicdataClientEntity byName = basicdataClientClient.findByName(distributionReservationEntity.getMallName());
+				if (!Func.isEmpty(byName)){
+					mallId = distributionReservationEntity.getMallId();
+					mallName = distributionReservationEntity.getMallName();
+				}
+			}else {
+				log.info("查询预约单客户信息失败reservationId:{}",reservationId);
+			}
 		}
 
 		//查询货位上物料信息