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

pbom正式表发布电控系统优化2

This commit is contained in:
10002327 2024-09-24 20:55:38 +08:00
parent 9f2af14cea
commit 3f51dd3317
2 changed files with 10 additions and 2 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/service/BomNewEbomParentService.java
View File

@ -1000,6 +1000,13 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
//1、删掉pbom 父级的数据
List<BomNewPbomParentEntity> pbomParent = eBomToPBom.getPBomParentResult().stream().filter(p -> (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("直发")) ||
(p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("制作"))).collect(Collectors.toList());
if(!pbomParent.isEmpty()){
String m = pbomParent.stream().map(BomNewPbomParentEntity::getMaterialNo).distinct().collect(Collectors.joining(","));
OperationErrorMsgVO oem = new OperationErrorMsgVO();
oem.setPrimaryKey(m);
oem.msg = String.format("物料%s因属于电控系统直发包或制作包，仅保存EBOM，未生成PBOM数据。",m);
rList.add(oem);
}
eBomToPBom.getPBomParentResult().removeAll(pbomParent);
//2、删掉pbom 子级的数据
List<BomNewPbomChildEntity> pbomChild = eBomToPBom.getPBomChildResult().stream()
@ -1016,7 +1023,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
// }
//3、判断parent下是否有子级，如果没有的话，把parent给删除了 物料****因下级全部是F项，仅保存EBOM，未生成PBOM数据
List<BomNewPbomParentEntity> emptyChildParentList = eBomToPBom.getPBomParentResult().stream()
.filter(p -> !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
.filter(p -> !p.getMaterialDesc().contains("电控系统") && !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
.collect(Collectors.toList());
if(!emptyChildParentList.isEmpty()){
rList = emptyChildParentList.stream().map(BomNewPbomParentEntity::getMaterialNo).distinct()

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
View File

@ -2,6 +2,7 @@ package com.nflg.product.bomnew.service.domain.EBom;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.enums.BooleanEnum;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@ -97,7 +98,7 @@ public class EBomToPBom extends EBomToPbomBase {
continue;
}
List<BomNewEbomParentVO> parentList = ListCommonUtil.toDistinct(result.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()), BomNewEbomParentVO::getBomRowId);
if(EBomConstant.MAIN_FACTORY_CODE_1010.equals(facCode)){
if(EBomConstant.MAIN_FACTORY_CODE_1010.equals(facCode) && CollectionUtil.isNotEmpty(facBomDataMp.get(facCode)) ){
parentList = ListCommonUtil.toDistinct(facBomDataMp.get(facCode).stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()), BomNewEbomParentVO::getBomRowId);
}
for (BomNewEbomParentVO vo : parentList) {