rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

原始bom描述

This commit is contained in:
jing's 2024-03-10 20:58:09 +08:00
parent 3bb1fe3eef
commit 8c87b8f058
4 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/CompareReportField.java
View File

@ -1,6 +1,7 @@
package com.nflg.product.bomnew.pojo.vo; package com.nflg.product.bomnew.pojo.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.ttzero.excel.annotation.ExcelColumn; import org.ttzero.excel.annotation.ExcelColumn;
@ -49,6 +50,7 @@ public class CompareReportField {
//@ExcelProperty("比对结果") //@ExcelProperty("比对结果")
@MediaColumn @MediaColumn
@ExcelColumn(value="比对结果") @ExcelColumn(value="比对结果")
// @ColumnWidth(50)
private File compareSymbol; private File compareSymbol;

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java
View File

@ -36,8 +36,8 @@ public class ForwardReportService {
//原始BOM //原始BOM
if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) == 0) { if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) == 0) {
// OriginalBomForwardReport originalBomForwardReport = new OriginalBomForwardReport(query); OriginalBomForwardReport originalBomForwardReport = new OriginalBomForwardReport(query);
return null; return originalBomForwardReport.bomVersion();
} }
//EBOM //EBOM

31
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomCompareReport.java
View File

@ -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 {
}

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomForwardReport.java
View File

@ -65,6 +65,17 @@ public class OriginalBomForwardReport extends BaseForwardReport {
return parentFormal; return parentFormal;
} }
public ReportBomVersionVO bomVersion() {
BomNewOriginalParentEntity parentEntity= getParent();
ReportBomVersionVO versionVO=new ReportBomVersionVO();
versionVO.setMaterialDesc(parentEntity.getMaterialDesc());
return versionVO;
}
/** /**
* 单层 * 单层