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

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

This commit is contained in:
曹鹏飞 2024-07-01 09:09:21 +08:00
parent 95121658ce 87c5567376
commit 760bea9dcc
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.nflg.product.bomnew.constant.EBomStatusEnum;
import com.nflg.product.bomnew.mapper.master.BomNewEbomUpgradeChangeMapper;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomUpgradeChangeEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomVirtualPackageCompositionEntity;
import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
import com.nflg.product.bomnew.service.domain.EBom.ChangeImpactUpgrade;
import org.springframework.stereotype.Service;
@ -17,6 +19,7 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
@ -41,6 +44,9 @@ public class BomNewEbomUpgradeChangeService extends ServiceImpl<BomNewEbomUpgrad
@Resource
BomNewEbomParentService ebomParentService;
@Resource
BomNewEbomVirtualPackageCompositionService virtualPackageCompositionService;
/**
* 删除
@ -91,6 +97,15 @@ public class BomNewEbomUpgradeChangeService extends ServiceImpl<BomNewEbomUpgrad
if (CollUtil.isNotEmpty(updateImpact.getPBomChildResult())) {
pbomChildService.saveOrUpdateBatch(updateImpact.getPBomChildResult());
}
//修改直发包-物料组成（更新虚拟包组成）
if(CollUtil.isNotEmpty(updateImpact.getVirtualPackageCompositionResult())){
virtualPackageCompositionService.getBaseMapper().deleteByMap(ImmutableMap.of("virtual_package_material_no",ent.getMaterialNo()));
List<BomNewEbomVirtualPackageCompositionEntity> comVList = updateImpact.getVirtualPackageCompositionResult().stream().filter(u -> u.getVirtualPackageMaterialNo().equals(ent.getMaterialNo())).collect(Collectors.toList());
if(CollUtil.isNotEmpty(comVList)) {
virtualPackageCompositionService.saveBatch(comVList);
}
}
//新加的移到历史表
if(CollUtil.isNotEmpty(updateImpact.getNewAddPBomParentResult())){
pbomParentService.getBaseMapper().insertPBomParentToFormal(updateImpact.getNewAddPBomParentResult());