diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index 051e0840..83798aae 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -54,9 +54,9 @@ public interface BomNewEbomParentMapper extends BaseMapper getSelfParentMaterialNo(@Param("createdBy") String createdBy ,@Param("list") Set list); - List getParentForMaterialNoSeach(@Param("materialNoList") List materialNoList); + List getParentForMaterialNoSeach(@Param("materialNoList") List materialNoList ,@Param("dataType") Integer dataType); - List getChildForMaterialNoSeach(@Param("materialNoList") List materialNoList,@Param("materialNo") String materialNo); + List getChildForMaterialNoSeach(@Param("materialNoList") List materialNoList,@Param("materialNo") String materialNo,@Param("dataType") Integer dataType ); void updateRootState(); 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 ec5263c4..b228500f 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 @@ -117,8 +117,8 @@ public class BomNewEbomParentService extends ServiceImpl parentMaterialByMaterialNo = getParentMaterialByMaterialNo(materialNo, !userRoleService.technician()).stream().collect(Collectors.toList()); parentMaterialByMaterialNo.add(materialNo); if (CollUtil.isNotEmpty(parentMaterialByMaterialNo)) { - List parents = this.getBaseMapper().getParentForMaterialNoSeach(parentMaterialByMaterialNo); - List childs = this.getBaseMapper().getChildForMaterialNoSeach(parentMaterialByMaterialNo, materialNo); + List parents = this.getBaseMapper().getParentForMaterialNoSeach(parentMaterialByMaterialNo, query.getDataType()); + List childs = this.getBaseMapper().getChildForMaterialNoSeach(parentMaterialByMaterialNo, materialNo,query.getDataType()); List data = new ArrayList<>(); data.addAll(parents); data.addAll(childs); 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 a77d4064..cec59609 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 @@ -95,7 +95,15 @@