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

fix(ebom): 转pbom时设置source

This commit is contained in:
曹鹏飞 2024-08-06 11:50:28 +08:00
parent b193c5917f
commit 9f74fa5b19
2 changed files with 4 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/domain/EBom/EBomToPBomFor31.java
View File

@ -2,26 +2,19 @@ package com.nflg.product.bomnew.service.domain.EBom;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.enums.BooleanEnum; import com.alibaba.excel.enums.BooleanEnum;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.google.common.collect.ImmutableList; import com.nflg.product.bomnew.constant.*;
import com.nflg.product.bomnew.constant.ConvertToPBomModelEnum;
import com.nflg.product.bomnew.constant.EBomConstant;
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;
import com.nflg.product.bomnew.util.ListCommonUtil;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.nflg.product.bomnew.util.ListCommonUtil;
/** /**
* 31码转PBOM * 31码转PBOM
*/ */
@ -138,6 +131,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
childEnt.setParentRowId(parentEnt.getRowId()); childEnt.setParentRowId(parentEnt.getRowId());
childEnt.setFacCode(facCode); childEnt.setFacCode(facCode);
childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo())); childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo()));
childEnt.setSource(PbomSourceEnum.FROM_EBOM.getValue());
this.pBomChildResult.add(childEnt); this.pBomChildResult.add(childEnt);
} }
} }

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

@ -220,6 +220,7 @@ public abstract class EBomToPbomBase {
pBomParent.setDeptName(SessionUtil.getDepartName()); pBomParent.setDeptName(SessionUtil.getDepartName());
pBomParent.setDeptRowId(SessionUtil.getDepartRowId()); pBomParent.setDeptRowId(SessionUtil.getDepartRowId());
pBomParent.setCreatedBy(SessionUtil.getUserCode()); pBomParent.setCreatedBy(SessionUtil.getUserCode());
pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue());
if (Objects.nonNull(oldParent)) { if (Objects.nonNull(oldParent)) {
oldParent.setExpireEndTime(LocalDateTime.now()); oldParent.setExpireEndTime(LocalDateTime.now());
oldParent.setLastVersionIs(0); oldParent.setLastVersionIs(0);