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 byWarePcode = invWarehouseService.getByWarePcode(byWareId.getCode()); + if( byWarePcode.size()>0){ + return ResultVOUtils.error(500, "此仓库下存在仓库无法删除!"); + } + + //判断此分库下是否有货位 List 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 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 getByWarePcode(@Param("parentCode") String parentCode); + + List 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 getByWarePcode(String parentCode) { + return invWarehouseDao.getByWarePcode(parentCode); + } + @Override public List 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