From 4777dbfb4d8a1e7c827bf9818b6b38f19929582e Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 2 Feb 2023 14:30:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=89=8D=E5=90=8E=E7=AB=AF=E4=B8=8D?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=80=99=E9=80=89=E5=8D=95=E6=8D=AE=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E9=97=AE=E9=A2=98=203.=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=87=8D=E5=90=8D=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeController.java | 15 +++++++++++---- .../res/basic/BasicBussinessTypeResponse.java | 6 +++--- .../glxp/api/res/basic/CandidateRequest.java | 4 ---- .../basic/IBasicBussinessTypeService.java | 8 ++++++++ .../impl/BasicBussinessTypeServiceImpl.java | 19 +++++++++++++++++++ .../glxp/api/util/page/ListPageRequest.java | 2 +- .../mapper/basic/BasicBussinessTypeDao.xml | 2 +- 7 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 5a2fe13b..61689c54 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -119,6 +119,11 @@ public class BasicBussinessTypeController extends BaseController { } if (bussinessTypeSaveRequest != null) { + boolean exists = basicBussinessTypeService.checkBusTypeNameExists(bussinessTypeSaveRequest.getName(), null); + if (exists) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据类型名称重复！"); + } + bussinessTypeSaveRequest.setAction("SC" + CustomUtil.getId()); BasicBussinessTypeEntity basicBussinessTypeEntity = new BasicBussinessTypeEntity(); BeanUtil.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity); @@ -141,7 +146,13 @@ public class BasicBussinessTypeController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + if (bussinessTypeSaveRequest != null) { + boolean exists = basicBussinessTypeService.checkBusTypeNameExists(bussinessTypeSaveRequest.getName(), bussinessTypeSaveRequest.getId().intValue()); + if (exists) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据类型名称重复！"); + } + BasicBussinessTypeEntity basicBussinessTypeEntity = new BasicBussinessTypeEntity(); BeanUtil.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity); basicBussinessTypeService.updateBussinessType(basicBussinessTypeEntity); @@ -276,10 +287,6 @@ public class BasicBussinessTypeController extends BaseController { return ResultVOUtils.error(ResultEnum.DATA_ERROR); } List bussinessTypeEntities = basicBussinessTypeService.candidateBussinessType(candidateRequest.getMainAction()); - if (StrUtil.isNotBlank(candidateRequest.getCurAction())) { - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(candidateRequest.getCurAction()); - bussinessTypeEntities.add(bussinessTypeEntity); - } //查询补单单据类型 return ResultVOUtils.success(bussinessTypeEntities); } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index dc53b8a3..754e35c3 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -73,8 +73,8 @@ public class BasicBussinessTypeResponse { private boolean enableSupplementOrder; - private boolean checkBalacne; - private boolean secCheckBalacne; + private boolean checkBalance; + private boolean secCheckBalance; private boolean useDyCount; private boolean expireTip; @@ -82,7 +82,7 @@ public class BasicBussinessTypeResponse { private String prefix; private String localPrefix; private boolean preIn; - private boolean outTospms; + private boolean outToSpms; private boolean ullageFill; private boolean scanPreIn; private boolean vailInv; diff --git a/src/main/java/com/glxp/api/res/basic/CandidateRequest.java b/src/main/java/com/glxp/api/res/basic/CandidateRequest.java index 79ff353c..9c54a6bc 100644 --- a/src/main/java/com/glxp/api/res/basic/CandidateRequest.java +++ b/src/main/java/com/glxp/api/res/basic/CandidateRequest.java @@ -13,8 +13,4 @@ public class CandidateRequest { */ String mainAction; - /** - * 当前单据类型 - */ - String curAction; } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java index 0c4849cb..c1674d26 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java @@ -100,4 +100,12 @@ public interface IBasicBussinessTypeService { */ List filterByUser(FilterBussinessTypeRequest filterBussinessTypeRequest); + /** + * 校验单据类型名称是否重复 + * + * @param name 单据类型名称 + * @param id 单据类型ID + * @return + */ + boolean checkBusTypeNameExists(String name, Integer id); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index f2ecb3e7..53b4b499 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -163,6 +164,24 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService return basicBussinessTypeDao.selectByUser(filterBussinessTypeRequest); } + @Override + public boolean checkBusTypeNameExists(String name, Integer id) { + List list = basicBussinessTypeDao.selectList(new QueryWrapper().select("name", "id").eq("name", name).eq(null != id, "id", id)); + if (CollUtil.isEmpty(list)) { + return false; + } else { + //存在同名单据类型，校验ID是否相同，如果不相同则表示存在相同数据 + if (null != id) { + for (BasicBussinessTypeEntity basicBussinessTypeEntity : list) { + if (basicBussinessTypeEntity.getId().equals(id)) { + return false; + } + } + } + } + return true; + } + /** * 统一设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/util/page/ListPageRequest.java b/src/main/java/com/glxp/api/util/page/ListPageRequest.java index e1ca7f07..75f1f39d 100644 --- a/src/main/java/com/glxp/api/util/page/ListPageRequest.java +++ b/src/main/java/com/glxp/api/util/page/ListPageRequest.java @@ -17,7 +17,7 @@ public class ListPageRequest { @Min(value = 1, message = "分页参数不能小于1") - @Max(value = 500, message = "分页参数不能大于50") + @Max(value = 500, message = "分页参数不能大于500") private Integer limit; } diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 74c5be16..05949ebf 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -180,7 +180,7 @@ select name, action from basic_bussiness_type where mainAction = #{mainAction} - and corpType = 1 + and corpType = 3 and (supplementOrderType is null or supplementOrderType = '')