From 30ccf28b28fb0f0eb07f02f2e77148775370077b Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Tue, 6 Jun 2023 09:54:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/controller/BasicdataWarehouseController.java | 7 +++++--
 .../logpm/basicdata/mapper/BasicdataWarehouseMapper.xml    | 1 -
 .../service/impl/BasicdataWarehouseServiceImpl.java        | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
index 9c63b1e49..7d56a6d9d 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
@@ -165,8 +165,11 @@ public class BasicdataWarehouseController extends BladeController {
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam List<String> ids) {
 		boolean result = warehouseService.removeWarehouse(ids);
-
-		return R.status(result);
+		if (result){
+			return R.status(result);
+		}else {
+			return R.fail("请先删除该仓库下所有资源!!!");
+		}
 	}
 
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml
index 91c4b8a51..e93ad46c8 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml
@@ -97,7 +97,6 @@
             abbreviation,
             linkman,
             contact_number,
-            administrative_areas,
             business_line,
             depot_base,
             money_receiving_code,
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
index f3fad7520..1af025f76 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
@@ -26,6 +26,7 @@ import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -83,13 +84,14 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 	public boolean removeWarehouse(List<String> ids) {
 //		//仓库涉及众多表，取消批量删除，这里只针对仓库下是否存在有托盘、货区、班组等下级资源
 		if (Func.isEmpty(ids)){
+			log.error("传入参数异常["+ids+"]");
 			return false;
 		}
 		boolean result = false;
 		for (String id : ids) {
 			result = SqlHelper.retBool(warehouseMapper.removeWarehouse(id));
 			if (!result){
-				throw new RuntimeException("选中仓库还存在待删除资源!!!");
+				return result;
 			}
 		}
 		return result;