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

问题修复

This commit is contained in:
luoliming 2024-03-30 16:33:43 +08:00
parent 689bdaba18
commit 53dd3add1b
6 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
View File

@ -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<BomNewEbomParentVO> 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);
}

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
View File

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

15
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EbomEditExportDTO.java Normal file
View File

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

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

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

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

@ -501,7 +501,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
// continue;
// }
LogRecordContext.putVariable("bom",parent);
LogRecordContext.putVariable("coToEbom",parent);
Long ebomRowId = IdWorker.getId();
try {

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

@ -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(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);