From 67160f8f1f08cd24bbb822f115cd56721bdf6ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 25 Apr 2024 11:46:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4ebom=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E9=9C=80=E8=A6=81=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=8E=9F=E5=A7=8Bbom=E7=9A=84=E5=AF=B9=E5=BA=94=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 3b89df67..62a9594b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -1681,10 +1681,10 @@ public class BomNewEbomParentService extends ServiceImpl rowIds = eBomDel.getRevertOBom().stream().map(BomNewEbomParentVO::getSourceRowId).collect(Collectors.toList()); - SpringUtil.getBean(BomNewOriginalParentService.class).revertBom(rowIds); - } + // if (CollectionUtil.isNotEmpty(eBomDel.getRevertOBom())) { + // List rowIds = eBomDel.getRevertOBom().stream().map(BomNewEbomParentVO::getSourceRowId).collect(Collectors.toList()); + // SpringUtil.getBean(BomNewOriginalParentService.class).revertBom(rowIds); + // } if (CollectionUtil.isNotEmpty(eBomDel.getDelEBom())) { From b34beca4f28b29b51c9193b64b531133cc3d094d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 25 Apr 2024 13:33:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E7=9B=B8=E5=90=8C=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E7=89=A9=E6=96=99=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=90=8C=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E5=88=A4=E6=96=AD=E4=B8=BA=E6=AD=A3=E5=B8=B8=EF=BC=8C?= =?UTF-8?q?=E5=90=A6=E5=88=99=E6=8F=90=E7=A4=BA=E6=95=B0=E6=8D=AE=E9=87=8D?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/CheckEBomException.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index 68deccdf..03822e61 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -158,11 +158,15 @@ public class CheckEBomException { for (String key : childMaterialMap.keySet()) { List materialGroupList = childMaterialMap.get(key); if (materialGroupList.size() > 1) { - materialGroupList.forEach(u -> { - u.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_6.getValue()); + Map> m2 = ListCommonUtil.listGroupMap(materialGroupList, BomNewEbomParentVO::getProjectType); + m2.forEach((mk, mv) -> { + if (mv.size() > 1) { + mv.forEach(u -> { + u.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_6.getValue()); + }); + } }); } - } if (ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_Q.getValue().equals(parent.getProjectType())) { List qList = child.stream().filter(u -> ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_Q.getValue().equals(u.getProjectType())).collect(Collectors.toList()); From 36e0e5c2934dc67c47aae678dd0c69b1da30a5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 25 Apr 2024 14:26:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E5=A6=82=E6=9E=9C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E5=8D=95=E4=BD=8D=E8=B7=9F=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E5=8D=95=E4=BD=8D=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=EF=BC=8C=E5=88=99=E6=8F=90=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewEbomParentService.java | 16 +++++------ .../bomnew/service/MaterialMainService.java | 5 +++- .../domain/EBom/CheckEBomException.java | 28 ++++++++++--------- .../nflg/product/bomnew/util/StringUtil.java | 6 ++++ 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 62a9594b..01438e3a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -626,14 +626,14 @@ public class BomNewEbomParentService extends ServiceImpl list, List unCheckList) { - CheckEBomException checkEBomException = new CheckEBomException(list); - checkEBomException.setUnCheckExcept(unCheckList); - checkEBomException.checkException(); - - //保存异常 - saveException(checkEBomException); - } + // public void checkBomException(List list, List unCheckList) { + // CheckEBomException checkEBomException = new CheckEBomException(list); + // checkEBomException.setUnCheckExcept(unCheckList); + // checkEBomException.checkException(); + // + // //保存异常 + // saveException(checkEBomException); + // } /** diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java index 2796ee78..0dc86b18 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java @@ -19,6 +19,7 @@ import com.nflg.product.bomnew.util.VUtils; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.function.BiConsumer; @@ -108,12 +109,14 @@ public class MaterialMainService extends ServiceImpl void intiMaterialInfo(List data , String ... ignorePropertyList) { + public List intiMaterialInfo(List data, String... ignorePropertyList) { List materialNos = data.stream().map(BaseMaterialVO::getMaterialNo).filter(StrUtil::isNotBlank).collect(Collectors.toList()); if (CollUtil.isNotEmpty(materialNos)) { List materialBaseInfos = SpringUtil.getBean(MaterialMainService.class).getMaterialBaseInfo(materialNos); intiMaterialInfo(data, materialBaseInfos, ignorePropertyList); + return materialBaseInfos; } + return Collections.emptyList(); } public void intiMaterialInfo(List data ,List materialBaseInfos, String ... ignorePropertyList) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index 03822e61..95f69909 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -14,10 +14,7 @@ import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.MaterialMainService; -import com.nflg.product.bomnew.util.BomLevelUtil; -import com.nflg.product.bomnew.util.ListCommonUtil; -import com.nflg.product.bomnew.util.TreeUtils; -import com.nflg.product.bomnew.util.VUtils; +import com.nflg.product.bomnew.util.*; import lombok.Getter; import lombok.Setter; import nflg.product.common.constant.STATE; @@ -88,28 +85,27 @@ public class CheckEBomException { */ public void initException() { //初始化物料信息 - SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(allBomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); + List materialBaseInfo = SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(allBomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); - checkException(); + checkException(materialBaseInfo); } public void initException(List unCheckException) { //初始化物料信息 - SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(allBomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); + List materialBaseInfo = SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(allBomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); this.unCheckExcept=unCheckException; - checkException(); + checkException(materialBaseInfo); } public void initException(String... ignorePropertyList) { - - SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(allBomDetail, ignorePropertyList); - checkException(); + List materialBaseInfo = SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(allBomDetail, ignorePropertyList); + checkException(materialBaseInfo); } - public void checkException() { + public void checkException(List materialBaseInfo) { for (BomNewEbomParentVO vo : allBomDetail) { // if(Objects.isNull(vo.getExceptionStatus())) { //忽略不检查的如14 @@ -118,7 +114,10 @@ public class CheckEBomException { && unCheckExcept.contains(vo.getExceptionStatus())) { continue; } - + BaseMaterialVO mainVO = materialBaseInfo.stream() + .filter(u -> StrUtil.equals(u.getMaterialNo(), vo.getMaterialNo())) + .findFirst() + .orElse(null); vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); // } if (StrUtil.isNotBlank(vo.getMaterialNo()) @@ -132,6 +131,9 @@ public class CheckEBomException { } else if (StrUtil.isBlank(vo.getProjectType()) && !Objects.equals(vo.getRootIs(), 1) && !Objects.equals(vo.getUserRootIs(), 1) && !Objects.equals(vo.getRootIsForWaitReview(), 1)) { vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_8.getValue()); + } else if ((StrUtil.equals("KG", StringUtil.toUpperCase(vo.getMaterialUnit())) && !StrUtil.equals(StringUtil.toUpperCase(vo.getMaterialUnit()), "PC")) + || (!Objects.isNull(mainVO) && !StrUtil.equals(vo.getMaterialUnit(), mainVO.getMaterialUnit()))) { + vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_12.getValue()); } else if (StrUtil.isNotBlank(vo.getNoticeNums()) && EBomExceptionStatusEnum.EXCEPT_NO_11.equalsValue(vo.getExceptionStatus())) { vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/StringUtil.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/StringUtil.java index 3bcdf746..bf9642bd 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/StringUtil.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/StringUtil.java @@ -1,5 +1,6 @@ package com.nflg.product.bomnew.util; +import cn.hutool.core.util.StrUtil; import org.apache.commons.lang3.StringUtils; /** @@ -134,4 +135,9 @@ public class StringUtil { } return count; } + + public static String toUpperCase(String str) { + if (StrUtil.isBlank(str)) return str; + return str.toUpperCase(); + } } From 515a72c325a856917b926f2ade1fc771e441c987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 25 Apr 2024 14:53:55 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E8=AE=BE=E8=AE=A1=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1=E7=9A=84?= =?UTF-8?q?=E5=BE=85=E5=A4=8D=E6=A0=B8=E5=92=8C=E5=B7=B2=E9=80=80=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/master/BomNewEbomParentMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index abf2eb34..b3043205 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -384,15 +384,15 @@