diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
index 7e1128f..332b547 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
@@ -76,12 +76,20 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
     }*/
     default TaskDispatchDetailDO selectBeforeDo(TaskDispatchDetailDO taskDispatchDetailDO){
         MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
-        query.leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId)
+        query.selectAll(TaskDispatchDetailDO.class).leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId)
                 .eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1)
                 .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId())
                 .eq(TaskDispatchDetailDO::getProcedureStatus, 2);
         return selectOne(query);
     }
+    default TaskDispatchDetailDO selectNoReportBeforeDo(TaskDispatchDetailDO taskDispatchDetailDO){
+        MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(TaskDispatchDetailDO.class).leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId)
+                .eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1)
+                .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId())
+                .eq(ProcedureDO::getIsReport,0);
+        return selectOne(query);
+    }
     default PageResult<TaskDispatchDetailDO> selectPageGroup(YgjxPageReqVO pageReqVO) {
         MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
         query.select( "DATE_FORMAT(t.create_time, '%Y-%m') as yearMonth,\n" +
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
index 0768fe6..85912f9 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
@@ -369,12 +369,17 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
 //                    .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId())
 //                    .eq(TaskDispatchDetailDO::getProcedureStatus, 2)
 //            );
-            TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectBeforeDo(taskDispatchDetailDO);
-            if (taskDispatchDetailDO1 == null){
-                //查不出来上一道工序已完工就代表它没完成
-                taskDispatchDetailDO.setBeforeProcedureStatus(0);
-            }else{
+            TaskDispatchDetailDO taskDispatchDetailDO2 = taskDispatchDetailMapper.selectNoReportBeforeDo(taskDispatchDetailDO);
+            if (taskDispatchDetailDO2 != null){
                 taskDispatchDetailDO.setBeforeProcedureStatus(1);
+            }else{
+                TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectBeforeDo(taskDispatchDetailDO);
+                if (taskDispatchDetailDO1 == null){
+                    //查不出来上一道工序已完工就代表它没完成
+                    taskDispatchDetailDO.setBeforeProcedureStatus(0);
+                }else{
+                    taskDispatchDetailDO.setBeforeProcedureStatus(1);
+                }
             }
         }else{
             taskDispatchDetailDO.setBeforeProcedureStatus(1);