diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java
index 7299304e..75540a53 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java
@@ -96,7 +96,7 @@ public class InspectionItem extends BaseEntity {
 	 */
     public static final String COL_CODE = "CODE";
     /**
-     * 特殊类型-[1]:测厚;[2]:测硬;[3]:尺寸;
+     * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;
      */
     public static final String COL_SPECIAL_TYPE = "SPECIAL_TYPE";
 
@@ -186,7 +186,7 @@ public class InspectionItem extends BaseEntity {
 	@Schema(description = "[检验项目]编码")
 	private String code;
     /**
-     * 特殊类型-[1]:测厚;[2]:测硬;[3]:尺寸;
+     * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;
      */
     @Schema(description = "特殊类型")
     private Integer specialType;
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java
index 99bd2a8c..053cc30a 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java
@@ -95,6 +95,10 @@ public class WorkPlanItem extends BaseEntity {
 	 * [检验模板]id
 	 */
     public static final String COL_TEMPLATE_ID = "TEMPLATE_ID";
+    /**
+     * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;
+     */
+    public static final String COL_SPECIAL_TYPE = "SPECIAL_TYPE";
 
 	/**
 	 * [作业计划]id
@@ -181,4 +185,9 @@ public class WorkPlanItem extends BaseEntity {
 	 */
 	@Schema(description = "[检验模板]id")
 	private Long templateId;
+    /**
+     * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;
+     */
+    @Schema(description = "特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;")
+    private Integer specialType;
 }
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java
index 690143ad..afdec040 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java
@@ -1,13 +1,17 @@
 package org.springblade.desk.quality.pojo.request;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 /**
- * todo:
+ * ERP审理 搜索
  */
 @Data
-@EqualsAndHashCode()
-public class ReviewSheetErpSearch {
+@EqualsAndHashCode(callSuper = false)
+public class ReviewSheetErpSearch extends ReviewSheet {
 
+    @Schema(description = "责任零件")
+    private String dutyPart;
 }
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java
index 18945bf4..c18b60a7 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java
@@ -1,4 +1,13 @@
 package org.springblade.desk.quality.pojo.request;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 历史已完成车间订单 搜索
+ */
+@Data
+@EqualsAndHashCode()
 public class ReviewSheetHisWOSearch {
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java
index 54168a1f..8f59454e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java
@@ -2,6 +2,7 @@ package org.springblade.desk.basic.constant;
 
 public interface BaseRequest {
 
+    String ID = "id";
     /**
      * 创建[用户]-真名
      */
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java
index bce93ec5..4487b3bb 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java
@@ -2,17 +2,20 @@ package org.springblade.desk.quality.constant;
 
 public interface InspectionItemConst {
 
-    Integer SPECIAL_TYPE_0 = 0;
+    /**
+     * 常规
+     */
+    Integer SPECIAL_TYPE_NORMAL = 0;
     /**
      * 测厚
      */
-    Integer SPECIAL_TYPE_1 = 1;
+    Integer SPECIAL_TYPE_THICK = 1;
     /**
      * 测硬
      */
-    Integer SPECIAL_TYPE_2 = 2;
+    Integer SPECIAL_TYPE_HARD = 2;
     /**
      * 尺寸
      */
-    Integer SPECIAL_TYPE_3 = 3;
+    Integer SPECIAL_TYPE_SIZE = 3;
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java
index c9691045..7eefee86 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java
@@ -32,6 +32,7 @@ import org.springblade.desk.quality.excel.ReviewSheetExcel;
 import org.springblade.desk.quality.pojo.entity.ReviewDuty;
 import org.springblade.desk.quality.pojo.entity.ReviewFault;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
+import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch;
 import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch;
 import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch;
 import org.springblade.desk.quality.pojo.request.ReviewSheetSelfSearch;
@@ -44,6 +45,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,7 +113,7 @@ public class ReviewSheetController extends BladeController {
     @PostMapping("/listInit")
     @ApiOperationSupport(order = 20)
     @Operation(summary = "生产处置单list分页", description = "传入ReviewSheet Obj")
-    public R<IPage<ReviewSheetInitVO>> listInit(@Parameter(hidden = true) @RequestBody
+    public R<IPage<ReviewSheetInitVO>> listInit(@Parameter() @RequestBody
                                                 ReviewSheetInitSearch search, Query query) {
         Map demo = new HashMap();
         demo.put("status", ReviewSheetConst.S_INIT);
@@ -133,7 +135,7 @@ public class ReviewSheetController extends BladeController {
     @PostMapping("/listReviewRedoScrap")
     @ApiOperationSupport(order = 20)
     @Operation(summary = "返工报废审理list分页", description = "传入ReviewSheet Obj")
-    public R<IPage<ReviewSheetRedoScrapVO>> listReviewRedoScrap(@Parameter(hidden = true) @RequestBody
+    public R<IPage<ReviewSheetRedoScrapVO>> listReviewRedoScrap(@Parameter() @RequestBody
                                                                 ReviewSheetRedoScrapSearch search, Query query) {
         Map demo = new HashMap();
         QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class);
@@ -154,7 +156,7 @@ public class ReviewSheetController extends BladeController {
     @PostMapping("/listSelf")
     @ApiOperationSupport(order = 20)
     @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj")
-    public R<IPage<ReviewSheetSelfVO>> listSelf(@Parameter(hidden = true) @RequestBody
+    public R<IPage<ReviewSheetSelfVO>> listSelf(@Parameter() @RequestBody
                                                 ReviewSheetSelfSearch search, Query query) {
         Map demo = new HashMap();
         QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class);
@@ -174,9 +176,10 @@ public class ReviewSheetController extends BladeController {
     @PostMapping("/listErp")
     @ApiOperationSupport(order = 20)
     @Operation(summary = "Erplist分页", description = "传入ReviewSheet Obj")
-    public R<IPage<ReviewSheetErpVO>> listErp(@Parameter(hidden = true) @RequestParam Map<String, Object> reviewSheet,
+    public R<IPage<ReviewSheetErpVO>> listErp(@Parameter() @RequestBody ReviewSheetErpSearch search,
                                               Query query) {
-        QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class);
+        Map demo = new HashMap();
+        QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class);
         qw.eq("bizType", ReviewSheetConst.BizType.T_ERP);
         IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw);
         IPage<ReviewSheetErpVO> pagesVO = ReviewSheetErpWrapper.build().pageVO(pages);
@@ -187,6 +190,29 @@ public class ReviewSheetController extends BladeController {
         return R.data(pagesVO);
     }
 
+    @PostMapping("/getHisWOList")
+    @ApiOperationSupport(order = 20)
+    @Operation(summary = "历史已经完成的车间订单", description = "Obj")
+    public R<List<ReviewSheetHisWOVO>> getHisWOList(@Parameter() @RequestBody ReviewSheetErpSearch search,
+                                                Query query) {
+        List<ReviewSheetHisWOVO> list = new ArrayList<>();
+        list.add(new ReviewSheetHisWOVO());
+        list.add(new ReviewSheetHisWOVO());
+        return R.data(list);
+    }
+
+    @GetMapping("/sameCopyFromHiWO")
+    @ApiOperationSupport(order = 10)
+    @Operation(summary = "copy相同数据到from车间订单id", description = "传入 [车间订单]id")
+    public R sameCopyFromHiWO(@Parameter(description = "列表id") @RequestParam Long id,
+                              @Parameter(description = "车间订单Id") @RequestParam Long woId) {
+        // todo:
+        // 找到的历史审理单
+        Long rsId = 100L;
+
+        return R.success("");
+    }
+
     /**
      * [生产处置单] page分页
      */
@@ -300,8 +326,8 @@ public class ReviewSheetController extends BladeController {
     @ApiOperationSupport(order = 22)
     @Operation(summary = "内部审批", description = "")
     public R reviewSelf(@Parameter(description = "id") @RequestParam Long id,
-                    @Parameter(description = "selfReviewFlag 1 or 2") @RequestParam Integer selfReviewFlag,
-                    @Parameter(description = "memo") @RequestParam String memo) {
+                        @Parameter(description = "selfReviewFlag") @RequestParam Integer selfReviewFlag,
+                        @Parameter(description = "memo") @RequestParam String memo) {
         return service.reviewSelf(id, selfReviewFlag, memo);
     }
 
@@ -381,6 +407,4 @@ public class ReviewSheetController extends BladeController {
     public R fill(@Valid @RequestBody ReviewSheetDetailVO vo) {
         return service.fill(vo);
     }
-
-    public R getHisWO(  )
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml
index 8945a7eb..01936f64 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml
@@ -23,6 +23,7 @@
         <result column="ITEM_ID" property="itemId"/>
         <result column="STANDARD_ID" property="standardId"/>
         <result column="TEMPLATE_ID" property="templateId"/>
+        <result column="SPECIAL_TYPE" property="specialType"/>
     </resultMap>
 
     <select id="selectWorkPlanItemPage" resultMap="workPlanItemResultMap">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java
index af57da4b..19718364 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.quality.excel.ReviewDutyExcel;
 import org.springblade.desk.quality.pojo.entity.ReviewDuty;
+import org.springblade.desk.quality.pojo.entity.ReviewFault;
 import org.springblade.desk.quality.pojo.vo.ReviewDutyVO;
 import org.springblade.desk.quality.pojo.vo.ReviewFaultVO;
 
@@ -44,6 +45,7 @@ public interface IReviewDutyService extends BaseService<ReviewDuty> {
      */
     void setVOValue(ReviewDutyVO vo);
 
+    int deleteByReviewSheetId(Long reviewSheetId);
 
     /**
      * <p>方法名: listByRsId </p>
@@ -57,4 +59,6 @@ public interface IReviewDutyService extends BaseService<ReviewDuty> {
     List<ReviewDuty> listByRsId(Long rsId);
 
     List<ReviewDutyVO> listVOByRsId(Long rsId);
+
+    List<ReviewDuty> listByReviewSheetId(Long reviewSheetId);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java
index 736929f7..3d90b33f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java
@@ -43,6 +43,8 @@ public interface IReviewFaultService extends BaseService<ReviewFault> {
      */
     void setVOValue(ReviewFaultVO vo);
 
+    int deleteByReviewSheetId(Long reviewSheetId);
+
     /**
      * <p>方法名: listByRsId </p>
      * <p>方法描述: 按审理单查询 </p>
@@ -55,4 +57,6 @@ public interface IReviewFaultService extends BaseService<ReviewFault> {
     List<ReviewFault> listByRsId(Long rsId);
 
     List<ReviewFaultVO> listVOByRsId(Long rsId);
+
+    List<ReviewFault> listByReviewSheetId(Long reviewSheetId);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java
index 079ab8a2..034fd853 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java
@@ -6,11 +6,13 @@ package org.springblade.desk.quality.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Parameter;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.basic.service.en.EnBaseService;
 import org.springblade.desk.quality.excel.ReviewSheetExcel;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 import org.springblade.desk.quality.pojo.vo.*;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -39,11 +41,6 @@ public interface IReviewSheetService extends EnBaseService<ReviewSheet> {
      */
     List<ReviewSheetExcel> exportReviewSheet(Wrapper<ReviewSheet> queryWrapper);
 
-    /**
-     * VO
-     *
-     * @param vo
-     */
     void setVOValue(ReviewSheetDetailVO vo);
 
     void setRedoScrapVOValue(ReviewSheetRedoScrapVO vo);
@@ -138,4 +135,8 @@ public interface IReviewSheetService extends EnBaseService<ReviewSheet> {
     R fill(ReviewSheetDetailVO vo);
 
     R reviewSelf(Long id, Integer selfReviewFlag, String memo);
+
+    R sameCopyFromHiWO(Long id, Long woId);
+
+    ReviewSheet getOneByWoId(Long woId);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java
index f6ff0452..802ff319 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java
@@ -43,5 +43,9 @@ public interface IWorkPlanItemDetailService extends BaseService<WorkPlanItemDeta
      */
     void setVOValue(WorkPlanItemDetailVO vo);
 
+    void deleteByWorkPlanItemId(Long workPlanItemId);
+
+    List<WorkPlanItemDetail> listByWorkPlanItemId(Long workPlanItemId);
+
     List<WorkPlanItemDetailVO> listVOByWorkPlanItemId(Long workPlanItemId);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java
index ddf28fe8..f802d098 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java
@@ -22,6 +22,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.basic.constant.BaseCol;
+import org.springblade.desk.basic.constant.BaseRequest;
 import org.springblade.desk.basic.constant.BaseValue;
 import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.desk.basic.util.StatusCountMap;
@@ -35,7 +36,6 @@ import org.springblade.desk.quality.pojo.request.InspectionTaskSearch;
 import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew;
 import org.springblade.desk.quality.pojo.vo.*;
 import org.springblade.desk.quality.service.*;
-import org.springblade.desk.quality.wrapper.IndicatorYearWrapper;
 import org.springblade.desk.quality.wrapper.InspectionTaskListWrapper;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
@@ -44,7 +44,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * [检验任务] 服务实现类
@@ -169,6 +168,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         // 查询工序用到的，所有启用的检验项目。
         List<InspectionItem> itemList = null;
         {
+            // todo:实际要根据工序定义查询
             itemList = itemService.getBaseMapper().selectList(
                     new QueryWrapper<InspectionItem>()
                             .eq(BaseCol.STATUS, BaseValue.STATE_ENABLE)
@@ -192,12 +192,13 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             wpItem.setCheckQty(0d);
             wpItem.setTestQty(0d);
             wpItem.setLossQty(0d);
+            wpItem.setSpecialType(iItem.getSpecialType());
             // 新插入 WorkPlanItem
             wpItemService.save(wpItem);
-            if (InspectionItemConst.SPECIAL_TYPE_1.equals(iItem.getSpecialType())) {
+            if (InspectionItemConst.SPECIAL_TYPE_THICK.equals(iItem.getSpecialType())) {
                 // 测厚 不创建 WorkPlanItemDetail
-            } else if (InspectionItemConst.SPECIAL_TYPE_2.equals(iItem.getSpecialType()) ||
-                    InspectionItemConst.SPECIAL_TYPE_3.equals(iItem.getSpecialType())) {
+            } else if (InspectionItemConst.SPECIAL_TYPE_HARD.equals(iItem.getSpecialType()) ||
+                    InspectionItemConst.SPECIAL_TYPE_SIZE.equals(iItem.getSpecialType())) {
                 for (int i = 0; i < 4; i++) {
                     WorkPlanItemDetail wpItemDetail = new WorkPlanItemDetail();
                     wpItemDetail.setWorkPlanItemId(wpItem.getId());
@@ -267,29 +268,51 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
     }
 
     @SneakyThrows
+    @Transactional(rollbackFor = Exception.class) // todo:
     @Override
     public R sameResultCopy(Long sourceId, Long targetId) {
-        InspectionTask source = null;
-        InspectionTask target = null;
-        {
-            LambdaQueryWrapper<InspectionTask> qw1 = Wrappers.lambdaQuery();
-            qw1.eq(InspectionTask::getId, sourceId);
-            source = baseMapper.selectById(qw1);
-        }
-        {
-            LambdaQueryWrapper<InspectionTask> qw2 = Wrappers.lambdaQuery();
-            qw2.eq(InspectionTask::getId, targetId);
-            target = baseMapper.selectById(qw2);
-        }
+        InspectionTask source = getById(sourceId);
+        InspectionTask target = getById(targetId);
         log.info("source = {}", source);
         log.info("target = {}", target);
         if (source == null || target == null) {
-            return R.fail("失败");
+            return R.fail("匹配结果失败");
         }
-        // todo: copy 赋值
-        // throw new IllegalAccessException("");
+        List<WorkPlanItem> wpItemListS = wpItemService.listByTaskId(source.getId());
+        List<WorkPlanItem> wpItemListT = wpItemService.listByTaskId(target.getId());
+        int count = 0;
+        //
+        for (WorkPlanItem wpItemT : wpItemListT) {
+            for (WorkPlanItem wpItemS : wpItemListS) {
+                if (wpItemT.getItemId().equals(wpItemS.getItemId())) { // 检测项id相等
+                    // 除id外 copy值
+                    BeanUtil.copyProperties(wpItemS, wpItemT, BaseRequest.ID);
+                    // 更新
+                    wpItemService.updateById(wpItemT);
+                    //
+                    count = count + 1;
+                    if (InspectionItemConst.SPECIAL_TYPE_NORMAL.equals(wpItemT.getSpecialType())) {
+                        // 常规不考虑itemDetail
 
-        return R.success();
+                    } else {
+                        // 考虑itemDetail
+                        List<WorkPlanItemDetail> wpItemDetailList = wpItemDetailService.listByWorkPlanItemId(wpItemS.getId());
+                        // 删除已有detail列表
+                        wpItemDetailService.deleteByWorkPlanItemId(wpItemT.getId());
+                        // 插入新detail列表
+                        for (WorkPlanItemDetail wpItemDetail : wpItemDetailList) {
+                            // 去除id
+                            wpItemDetail.setId(null);
+                            // 关联item id
+                            wpItemDetail.setWorkPlanItemId(wpItemT.getId());
+                            // 新插入detail一条
+                            wpItemDetailService.save(wpItemDetail);
+                        }
+                    }
+                }
+            }
+        }
+        return R.data(count);
     }
 
     @Override
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java
index bbfe7979..68437981 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java
@@ -68,6 +68,13 @@ public class ReviewDutyServiceImpl extends BaseServiceImpl<ReviewDutyMapper, Rev
 
     }
 
+    @Override
+    public int deleteByReviewSheetId(Long reviewSheetId) {
+        LambdaQueryWrapper<ReviewDuty> qw = Wrappers.lambdaQuery(ReviewDuty.class)
+                .eq(ReviewDuty::getReviewSheetId, reviewSheetId);
+        return baseMapper.delete(qw);
+    }
+
     @Override
     public List<ReviewDuty> listByRsId(Long rsId) {
         LambdaQueryWrapper<ReviewDuty> queryWrapper = Wrappers.lambdaQuery(ReviewDuty.class)
@@ -88,4 +95,11 @@ public class ReviewDutyServiceImpl extends BaseServiceImpl<ReviewDutyMapper, Rev
         }
         return listVO;
     }
+
+    @Override
+    public List<ReviewDuty> listByReviewSheetId(Long reviewSheetId) {
+        LambdaQueryWrapper<ReviewDuty> qw = Wrappers.lambdaQuery(ReviewDuty.class);
+        qw.eq(ReviewDuty::getReviewSheetId, reviewSheetId);
+        return baseMapper.selectList(qw);
+    }
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java
index b80ed5d0..15417e30 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java
@@ -71,6 +71,13 @@ public class ReviewFaultServiceImpl extends BaseServiceImpl<ReviewFaultMapper, R
         vo.setNgType4Name(ngService.getById(vo.getNgType4Id()).getName());
     }
 
+    @Override
+    public int deleteByReviewSheetId(Long reviewSheetId) {
+        LambdaQueryWrapper<ReviewFault> queryWrapper = Wrappers.lambdaQuery(ReviewFault.class)
+                .eq(ReviewFault::getReviewSheetId, reviewSheetId);
+        return baseMapper.delete(queryWrapper);
+    }
+
     @Override
     public List<ReviewFault> listByRsId(Long rsId) {
         LambdaQueryWrapper<ReviewFault> queryWrapper = Wrappers.lambdaQuery(ReviewFault.class)
@@ -91,4 +98,12 @@ public class ReviewFaultServiceImpl extends BaseServiceImpl<ReviewFaultMapper, R
         }
         return listVO;
     }
+
+    @Override
+    public List<ReviewFault> listByReviewSheetId(Long reviewSheetId) {
+        LambdaQueryWrapper<ReviewFault> qw = Wrappers.lambdaQuery(ReviewFault.class)
+                .eq(ReviewFault::getReviewSheetId, reviewSheetId)
+                .eq(ReviewFault::getIsDeleted, CommonConstant.DELETE_FALSE);
+        return baseMapper.selectList(qw);
+    }
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
index c726d6fc..baadff93 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
@@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.exception.BusinessException;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.basic.constant.BaseRequest;
 import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl;
 import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.desk.quality.constant.InspectionTaskConst;
@@ -251,6 +252,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
 
     @Override
     public R reviewSelf(Long id, Integer selfReviewFlag, String memo) {
+        // 参数校验
         if (!ReviewSheetConst.SELF_REVIEW_FLAG.YES.equals(selfReviewFlag) &&
                 !ReviewSheetConst.SELF_REVIEW_FLAG.NO.equals(selfReviewFlag)) {
             return R.fail("selfReviewFlag value error");
@@ -263,6 +265,43 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
         return R.success();
     }
 
+    @Override
+    public R sameCopyFromHiWO(Long id, Long woId) {
+        ReviewSheet rsS = getOneByWoId(woId);
+        ReviewSheet rsT = getById(id);
+        if (rsS == null || rsT == null) {
+            return R.fail("");
+        }
+        //
+        faultService.deleteByReviewSheetId(rsT.getId());
+        dutyService.deleteByReviewSheetId(rsS.getId());
+        //
+        List<ReviewFault> listF = faultService.listByReviewSheetId(rsS.getId());
+        for (ReviewFault oneF : listF) {
+            oneF.setId(null);
+            oneF.setReviewSheetId(rsT.getId());
+            faultService.saveOrUpdate(oneF);
+        }
+        //
+        List<ReviewDuty> listD = dutyService.listByReviewSheetId(rsT.getId());
+        for (ReviewDuty oneD : listD) {
+            oneD.setId(null);
+            oneD.setReviewSheetId(rsT.getId());
+            dutyService.saveOrUpdate(oneD);
+        }
+        // 更新rs
+        BeanUtil.copyProperties(rsS, rsT, BaseRequest.ID);
+        updateById(rsT);
+        return R.success();
+    }
+
+    @Override
+    public ReviewSheet getOneByWoId(Long woId) {
+        LambdaQueryWrapper<ReviewSheet> qw = Wrappers.lambdaQuery();
+        qw.eq(ReviewSheet::getWoId, woId);
+        return baseMapper.selectOne(qw);
+    }
+
     @Override
     public ReviewSheet getByRsCode(String rsCode) {
         LambdaQueryWrapper<ReviewSheet> qw = Wrappers.lambdaQuery();
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java
index e0ead8fb..6ed27b46 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java
@@ -39,7 +39,8 @@ import java.util.List;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
-public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl<WorkPlanItemDetailMapper, WorkPlanItemDetail> implements IWorkPlanItemDetailService {
+public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl<WorkPlanItemDetailMapper, WorkPlanItemDetail>
+        implements IWorkPlanItemDetailService {
 
     @Resource
     private IUserClient userClient;
@@ -65,6 +66,21 @@ public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl<WorkPlanItemD
 
     }
 
+    @Override
+    public void deleteByWorkPlanItemId(Long workPlanItemId) {
+        LambdaQueryWrapper<WorkPlanItemDetail> qw = Wrappers.lambdaQuery();
+        qw.eq(WorkPlanItemDetail::getWorkPlanItemId, workPlanItemId);
+        baseMapper.delete(qw);
+    }
+
+    @Override
+    public List<WorkPlanItemDetail> listByWorkPlanItemId(Long workPlanItemId) {
+        LambdaQueryWrapper<WorkPlanItemDetail> qw = Wrappers.lambdaQuery();
+        qw.eq(WorkPlanItemDetail::getWorkPlanItemId, workPlanItemId);
+        qw.orderByAsc(WorkPlanItemDetail::getId);
+        return list(qw);
+    }
+
     @Override
     public List<WorkPlanItemDetailVO> listVOByWorkPlanItemId(Long workPlanItemId) {
         LambdaQueryWrapper<WorkPlanItemDetail> qw = Wrappers.lambdaQuery();
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java
index 38876106..17eb9f79 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java
@@ -13,7 +13,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.desk.quality.constant.InspectionItemConst;
@@ -38,7 +37,6 @@ import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * [工序检验项] 服务实现类
@@ -102,9 +100,9 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
             vo.setStandard(standardVO);
         }
         if (vo.getItem() != null && vo.getItem().getSpecialType() != null) {
-            if (InspectionItemConst.SPECIAL_TYPE_1.equals(vo.getItem().getSpecialType()) ||
-                    InspectionItemConst.SPECIAL_TYPE_2.equals(vo.getItem().getSpecialType()) ||
-                    InspectionItemConst.SPECIAL_TYPE_3.equals(vo.getItem().getSpecialType())
+            if (InspectionItemConst.SPECIAL_TYPE_THICK.equals(vo.getItem().getSpecialType()) ||
+                    InspectionItemConst.SPECIAL_TYPE_HARD.equals(vo.getItem().getSpecialType()) ||
+                    InspectionItemConst.SPECIAL_TYPE_SIZE.equals(vo.getItem().getSpecialType())
             ) {
                 vo.setWpItemDetailList(wpItemDetailService.listVOByWorkPlanItemId(vo.getId()));
             }