From 600be8183eaa8b3e04d2fd169ba3bd342ee69be6 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 21 Sep 2023 14:52:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WarehouseUpdownTypeServiceImpl.java  | 11 +++++++++++
 .../service/impl/WarehouseWaybillServiceImpl.java     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

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 b016a85c3..8f9383b9a 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
@@ -316,6 +316,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("#################upShelfScanAllocation: 货区信息不存在 goodsAreaId={}",goodsAreaId);
 			throw new CustomerException(403,"货区信息不存在");
 		}
+		String areaType = basicdataGoodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfScanAllocation: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
 		Long wid = basicdataGoodsAreaEntity.getWarehouseId();
 		String goodsAreaName = basicdataGoodsAreaEntity.getHeadline();//货区名称
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
@@ -1615,6 +1620,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("#################moveAllocationScanAllocation: 货区信息不存在 goodsAreaId={}",goodsAreaId);
 			throw new CustomerException(403,"货区信息不存在");
 		}
+		String areaType = basicdataGoodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################moveAllocationScanAllocation: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
+
 		Long wid = basicdataGoodsAreaEntity.getWarehouseId();
 		String goodsAreaName = basicdataGoodsAreaEntity.getHeadline();//货区名称
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
index 659c8a8e9..ef5afd1dc 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
@@ -452,7 +452,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		Date date = new Date();
 		warehouseWaybill.setCreateTime(date);
 		warehouseWaybill.setUpdateTime(date);
-		warehouseWaybillMapper.insert(warehouseWaybill);
+		save(warehouseWaybill);
 		return warehouseWaybill;
 
 	}