From 53dd3add1b959f31c0ae9813e6dc1e2931b76a32 Mon Sep 17 00:00:00 2001 From: luoliming Date: Sat, 30 Mar 2024 16:33:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/EbomApi.java | 9 +++++---- .../product/bomnew/api/user/OriginalBomApi.java | 2 +- .../bomnew/pojo/dto/EbomEditExportDTO.java | 15 +++++++++++++++ .../bomnew/service/BomNewEbomParentService.java | 17 ++++++----------- .../service/BomNewOriginalParentService.java | 2 +- .../OriginalBom/OriginalBomToEBomConvert.java | 4 ++-- 6 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EbomEditExportDTO.java 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 b81e0f1d..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 @@ -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/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index b0559018..36e4809a 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 @@ -837,17 +837,12 @@ 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(result); 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);