diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 0269ba6b..45ba7a93 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -402,7 +402,8 @@ public class BomNewPbomParentService extends ServiceImpl{ item.setBomVersion(parentFormal.getCurrentVersion()); // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料,版本号显示B00 by 10002327 241101 - if(MaterialshouldBomExistUtil.checkNoNeedBom(item)){ + if(MaterialshouldBomExistUtil.checkNoNeedBom(item) || Objects.equals("T",item.getProjectType())){ item.setCurrentVersion(OriginalConstant.NO_NEED_BOM); } }); @@ -521,7 +521,7 @@ public class PBomForwardReport extends BaseForwardReport { // vo.setCreatedTime(parentFormal.getCreatedTime()); // vo.setExpireEndTime(parentFormal.getReleaseTime()); // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料,版本号显示B00 by 10002327 241101 - if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){ vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); } } @@ -561,7 +561,7 @@ public class PBomForwardReport extends BaseForwardReport { // vo.setLevelNum(1); vo.setOrderNumber(orderNum.incrementAndGet() + ""); // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料,版本号显示B00 by 10002327 241101 - if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){ vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); } }