diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java index ea5e99920..ef2b7b80d 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java @@ -54,6 +54,18 @@ public class RelCodeBatchController extends BaseController { return ResultVOUtils.successMsg("添加成功!"); } + /** + * 添加拼箱 + * @param relCodeBatchRequest + * @return + */ + @RepeatSubmit() + @PostMapping("/udiwms/relCode/batch/addRelCodeSpellBox") + public BaseResponse addRelCodeSpellBox(@RequestBody @Valid List relCodeBatchRequest,BindingResult bindingResult) { + relCodeBatchService.addRelCodeSpellBox(relCodeBatchRequest); + return ResultVOUtils.successMsg("添加成功!"); + } + @GetMapping("/udiwms/relCode/batch/filter") public BaseResponse list(RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) { List relCodeBatchResponses = relCodeBatchService.filterList(relCodeBatchRequest); diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 52d735dd7..138c2503f 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -187,4 +187,14 @@ public class RelCodeBatchService extends ServiceImpl().eq(RelCodeDetail::getBatchIdFk,id)); this.removeById(id); } + + @Transactional(rollbackFor = Exception.class) + public void addRelCodeSpellBox(List relCodeBatchRequests) { + if (CollUtil.isEmpty(relCodeBatchRequests)){ + throw new JsonException("单据信息异常!"); + } + relCodeBatchRequests.forEach( item -> { + this.add(item); + }); + } } diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java index a5cf1cc97..cc3d725f8 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java @@ -1,7 +1,9 @@ package com.glxp.api.service.collect; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicProductsDao; import com.glxp.api.entity.basic.BasicProductsEntity; @@ -50,6 +52,11 @@ public class RelCodeDetailService extends ServiceImpl list = this.baseMapper.selectList(new LambdaQueryWrapper().eq(RelCodeDetail::getCurCode, curCode)); + if (CollUtil.isNotEmpty(list)){ + throw new JsonException("当前条码关联关系已被维护!"); + } if(StrUtil.isNotBlank(parentCode)){ if (parentCode.endsWith("\u001D")) { parentCode = parentCode.replace("\u001D", "");