From 4d07895aff45e049b106e2df593985d8207ce88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Fri, 17 May 2024 12:28:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9B=BF=E6=8D=A2=E9=A1=B9=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OriginalBom/OriginalBomToEBomV2Convert.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java index d0a0dc9d..553cffc1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java @@ -141,8 +141,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { //子节点 List parentChild = bomDetail.stream().filter(u -> Objects.nonNull(u.getParentRowId()) && u.getParentRowId().equals(parentEnt.getBomRowId())).distinct().collect(Collectors.toList()); - //合并一般零部件 - mergeCommonPartBOM(parentChild); + BomNewEbomParentEntity oldEBom = ebomParentService.lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parentEnt.getMaterialNo()).last(" order by current_version desc limit 1").one(); List oldParenChild = ebomChildService.getBaseMapper().getChildByMaterialNo(parentEnt.getMaterialNo()); @@ -228,11 +227,17 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { * @param */ private void handlerChild(BomOriginalListVO parentEntity, List parentChild) { - for (BomOriginalListVO childVo : parentChild) { if (StrUtil.isBlank(childVo.getMaterialNo())) { handlerCommonMaterialForReplace(childVo); - } else if (StrUtil.isNotBlank(childVo.getMaterialNo()) && StrUtil.isNotBlank(childVo.getMaterialCategoryCode()) && childVo.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE)) { + } + } + + //合并一般零部件 + parentChild= mergeCommonPartBOM(parentChild); + + for (BomOriginalListVO childVo : parentChild) { + if (StrUtil.isNotBlank(childVo.getMaterialNo()) && StrUtil.isNotBlank(childVo.getMaterialCategoryCode()) && childVo.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE)) { //找到对应物料 BaseMaterialVO materialBaseInfo = getCommonMaterialByRel(childVo); @@ -298,6 +303,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { parentEntity.setMaterialUnit("KG"); parentEntity.setNum(parentEntity.getTotalWeight()); parentEntity.setProjectType("L"); + parentEntity.setRegReplaceIs(1); } else { parentEntity.setMaterialDesc(parentEntity.getMaterialName()); }