From f675187f8148e96a294f196fe97362aad98ce500 Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Mon, 23 Dec 2024 15:07:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=89=A9=E6=96=99=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=AE=A1=E7=90=86=E4=B8=AD=E7=9A=84SIP=E5=92=8CSOP?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F=E5=92=8C?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=92=8C=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../md/controller/MdProductSipController.java | 4 +- .../md/controller/MdProductSopController.java | 4 +- .../mes/md/service/IMdProductSipService.java | 10 +++-- .../mes/md/service/IMdProductSopService.java | 10 +++-- .../md/service/impl/MdItemServiceImpl.java | 16 ++++++++ .../service/impl/MdProductSipServiceImpl.java | 38 ++++++++++++++---- .../service/impl/MdProductSopServiceImpl.java | 39 +++++++++++++++---- .../resources/mapper/md/ItemTypeMapper.xml | 20 ++++++---- 8 files changed, 108 insertions(+), 33 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdProductSipController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdProductSipController.java index f003d69..2512ad7 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdProductSipController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdProductSipController.java @@ -76,7 +76,7 @@ public class MdProductSipController extends BaseController @PostMapping public AjaxResult add(@RequestBody MdProductSip mdProductSip) { - return toAjax(mdProductSipService.insertMdProductSip(mdProductSip)); + return mdProductSipService.insertMdProductSip(mdProductSip); } /** @@ -87,7 +87,7 @@ public class MdProductSipController extends BaseController @PutMapping public AjaxResult edit(@RequestBody MdProductSip mdProductSip) { - return toAjax(mdProductSipService.updateMdProductSip(mdProductSip)); + return mdProductSipService.updateMdProductSip(mdProductSip); } /** diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdProductSopController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdProductSopController.java index e16a0a7..76c12a7 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdProductSopController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdProductSopController.java @@ -76,7 +76,7 @@ public class MdProductSopController extends BaseController @PostMapping public AjaxResult add(@RequestBody MdProductSop mdProdutSop) { - return toAjax(mdProductSopService.insertMdProductSop(mdProdutSop)); + return mdProductSopService.insertMdProductSop(mdProdutSop); } /** @@ -87,7 +87,7 @@ public class MdProductSopController extends BaseController @PutMapping public AjaxResult edit(@RequestBody MdProductSop mdProdutSop) { - return toAjax(mdProductSopService.updateMdProductSop(mdProdutSop)); + return mdProductSopService.updateMdProductSop(mdProdutSop); } /** diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdProductSipService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdProductSipService.java index 079985f..5c7a8a3 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdProductSipService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdProductSipService.java @@ -1,6 +1,8 @@ package com.ktg.mes.md.service; import java.util.List; + +import com.ktg.common.core.domain.AjaxResult; import com.ktg.mes.md.domain.MdProductSip; /** @@ -29,19 +31,19 @@ public interface IMdProductSipService /** * 新增产品SIP - * + * * @param mdProductSip 产品SIP * @return 结果 */ - public int insertMdProductSip(MdProductSip mdProductSip); + public AjaxResult insertMdProductSip(MdProductSip mdProductSip); /** * 修改产品SIP - * + * * @param mdProductSip 产品SIP * @return 结果 */ - public int updateMdProductSip(MdProductSip mdProductSip); + public AjaxResult updateMdProductSip(MdProductSip mdProductSip); /** * 批量删除产品SIP diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdProductSopService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdProductSopService.java index e250faa..b4dcbfe 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdProductSopService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdProductSopService.java @@ -1,6 +1,8 @@ package com.ktg.mes.md.service; import java.util.List; + +import com.ktg.common.core.domain.AjaxResult; import com.ktg.mes.md.domain.MdProductSop; /** @@ -29,19 +31,19 @@ public interface IMdProductSopService /** * 新增产品SOP - * + * * @param mdProdutSop 产品SOP * @return 结果 */ - public int insertMdProductSop(MdProductSop mdProductSop); + public AjaxResult insertMdProductSop(MdProductSop mdProductSop); /** * 修改产品SOP - * + * * @param mdProdutSop 产品SOP * @return 结果 */ - public int updateMdProductSop(MdProductSop mdProductSop); + public AjaxResult updateMdProductSop(MdProductSop mdProductSop); /** * 批量删除产品SOP diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdItemServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdItemServiceImpl.java index 32299aa..f5a6121 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdItemServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdItemServiceImpl.java @@ -1,5 +1,6 @@ package com.ktg.mes.md.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.ktg.common.core.domain.entity.ItemType; import com.ktg.common.exception.ServiceException; import com.ktg.common.utils.bean.BeanValidators; @@ -65,6 +66,21 @@ public class MdItemServiceImpl implements IMdItemService { for (MdItem item : itemList) { try{ + if (ObjectUtil.isEmpty(item.getItemCode())) { + failureNum++; + failureMsg.append("
" + failureNum + "、物料/产品 " + item.getItemName() + " 缺少必填项"); + continue; + } + if (ObjectUtil.isEmpty(item.getItemName())) { + failureNum++; + failureMsg.append("
" + failureNum + "、物料/产品 " + item.getItemName() + " 缺少必填项"); + continue; + } + if (ObjectUtil.isEmpty(item.getUnitOfMeasure())) { + failureNum++; + failureMsg.append("
" + failureNum + "、物料/产品 " + item.getItemName() + " 缺少必填项"); + continue; + } //物料分类是否正确 if(StringUtils.isNotNull(item.getItemTypeName())){ List types = itemTypeMapper.selectItemTypeByName(item.getItemTypeName()); diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdProductSipServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdProductSipServiceImpl.java index da1b511..e3c1f01 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdProductSipServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdProductSipServiceImpl.java @@ -1,6 +1,10 @@ package com.ktg.mes.md.service.impl; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; + +import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,33 +45,53 @@ public class MdProductSipServiceImpl implements IMdProductSipService @Override public List selectMdProductSipList(MdProductSip mdProductSip) { - return mdProductSipMapper.selectMdProductSipList(mdProductSip); + List mdProductSips = mdProductSipMapper.selectMdProductSipList(mdProductSip); + List collect = mdProductSips.stream().sorted(Comparator.comparing(MdProductSip::getOrderNum)).collect(Collectors.toList()); + return collect; } /** * 新增产品SIP - * + * * @param mdProductSip 产品SIP * @return 结果 */ @Override - public int insertMdProductSip(MdProductSip mdProductSip) + public AjaxResult insertMdProductSip(MdProductSip mdProductSip) { + // 查询当前物料下所有的SIP + MdProductSip parame = new MdProductSip(); + parame.setItemId(mdProductSip.getItemId()); + List list = mdProductSipMapper.selectMdProductSipList(parame); + for (MdProductSip item : list) { + if (item.getOrderNum() == mdProductSip.getOrderNum()) { + return AjaxResult.error("展示序号已存在"); + } + } mdProductSip.setCreateTime(DateUtils.getNowDate()); - return mdProductSipMapper.insertMdProductSip(mdProductSip); + return AjaxResult.success(mdProductSipMapper.insertMdProductSip(mdProductSip)); } /** * 修改产品SIP - * + * * @param mdProductSip 产品SIP * @return 结果 */ @Override - public int updateMdProductSip(MdProductSip mdProductSip) + public AjaxResult updateMdProductSip(MdProductSip mdProductSip) { + // 查询当前物料下所有的SIP + MdProductSip parame = new MdProductSip(); + parame.setItemId(mdProductSip.getItemId()); + List list = mdProductSipMapper.selectMdProductSipList(parame); + for (MdProductSip item : list) { + if (item.getOrderNum() == mdProductSip.getOrderNum()) { + return AjaxResult.error("展示序号已存在"); + } + } mdProductSip.setUpdateTime(DateUtils.getNowDate()); - return mdProductSipMapper.updateMdProductSip(mdProductSip); + return AjaxResult.success(mdProductSipMapper.updateMdProductSip(mdProductSip)); } /** diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdProductSopServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdProductSopServiceImpl.java index 756ec0b..cd8b4cd 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdProductSopServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdProductSopServiceImpl.java @@ -1,7 +1,12 @@ package com.ktg.mes.md.service.impl; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; + +import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.utils.DateUtils; +import com.ktg.mes.md.domain.MdProductSip; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.md.mapper.MdProductSopMapper; @@ -41,33 +46,53 @@ public class MdProductSopServiceImpl implements IMdProductSopService @Override public List selectMdProductSopList(MdProductSop mdProdutSop) { - return mdProductSopMapper.selectMdProductSopList(mdProdutSop); + List mdProductSops = mdProductSopMapper.selectMdProductSopList(mdProdutSop); + List collect = mdProductSops.stream().sorted(Comparator.comparing(MdProductSop::getOrderNum)).collect(Collectors.toList()); + return collect; } /** * 新增产品SOP - * + * * @param mdProdutSop 产品SOP * @return 结果 */ @Override - public int insertMdProductSop(MdProductSop mdProdutSop) + public AjaxResult insertMdProductSop(MdProductSop mdProdutSop) { + // 查询当前物料下所有的SOP + MdProductSop parame = new MdProductSop(); + parame.setItemId(mdProdutSop.getItemId()); + List list = mdProductSopMapper.selectMdProductSopList(mdProdutSop); + for (MdProductSop item : list) { + if (item.getOrderNum() == mdProdutSop.getOrderNum()) { + return AjaxResult.error("展示序号已存在"); + } + } mdProdutSop.setCreateTime(DateUtils.getNowDate()); - return mdProductSopMapper.insertMdProductSop(mdProdutSop); + return AjaxResult.success(mdProductSopMapper.insertMdProductSop(mdProdutSop)); } /** * 修改产品SOP - * + * * @param mdProdutSop 产品SOP * @return 结果 */ @Override - public int updateMdProductSop(MdProductSop mdProdutSop) + public AjaxResult updateMdProductSop(MdProductSop mdProdutSop) { + // 查询当前物料下所有的SOP + MdProductSop parame = new MdProductSop(); + parame.setItemId(mdProdutSop.getItemId()); + List list = mdProductSopMapper.selectMdProductSopList(mdProdutSop); + for (MdProductSop item : list) { + if (item.getOrderNum() == mdProdutSop.getOrderNum()) { + return AjaxResult.error("展示序号已存在"); + } + } mdProdutSop.setUpdateTime(DateUtils.getNowDate()); - return mdProductSopMapper.updateMdProductSop(mdProdutSop); + return AjaxResult.success(mdProductSopMapper.updateMdProductSop(mdProdutSop)); } /** diff --git a/ktg-mes/src/main/resources/mapper/md/ItemTypeMapper.xml b/ktg-mes/src/main/resources/mapper/md/ItemTypeMapper.xml index 44e6fe8..e073d1f 100644 --- a/ktg-mes/src/main/resources/mapper/md/ItemTypeMapper.xml +++ b/ktg-mes/src/main/resources/mapper/md/ItemTypeMapper.xml @@ -84,15 +84,21 @@ where item_type_name=#{itemTypeName} and parent_type_id = #{parentTypeId} limit 1 + + + + + + + + + + +