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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-06-29 14:53:45 +08:00
parent c534eaf33f 45f0c9a3ae
commit 792eec20bb
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,15 +86,17 @@ public class BomNewEbomUpgradeChangeService extends ServiceImpl<BomNewEbomUpgrad
if (CollUtil.isNotEmpty(updateImpact.getPBomParentResult())) { if (CollUtil.isNotEmpty(updateImpact.getPBomParentResult())) {
pbomParentService.saveOrUpdateBatch(updateImpact.getPBomParentResult()); pbomParentService.saveOrUpdateBatch(updateImpact.getPBomParentResult());
//新加的移到历史表
List<Long> newPBomRowIds = updateImpact.getPBomParentResult().stream().map(u -> u.getRowId()).collect(Collectors.toList());
pbomParentService.getBaseMapper().insertPBomParentToFormal(newPBomRowIds);
pbomParentService.getBaseMapper().insertPBomChildToFormal(newPBomRowIds);
} }
if (CollUtil.isNotEmpty(updateImpact.getPBomChildResult())) { if (CollUtil.isNotEmpty(updateImpact.getPBomChildResult())) {
pbomChildService.saveOrUpdateBatch(updateImpact.getPBomChildResult()); pbomChildService.saveOrUpdateBatch(updateImpact.getPBomChildResult());
} }
//旧版PBOM移动到历史表中 //新加的移到历史表
if(CollUtil.isNotEmpty(updateImpact.getNewAddPBomParentResult())){
pbomParentService.getBaseMapper().insertPBomParentToFormal(updateImpact.getNewAddPBomParentResult());
pbomParentService.getBaseMapper().insertPBomChildToFormal(updateImpact.getNewAddPBomParentResult());
}
//删除旧版PBOM移动到历史表中
if (CollUtil.isNotEmpty(updateImpact.getOldPBomList())) { if (CollUtil.isNotEmpty(updateImpact.getOldPBomList())) {
List<Long> oldPbomRowIds = updateImpact.getOldPBomList().stream().map(u -> u.getRowId()).collect(Collectors.toList()); List<Long> oldPbomRowIds = updateImpact.getOldPBomList().stream().map(u -> u.getRowId()).collect(Collectors.toList());
pbomParentService.getBaseMapper().delPBom(oldPbomRowIds); pbomParentService.getBaseMapper().delPBom(oldPbomRowIds);

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

@ -6,11 +6,12 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.conmon.util.SessionUtil;
import com.nflg.product.bomnew.constant.*; import com.nflg.product.bomnew.constant.EBomStatusEnum;
import com.nflg.product.bomnew.constant.PBomEditStatusEnum;
import com.nflg.product.bomnew.constant.PBomStatusEnum;
import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity; import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity; import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
@ -18,7 +19,6 @@ import com.nflg.product.bomnew.service.BomNewPbomChildService;
import com.nflg.product.bomnew.service.BomNewPbomParentService; import com.nflg.product.bomnew.service.BomNewPbomParentService;
import com.nflg.product.bomnew.util.BomLevelUtil; import com.nflg.product.bomnew.util.BomLevelUtil;
import com.nflg.product.bomnew.util.VersionUtil; import com.nflg.product.bomnew.util.VersionUtil;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -172,6 +172,7 @@ public class ChangeImpactUpgrade extends EBomToPbomBase {
} }
this.pBomParentResult.add(pBomParent); this.pBomParentResult.add(pBomParent);
this.newAddPBomParentResult.add(pBomParent.getRowId());
return pBomParent; return pBomParent;
} }

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

@ -48,6 +48,8 @@ public abstract class EBomToPbomBase {
@Getter @Getter
protected List<BomNewPbomParentEntity> pBomParentResult = new ArrayList<>(); protected List<BomNewPbomParentEntity> pBomParentResult = new ArrayList<>();
@Getter
protected List<Long> newAddPBomParentResult = new ArrayList<>();
@Getter @Getter
protected List<BomNewPbomChildEntity> pBomChildResult = new ArrayList<>(); protected List<BomNewPbomChildEntity> pBomChildResult = new ArrayList<>();