生产处置单相关。

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java

@@ -23,10 +23,10 @@ import java.time.LocalDateTime;
  * @author Tom Shuo
  * @since 2026-01-06
  */
-@Data
 @TableName("QA_REVIEW_SHEET")
-@Schema(description = "ReviewSheet Entity对象")
+@Data
 @EqualsAndHashCode(callSuper = true)
+@Schema(description = "ReviewSheet Entity对象")
 public class ReviewSheet extends BaseEntity {
 
     @Serial
@@ -349,12 +349,12 @@ public class ReviewSheet extends BaseEntity {
      * 总数量
      */
     @Schema(description = "总数量")
-    private Short totalNum;
+    private Integer totalNum;
     /**
      * 返修数量
      */
     @Schema(description = "返修数量")
-    private Short reDoNum;
+    private Integer reDoNum;
     /**
      * 返修原因
      */
@@ -375,4 +375,24 @@ public class ReviewSheet extends BaseEntity {
      */
     @Schema(description = "[作业中心]id")
     private Long wcId;
+    /**
+     * 报废数量
+     */
+    @Schema(description = "报废数量")
+    private Integer scrapNum;
+    /**
+     * 报废数量
+     */
+    @Schema(description = "内部审理是否通过/驳回-[1]:通过;[2]:驳回;")
+    private Integer selfReviewFlag;
+    /**
+     * 不良原因
+     */
+    @Schema(description = "不良原因")
+    private String poorReason;
+    /**
+     * 不良描述
+     */
+    @Schema(description = "不良描述")
+    private String poorDesc;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java

@@ -0,0 +1,4 @@
+package org.springblade.desk.quality.pojo.request;
+
+public class ReviewSheetHisWOSearch {
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java

@@ -1,14 +1,35 @@
 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:
+ * 生产处置单 搜索
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class ReviewSheetInitSearch extends ReviewSheet {
 
+    @Schema(description = "单据编号")
+    private String docCode;
+    @Schema(description = "车间订单号")
+    private String woCode;
+    @Schema(description = "产品编号")
+    private String prodCode;
+    @Schema(description = "产品名称")
+    private String prodName;
+    @Schema(description = "产品型号名称")
+    private String prodTypeName;
+    @Schema(description = "生产标识")
+    private String prodIdent;
+    @Schema(description = "批次号")
+    private String batchNo;
+    @Schema(description = "流程卡号")
+    private String cardNo;
+    @Schema(description = "创建时间-开始")
+    private String createTimeStart;
+    @Schema(description = "创建时间-结束")
+    private String createTimeEnd;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java

@@ -0,0 +1,33 @@
+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;
+
+/**
+ * 返工审理 报废审理 搜索
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ReviewSheetRedoScrapSearch extends ReviewSheet {
+
+    @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;")
+    private Integer bizType;
+    @Schema(description = "车间订单号")
+    private String woCode;
+    @Schema(description = "创建时间-开始")
+    private String createTimeStart;
+    @Schema(description = "创建时间-结束")
+    private String createTimeEnd;
+    @Schema(description = "提请人员[用户]真名")
+    private String createUserRealName;
+    @Schema(description = "审理[用户]真名")
+    private String reviewUserRealName;
+    @Schema(description = "供应商代码")
+    private String oemCode;
+    @Schema(description = "供应商名称")
+    private String oemName;
+    @Schema(description = "生产标识")
+    private String prodIdent;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java

@@ -1,13 +0,0 @@
-package org.springblade.desk.quality.pojo.request;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * todo:
- */
-@Data
-@EqualsAndHashCode()
-public class ReviewSheetRedoSearch {
-
-}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java

@@ -1,13 +0,0 @@
-package org.springblade.desk.quality.pojo.request;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * todo:
- */
-@Data
-@EqualsAndHashCode()
-public class ReviewSheetScrapSearch {
-
-}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java

@@ -1,13 +1,27 @@
 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:
+ * 内部审理 搜索
  */
 @Data
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
-public class ReviewSheetSelfSearch {
+public class ReviewSheetSelfSearch extends ReviewSheet {
 
+    @Schema(description = "车间订单号")
+    private String woCode;
+    @Schema(description = "供应商名称")
+    private String oemName;
+    @Schema(description = "创建时间-开始")
+    private String createTimeStart;
+    @Schema(description = "创建时间-结束")
+    private String createTimeEnd;
+    @Schema(description = "审理时间-开始")
+    private String reviewTimeStart;
+    @Schema(description = "审理时间-结束")
+    private String reviewTimeEnd;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ELeVO.java

@@ -0,0 +1,28 @@
+package org.springblade.desk.quality.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * [电子档案] todo:
+ */
+@Data
+@EqualsAndHashCode()
+public class ELeVO {
+
+    @Schema(description = "[车间订单]编号")
+    private String woCode = "";
+    @Schema(description = "[产品]编号")
+    private String prodCode = "";
+    @Schema(description = "[批次]编号")
+    private String batCode = "";
+    @Schema(description = "生产标识")
+    private String prodIdent = "";
+    @Schema(description = "加工[班组]名称")
+    private String workTeamSetName;
+    @Schema(description = "完工时间")
+    private String finishTime;
+    @Schema(description = "上传兰台时间")
+    private String uploadTime;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java

@@ -0,0 +1,44 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.quality.pojo.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.quality.pojo.entity.ReviewSheet;
+
+import java.io.Serial;
+import java.util.List;
+
+/**
+ * [生产处置单] 视图实体类 detail详情
+ *
+ * @author Tom Shuo
+ * @since 2026-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ReviewSheetDetailVO extends ReviewSheet {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "问题故障list")
+    private List<ReviewFaultVO> faultList;
+    @Schema(description = "问题故障删除ids")
+    private String faultDeleteIds = "";
+    @Schema(description = "责任零件list")
+    private List<ReviewDutyVO> dutyList;
+    @Schema(description = "责任零件删除ids")
+    private String dutyDeleteIds = "";
+
+    @Schema(description = "发现[工序]名称")
+    private String findPrecessName;
+    @Schema(description = "流程卡号")
+    private String cardNo;
+    @Schema(description = "[物料]名称")
+    private String materialName;
+    @Schema(description = "提交类型")
+    private Integer submitType = 0;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpVO.java

@@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ReviewSheetErpListVO extends ReviewSheet {
+public class ReviewSheetErpVO extends ReviewSheet {
 
     @Schema(description = "BaseEntityVO")
     private BaseEntityVO base;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java

@@ -0,0 +1,22 @@
+package org.springblade.desk.quality.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 历史已完成车间订单 WorkOrder Copy Entity
+ */
+@Data
+@EqualsAndHashCode()
+public class ReviewSheetHisWOVO {
+
+    @Schema(description = "车间订单id")
+    private Long woId = 1000L;
+
+    @Schema(description = "车间订单编码")
+    private String woCode = "CJ1000";
+
+    @Schema(description = "车间订单下拉显示信息")
+    private String woInfo = "CJ1000";
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java

@@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ReviewSheetSelfListVO extends ReviewSheet {
+public class ReviewSheetInitVO extends ReviewSheet {
 
     @Schema(description = "BaseEntityVO")
     private BaseEntityVO base;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java

@@ -1,24 +0,0 @@
-package org.springblade.desk.quality.pojo.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.desk.basic.pojo.vo.BaseEntityVO;
-import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ReviewSheetRedoListVO extends ReviewSheet {
-
-    @Schema(description = "BaseEntityVO")
-    private BaseEntityVO base;
-    @Schema(description = "审理状态 名称")
-    private String reviewStatusName;
-    @Schema(description = "审理[用户]真名")
-    private String reviewUserRealName;
-    @Schema(description = "打回[用户]真名")
-    private String  backUserRealName;
-    @Schema(description = "车间订单号")
-    private String woCode;
-
-}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java

@@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ReviewSheetScrapListVO extends ReviewSheet {
+public class ReviewSheetRedoScrapVO extends ReviewSheet {
 
     @Schema(description = "BaseEntityVO")
     private BaseEntityVO base;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfVO.java

@@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ReviewSheetInitListVO extends ReviewSheet {
+public class ReviewSheetSelfVO extends ReviewSheet {
 
     @Schema(description = "BaseEntityVO")
     private BaseEntityVO base;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java

@@ -1,34 +0,0 @@
-/**
- * Author: Tom Shuo
- */
-package org.springblade.desk.quality.pojo.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-
-import java.io.Serial;
-import java.util.List;
-
-/**
- * [生产处置单] 视图实体类 detail详情
- *
- * @author Tom Shuo
- * @since 2026-01-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ReviewSheetVO extends ReviewSheet {
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-    @Schema(description = "故障list")
-    private List<ReviewFaultVO> faultList;
-    @Schema(description = "故障删除ids")
-    private String faultDeleteIds = "";
-    @Schema(description = "责任零件list")
-	private List<ReviewDutyVO> dutyList;
-    @Schema(description = "责任零件删除ids")
-	private String dutyDeleteIds = "";
-}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java

@@ -5,13 +5,24 @@ package org.springblade.desk.quality.constant;
  */
 public interface ReviewSheetConst {
 
+    /**
+     * 初始化
+     */
     Integer S_INIT = 0;
 
-    // [1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理;
     interface BizType {
-        Integer T_1 = 1;
+        /**
-        Integer T_2 = 2;
+         * [1]:内部审理返修
-        Integer T_3 = 3;
+         */
+        Integer T_SELF_REDO = 1;
+        /**
+         * [2]:内部审理报废
+         */
+        Integer T_SELF_SCRAP = 2;
+        /**
+         * [3]:ERP审理
+         */
+        Integer T_ERP = 3;
     }
 
     interface ERP {
@@ -62,6 +73,24 @@ public interface ReviewSheetConst {
         Integer REVIEW_STATUS_15 = 15;
     }
 
+    interface SELF {
+        /**
+         * 编制中
+         */
+        Integer S_NEW = 1;
+        /**
+         * 待审理
+         */
+        Integer S_JUDGE = 2;
+        /**
+         * 待完成
+         */
+        Integer S_TODO = 3;
+        /**
+         * 已完成
+         */
+        Integer S_FINISH = 4;
+    }
 
     /**
      * 零件模式
@@ -72,7 +101,43 @@ public interface ReviewSheetConst {
      */
     Integer MODE_ASSEMBLY = 2;
     /**
-     * 售后模式
+     * 售后模式 目前不用
      */
     Integer MODE_AFTER_SALES = 3;
+
+    interface SUBMIT_TYPE {
+        /**
+         * 内部提交
+         */
+        Integer T_SELF = 10;
+        /**
+         * 内部暂存 目前不需要
+         */
+        Integer T_SELF_TEMP = 11;
+        /**
+         * ERP暂存
+         */
+        Integer T_ERP_TEMP = 21;
+        /**
+         * ERP提交质保
+         */
+        Integer T_ERP_QA = 22;
+        /**
+         * ERP提交工艺
+         */
+        Integer T_ERP_CRAFT = 23;
+        /**
+         * ERP提交设计
+         */
+        Integer T_ERP_DES = 24;
+        /**
+         * ERP提交设计变更
+         */
+        Integer T_ERP_DES_CHANGE = 25;
+    }
+
+    interface SELF_REVIEW_FLAG {
+        Integer YES = 1;
+        Integer NO = 2;
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java

@@ -5,7 +5,6 @@ package org.springblade.desk.quality.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.injector.methods.UpdateById;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
@@ -34,19 +33,13 @@ 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.ReviewSheetInitSearch;
-import org.springblade.desk.quality.pojo.request.ReviewSheetRedoSearch;
+import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch;
-import org.springblade.desk.quality.pojo.request.ReviewSheetScrapSearch;
 import org.springblade.desk.quality.pojo.request.ReviewSheetSelfSearch;
-import org.springblade.desk.quality.pojo.vo.ReviewDutyVO;
+import org.springblade.desk.quality.pojo.vo.*;
-import org.springblade.desk.quality.pojo.vo.ReviewFaultVO;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetInitListVO;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetVO;
 import org.springblade.desk.quality.service.IReviewDutyService;
 import org.springblade.desk.quality.service.IReviewFaultService;
 import org.springblade.desk.quality.service.IReviewSheetService;
-import org.springblade.desk.quality.wrapper.ReviewDutyWrapper;
+import org.springblade.desk.quality.wrapper.*;
-import org.springblade.desk.quality.wrapper.ReviewSheetInitListWrapper;
-import org.springblade.desk.quality.wrapper.ReviewSheetWrapper;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -84,10 +77,10 @@ public class ReviewSheetController extends BladeController {
     @GetMapping("/detail")
     @ApiOperationSupport(order = 10)
     @Operation(summary = "详情", description = "传入ReviewSheet Obj")
-    public R<ReviewSheetVO> detail(ReviewSheet reviewSheet) {
+    public R<ReviewSheetDetailVO> detail(ReviewSheet reviewSheet) {
         QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(reviewSheet);
         ReviewSheet detail = service.getOne(qw);
-        ReviewSheetVO detailVO = ReviewSheetWrapper.build().entityVO(detail);
+        ReviewSheetDetailVO detailVO = ReviewSheetDetailWrapper.build().entityVO(detail);
         service.setVOValue(detailVO);
         return R.data(detailVO);
     }
@@ -118,13 +111,13 @@ public class ReviewSheetController extends BladeController {
     @PostMapping("/listInit")
     @ApiOperationSupport(order = 20)
     @Operation(summary = "生产处置单list分页", description = "传入ReviewSheet Obj")
-    public R<IPage<ReviewSheetInitListVO>> listInit(@Parameter(hidden = true) @RequestParam(required = false)
+    public R<IPage<ReviewSheetInitVO>> listInit(@Parameter(hidden = true) @RequestBody
-                                                    ReviewSheetInitSearch search, Query query) {
+                                                ReviewSheetInitSearch search, Query query) {
         Map demo = new HashMap();
         demo.put("status", ReviewSheetConst.S_INIT);
         QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class);
         IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw);
-        IPage<ReviewSheetInitListVO> pagesVO = ReviewSheetInitListWrapper.build().pageVO(pages);
+        IPage<ReviewSheetInitVO> pagesVO = ReviewSheetInitWrapper.build().pageVO(pages);
 
         // todo:
 //        pagesVO.getRecords()
@@ -135,41 +128,22 @@ public class ReviewSheetController extends BladeController {
     }
 
     /**
-     * [生产处置单] 返工审理list分页
+     * [生产处置单] 返工报废审理list分页
      */
-    @PostMapping("/listRedo")
+    @PostMapping("/listReviewRedoScrap")
     @ApiOperationSupport(order = 20)
-    @Operation(summary = "返工审理list分页", description = "传入ReviewSheet Obj")
+    @Operation(summary = "返工报废审理list分页", description = "传入ReviewSheet Obj")
-    public R<IPage<ReviewSheetVO>> listRedo(@Parameter(hidden = true) @RequestParam(required = false)
+    public R<IPage<ReviewSheetRedoScrapVO>> listReviewRedoScrap(@Parameter(hidden = true) @RequestBody
-                                            ReviewSheetRedoSearch search, Query query) {
+                                                                ReviewSheetRedoScrapSearch search, Query query) {
         Map demo = new HashMap();
-        demo.put("bizType", ReviewSheetConst.BizType.T_1);
         QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class);
+        qw.eq(ReviewSheet.COL_BIZ_TYPE, search.getBizType());
+        qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE);
         IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw);
-        IPage<ReviewSheetVO> pagesVO = ReviewSheetWrapper.build().pageVO(pages);
+        IPage<ReviewSheetRedoScrapVO> pagesVO = ReviewSheetRedoScrapWrapper.build().pageVO(pages);
         pagesVO.getRecords()
                 .stream()
-                .peek(service::setVOValue)
+                .peek(service::setRedoScrapVOValue)
-                .collect(Collectors.toList());
-        return R.data(pagesVO);
-    }
-
-    /**
-     * [生产处置单] 返工审理list分页
-     */
-    @PostMapping("/listScrap")
-    @ApiOperationSupport(order = 20)
-    @Operation(summary = "返工审理list分页", description = "传入ReviewSheet Obj")
-    public R<IPage<ReviewSheetVO>> listScrap(@Parameter(hidden = true) @RequestParam(required = false)
-                                             ReviewSheetScrapSearch search, Query query) {
-        Map demo = new HashMap();
-        demo.put("bizType", ReviewSheetConst.BizType.T_2);
-        QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class);
-        IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw);
-        IPage<ReviewSheetVO> pagesVO = ReviewSheetWrapper.build().pageVO(pages);
-        pagesVO.getRecords()
-                .stream()
-                .peek(service::setVOValue)
                 .collect(Collectors.toList());
         return R.data(pagesVO);
     }
@@ -180,16 +154,16 @@ public class ReviewSheetController extends BladeController {
     @PostMapping("/listSelf")
     @ApiOperationSupport(order = 20)
     @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj")
-    public R<IPage<ReviewSheetVO>> listSelf(@Parameter(hidden = true) @RequestParam(required = false)
+    public R<IPage<ReviewSheetSelfVO>> listSelf(@Parameter(hidden = true) @RequestBody
-                                            ReviewSheetSelfSearch search, Query query) {
+                                                ReviewSheetSelfSearch search, Query query) {
         Map demo = new HashMap();
         QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class);
-        qw.in("bizType", ReviewSheetConst.BizType.T_1, ReviewSheetConst.BizType.T_2);
+        qw.in("bizType", ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP);
         IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw);
-        IPage<ReviewSheetVO> pagesVO = ReviewSheetWrapper.build().pageVO(pages);
+        IPage<ReviewSheetSelfVO> pagesVO = ReviewSheetSelfWrapper.build().pageVO(pages);
         pagesVO.getRecords()
                 .stream()
-                .peek(service::setVOValue)
+                .peek(service::setSelfVOValue)
                 .collect(Collectors.toList());
         return R.data(pagesVO);
     }
@@ -199,16 +173,16 @@ public class ReviewSheetController extends BladeController {
      */
     @PostMapping("/listErp")
     @ApiOperationSupport(order = 20)
-    @Operation(summary = "ERPlist分页", description = "传入ReviewSheet Obj")
+    @Operation(summary = "Erplist分页", description = "传入ReviewSheet Obj")
-    public R<IPage<ReviewSheetVO>> listErp(@Parameter(hidden = true) @RequestParam Map<String, Object> reviewSheet,
+    public R<IPage<ReviewSheetErpVO>> listErp(@Parameter(hidden = true) @RequestParam Map<String, Object> reviewSheet,
-                                           Query query) {
+                                              Query query) {
         QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class);
-        qw.eq("bizType", ReviewSheetConst.BizType.T_3);
+        qw.eq("bizType", ReviewSheetConst.BizType.T_ERP);
         IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw);
-        IPage<ReviewSheetVO> pagesVO = ReviewSheetWrapper.build().pageVO(pages);
+        IPage<ReviewSheetErpVO> pagesVO = ReviewSheetErpWrapper.build().pageVO(pages);
         pagesVO.getRecords()
                 .stream()
-                .peek(service::setVOValue)
+                .peek(service::setErpVOValue)
                 .collect(Collectors.toList());
         return R.data(pagesVO);
     }
@@ -232,9 +206,9 @@ public class ReviewSheetController extends BladeController {
     @GetMapping("/listForSelect")
     @ApiOperationSupport(order = 22)
     @Operation(summary = "list下拉选择", description = "")
-    public R<List<ReviewSheetVO>> listForSelect() {
+    public R<List<ReviewSheetDetailVO>> listForSelect() {
         List<ReviewSheet> list = service.list();
-        List<ReviewSheetVO> listVO = ReviewSheetWrapper.build().listVO(list);
+        List<ReviewSheetDetailVO> listVO = ReviewSheetDetailWrapper.build().listVO(list);
         return R.data(listVO);
     }
 
@@ -288,7 +262,7 @@ public class ReviewSheetController extends BladeController {
     @PostMapping("/submitInternal")
     @ApiOperationSupport(order = 50)
     @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj")
-    public R submitInternal(@Valid @RequestBody ReviewSheetVO vo) {
+    public R submitInternal(@Valid @RequestBody ReviewSheetDetailVO vo) {
         {
             //
             dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class));
@@ -308,7 +282,7 @@ public class ReviewSheetController extends BladeController {
     @PostMapping("/submitErp")
     @ApiOperationSupport(order = 50)
     @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj")
-    public R submitErp(@Valid @RequestBody ReviewSheetVO vo) {
+    public R submitErp(@Valid @RequestBody ReviewSheetDetailVO vo) {
         {
             //
             dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class));
@@ -322,16 +296,13 @@ public class ReviewSheetController extends BladeController {
         return R.status(service.saveOrUpdate(vo));
     }
 
-    @GetMapping("/review")
+    @GetMapping("/reviewSelf")
     @ApiOperationSupport(order = 22)
-    @Operation(summary = "审批", description = "")
+    @Operation(summary = "内部审批", description = "")
-    public R review(@RequestParam Long id,
+    public R reviewSelf(@Parameter(description = "id") @RequestParam Long id,
-                    @RequestParam Integer status,
+                    @Parameter(description = "selfReviewFlag 1 or 2") @RequestParam Integer selfReviewFlag,
-                    @RequestParam String memo) {
+                    @Parameter(description = "memo") @RequestParam String memo) {
-        ReviewSheet rs = service.getById(id);
+        return service.reviewSelf(id, selfReviewFlag, memo);
-        rs.setStatus(status);
-        rs.setMemo(memo);
-        return R.status(service.updateById(rs));
     }
 
     /**
@@ -402,12 +373,14 @@ public class ReviewSheetController extends BladeController {
     }
 
     /**
-     * [生产处置单] 修改一条
+     * 填报[生产处置单]
      */
     @PostMapping("/fill")
     @ApiOperationSupport(order = 40)
-    @Operation(summary = "fill", description = "ReviewSheetVO Obj")
+    @Operation(summary = "填报[生产处置单]", description = "ReviewSheetVO Obj")
-    public R fill(@Valid @RequestBody ReviewSheetVO vo) {
+    public R fill(@Valid @RequestBody ReviewSheetDetailVO vo) {
         return service.fill(vo);
     }
+
+    public R getHisWO(  )
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.desk.quality.excel.ReviewSheetExcel;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetVO;
+import org.springblade.desk.quality.pojo.vo.ReviewSheetDetailVO;
 
 import java.util.List;
 
@@ -28,7 +28,7 @@ public interface ReviewSheetMapper extends BaseMapper<ReviewSheet> {
 	 * @param reviewSheet 查询参数
 	 * @return List<ReviewSheetVO>
 	 */
-	List<ReviewSheetVO> selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet);
+	List<ReviewSheetDetailVO> selectReviewSheetPage(IPage page, ReviewSheetDetailVO reviewSheet);
 
 	/**
 	 * 获取导出数据

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml

@@ -44,6 +44,10 @@
         <result column="RE_DO_SUGGEST" property="reDoSuggest"/>
         <result column="RE_DO_PATH" property="reDoPath"/>
         <result column="WC_ID" property="wcId"/>
+        <result column="SCRAP_NUM" property="scrapNum"/>
+        <result column="SELF_REVIEW_FLAG" property="selfReviewFlag"/>
+        <result column="POOR_REASON" property="poorReason"/>
+        <result column="POOR_DESC" property="poorDesc"/>
     </resultMap>
 
     <select id="selectReviewSheetPage" resultMap="reviewSheetResultMap">

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java

@@ -6,14 +6,11 @@ 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 org.springblade.core.mp.base.BaseService;
 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.PpmReportDetailModel;
+import org.springblade.desk.quality.pojo.vo.*;
-import org.springblade.desk.quality.pojo.vo.PrintChildReviewSheet;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetVO;
 
 import java.util.List;
 
@@ -32,7 +29,7 @@ public interface IReviewSheetService extends EnBaseService<ReviewSheet> {
      * @param reviewSheet 查询参数
      * @return IPage<ReviewSheetVO>
      */
-    IPage<ReviewSheetVO> selectReviewSheetPage(IPage<ReviewSheetVO> page, ReviewSheetVO reviewSheet);
+    IPage<ReviewSheetDetailVO> selectReviewSheetPage(IPage<ReviewSheetDetailVO> page, ReviewSheetDetailVO reviewSheet);
 
     /**
      * 导出数据
@@ -47,7 +44,13 @@ public interface IReviewSheetService extends EnBaseService<ReviewSheet> {
      *
      * @param vo
      */
-    void setVOValue(ReviewSheetVO vo);
+    void setVOValue(ReviewSheetDetailVO vo);
+
+    void setRedoScrapVOValue(ReviewSheetRedoScrapVO vo);
+
+    void setErpVOValue(ReviewSheetErpVO vo);
+
+    void setSelfVOValue(ReviewSheetSelfVO vo);
 
     /**
      * <p>方法名: getByTrialId </p>
@@ -132,7 +135,7 @@ public interface IReviewSheetService extends EnBaseService<ReviewSheet> {
      */
     void deleteReviewOrder(String trialId) throws Exception;
 
-    R fill(ReviewSheetVO vo);
+    R fill(ReviewSheetDetailVO vo);
-
 
+    R reviewSelf(Long id, Integer selfReviewFlag, String memo);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -27,6 +27,7 @@ import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.desk.basic.util.StatusCountMap;
 import org.springblade.desk.quality.constant.InspectionItemConst;
 import org.springblade.desk.quality.constant.InspectionTaskConst;
+import org.springblade.desk.quality.constant.ReviewSheetConst;
 import org.springblade.desk.quality.excel.InspectionTaskExcel;
 import org.springblade.desk.quality.mapper.InspectionTaskMapper;
 import org.springblade.desk.quality.pojo.entity.*;
@@ -254,10 +255,10 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 
     @Override
     public R getSamePlace(Long id) {
-        LambdaQueryWrapper<InspectionTask> qw = Wrappers.lambdaQuery();
+//        LambdaQueryWrapper<InspectionTask> qw = Wrappers.lambdaQuery();
         // todo: 需要生产支持
-        qw.eq(InspectionTask::getId, 2010526540823642113L);
+//        qw.eq(InspectionTask::getId, 2010909559614988290L);
-        List<InspectionTask> list = baseMapper.selectList(qw);
+        List<InspectionTask> list = baseMapper.selectList(null).subList(0, 2);
         List<InspectionTaskListVO> listVO = InspectionTaskListWrapper.build().listVO(list);
         for (InspectionTaskListVO one : listVO) {
             setListVOValue(one);
@@ -328,6 +329,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         if (InspectionTaskConst.CHECK_RESULT_NG.equals(task.getCheckResult())) {
             if (!rsSubService.existTaskId(id)) {
                 ReviewSheet rs = new ReviewSheet();
+                rs.setStatus(ReviewSheetConst.S_INIT);
                 rs.setTaskId(id);
                 rsSubService.save(rs);
             }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java

@@ -67,7 +67,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     private IDictClient dictClient;
 
     @Override
-    public IPage<ReviewSheetVO> selectReviewSheetPage(IPage<ReviewSheetVO> page, ReviewSheetVO reviewSheet) {
+    public IPage<ReviewSheetDetailVO> selectReviewSheetPage(IPage<ReviewSheetDetailVO> page, ReviewSheetDetailVO reviewSheet) {
         return page.setRecords(baseMapper.selectReviewSheetPage(page, reviewSheet));
     }
 
@@ -81,11 +81,26 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     }
 
     @Override
-    public void setVOValue(ReviewSheetVO vo) {
+    public void setVOValue(ReviewSheetDetailVO vo) {
         vo.setFaultList(faultService.listVOByRsId(vo.getId()));
         vo.setDutyList(dutyService.listVOByRsId(vo.getId()));
     }
 
+    @Override
+    public void setRedoScrapVOValue(ReviewSheetRedoScrapVO vo) {
+
+    }
+
+    @Override
+    public void setErpVOValue(ReviewSheetErpVO vo) {
+
+    }
+
+    @Override
+    public void setSelfVOValue(ReviewSheetSelfVO vo) {
+
+    }
+
     /**
      * <p>方法名: getByTrialId </p>
      * <p>方法描述: 按审理单erpId查询 </p>
@@ -175,35 +190,77 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
         if (reviewSheet == null) {
             throw new BusinessException("审理单信息不存在！");
         }
-
+        // todo: mes v1
-
-        // todo:
     }
 
     @Override
-    public R fill(ReviewSheetVO vo) {
+    public R fill(ReviewSheetDetailVO vo) {
         // 关联rsId
         for (ReviewFaultVO voF : vo.getFaultList()) {
             voF.setReviewSheetId(vo.getId());
         }
+        // 删除
         if (StringUtils.isNotBlank(vo.getFaultDeleteIds())) {
             faultService.deleteLogic(Func.toLongList(vo.getFaultDeleteIds()));
         }
         List<ReviewFault> listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class);
+        // 保存 或 更新
         faultService.saveOrUpdateBatch(listF);
         // 关联rsId
         for (ReviewDutyVO voD : vo.getDutyList()) {
             voD.setReviewSheetId(vo.getId());
         }
+        // 删除
         if (StringUtils.isNotBlank(vo.getDutyDeleteIds())) {
             dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds()));
         }
         List<ReviewDuty> listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class);
+        // 保存 或 更新
         dutyService.saveOrUpdateBatch(listD);
-        ReviewSheet bs = BeanUtil.copyProperties(vo, ReviewSheet.class);
+        // 审理单
-        // ReviewSheetVO
+        ReviewSheet rs = BeanUtil.copyProperties(vo, ReviewSheet.class);
-        saveOrUpdate(bs);
+        // 提交类型
-        return R.success("");
+        Integer submitType = vo.getSubmitType();
+        // 内部
+        if (
+                ReviewSheetConst.BizType.T_SELF_REDO.equals(rs.getBizType()) ||
+                        ReviewSheetConst.BizType.T_SELF_SCRAP.equals(rs.getBizType())
+        ) {
+            if (ReviewSheetConst.SUBMIT_TYPE.T_SELF.equals(submitType)) { // 提交
+                rs.setStatus(ReviewSheetConst.SELF.S_JUDGE);
+            } else if (ReviewSheetConst.SUBMIT_TYPE.T_SELF_TEMP.equals(submitType)) { // 暂存
+
+            }
+        }
+        // ERP
+        if (ReviewSheetConst.BizType.T_ERP.equals(rs.getBizType())) {
+            if (ReviewSheetConst.SUBMIT_TYPE.T_ERP_TEMP.equals(submitType)) { // 暂存
+
+            }
+            if (ReviewSheetConst.SUBMIT_TYPE.T_ERP_QA.equals(submitType) ||
+                    ReviewSheetConst.SUBMIT_TYPE.T_ERP_CRAFT.equals(submitType) ||
+                    ReviewSheetConst.SUBMIT_TYPE.T_ERP_DES.equals(submitType) ||
+                    ReviewSheetConst.SUBMIT_TYPE.T_ERP_DES_CHANGE.equals(submitType)) { // 外部提交
+
+            }
+        }
+        // 处置单
+        saveOrUpdate(rs);
+        return R.success("成功");
+    }
+
+    @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");
+        }
+        ReviewSheet rs = getById(id);
+        rs.setSelfReviewFlag(selfReviewFlag);
+        rs.setMemo(memo);
+        rs.setReviewStatus(ReviewSheetConst.SELF.S_FINISH);
+        updateById(rs);
+        return R.success();
     }
 
     @Override

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetDetailWrapper.java

@@ -6,8 +6,7 @@ package org.springblade.desk.quality.wrapper;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetErpListVO;
+import org.springblade.desk.quality.pojo.vo.ReviewSheetDetailVO;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetInitListVO;
 
 import java.util.Objects;
 
@@ -17,15 +16,15 @@ import java.util.Objects;
  * @author Tom Shuo
  * @since 2026-01-06
  */
-public class ReviewSheetErpListWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetErpListVO>  {
+public class ReviewSheetDetailWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetDetailVO>  {
 
-	public static ReviewSheetErpListWrapper build() {
+	public static ReviewSheetDetailWrapper build() {
-		return new ReviewSheetErpListWrapper();
+		return new ReviewSheetDetailWrapper();
  	}
 
 	@Override
-	public ReviewSheetErpListVO entityVO(ReviewSheet reviewSheet) {
+	public ReviewSheetDetailVO entityVO(ReviewSheet reviewSheet) {
-        ReviewSheetErpListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetErpListVO.class));
+		ReviewSheetDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetDetailVO.class));
 
 		//User createUser = UserCache.getUser(reviewSheet.getCreateUser());
 		//User updateUser = UserCache.getUser(reviewSheet.getUpdateUser());

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetErpWrapper.java

@@ -6,7 +6,7 @@ package org.springblade.desk.quality.wrapper;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetVO;
+import org.springblade.desk.quality.pojo.vo.ReviewSheetErpVO;
 
 import java.util.Objects;
 
@@ -16,15 +16,15 @@ import java.util.Objects;
  * @author Tom Shuo
  * @since 2026-01-06
  */
-public class ReviewSheetWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetVO>  {
+public class ReviewSheetErpWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetErpVO>  {
 
-	public static ReviewSheetWrapper build() {
+	public static ReviewSheetErpWrapper build() {
-		return new ReviewSheetWrapper();
+		return new ReviewSheetErpWrapper();
  	}
 
 	@Override
-	public ReviewSheetVO entityVO(ReviewSheet reviewSheet) {
+	public ReviewSheetErpVO entityVO(ReviewSheet reviewSheet) {
-		ReviewSheetVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetVO.class));
+        ReviewSheetErpVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetErpVO.class));
 
 		//User createUser = UserCache.getUser(reviewSheet.getCreateUser());
 		//User updateUser = UserCache.getUser(reviewSheet.getUpdateUser());

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetInitWrapper.java

@@ -6,8 +6,7 @@ package org.springblade.desk.quality.wrapper;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetInitListVO;
+import org.springblade.desk.quality.pojo.vo.ReviewSheetInitVO;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetVO;
 
 import java.util.Objects;
 
@@ -17,15 +16,15 @@ import java.util.Objects;
  * @author Tom Shuo
  * @since 2026-01-06
  */
-public class ReviewSheetInitListWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetInitListVO>  {
+public class ReviewSheetInitWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetInitVO>  {
 
-	public static ReviewSheetInitListWrapper build() {
+	public static ReviewSheetInitWrapper build() {
-		return new ReviewSheetInitListWrapper();
+		return new ReviewSheetInitWrapper();
  	}
 
 	@Override
-	public ReviewSheetInitListVO entityVO(ReviewSheet reviewSheet) {
+	public ReviewSheetInitVO entityVO(ReviewSheet reviewSheet) {
-        ReviewSheetInitListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetInitListVO.class));
+        ReviewSheetInitVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetInitVO.class));
 
 		//User createUser = UserCache.getUser(reviewSheet.getCreateUser());
 		//User updateUser = UserCache.getUser(reviewSheet.getUpdateUser());

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetRedoScrapWrapper.java

@@ -6,8 +6,7 @@ package org.springblade.desk.quality.wrapper;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetScrapListVO;
+import org.springblade.desk.quality.pojo.vo.ReviewSheetRedoScrapVO;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetSelfListVO;
 
 import java.util.Objects;
 
@@ -17,15 +16,15 @@ import java.util.Objects;
  * @author Tom Shuo
  * @since 2026-01-06
  */
-public class ReviewSheetSelfListWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetSelfListVO>  {
+public class ReviewSheetRedoScrapWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetRedoScrapVO>  {
 
-	public static ReviewSheetSelfListWrapper build() {
+	public static ReviewSheetRedoScrapWrapper build() {
-		return new ReviewSheetSelfListWrapper();
+		return new ReviewSheetRedoScrapWrapper();
  	}
 
 	@Override
-	public ReviewSheetSelfListVO entityVO(ReviewSheet reviewSheet) {
+	public ReviewSheetRedoScrapVO entityVO(ReviewSheet reviewSheet) {
-        ReviewSheetSelfListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetSelfListVO.class));
+        ReviewSheetRedoScrapVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetRedoScrapVO.class));
 
 		//User createUser = UserCache.getUser(reviewSheet.getCreateUser());
 		//User updateUser = UserCache.getUser(reviewSheet.getUpdateUser());

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetScrapListWrapper.java

@@ -1,37 +0,0 @@
-/**
- * Author: Tom Shuo
- */
-package org.springblade.desk.quality.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetRedoListVO;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetScrapListVO;
-
-import java.util.Objects;
-
-/**
- * [生产处置单] 包装类,返回视图层所需的字段
- *
- * @author Tom Shuo
- * @since 2026-01-06
- */
-public class ReviewSheetScrapListWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetScrapListVO>  {
-
-	public static ReviewSheetScrapListWrapper build() {
-		return new ReviewSheetScrapListWrapper();
- 	}
-
-	@Override
-	public ReviewSheetScrapListVO entityVO(ReviewSheet reviewSheet) {
-        ReviewSheetScrapListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetScrapListVO.class));
-
-		//User createUser = UserCache.getUser(reviewSheet.getCreateUser());
-		//User updateUser = UserCache.getUser(reviewSheet.getUpdateUser());
-		//reviewSheetVO.setCreateUserName(createUser.getName());
-		//reviewSheetVO.setUpdateUserName(updateUser.getName());
-
-		return VO;
-	}
-}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetSelfWrapper.java

@@ -6,8 +6,7 @@ package org.springblade.desk.quality.wrapper;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetErpListVO;
+import org.springblade.desk.quality.pojo.vo.ReviewSheetSelfVO;
-import org.springblade.desk.quality.pojo.vo.ReviewSheetRedoListVO;
 
 import java.util.Objects;
 
@@ -17,15 +16,15 @@ import java.util.Objects;
  * @author Tom Shuo
  * @since 2026-01-06
  */
-public class ReviewSheetRedoListWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetRedoListVO>  {
+public class ReviewSheetSelfWrapper extends BaseEntityWrapper<ReviewSheet, ReviewSheetSelfVO>  {
 
-	public static ReviewSheetRedoListWrapper build() {
+	public static ReviewSheetSelfWrapper build() {
-		return new ReviewSheetRedoListWrapper();
+		return new ReviewSheetSelfWrapper();
  	}
 
 	@Override
-	public ReviewSheetRedoListVO entityVO(ReviewSheet reviewSheet) {
+	public ReviewSheetSelfVO entityVO(ReviewSheet reviewSheet) {
-        ReviewSheetRedoListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetRedoListVO.class));
+        ReviewSheetSelfVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetSelfVO.class));
 
 		//User createUser = UserCache.getUser(reviewSheet.getCreateUser());
 		//User updateUser = UserCache.getUser(reviewSheet.getUpdateUser());