仓库调整

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);
-
+		if (result){
 			return R.status(result);
+		}else {
+			return R.fail("请先删除该仓库下所有资源!!!");
+		}
 	}
 
 

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,

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;