From eba677e7a497d08649abeea6c675d8d149ec544a Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 15 Mar 2024 18:18:58 +0800 Subject: [PATCH] =?UTF-8?q?Mbom=E6=90=9C=E7=B4=A2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/pojo/vo/BomNewMbomIndexVO.java | 44 +++++++++++++++++++ .../bomnew/pojo/vo/BomNewMbomMiddleVO.java | 21 +++++++++ .../service/BomNewMbomParentService.java | 14 +++++- .../service/BomNewPbomParentService.java | 9 ++++ .../mapper/master/BomNewMbomParentMapper.xml | 4 +- 5 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomIndexVO.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomIndexVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomIndexVO.java new file mode 100644 index 00000000..efcea9f7 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomIndexVO.java @@ -0,0 +1,44 @@ +package com.nflg.product.bomnew.pojo.vo; + +import cn.hutool.core.util.StrUtil; +import com.nflg.product.bomnew.constant.FactoryCodeEnum; +import com.nflg.product.bomnew.constant.MBomConstantEnum; +import com.nflg.product.bomnew.util.EnumUtils; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + +/** + * t_bom_new_mbom_parent + * + * + * @author makejava + * @since 2024-01-01 10:53:26 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="com-nflg-product-bomnew-pojo-new-vo-BomNewMbomMiddleVO") +public class BomNewMbomIndexVO implements Serializable { + + + + @ApiModelProperty(value = "主键行ID-雪花") + private String rowIds; + + + /** + * bom版本行ID,和mbom_parent表row_id关联 + */ + @ApiModelProperty(value = "bom版本行ID,和mbom_parent表row_id关联") + private Long bomRowId; + + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java index 2b49cb4a..d2737e80 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java @@ -36,6 +36,9 @@ public class BomNewMbomMiddleVO extends BaseMaterialVO implements Serializable { private Long rowId; + private String rowIds; + + /** * bom版本行ID,和mbom_parent表row_id关联 */ @@ -296,4 +299,22 @@ public class BomNewMbomMiddleVO extends BaseMaterialVO implements Serializable { private List childNodes = Collections.emptyList(); + + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + BomNewMbomMiddleVO vo = (BomNewMbomMiddleVO) o; + + return Objects.equals(rowId, vo.rowId); + } + + @Override + public int hashCode() { + return rowId != null ? rowId.hashCode() : 0; + } + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java index dfcdb40c..45e35bcd 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java @@ -22,6 +22,7 @@ import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO; import com.nflg.product.bomnew.pojo.entity.BomNewMbomParentEntity; import com.nflg.product.bomnew.pojo.query.BomNewMbomParentQuery; +import com.nflg.product.bomnew.pojo.vo.BomNewMbomIndexVO; import com.nflg.product.bomnew.pojo.vo.BomNewMbomMiddleVO; import com.nflg.product.bomnew.pojo.vo.ForwardReportVO; import com.nflg.product.bomnew.service.domain.MBom.IndexListTree; @@ -86,9 +87,18 @@ public class BomNewMbomParentService extends ServiceImpl childList = this.getBaseMapper().searchList(item.getRowId()); - SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(childList, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2); + List rowIds= new ArrayList<>(Arrays.asList(StrUtil.split(item.getRowIds(),","))); + List childList=new ArrayList<>(); + for(String rowId:rowIds) { + + List child= this.getBaseMapper().searchList(Long.valueOf(rowId)); + childList.addAll(child); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(child, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2); + } + + childList= childList .stream().distinct().collect(Collectors.toList()); + IndexListTree.listToTree(parent, childList); page.getRecords().add(parent); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 71309be2..30bd605e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -802,6 +802,15 @@ public class BomNewPbomParentService extends ServiceImpl bomRowId){ + + } + + /** * 发布MBOM diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml index 5133a16b..c0441966 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml @@ -141,9 +141,9 @@ - +