diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/CompareReportField.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/CompareReportField.java index 27624cdc..59f73c1f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/CompareReportField.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/CompareReportField.java @@ -1,6 +1,7 @@ package com.nflg.product.bomnew.pojo.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.ttzero.excel.annotation.ExcelColumn; @@ -49,6 +50,7 @@ public class CompareReportField { //@ExcelProperty("比对结果") @MediaColumn @ExcelColumn(value="比对结果") + // @ColumnWidth(50) private File compareSymbol; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java index 2926a3d7..e6c280f7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java @@ -36,8 +36,8 @@ public class ForwardReportService { //原始BOM if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) == 0) { -// OriginalBomForwardReport originalBomForwardReport = new OriginalBomForwardReport(query); - return null; + OriginalBomForwardReport originalBomForwardReport = new OriginalBomForwardReport(query); + return originalBomForwardReport.bomVersion(); } //EBOM diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomCompareReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomCompareReport.java deleted file mode 100644 index df3ca2ad..00000000 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomCompareReport.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.nflg.product.bomnew.service.domain.OriginalBom; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.spring.SpringUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.nflg.product.base.core.exception.NflgBusinessException; -import com.nflg.product.bomnew.constant.ReportConstant; -import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity; -import com.nflg.product.bomnew.pojo.query.ReverseReportQuery; -import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO; -import com.nflg.product.bomnew.pojo.vo.ForwardReportVO; -import com.nflg.product.bomnew.pojo.vo.ReportBomVO; -import com.nflg.product.bomnew.service.BomNewOriginalParentService; -import com.nflg.product.bomnew.service.domain.BaseForwardReport; -import nflg.product.common.constant.STATE; - -import java.util.List; -import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.ForkJoinTask; - -/** - * 原始bom 比对报表统计 - */ -public class OriginalBomCompareReport { - - - -} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomForwardReport.java index e6fe63ac..ee5ce1d7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomForwardReport.java @@ -65,6 +65,17 @@ public class OriginalBomForwardReport extends BaseForwardReport { return parentFormal; } + public ReportBomVersionVO bomVersion() { + + BomNewOriginalParentEntity parentEntity= getParent(); + ReportBomVersionVO versionVO=new ReportBomVersionVO(); + versionVO.setMaterialDesc(parentEntity.getMaterialDesc()); + return versionVO; + + } + + + /** * 单层