From e90c7c28184481f69da2fb58ebf0017ed4af942c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Tue, 28 May 2024 20:45:53 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=91=E8=B4=A7=E6=96=87=E6=A1=88?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/VirtualPackageTypeEnum.java | 12 ++++++------ .../service/BomNewEbomParentService.java | 18 +++++++++--------- .../service/domain/EBom/EBomToPBomFor31.java | 4 ++-- .../service/domain/EBom/EBomToPbomBase.java | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java index 0c454188..8e9facb8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java @@ -9,18 +9,18 @@ import lombok.Getter; public enum VirtualPackageTypeEnum implements ValueEnum{ //1-发货包 2-制作包 4-直发包 8-发货前装配包 - UN_VIRTUAL_PACKAGE(0,"非虚拟包","" ,"", "",""), - DELIVERY_PACKAGE(1,"发货包","发货" ,"201101", "","(发货)"), - MAKING_PACKAGE(2,"制作包","制作","201101","","(制作)"), - DIRECT_DELIVERY_PACKAGE(4,"直发包","直发","201101","F","(直发)"), - PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","200601","Z","(发货前装配)"); + UN_VIRTUAL_PACKAGE(0,"非虚拟包","" ,"", "",0), + DELIVERY_PACKAGE(1,"发货包","发货" ,"201101", "",1), + MAKING_PACKAGE(2,"制作包","制作","201101","",2), + DIRECT_DELIVERY_PACKAGE(4,"直发包","直发","201101","F",4), + PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","200601","Z",8); private final Integer value; private final String description; private final String conMaterialName; private final String materialCategoryCode; private final String productTypeKey; - private final String findConMaterialName; + private final Integer virtualPartType; public static Integer getAll(){ 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 5c92ae98..94e70b0f 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 @@ -859,15 +859,15 @@ public class BomNewEbomParentService extends ServiceImpl list = pBomParentService.lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo()).eq(BomNewPbomParentEntity::getCurrentVersion, parent.getCurrentVersion()) - .select(BomNewPbomParentEntity::getFacCode).list(); - if(CollUtil.isNotEmpty(list)){ - Set dbExistsFac = list.stream().map(u -> u.getFacCode()).collect(Collectors.toSet()); - Set checkResultFac = Sets.intersection(dbExistsFac, new HashSet<>(paramDto.getFacCodes())); - VUtils.isTure(CollUtil.isNotEmpty(checkResultFac)).throwMessage("物料："+parent.getMaterialNo()+"已经转换过"+ StrUtil.join(",", checkResultFac)+"工厂"); - } - } +// for (BomNewEbomParentEntity parent : parents){ +// List list = pBomParentService.lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo()).eq(BomNewPbomParentEntity::getCurrentVersion, parent.getCurrentVersion()) +// .select(BomNewPbomParentEntity::getFacCode).list(); +// if(CollUtil.isNotEmpty(list)){ +// Set dbExistsFac = list.stream().map(u -> u.getFacCode()).collect(Collectors.toSet()); +// Set checkResultFac = Sets.intersection(dbExistsFac, new HashSet<>(paramDto.getFacCodes())); +// VUtils.isTure(CollUtil.isNotEmpty(checkResultFac)).throwMessage("物料："+parent.getMaterialNo()+"已经转换过"+ StrUtil.join(",", checkResultFac)+"工厂"); +// } +// } for (Long bomRowId : paramDto.getBomRowIds()) { BomNewEbomParentVO parent = Convert.convert(BomNewEbomParentVO.class, this.getById(bomRowId)); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java index 4d8ce114..eb57efb7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java @@ -44,7 +44,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase { this.facCodes=new ArrayList<>(); //1020数据 List data1020=new ArrayList<>(); - List deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("(发货)")).collect(Collectors.toList()); + List deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃") ).collect(Collectors.toList()); if(CollUtil.isNotEmpty(deliveryPackage1020)){ facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020); data1020.add(parent); @@ -58,7 +58,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase { //1010 数据 List data1010=new ArrayList<>(); - List deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && !u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("(发货)")).collect(Collectors.toList()); + List deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && !u.getMaterialName().contains("仙桃")).collect(Collectors.toList()); if(CollUtil.isNotEmpty(deliveryPackage1010)){ facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010); data1010.add(parent); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index 157af8bf..b4eac712 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -349,7 +349,7 @@ public abstract class EBomToPbomBase { private BomNewEbomParentVO getLastVirtualPackage(BomNewEbomParentVO vo, VirtualPackageTypeEnum virtualPackageTypeEnum) { - List zhiFaList = allBomDetail.stream().filter(u -> vo.getLevelNumber().compareTo(u.getLevelNumber()) > 0 && u.getMaterialName().contains(virtualPackageTypeEnum.getConMaterialName())).collect(Collectors.toList()); + List zhiFaList = allBomDetail.stream().filter(u -> vo.getLevelNumber().compareTo(u.getLevelNumber()) > 0 && virtualPackageTypeEnum.getVirtualPartType().equals(u.getVirtualPartType())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(zhiFaList)) { return Collections.max(zhiFaList, Comparator.comparing(BomNewEbomParentVO::getLevelNumber)); } @@ -359,7 +359,7 @@ public abstract class EBomToPbomBase { private BomNewEbomParentVO getVirtualPackageByName(VirtualPackageTypeEnum virtualPackageTypeEnum) { - List list = allBomDetail.stream().filter(u -> u.getMaterialName().contains(virtualPackageTypeEnum.getConMaterialName())).collect(Collectors.toList()); + List list = allBomDetail.stream().filter(u -> u.getLevelNumber().compareTo(u.getLevelNumber()) > 0 && virtualPackageTypeEnum.getVirtualPartType().equals(u.getVirtualPartType())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(list)) { return list.get(0); } @@ -383,7 +383,7 @@ public abstract class EBomToPbomBase { String preAssemblyPackageLevelNo = StrUtil.isNotBlank(parentDrawingNoRe) ? StrUtil.join("-", parentDrawingNoRe, "1") : "1"; for (BomNewEbomParentVO firstLevelBom : firstLevelBoms) { - if (firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getFindConMaterialName()) || firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getFindConMaterialName())) { + if (VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getVirtualPartType().equals(firstLevelBom.getVirtualPartType()) || VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getVirtualPartType().equals(firstLevelBom.getVirtualPartType())) { firstLevelBom.setLevelNumber(levelToNum(preAssemblyPackageLevelNo)); firstLevelBom.setLevelNo(preAssemblyPackageLevelNo); continue;