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 d2abb7e1..cf544447 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 @@ -1,6 +1,7 @@ package com.nflg.product.bomnew.service.domain.OriginalBom; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; @@ -117,7 +118,7 @@ public abstract class BaseConvert { parentEntity.setMaterialDesc(material.getMaterialDesc()); parentEntity.setCurrentVersion(VersionUtil.getNextVersion(preVersion)); parentEntity.setNum(Convert.toBigDecimal(material.getQty()) ); - parentEntity.setBomExist(childs.isEmpty()?0:1); + parentEntity.setBomExist(CollUtil.isEmpty(childs)?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/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java index a7496dbe..c9507dcf 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java @@ -373,7 +373,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { eBomParent.setLastVersionIs(1); eBomParent.setEditStatus(EbomEditStatusEnum.HANDLER_CREATED.getValue()); //eBomParent.setModifyTime(LocalDateTime.now()); - eBomParent.setBomExist(parentEnt.getBomRowId() > 0 ? 1 : 0); +// eBomParent.setBomExist(parentEnt.getBomRowId() > 0 ? 1 : 0); eBomParent.setDeviseName(SessionUtil.getRealName()); eBomParent.setDeptName(SessionUtil.getDepartName()); eBomParent.setDeviseUserCode(SessionUtil.getUserCode());