问题修复

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-编辑导出")
+            extra = "{{#exportParam.toString()}}", type = "Ebom-编辑导出")
-    public void editExportBom(@RequestBody List<BomNewEbomParentVO> list, HttpServletResponse response) throws IOException {
+    public void editExportBom(@RequestBody EbomEditExportDTO exportParam , HttpServletResponse response) throws IOException {
-        VUtils.isTure(CollectionUtil.isEmpty(list)).throwMessage("请选择要导出的物料行");
+        VUtils.isTure(CollUtil.isEmpty(exportParam.getList()) && exportParam.getBomRowId()<=0).throwMessage("请选择要导出的物料行");
-        bomNewEbomParentService.editExportBom(list, response);
+
+        bomNewEbomParentService.editExportBom(exportParam, response);
     }
 
 

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<List<ImportOriginalBomVO>> convertToEBom(@RequestBody List<Long> bomRowIds) throws ExecutionException, InterruptedException {

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<BomNewEbomParentVO> list;
+    @ApiModelProperty("bom行ID")
+    private Long bomRowId=0L;
+}

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<BomNewEbomParentMapper,
     }
 
 
-    public void editExportBom(List<BomNewEbomParentVO> list, HttpServletResponse response) throws IOException {
+    public void editExportBom(EbomEditExportDTO param, HttpServletResponse response) throws IOException {
-        final ListSheet<EbomExcelEditVO> listSheet = new ListSheet<EbomExcelEditVO>() {
+        List<BomNewEbomParentVO> result=param.getList();
-            Long n = 0L;
+        if(CollUtil.isEmpty(param.getList())){
-            Long pages = 1L;
+            result=getChild(param.getBomRowId());
-
-            @Override
-            protected List<EbomExcelEditVO> more() {
-
-                return n++ < pages ? Convert.toList(EbomExcelEditVO.class, list) : null;
         }
-        };
+        final ListSheet<EbomExcelEditVO> listSheet = new ListSheet<EbomExcelEditVO>(result);
         EecExcelUtil.eecExcel("bom列表", listSheet, response);
 
     }

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<BomNewOriginalParen
 //                continue;
 //            }
 
-            LogRecordContext.putVariable("bom",parent);
+            LogRecordContext.putVariable("coToEbom",parent);
             Long ebomRowId = IdWorker.getId();
 
             try {

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java

@@ -79,8 +79,8 @@ public class OriginalBomToEBomConvert extends BaseConvert {
         List<BomOriginalListVO> 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(ImmutableList.of(parent),"material", "materialTexture","materialName","projectType");
-        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(bomDetail, "material", "materialTexture","materialName");
+        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(bomDetail, "material", "materialTexture","materialName","projectType");
 
         SpringUtil.getBean(MaterialMainService.class).initShouldBomExist(bomDetail, BomOriginalListVO::getMaterialCategoryCode, BomOriginalListVO::setShouldBomExist, BomOriginalListVO::getMaterialGetType);