From 607ed9d581690fc4bfa3ff28c9eddeb2939ed9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 29 Feb 2024 19:30:45 +0800 Subject: [PATCH] =?UTF-8?q?bom-=E7=94=9F=E6=88=90=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/domain/EBom/EBomDetailTask.java | 2 +- .../nflg/product/bomnew/service/domain/EBom/EBomToPBom.java | 2 +- .../service/domain/OriginalBom/OriginalBomToEBomConvert.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java index e45679d7..ad82a013 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java @@ -66,7 +66,7 @@ public class EBomDetailTask extends RecursiveTask> { detailVO.setDeptName(ebomParentEntity.getDeptName()); detailVO.setDeviseName(ebomParentEntity.getDeviseName()); detailVO.setBomExist(ebomParentEntity.getBomExist()); - + detailVO.setStatus(ebomParentEntity.getStatus()); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java index 809485de..6aa6f895 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java @@ -83,7 +83,7 @@ public class EBomToPBom { check(); //bom 提层 liftingLayer(); - List parentList = result.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()); + List parentList = result.stream().filter(u -> u.getBomRowId() > 0 && u.getStatus() hasConvert=new ArrayList<>(); for (String facCode : facCodes) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java index 639d1548..2a102c74 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java @@ -96,7 +96,7 @@ public class OriginalBomToEBomConvert extends BaseConvert { //处理子级 - List bomParents = bomDetail.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()); + List bomParents = bomDetail.stream().filter(u -> u.getBomRowId() > 0 && ( OriginalStatusEnum.UN_CONVERT.equalsValue(u.getStatus()) || OriginalStatusEnum.REFERENCE.equalsValue(u.getStatus())) ).collect(Collectors.toList()); for (BomOriginalListVO childParent : bomParents) { hanlerDo(childParent); this.hasHandlerParentIds.add(childParent.getBomRowId()); @@ -315,7 +315,7 @@ public class OriginalBomToEBomConvert extends BaseConvert { if(parentMap.containsKey(parentEnt.getMaterialNo())){ return parentMap.get(parentEnt.getMaterialNo()).getRowId(); } - BomNewEbomParentEntity ebom = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parentEnt.getMaterialNo()).eq(BomNewEbomParentEntity::getLastVersionIs, 1).one(); + BomNewEbomParentEntity ebom = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parentEnt.getMaterialNo()).last(" order by current_version desc limit 1").one(); BomNewEbomParentEntity eBomParent = new BomNewEbomParentEntity(); BeanUtil.copyProperties(parentEnt, eBomParent, "materialGetType"); eBomParent.setRowId(parentEnt.getEBomRowId() > 0 ? parentEnt.getEBomRowId() : IdWorker.getId());