diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
index 7b6250e..4792ff3 100644
--- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
+++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
@@ -1098,6 +1098,9 @@ public class DailyPlanController {
         if (null == list || list.isEmpty()){
             throw new RuntimeException("未找到该派工单的返工返修单");
         }
+        if (list.size() > 1){
+            throw new RuntimeException("派工单"+list.get(0).getSeqNo()+"存在多条返工返修单,请找到具体返工返修单报工");
+        }
         return R.ok().put("row",list.get(0));
     }
 
@@ -1122,4 +1125,16 @@ public class DailyPlanController {
         List<SfdcTimeHistSOSData> list = dailyPlanService.getTimeHistListForSfdc(indata);
         return R.ok().put("rows",list);
     }
+
+
+    @PostMapping("/removeRework")
+    public R removeRework(@RequestBody ReworkRecord reworkRecord){
+        reworkRecordService.removeRework(reworkRecord);
+        return R.ok("操作成功");
+    }
+    @PostMapping("/cancelRework")
+    public R cancelRework(@RequestBody ReworkRecord reworkRecord){
+        reworkRecordService.cancelRework(reworkRecord);
+        return R.ok("操作成功");
+    }
 }
diff --git a/src/main/java/com/heai/modules/production/dao/ReworkRecordMapper.java b/src/main/java/com/heai/modules/production/dao/ReworkRecordMapper.java
index af4c753..0d00d97 100644
--- a/src/main/java/com/heai/modules/production/dao/ReworkRecordMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/ReworkRecordMapper.java
@@ -40,4 +40,7 @@ public interface ReworkRecordMapper extends BaseMapper<ReworkRecord> {
     List<ReworkRecordData> selectReworkRecordData(ReworkRecordData reworkRecord);
 
     List<OperatorData> queryOperator(ReworkRecord record);
+
+    void cancelRework(ReworkRecord reworkRecord);
+
 }
diff --git a/src/main/java/com/heai/modules/production/service/ReworkRecordService.java b/src/main/java/com/heai/modules/production/service/ReworkRecordService.java
index 0f776d2..4462c97 100644
--- a/src/main/java/com/heai/modules/production/service/ReworkRecordService.java
+++ b/src/main/java/com/heai/modules/production/service/ReworkRecordService.java
@@ -24,4 +24,8 @@ public interface ReworkRecordService extends IService<ReworkRecord> {
      */
     List<ReworkRecordData> selectRework(ReworkRecordData reworkRecord);
     List<ReworkRecordData> selectRework(ReworkRecord reworkRecord);
+
+    void removeRework(ReworkRecord reworkRecord);
+
+    void cancelRework(ReworkRecord reworkRecord);
 }
diff --git a/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java
index ef7772c..911d0a2 100644
--- a/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java
@@ -100,4 +100,15 @@ public class ReworkRecordServiceImpl extends ServiceImpl<ReworkRecordMapper,Rewo
         }
         return routing;
     }
+
+
+    @Override
+    public void removeRework(ReworkRecord reworkRecord) {
+        lambdaUpdate().eq(ReworkRecord::getReworkNo,reworkRecord.getReworkNo()).remove();
+    }
+
+    @Override
+    public void cancelRework(ReworkRecord reworkRecord) {
+        baseMapper.cancelRework(reworkRecord);
+    }
 }
diff --git a/src/main/resources/mapper/production/ReworkRecordMapper.xml b/src/main/resources/mapper/production/ReworkRecordMapper.xml
index 4dd2fc8..39bb371 100644
--- a/src/main/resources/mapper/production/ReworkRecordMapper.xml
+++ b/src/main/resources/mapper/production/ReworkRecordMapper.xml
@@ -135,6 +135,9 @@
             <if test="type != null and type != ''">
                 and rw.type = #{type}
             </if>
+            <if test="reworkStatus != null and reworkStatus != ''">
+                and rw.rework_status = #{reworkStatus}
+            </if>
         </where>
     </select>
 
@@ -152,4 +155,27 @@
         where site = #{site}
           and OperatorID = #{operatorId}
     </select>
+
+    <update id="cancelRework">
+        update so_rework_record
+        set rework_status = N'返工中',
+            rework_start_date = null,
+            rework_end_date = null,
+            qualified_qty = 0,
+            missing_qty = 0,
+            qualified_weight_frame = 0,
+            missing_weight = 0,
+            die_hole_number = 0,
+            frame_weight = 0,
+            waste_edge_weight = 0,
+            theoretical_quantity = 0,
+            scrap_quantity = 0,
+            scrap_reason = '',
+            accepted_quantity = 0,
+            cause_defect = '',
+            readiness_time = 0,
+            production_time = 0,
+            remark = ''
+        where rework_no = #{reworkNo}
+    </update>
 </mapper>
\ No newline at end of file