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 a00e6c54..857a8f02 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
@@ -86,7 +86,7 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
 
     List<BomNewEbomParentVO> getChildren(Long bomRowId, int type);
 
-    List<BomNewEbomParentVO> getBom(String materialNo, String drawingNo);
+    List<BomNewEbomParentVO> getBom(Integer state, String materialNo, String drawingNo);
 
     List<BomNewEbomParentVO> getVOById(Long parentRowId);
 
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 e440a047..8dbfe7df 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
@@ -48,7 +48,6 @@ import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
@@ -2235,7 +2234,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 .collect(Collectors.toList());
         roots.forEach(this::buildChildren);
         //从子级开始查找
-        List<BomNewEbomParentVO> boms = this.getBaseMapper().getBom(query.getMaterialNo(), query.getDrawingNo());
+        List<BomNewEbomParentVO> boms = this.getBaseMapper().getBom(0, query.getMaterialNo(), query.getDrawingNo());
         boms.removeIf(c -> Objects.equals(c.getLastVersionIs(), 0) || Objects.equals(c.getStatus(), EBomStatusEnum.PUBLISHED.getValue()));
         boms.forEach(this::buildChildren);
         roots.addAll(boms.stream().filter(b -> b.getRootIs() == 0 && b.getUserRootIs() == 0 && b.getRootIsForWaitReview() == 0).map(this::buildParent).flatMap(List::stream).collect(Collectors.toList()));
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 a54759c3..b45bd770 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
@@ -312,10 +312,15 @@
     </delete>
 
     <update id="updateStateBatchByRowIds">
-        update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now() where row_id in
+        update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now(),edit_status=2,exception_status=1
+        where row_id in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}
-        </foreach>
+        </foreach>;
+        UPDATE t_bom_new_ebom_child SET edit_status=2 WHERE parent_row_id IN
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>;
     </update>
     <update id="updateLastVersionIs">
         UPDATE t_bom_new_ebom_parent
@@ -480,6 +485,12 @@
             <if test="drawingNo!=null and drawingNo!=''">
                 AND b.drawing_no = #{drawingNo}
             </if>
+            <if test="state==0">
+                AND a.status &lt; 4
+            </if>
+            <if test="state==1">
+                AND a.status = 4
+            </if>
         </where>
         ORDER BY b.order_number
     </select>