From eb43a9c785ed6e7d2519de37031dae47ad3a6217 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 18 Oct 2024 21:39:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WarehouseConfigServiceImpl.java          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
index faa1752ae..537317759 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
@@ -47,9 +47,11 @@ public class WarehouseConfigServiceImpl extends BaseServiceImpl<WarehouseConfigM
 			}
 		} else {
 			BasicdataGoodsAllocationEntity defaultGoodsAllocation = basicdataGoodsAllocationClient.findDefaultGoodsAllocation(warehouseConfigEntity.getWarehouseId());
-			BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.findEntityByQrCode(warehouseConfigEntity.getWarehouseId(), warehouseConfigEntity.getDefaultAllocation());
-			if (!Objects.isNull(defaultGoodsAllocation) || !Strings.isBlank(warehouseConfigEntity.getDefaultAllocation())) {
-				flag = basicdataGoodsAllocationClient.closeDefaultAllocation(goodsAllocationEntity.getId());
+			if (!Objects.isNull(defaultGoodsAllocation)) {
+				BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.findEntityByQrCode(warehouseConfigEntity.getWarehouseId(), warehouseConfigEntity.getDefaultAllocation());
+				if (!Objects.isNull(goodsAllocationEntity)){
+					flag = basicdataGoodsAllocationClient.closeDefaultAllocation(goodsAllocationEntity.getId());
+				}
 			}
 			//关闭配置进行默认库位的清理
 			warehouseConfigEntity.setDefaultAllocation("");