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

bom-生成多个版本问题

This commit is contained in:
大米 2024-02-29 19:30:45 +08:00
parent 07b4f1bc17
commit 607ed9d581
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ public class EBomDetailTask extends RecursiveTask<List<BomNewEbomParentVO>> {
detailVO.setDeptName(ebomParentEntity.getDeptName()); detailVO.setDeptName(ebomParentEntity.getDeptName());
detailVO.setDeviseName(ebomParentEntity.getDeviseName()); detailVO.setDeviseName(ebomParentEntity.getDeviseName());
detailVO.setBomExist(ebomParentEntity.getBomExist()); detailVO.setBomExist(ebomParentEntity.getBomExist());
detailVO.setStatus(ebomParentEntity.getStatus());
} }
} }

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

@ -83,7 +83,7 @@ public class EBomToPBom {
check(); check();
//bom 提层 //bom 提层
liftingLayer(); liftingLayer();
List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()); List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0 && u.getStatus()<PBomStatusEnum.PUBLISH.getValue()).collect(Collectors.toList());
List<String> hasConvert=new ArrayList<>(); List<String> hasConvert=new ArrayList<>();
for (String facCode : facCodes) { for (String facCode : facCodes) {

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

@ -96,7 +96,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
//处理子级 //处理子级
List<BomOriginalListVO> bomParents = bomDetail.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()); List<BomOriginalListVO> bomParents = bomDetail.stream().filter(u -> u.getBomRowId() > 0 && ( OriginalStatusEnum.UN_CONVERT.equalsValue(u.getStatus()) || OriginalStatusEnum.REFERENCE.equalsValue(u.getStatus())) ).collect(Collectors.toList());
for (BomOriginalListVO childParent : bomParents) { for (BomOriginalListVO childParent : bomParents) {
hanlerDo(childParent); hanlerDo(childParent);
this.hasHandlerParentIds.add(childParent.getBomRowId()); this.hasHandlerParentIds.add(childParent.getBomRowId());
@ -315,7 +315,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
if(parentMap.containsKey(parentEnt.getMaterialNo())){ if(parentMap.containsKey(parentEnt.getMaterialNo())){
return parentMap.get(parentEnt.getMaterialNo()).getRowId(); return parentMap.get(parentEnt.getMaterialNo()).getRowId();
} }
BomNewEbomParentEntity ebom = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parentEnt.getMaterialNo()).eq(BomNewEbomParentEntity::getLastVersionIs, 1).one(); BomNewEbomParentEntity ebom = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parentEnt.getMaterialNo()).last(" order by current_version desc limit 1").one();
BomNewEbomParentEntity eBomParent = new BomNewEbomParentEntity(); BomNewEbomParentEntity eBomParent = new BomNewEbomParentEntity();
BeanUtil.copyProperties(parentEnt, eBomParent, "materialGetType"); BeanUtil.copyProperties(parentEnt, eBomParent, "materialGetType");
eBomParent.setRowId(parentEnt.getEBomRowId() > 0 ? parentEnt.getEBomRowId() : IdWorker.getId()); eBomParent.setRowId(parentEnt.getEBomRowId() > 0 ? parentEnt.getEBomRowId() : IdWorker.getId());