From 9789df9eb2585d602948162cd0fab2c67b081e2f Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 17 Oct 2024 22:27:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockupServiceImpl.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 50bc1e22e..fbcf63c09 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
@@ -3202,6 +3202,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 		// 查询预约单上的商城
 		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
+		String mallName = "";
+		if (Objects.isNull(distributionReservationEntity)){
+			mallName = distributionReservationEntity.getReceivingUnit();
+		}
+		//查询自提
+		DistrilbutionBillLadingEntity billLadingEntity = distrilbutionBillLadingService.getById(reservationId);
+		if (Objects.isNull(billLadingEntity)){
+			mallName = billLadingEntity.getConsigneeUnit();
+		}
 		//查询货位上物料信息
 		// todo
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
@@ -3235,7 +3244,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			LambdaQueryWrapper<DistributionStockListEntity> lambdaQueryWrapper = new LambdaQueryWrapper();
 			lambdaQueryWrapper.eq(DistributionStockListEntity::getIncomingBatch, incomingBatches);
 			lambdaQueryWrapper.eq(DistributionStockListEntity::getCargoNumber, cargoNumber);
-			lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, distributionReservationEntity.getMallName());
+			lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, mallName);
 			// 入库 时间先进的先出
 			lambdaQueryWrapper.orderByAsc(DistributionStockListEntity::getCreateTime);
 			DistributionStockListEntity distributionStockListEntities = distributionStockListMapper.selectOne(lambdaQueryWrapper);