diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index eaba3102..5417c594 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -451,8 +451,9 @@ public class BomNewEbomParentService extends ServiceImpl= EBomStatusEnum.PUBLISHED.getValue()).throwMessage("发布PBOM之后,不能再删除~"); LogRecordContext.putVariable("bom", parent); 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 8b5285eb..89b404ec 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 @@ -429,7 +429,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); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 10ea7915..84472853 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -598,7 +598,6 @@ SELECT *, row_id AS bomRowId FROM t_bom_new_ebom_parent WHERE status = 4 - AND (root_is = 1 OR user_root_is = 1) AND sap_state > 3 AND created_by = #{userCode}