diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java index df550ff2..3dd97b1d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java @@ -110,7 +110,7 @@ public class EbomApi extends BaseApi { @PostMapping("projectTypeInit") @ApiOperation("项目类别自动赋值") - @LogRecord(success = "项目类别自动赋值：物料编码：{{#bom.materialNo}} 版本：{{#bom.currentVersion}},操作结果:{{#_ret}}", + @LogRecord(success = "项目类别自动赋值：物料编码：{{#InitPTypeBom.materialNo}} 版本：{{#InitPTypeBom.currentVersion}},操作结果:{{#_ret}}", bizNo = "{{#bomRowIds.toString()}}", type = "项目类别自动赋值") public ResultVO projectTypeInit(@RequestBody List bomRowIds) throws ExecutionException, InterruptedException { VUtils.isTure(CollUtil.isEmpty(bomRowIds)).throwMessage("请选择要自动赋值的行"); @@ -122,7 +122,7 @@ public class EbomApi extends BaseApi { @PostMapping("generateVirtualPackage") @ApiOperation("生成虚拟包") - @LogRecord(success = "生成虚拟包：物料编码：{{#bom.materialNo}} 版本：{{#bom.currentVersion}},操作结果:{{#_ret}}", + @LogRecord(success = "生成虚拟包：物料编码：{{#gvbom.materialNo}} 版本：{{#gvbom.currentVersion}},操作结果:{{#_ret}}", bizNo = "{{#paramDto.bomRowId}}", type = "生成虚拟包") public ResultVO generateVirtualPackage(@RequestBody VirtualPackageParamDto paramDto) { VUtils.isTure(CollUtil.isEmpty(paramDto.getVirtualPackageValue())).throwMessage("请选择要生成的虚拟包"); @@ -140,7 +140,7 @@ public class EbomApi extends BaseApi { @PostMapping("convertToPBom") @ApiOperation("转PBom") - @LogRecord(success = "转PBom：物料编码：{{#bom.materialNo}} 版本：{{#bom.currentVersion}},操作结果:{{#_ret}}", + @LogRecord(success = "转PBom：物料编码：{{#CToPbom.materialNo}} 版本：{{#CToPbom.currentVersion}},操作结果:{{#_ret}}", bizNo = "{{#paramDto.bomRowIds.toString()}}", type = "转PBom") public ResultVO convertToPBom(@RequestBody EBomToPBomParamDTO paramDto) throws ExecutionException, InterruptedException { VUtils.isTure(CollUtil.isEmpty(paramDto.getBomRowIds())).throwMessage("请选择要转换的物料"); @@ -178,10 +178,11 @@ public class EbomApi extends BaseApi { @PostMapping("editExportBom") @ApiOperation("编辑导出") @LogRecord(success = "Ebom-编辑导出,操作结果:{{#_ret}}", bizNo = "", - extra = "{{#list.toString()}}", type = "Ebom-编辑导出") - public void editExportBom(@RequestBody List list, HttpServletResponse response) throws IOException { - VUtils.isTure(CollectionUtil.isEmpty(list)).throwMessage("请选择要导出的物料行"); - bomNewEbomParentService.editExportBom(list, response); + extra = "{{#exportParam.toString()}}", type = "Ebom-编辑导出") + public void editExportBom(@RequestBody EbomEditExportDTO exportParam , HttpServletResponse response) throws IOException { + VUtils.isTure(CollUtil.isEmpty(exportParam.getList()) && exportParam.getBomRowId()<=0).throwMessage("请选择要导出的物料行"); + + bomNewEbomParentService.editExportBom(exportParam, response); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java index 674aecec..62d26ba9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java @@ -154,7 +154,7 @@ public class OriginalBomApi extends BaseApi { */ @PostMapping("convertToEBom") @ApiOperation("原始BOM转Ebom") - @LogRecord(success = "删除BOM-图号：{{#bom.drawingNo}} 版本：{{#bom.currentVersion}},操作结果:{{#_ret}}", + @LogRecord(success = "删除BOM-图号：{{#coToEbom.drawingNo}} 版本：{{#coToEbom.currentVersion}},操作结果:{{#_ret}}", bizNo = "{{#bomRowIds.toString()}}" ,type = "原始BOM转Ebom") @Transactional(rollbackFor = Exception.class) public ResultVO> convertToEBom(@RequestBody List bomRowIds) throws ExecutionException, InterruptedException { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EbomEditExportDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EbomEditExportDTO.java new file mode 100644 index 00000000..174f165e --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EbomEditExportDTO.java @@ -0,0 +1,15 @@ +package com.nflg.product.bomnew.pojo.dto; + +import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class EbomEditExportDTO { + @ApiModelProperty("数据列表") + private List list; + @ApiModelProperty("bom行ID") + private Long bomRowId=0L; +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java index ef3e6c6e..fd089dcf 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java @@ -12,6 +12,7 @@ import org.ttzero.excel.annotation.ExcelColumn; import java.math.BigDecimal; import java.util.Map; +import java.util.Objects; /** * eBOM 导出模版 @@ -46,16 +47,18 @@ public class EbomExcelVO { public String getStatusName() { - return EnumUtils.getValueEnum(EBomStatusEnum.class, this.status).getDescription(); + return Objects.nonNull(this.status)? EnumUtils.getValueEnum(EBomStatusEnum.class, this.status).getDescription():""; } @ExcelColumn("异常状态") private String errorStatus; - public String getErrorStatus(){ - return EnumUtils.getValueEnum(EBomExceptionStatusEnum.class, this.status).getDescription(); - } + private Integer exceptionStatus; + public String getErrorStatus(){ + return Objects.nonNull(exceptionStatus)? EnumUtils.getValueEnum(EBomExceptionStatusEnum.class, this.getExceptionStatus()).getDescription():""; + } + diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 12d657f2..a45d178c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -41,6 +41,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.ttzero.excel.entity.ListSheet; +import org.ttzero.excel.entity.Workbook; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -436,7 +437,7 @@ public class BomNewEbomParentService extends ServiceImpl data = getBomTree(bomRowId); BomNewEbomParentVO parent = Convert.convert(BomNewEbomParentVO.class, this.getById(bomRowId)); - LogRecordContext.putVariable("bom", parent); + LogRecordContext.putVariable("InitPTypeBom", parent); //初始化物料信息 materialMainService.intiMaterialInfo(data); productTypeInitDo(parent, data); @@ -646,12 +647,10 @@ public class BomNewEbomParentService extends ServiceImpl bomTree = getBomTree(bomRowId); VUtils.isTure(CollUtil.isEmpty(bomTree)).throwMessage("该BOM不存在下级，无需转换：" + bomRowId.toString()); parent.setBomRowId(parent.getRowId()); @@ -838,34 +837,21 @@ public class BomNewEbomParentService extends ServiceImpl list, HttpServletResponse response) throws IOException { - final ListSheet listSheet = new ListSheet() { - Long n = 0L; - Long pages = 1L; - - @Override - protected List more() { - - return n++ < pages ? Convert.toList(EbomExcelEditVO.class, list) : null; - } - }; + public void editExportBom(EbomEditExportDTO param, HttpServletResponse response) throws IOException { + List result=param.getList(); + if(CollUtil.isEmpty(param.getList())){ + result=getChild(param.getBomRowId()); + } + final ListSheet listSheet = new ListSheet(Convert.toList(EbomExcelEditVO.class,result) ); EecExcelUtil.eecExcel("bom列表", listSheet, response); } public void exportBom(List bomRowIds, HttpServletResponse response) throws IOException { - final ListSheet listSheet = new ListSheet() { - Long n = 0L; - Long pages = 1L; - - @Override - protected List more() { - List child = getChildBatch(bomRowIds); - return n++ < pages ? Convert.toList(EbomExcelVO.class, child) : null; - } - }; + List child = getChildBatch(bomRowIds); + final ListSheet listSheet = new ListSheet<>(Convert.toList(EbomExcelVO.class, child)); EecExcelUtil.eecExcel("bom列表", listSheet, response); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java index 4775a037..d4daf7fb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java @@ -501,7 +501,7 @@ public class BomNewOriginalParentService extends ServiceImpl noMaterialNo = data.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList()); SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(noMaterialNo, BomOriginalListVO::getDrawingNo, BomOriginalListVO::setMaterialNo, BomOriginalListVO::setMaterialName); - SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(parent),"material", "materialTexture","materialName"); - SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(bomDetail, "material", "materialTexture","materialName"); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(parent),"material", "materialTexture","materialName","projectType"); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(bomDetail, "material", "materialTexture","materialName","projectType"); SpringUtil.getBean(MaterialMainService.class).initShouldBomExist(bomDetail, BomOriginalListVO::getMaterialCategoryCode, BomOriginalListVO::setShouldBomExist, BomOriginalListVO::getMaterialGetType);