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-03-21 09:40:04 +08:00
parent be1ef7ad69 dc84e52cdb
commit 1aa43f0ef8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,6 @@ import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewOriginalChildEntity; import com.nflg.product.bomnew.pojo.entity.BomNewOriginalChildEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity; import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity;
import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
import com.nflg.product.bomnew.pojo.vo.BomOriginalPlmBomVO; import com.nflg.product.bomnew.pojo.vo.BomOriginalPlmBomVO;
import com.nflg.product.bomnew.pojo.vo.MaterialMateVO; import com.nflg.product.bomnew.pojo.vo.MaterialMateVO;
import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.BomNewEbomParentService;
@ -112,7 +111,7 @@ public abstract class BaseConvert {
parentEntity.setMaterialDesc(material.getMaterialDesc()); parentEntity.setMaterialDesc(material.getMaterialDesc());
parentEntity.setCurrentVersion(VersionUtil.getNextVersion(preVersion)); parentEntity.setCurrentVersion(VersionUtil.getNextVersion(preVersion));
parentEntity.setNum(Convert.toBigDecimal(material.getQty()) ); parentEntity.setNum(Convert.toBigDecimal(material.getQty()) );
parentEntity.setBomExist(childs.size()>0?1:0); parentEntity.setBomExist(childs.isEmpty()?0:1);
parentEntity.setShouldBomExist(MaterialshouldBomExistUtil.checkShouldBomExist(material)?1:0); parentEntity.setShouldBomExist(MaterialshouldBomExistUtil.checkShouldBomExist(material)?1:0);
parentEntity.setLastVersionIs(1); parentEntity.setLastVersionIs(1);
parentEntity.setMaterialTexture(material.getMaterial()); parentEntity.setMaterialTexture(material.getMaterial());

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

@ -17,6 +17,7 @@ import com.nflg.product.bomnew.util.VersionUtil;
import lombok.Getter; import lombok.Getter;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -30,10 +31,10 @@ public class PBomUpgrade {
private List<BomNewPbomParentVO> allBom; private List<BomNewPbomParentVO> allBom;
@Getter @Getter
private List<BomNewPbomParentEntity> parentResult; private final List<BomNewPbomParentEntity> parentResult = new ArrayList<>();
@Getter @Getter
private List<BomNewPbomChildEntity> childResult; private final List<BomNewPbomChildEntity> childResult = new ArrayList<>();
public PBomUpgrade(BomNewPbomParentEntity root, List<BomNewPbomParentVO> allBom) { public PBomUpgrade(BomNewPbomParentEntity root, List<BomNewPbomParentVO> allBom) {