From 61415aa489c27e7385648a92ece2dbb3063ff189 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 13 Feb 2023 13:42:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=AD=89=E6=8E=A5=E5=8F=A3=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 4 +-- .../basic/BasicBusTypePreController.java | 6 +++++ .../entity/basic/BasicBusTypePreEntity.java | 2 +- .../req/basic/FilterBusTypeChangeRequest.java | 5 ++++ .../basic/IBasicBusTypePreService.java | 9 ++++++- .../impl/BasicBusTypePreServiceImpl.java | 25 ++++++++++++++++++- .../mapper/basic/BasicBusTypePreDao.xml | 12 ++++++--- 7 files changed, 54 insertions(+), 9 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 9513e4252..1c06c4d35 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -20,12 +20,10 @@ import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.auth.InvSubWarehouseResponse; import com.glxp.api.res.auth.InvWarehouseThirdSysResponse; -import com.glxp.api.res.auth.WarehouseUserResponse; import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.service.auth.*; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.system.SystemParamConfigService; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -299,6 +297,8 @@ public class InvWarehouseController extends BaseController { if (!warehouseBussinessTypeEntities.isEmpty()) { return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); } + + // // //判断此分库中是否还有库存 // InvWarehouseEntity invSubWarehouse = invWarehouseService.findById(deleteRequest.getId()); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index 7d1a86d83..4de2c324d 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -182,6 +182,12 @@ public class BasicBusTypePreController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (basicBusTypePreEntity != null) { + //判断是否重复添加 + boolean result = basicBusTypePreService.checkExists(basicBusTypePreEntity); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加！"); + } + if (StrUtil.isNotBlank(basicBusTypePreEntity.getDefaultInvCode())) { InvWarehouseEntity invWarehouse = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getDefaultInvCode()); basicBusTypePreEntity.setDefaultDeptCode(invWarehouse.getParentId()); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java index 3023e502c..fbb3eaf2a 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -85,7 +85,7 @@ public class BasicBusTypePreEntity { * 是否自动补单 */ @TableField(value = "changeEnable") - private Byte changeEnable; + private Boolean changeEnable; /** * 是否全量补单 diff --git a/src/main/java/com/glxp/api/req/basic/FilterBusTypeChangeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBusTypeChangeRequest.java index 589cec509..e6c618473 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBusTypeChangeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBusTypeChangeRequest.java @@ -29,4 +29,9 @@ public class FilterBusTypeChangeRequest extends ListPageRequest { */ private String lastUpdateTime; + /** + * 是否启用 + */ + private Boolean enable; + } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 75482700b..9c523051d 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -71,6 +71,13 @@ public interface IBasicBusTypePreService { List filterBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest); - BasicBusTypePreEntity findByOriginAction(String orginAction); + BasicBusTypePreEntity findByOriginAction(String originAction); + /** + * 校验数据是否重复 + * + * @param basicBusTypePreEntity + * @return + */ + boolean checkExists(BasicBusTypePreEntity basicBusTypePreEntity); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 43c70556a..29a9ae201 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -1,10 +1,10 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypePreDao; import com.glxp.api.entity.basic.BasicBusTypePreEntity; -import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; @@ -80,6 +80,29 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return basicBusTypePreDao.selectOne(new QueryWrapper().eq("originAction", originAction)); } + @Override + public boolean checkExists(BasicBusTypePreEntity basicBusTypePreEntity) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("action", basicBusTypePreEntity.getAction()) + .eq("originAction", basicBusTypePreEntity.getOriginAction()) + .eq("invCode", basicBusTypePreEntity.getInvCode()) + .eq(null != basicBusTypePreEntity.getBeforeTime(), "beforeTime", basicBusTypePreEntity.getBeforeTime()) + .eq(null != basicBusTypePreEntity.getDefaultInvCode(), "defaultInvCode", basicBusTypePreEntity.getDefaultInvCode()) + .eq(null != basicBusTypePreEntity.getSupplementAll(), "supplementAll", basicBusTypePreEntity.getSupplementAll()); + + List list = basicBusTypePreDao.selectList(wrapper); + if (CollUtil.isNotEmpty(list)) { + if (null != basicBusTypePreEntity.getId()) { + for (BasicBusTypePreEntity busTypePreEntity : list) { + return busTypePreEntity.getId() == basicBusTypePreEntity.getId() ? false : true; + } + } else { + return true; + } + } + return false; + } + /** * 设置创建/更新信息 * diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml index d4e221e3e..3262b6b1e 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -29,14 +29,15 @@