From a3ada088186ed25febc8aae8f8ef3b027cf1b600 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 12 Dec 2023 16:11:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=83=BD=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E5=A4=87=E8=B4=A7=E5=8C=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WarehouseUpdownTypeServiceImpl.java  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 5966dce47..0b85f1319 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -743,6 +743,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##############upShelfPackage: 货区不存在 goodsAreaId={}",goodsAreaId);
 			return R.fail(403,"货区不存在");
 		}
+		String areaType = goodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfPackage: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
+
 		Long wid = goodsAreaEntity.getWarehouseId();
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
 		if(Objects.isNull(warehouseEntity)){
@@ -848,6 +854,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##############upShelfTray: 货区不存在 goodsAreaId={}",goodsAreaId);
 			return R.fail(403,"货区不存在");
 		}
+		String areaType = goodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfTray: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
 		Long wid = goodsAreaEntity.getWarehouseId();
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
 		if(Objects.isNull(warehouseEntity)){
@@ -913,6 +924,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##############upShelfOrder: 货区不存在 goodsAreaId={}",goodsAreaId);
 			return R.fail(403,"货区不存在");
 		}
+		String areaType = goodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfOrder: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
 		Long wid = goodsAreaEntity.getWarehouseId();
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
 		if(Objects.isNull(warehouseEntity)){
@@ -1065,6 +1081,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##############upShelfOrder: 货区不存在 goodsAreaId={}",goodsAreaId);
 			return R.fail(403,"货区不存在");
 		}
+		String areaType = goodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfOrder: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
+
 		Long wid = goodsAreaEntity.getWarehouseId();
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
 		if(Objects.isNull(warehouseEntity)){