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

fix(ebom): 修复从excel导入时T项图号为空的问题

This commit is contained in:
曹鹏飞 2024-05-22 09:33:09 +08:00
parent 34fe4b7540
commit 794721e1a0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,7 +220,7 @@ public class EBomImportService {
if (Objects.isNull(dto.getNum())) { if (Objects.isNull(dto.getNum())) {
dto.setNum(BigDecimal.ONE); dto.setNum(BigDecimal.ONE);
} }
if (Objects.isNull(dto.getUnit())) { if (StrUtil.isBlank(dto.getUnit())) {
dto.setUnit("PC"); dto.setUnit("PC");
} }
} }
@ -294,7 +294,10 @@ public class EBomImportService {
List<BomNewEbomParentEntity> parents = new ArrayList<>(); List<BomNewEbomParentEntity> parents = new ArrayList<>();
List<BomNewEbomChildEntity> children = new ArrayList<>(); List<BomNewEbomChildEntity> children = new ArrayList<>();
List<String> materialNos = datas.stream().map(EbomExcelDTO::getMaterialNo).collect(Collectors.toList()); List<String> materialNos = datas.stream()
.filter(d -> !StrUtil.equals(d.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY, true))
.map(EbomExcelDTO::getMaterialNo)
.collect(Collectors.toList());
materialNos.addAll(datas.stream().map(EbomExcelDTO::getParentMaterialNo).collect(Collectors.toList())); materialNos.addAll(datas.stream().map(EbomExcelDTO::getParentMaterialNo).collect(Collectors.toList()));
materialNos = materialNos.stream().distinct().collect(Collectors.toList()); materialNos = materialNos.stream().distinct().collect(Collectors.toList());
List<BaseMaterialVO> materialBaseInfos = materialMainService.getMaterialBaseInfo(materialNos); List<BaseMaterialVO> materialBaseInfos = materialMainService.getMaterialBaseInfo(materialNos);
@ -338,7 +341,7 @@ public class EBomImportService {
.filter(m -> m.getMaterialNo().equals(child.getMaterialNo())) .filter(m -> m.getMaterialNo().equals(child.getMaterialNo()))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
if (!Objects.isNull(vo)) { if (Objects.nonNull(vo)) {
child.setMaterialCategoryCode(vo.getMaterialCategoryCode()); child.setMaterialCategoryCode(vo.getMaterialCategoryCode());
child.setMaterialName(vo.getMaterialName()); child.setMaterialName(vo.getMaterialName());
child.setDrawingNo(vo.getDrawingNo()); child.setDrawingNo(vo.getDrawingNo());
@ -379,7 +382,7 @@ public class EBomImportService {
.filter(m -> m.getMaterialNo().equals(data.getParentMaterialNo())) .filter(m -> m.getMaterialNo().equals(data.getParentMaterialNo()))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
if (!Objects.isNull(vo)) { if (Objects.nonNull(vo)) {
parent.setDrawingNo(vo.getDrawingNo()); parent.setDrawingNo(vo.getDrawingNo());
parent.setUnitWeight(vo.getMaterialWeight()); parent.setUnitWeight(vo.getMaterialWeight());
parent.setMaterialName(vo.getMaterialName()); parent.setMaterialName(vo.getMaterialName());
@ -438,7 +441,7 @@ public class EBomImportService {
.filter(m -> m.getMaterialNo().equals(materialNo)) .filter(m -> m.getMaterialNo().equals(materialNo))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
if (!Objects.isNull(vo)) { if (Objects.nonNull(vo)) {
parent.setDrawingNo(vo.getDrawingNo()); parent.setDrawingNo(vo.getDrawingNo());
parent.setUnitWeight(vo.getMaterialWeight()); parent.setUnitWeight(vo.getMaterialWeight());
parent.setMaterialName(vo.getMaterialName()); parent.setMaterialName(vo.getMaterialName());