From 64b81b88b3c9d89c3de0374d93672579cbe280f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Mon, 24 Jun 2024 19:07:37 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=813=E4=B8=AA=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/OriginalBom/BaseConvert.java | 1 + .../OriginalBomToEBomV2Convert.java | 2 + .../PlmBomToOriginalConvertV2.java | 43 ++++++++----------- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java index cf544447..69556d95 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java @@ -193,6 +193,7 @@ public abstract class BaseConvert { childEntity.setUnitWeight(parent.getUnitWeight()); childEntity.setNum(parent.getUnitWeight()); childEntity.setCreatedBy(SessionUtil.getUserCode()); + childEntity.setMaterialOriginalUnit(material.getMaterialUnit()); this.resultChild.add(childEntity); return childEntity; 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 ba90d467..7d43a4b0 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 @@ -348,6 +348,8 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { childEntity.setCreatedBy(SessionUtil.getUserCode()); childEntity.setMaterialUnit("KG"); childEntity.setProjectType("L"); + childEntity.setMaterialOriginalUnit(material.getMaterialUnit()); + childEntity.setSourceRowId(parent.getRowId().toString()); parent.setBomExist(1); // this.eBomChildResult.add(childEntity); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java index 9b8d180d..176b6982 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java @@ -111,25 +111,25 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert { } else { // 一般零部件 - if (StrUtil.isNotBlank(parent.getMaterialCategoryCode()) && parent.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE) && CollUtil.isEmpty(childs)) { - // 有物料编码，则通过规则匹配物料作为下级 - if (StrUtil.isNotBlank(parent.getMaterialNo())) { - BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum); - parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue()); - parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); - - handlerCommonMaterial(parentEntity); - } else { //无物料编码，则通过规则找物料 ，找到则替换，未找到则直接进库。ebom 再处理 - handlerCommonMaterialForReplace(parent); - BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum); - parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue()); - parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); - } - } else { +// if (StrUtil.isNotBlank(parent.getMaterialCategoryCode()) && parent.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE) && CollUtil.isEmpty(childs)) { +// // 有物料编码，则通过规则匹配物料作为下级 +// if (StrUtil.isNotBlank(parent.getMaterialNo())) { +// BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum); +// parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue()); +// parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); +// +// handlerCommonMaterial(parentEntity); +// } else { //无物料编码，则通过规则找物料 ，找到则替换，未找到则直接进库。ebom 再处理 +// handlerCommonMaterialForReplace(parent); +// BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum); +// parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue()); +// parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); +// } +// } else { BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum); parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue()); parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); - } +// } } @@ -142,16 +142,7 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert { for (BomOriginalPlmBomVO childVo : childs) { //一般零部件 if (StrUtil.isNotBlank(childVo.getMaterialCategoryCode()) && childVo.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE)) { - //通过规则- 获取子级物料 -// BomNewOriginalParentEntity originalBomForMaterial = getOriginalBomForMaterial(childVo.getChartNo()); -// List parentResultOne = this.resultParent.stream().filter(u -> u.getDrawingNo().equals(childVo.getChartNo())).collect(Collectors.toList()); -// if(StrUtil.isNotBlank(childVo.getMaterialNo())) { -// if (Objects.isNull(originalBomForMaterial) && CollUtil.isEmpty(parentResultOne)) { -// childVo.setCreatedBy(parentEntity.getCreatedBy()); -// BomNewOriginalParentEntity parentEntity1 = buildParentEntity(childVo, "", originalSourceEnum); -// handlerCommonMaterial(parentEntity1); -// } -// }else + if (StrUtil.isBlank(childVo.getMaterialNo())) { handlerCommonMaterialForReplace(childVo); }