From 39769ee3e28282dda8c35dc07689b2ef1bf56175 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 19 Apr 2023 16:17:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/auth/InvWarehouseController.java  |  8 ++++++++
 .../java/com/glxp/api/dao/auth/InvWarehouseDao.java  |  4 ++++
 .../glxp/api/service/auth/InvWarehouseService.java   |  5 +++++
 .../service/auth/impl/InvWarehouseServiceImpl.java   | 10 ++++++++++
 .../mybatis/mapper/auth/InvWarehouseDao.xml          | 12 ++++++++++++
 5 files changed, 39 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
index 1f66dd7e..aa5ee0b4 100644
--- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
@@ -314,6 +314,14 @@ public class InvWarehouseController extends BaseController {
 //            return ResultVOUtils.error(500, "此分库存在库存，不能删除！");
 //        }
 //
+        // 判断此分库中是否还有库存
+        InvWarehouseEntity byWareId = invWarehouseService.getByWareId(deleteRequest.getId());
+        List<InvWarehouseEntity> byWarePcode = invWarehouseService.getByWarePcode(byWareId.getCode());
+        if( byWarePcode.size()>0){
+            return ResultVOUtils.error(500, "此仓库下存在仓库无法删除！");
+        }
+
+
         //判断此分库下是否有货位
         List<InvSpace> spaceList = invSpaceService.findBySubWarehouseCode(invWarehouseEntity.getCode());
         if (CollUtil.isNotEmpty(spaceList)) {
diff --git a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java
index 1dcebd8b..c3e631c8 100644
--- a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java
+++ b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java
@@ -31,6 +31,10 @@ public interface InvWarehouseDao extends BaseMapperPlus<InvWarehouseDao, InvWare
 
     boolean deleteByParentCode(@Param("code") String code);
 
+    InvWarehouseEntity getByWareId(@Param("id") String id);
+
+    List<InvWarehouseEntity> getByWarePcode(@Param("parentCode") String parentCode);
+
     /**
      * 根据parentId和分库名称统计仓库数量
      *
diff --git a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java
index ee8c001d..18fe59c1 100644
--- a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java
+++ b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java
@@ -16,6 +16,11 @@ public interface InvWarehouseService {
 
     InvWarehouseEntity selectByThrCode(String code, String thirdSys);
 
+    InvWarehouseEntity getByWareId( String id);
+
+    List<InvWarehouseEntity> getByWarePcode(@Param("parentCode") String parentCode);
+
+
 
     List<InvWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
 
diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
index 2a757879..16efbe4c 100644
--- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
@@ -54,6 +54,16 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
         return null;
     }
 
+    @Override
+    public InvWarehouseEntity getByWareId(String id) {
+        return invWarehouseDao.getByWareId(id);
+    }
+
+    @Override
+    public List<InvWarehouseEntity> getByWarePcode(String parentCode) {
+        return invWarehouseDao.getByWarePcode(parentCode);
+    }
+
     @Override
     public List<InvWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
         if (filterInvSubWarehouseRequest == null) {
diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
index 7d4400c9..a979cd35 100644
--- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
@@ -159,6 +159,18 @@
         WHERE id = #{id}
     </delete>
 
+    <select id="getByWareId"  resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+      select *
+        FROM auth_warehouse
+        WHERE id = #{id}
+    </select>
+
+    <select id="getByWarePcode"  resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+        select *
+        FROM auth_warehouse
+        WHERE parentCode = #{parentCode}
+    </select>
+
 
     <delete id="deleteByParentCode" parameterType="Map">
         DELETE