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 532088a2..26e60dc3 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 @@ -59,7 +59,9 @@ public interface BomNewEbomParentMapper extends BaseMapper rowIds); - void updateStateBatchByRowIds(@Param("status") Integer status, String userName, @Param("list") List list); + void updateStateBatchByRowIdsParent(@Param("status") Integer status, String userName, @Param("list") List list); + + void updateStateBatchByRowIdsChild( @Param("list") List list); Integer checkIsRoot(@Param("materialNo") String materialNo); 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 5254741b..c800af6e 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 @@ -1028,7 +1028,8 @@ public class BomNewEbomParentService extends ServiceImpl bomRowIds = bomTree.stream().filter(u ->!EBomStatusEnum.PUBLISHED.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList()); if (CollUtil.isNotEmpty(eBomToPBom.getAddEBomNew())) { - this.getBaseMapper().updateStateBatchByRowIds(EBomStatusEnum.PUBLISHED.getValue(), SessionUtil.getRealName(), eBomToPBom.getAddEBomNew()); + this.getBaseMapper().updateStateBatchByRowIdsParent(EBomStatusEnum.PUBLISHED.getValue(), SessionUtil.getRealName(), eBomToPBom.getAddEBomNew()); + this.getBaseMapper().updateStateBatchByRowIdsChild(eBomToPBom.getAddEBomNew()); } //替换需覆盖的受影响的虚拟包 if(CollUtil.isNotEmpty(eBomToPBom.getUpgradeChangeResultForCover())){ 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 76d47dc8..7cef6dbf 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 @@ -310,13 +310,18 @@ ; - + update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now(),release_time=now(),release_user_name=#{userName},edit_status=2,exception_status=1 where row_id in #{item} - ; + + + + + + UPDATE t_bom_new_ebom_child SET edit_status=2 WHERE parent_row_id IN #{item}