diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java index eb742cc5..068f6fb6 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java @@ -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.BomNewOriginalParentEntity; 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.MaterialMateVO; import com.nflg.product.bomnew.service.BomNewEbomParentService; @@ -112,7 +111,7 @@ public abstract class BaseConvert { parentEntity.setMaterialDesc(material.getMaterialDesc()); parentEntity.setCurrentVersion(VersionUtil.getNextVersion(preVersion)); 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.setLastVersionIs(1); parentEntity.setMaterialTexture(material.getMaterial()); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java index 443bdcca..b2a928ed 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java @@ -17,6 +17,7 @@ import com.nflg.product.bomnew.util.VersionUtil; import lombok.Getter; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -30,10 +31,10 @@ public class PBomUpgrade { private List allBom; @Getter - private List parentResult; + private final List parentResult = new ArrayList<>(); @Getter - private List childResult; + private final List childResult = new ArrayList<>(); public PBomUpgrade(BomNewPbomParentEntity root, List allBom) {