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

Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom

This commit is contained in:
jing's 2024-01-08 22:37:39 +08:00
parent be8b809c6f 55da2e01c0
commit a0409d15e5
4 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ import java.util.*;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ForkJoinTask; import java.util.concurrent.ForkJoinTask;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -425,8 +426,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
*/ */
public List<BomNewPbomParentVO> getAllBom(Long rowId, Integer countLevelNum) throws ExecutionException, InterruptedException { public List<BomNewPbomParentVO> getAllBom(Long rowId, Integer countLevelNum) throws ExecutionException, InterruptedException {
List<BomNewPbomParentVO> bomDetail = this.getBaseMapper().getParentChild(rowId); List<BomNewPbomParentVO> bomDetail = this.getBaseMapper().getParentChild(rowId);
AtomicInteger levelNum = new AtomicInteger(1);
PBomDetailTask detailTask = new PBomDetailTask(bomDetail,countLevelNum); PBomDetailTask detailTask = new PBomDetailTask(bomDetail,countLevelNum,levelNum);
ForkJoinTask<List<BomNewPbomParentVO>> submit = bomDetailPool.submit(detailTask); ForkJoinTask<List<BomNewPbomParentVO>> submit = bomDetailPool.submit(detailTask);
List<BomNewPbomParentVO> result = submit.join(); List<BomNewPbomParentVO> result = submit.join();
@ -561,7 +562,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
} }
//将PBOM改为已发布 //将PBOM改为已发布
List<Long> bomRowIds = allChild.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList()); List<Long> bomRowIds = allChild.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
rootParent.setOrderNo("订单号");
rootParent.setStatus(PBomStatusEnum.PUBLISH.getValue()); rootParent.setStatus(PBomStatusEnum.PUBLISH.getValue());
this.updateById(rootParent); this.updateById(rootParent);
if(CollUtil.isNotEmpty(bomRowIds)){ if(CollUtil.isNotEmpty(bomRowIds)){

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

@ -56,8 +56,6 @@ public class VirtualPackageFor31 extends VirtualPackageBase {
buildChild(makingPackage, deliveryPackage.getRowId(), "001", VirtualPackageTypeEnum.MAKING_PACKAGE); buildChild(makingPackage, deliveryPackage.getRowId(), "001", VirtualPackageTypeEnum.MAKING_PACKAGE);
buildChild(directDeliveryPackage, deliveryPackage.getRowId(), "002", VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE); buildChild(directDeliveryPackage, deliveryPackage.getRowId(), "002", VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE);
BomNewEbomChildEntity itemUp = new BomNewEbomChildEntity(); BomNewEbomChildEntity itemUp = new BomNewEbomChildEntity();
itemUp.setRowId(item.getRowId()); itemUp.setRowId(item.getRowId());
itemUp.setParentRowId(makingPackage.getRowId()); itemUp.setParentRowId(makingPackage.getRowId());
@ -72,16 +70,24 @@ public class VirtualPackageFor31 extends VirtualPackageBase {
} }
buildChild(preAssemblyPackage, makingPackage.getRowId(), "001", VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE); buildChild(preAssemblyPackage, makingPackage.getRowId(), "001", VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);
} }
} }
parent.setVirtrualPackageEnum(VirtualPackageTypeEnum.getAll()); parent.setVirtrualPackageEnum(getVPackageNum(parent));
this.parentResult.add(parent); this.parentResult.add(parent);
}catch (Exception ex) { }catch (Exception ex) {
throw new NflgBusinessException(STATE.BusinessError, ex.getMessage()); throw new NflgBusinessException(STATE.BusinessError, ex.getMessage());
} }
}
private Integer getVPackageNum(BomNewEbomParentEntity parent){
Integer vNum= parent.getVirtrualPackageEnum();
for ( Integer i: virtualPackageValue) {
vNum=vNum|i;
}
return vNum;
} }

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

@ -401,7 +401,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
BigDecimal numResult = BigDecimal.ZERO; BigDecimal numResult = BigDecimal.ZERO;
BigDecimal totalWeightResult = BigDecimal.ZERO; BigDecimal totalWeightResult = BigDecimal.ZERO;
for (BomOriginalListVO item : list1) { for (BomOriginalListVO item : list1) {
numResult = Objects.nonNull(item.getNum()) ? item.getNum() : BigDecimal.ZERO; numResult = NumberUtil.add(numResult, Objects.nonNull(item.getNum()) ? item.getNum() : BigDecimal.ZERO);
totalWeightResult = NumberUtil.add(totalWeightResult, item.getTotalWeight()); totalWeightResult = NumberUtil.add(totalWeightResult, item.getTotalWeight());
} }
one.setNum(numResult); one.setNum(numResult);

45
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomDetailTask.java
View File

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.RecursiveTask; import java.util.concurrent.RecursiveTask;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -34,17 +35,16 @@ public class PBomDetailTask extends RecursiveTask<List<BomNewPbomParentVO>> {
List<BomNewPbomParentVO> result = new ArrayList<>(); List<BomNewPbomParentVO> result = new ArrayList<>();
public static Integer levelNum=1; public AtomicInteger levelNum = new AtomicInteger(1);
//是否统计层级数 //是否统计层级数
private Integer countLevelState; private Integer countLevelState;
public PBomDetailTask(List<BomNewPbomParentVO> inBomDetail, Integer inCountLevelState, AtomicInteger inLevelNum) {
public PBomDetailTask(List<BomNewPbomParentVO> inBomDetail ,Integer inCountLevelState) {
bomDetail = inBomDetail; bomDetail = inBomDetail;
countLevelState=inCountLevelState; levelNum=inLevelNum;
countLevelState = inCountLevelState;
} }
@ -53,7 +53,7 @@ public class PBomDetailTask extends RecursiveTask<List<BomNewPbomParentVO>> {
* 处理BOM明细中未选择Bom版本的明细；使用最新版 * 处理BOM明细中未选择Bom版本的明细；使用最新版
*/ */
public void handlerChildBomVersionDetail() { public void handlerChildBomVersionDetail() {
List<String> materialNos = bomDetail.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo()) ).map(BomNewPbomParentVO::getMaterialNo).collect(Collectors.toList()); List<String> materialNos = bomDetail.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).map(BomNewPbomParentVO::getMaterialNo).collect(Collectors.toList());
if (CollUtil.isNotEmpty(materialNos)) { if (CollUtil.isNotEmpty(materialNos)) {
@ -82,15 +82,14 @@ public class PBomDetailTask extends RecursiveTask<List<BomNewPbomParentVO>> {
detailVO.setBomExist(ebomParentEntity.getBomExist()); detailVO.setBomExist(ebomParentEntity.getBomExist());
detailVO.setShouldBomExist(ebomParentEntity.getShouldBomExist()); detailVO.setShouldBomExist(ebomParentEntity.getShouldBomExist());
detailVO.setVirtualPackageIs(ebomParentEntity.getVirtualPackageIs()); detailVO.setVirtualPackageIs(ebomParentEntity.getVirtualPackageIs());
} } else {
else { BomNewPbomParentEntity parent = SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery().eq(BomNewPbomParentEntity::getRowId, detailVO.getParentRowId()).one();
BomNewPbomParentEntity parent= SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery().eq(BomNewPbomParentEntity::getRowId, detailVO.getParentRowId()).one();
detailVO.setDeviseUserCode(parent.getDeviseUserCode()); detailVO.setDeviseUserCode(parent.getDeviseUserCode());
detailVO.setDeviseName(parent.getDeviseName()); detailVO.setDeviseName(parent.getDeviseName());
detailVO.setDeptName(parent.getDeptName()); detailVO.setDeptName(parent.getDeptName());
detailVO.setStatus(parent.getStatus()); detailVO.setStatus(parent.getStatus());
detailVO.setEditStatus(parent.getEditStatus()); detailVO.setEditStatus(parent.getEditStatus());
detailVO.setVirtualPackageIs(parent.getVirtualPackageIs()) ; detailVO.setVirtualPackageIs(parent.getVirtualPackageIs());
} }
} }
@ -113,19 +112,19 @@ public class PBomDetailTask extends RecursiveTask<List<BomNewPbomParentVO>> {
result.addAll(bomDetail); result.addAll(bomDetail);
//标记层级 //标记层级
if(countLevelState.equals(1)){ if (countLevelState.equals(1)) {
// Integer levelNumd=levelNum.getAndAdd(1);
bomDetail.forEach(k->k.setLevelNum(levelNum)); // bomDetail.forEach(k->k.setLevelNum(levelNumd));
levelNumAdd(); levelNumSet(bomDetail);
} }
if (CollUtil.isNotEmpty(bomDetail)) { if (CollUtil.isNotEmpty(bomDetail)) {
List<Long> childBowIds = bomDetail.stream().filter(u-> u.getBomRowId() > 0).map(u->u.getBomRowId()).collect(Collectors.toList()); List<Long> childBowIds = bomDetail.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
if(CollUtil.isNotEmpty(childBowIds)) { if (CollUtil.isNotEmpty(childBowIds)) {
List<BomNewPbomChildEntity> children = SpringUtil.getBean(BomNewPbomChildService.class).lambdaQuery().in(BomNewPbomChildEntity::getParentRowId, childBowIds).list(); List<BomNewPbomChildEntity> children = SpringUtil.getBean(BomNewPbomChildService.class).lambdaQuery().in(BomNewPbomChildEntity::getParentRowId, childBowIds).list();
List<BomNewPbomParentVO> bom = Convert.toList(BomNewPbomParentVO.class,children); List<BomNewPbomParentVO> bom = Convert.toList(BomNewPbomParentVO.class, children);
PBomDetailTask task = new PBomDetailTask(bom,countLevelState); PBomDetailTask task = new PBomDetailTask(bom, countLevelState,levelNum);
task.fork(); task.fork();
bomDetail.addAll(task.join()); bomDetail.addAll(task.join());
return bomDetail; return bomDetail;
@ -135,10 +134,16 @@ public class PBomDetailTask extends RecursiveTask<List<BomNewPbomParentVO>> {
return result; return result;
} }
private synchronized void levelNumSet(List<BomNewPbomParentVO> dt) {
Integer levelNumd = levelNum.getAndIncrement();
dt.forEach(k -> k.setLevelNum(levelNumd));
public synchronized void levelNumAdd(){
levelNum++;
} }
// public synchronized void levelNumAdd(){
// levelNum.add;
// }
} }