From a9fd3f2c2b058e4195174ad24facf8844659127f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 29 Apr 2023 11:17:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 11 +++++---- .../basic/BasicBusTypeChangeController.java | 2 +- .../controller/inout/ioCodeRelController.java | 3 +++ .../controller/inv/InvPlaceController.java | 3 +++ .../api/service/auth/InvWarehouseService.java | 4 +++- .../auth/impl/InvWarehouseServiceImpl.java | 6 +++++ .../basic/IBasicBusTypeChangeService.java | 4 ++++ .../impl/BasicBusTypeChangeServiceImpl.java | 24 +++++++++---------- 8 files changed, 38 insertions(+), 19 deletions(-) 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 dad64d2ad..fdf708414 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -267,13 +267,16 @@ public class InvWarehouseController extends BaseController { if (invWarehouseEntity.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + InvWarehouseEntity originEntity = invWarehouseService.findByInvSubByCode(invWarehouseEntity.getCode()); - Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode()); - if (userCount > 0) { - return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户！"); + if (!originEntity.getParentId().equals(invWarehouseEntity.getParentId()) || !originEntity.getParentCode().equals(invWarehouseEntity.getParentCode())) { + Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode()); + if (userCount > 0) { + return ResultVOUtils.error(500, "修改部门或上级仓库时,请先移除该仓库关联用户！"); + } } // 先判断是否有相同名字的仓库 - boolean checkResult = invWarehouseService.checkDuplicateName(invWarehouseEntity.getParentId(), invWarehouseEntity.getName()); + boolean checkResult = invWarehouseService.updateCheckExit(invWarehouseEntity); if (checkResult) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "仓库名称重复！"); } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java index 942b217fd..af9e37f55 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java @@ -66,7 +66,7 @@ public class BasicBusTypeChangeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - boolean result = basicBusTypeChangeService.verifyExists(basicBusTypeChangeEntity); + boolean result = basicBusTypeChangeService.insertVerifyExists(basicBusTypeChangeEntity); if (result) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); } diff --git a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java index 2bf1ba6c5..fedc25c2e 100644 --- a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java +++ b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java @@ -57,6 +57,9 @@ public class ioCodeRelController { if (StrUtil.isNotEmpty(code)) { UdiEntity udiEntity = FilterUdiUtils.getGS1Udi(code); + if (udiEntity == null) { + return ResultVOUtils.error(500, "UDI码格式错误！"); + } UdiProductEntity udiProductEntity = udiProductService.findByNameCode(udiEntity.getUdi()); if (udiProductEntity.getPackLevel() != null) { if (Integer.valueOf(udiProductEntity.getPackLevel()) > 1) { diff --git a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java index 2b7ed0884..f8ccae7aa 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inv; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; @@ -78,6 +79,8 @@ public class InvPlaceController { @GetMapping("/spms/inv/product/getInvProductInfo") private BaseResponse getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest) { List list = invPlaceService.getInvProductInfo(filterInvPlaceRequest); + if (CollUtil.isEmpty(list)) + return ResultVOUtils.error(500, "库存未找到产品信息！"); return ResultVOUtils.success(list); } 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 f57e0fb80..0d31866af 100644 --- a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java @@ -13,7 +13,7 @@ import java.util.List; public interface InvWarehouseService extends IService { - InvWarehouseEntity getByWareId( String id); + InvWarehouseEntity getByWareId(String id); List getByWarePcode(@Param("parentCode") String parentCode); @@ -42,6 +42,8 @@ public interface InvWarehouseService extends IService { public boolean checkDuplicateName(String parentId, String name); + boolean updateCheckExit(InvWarehouseEntity invWarehouseEntity); + /** * 根据分库编码，查询分库名称 * 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 91bff5a72..f5e13a9b2 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 @@ -149,6 +149,12 @@ public class InvWarehouseServiceImpl extends ServiceImpl().eq("parentId", invWarehouseEntity.getParentId()) + .eq("name", invWarehouseEntity.getName()).ne("id", invWarehouseEntity.getId())); + } + @Override public String getSubInvName(String subInvCode) { if (StrUtil.isBlank(subInvCode)) { diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java index 887e373b4..99287ecbc 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java @@ -56,4 +56,8 @@ public interface IBasicBusTypeChangeService extends IService findByLastTime(Date lastUpdateTime); + + boolean insertVerifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity); + + } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index 73c48e8b5..716fe8b10 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -68,19 +68,17 @@ public class BasicBusTypeChangeServiceImpl extends ServiceImpl list = basicBusTypeChangeDao.selectList(wrapper); - if (CollUtil.isNotEmpty(list)) { - if (null != basicBusTypeChangeEntity.getId()) { - for (BasicBusTypeChangeEntity busTypeChangeEntity : list) { - if (busTypeChangeEntity.getId() != basicBusTypeChangeEntity.getId()) { - return true; - } - } - } else { - return true; - } - } - return false; + return basicBusTypeChangeDao.exists(wrapper); + } + + + @Override + public boolean insertVerifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("originAction", basicBusTypeChangeEntity.getOriginAction()) + .eq("targetAction", basicBusTypeChangeEntity.getTargetAction()) + .eq("originName", basicBusTypeChangeEntity.getOriginName()); + return basicBusTypeChangeDao.exists(wrapper); } @Override