✨ feat(mes): 将质量状态字段类型更新为整型，优化数据一致性

YunaiV
1 parent fa473f7d
Showing 46 changed files with 970 additions and 127 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchGenerateReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/oqc/MesQcOqcDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/batch/MesWmBatchDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -33,8 +33,8 @@ public class MesQcOqcRespVO {
     @Schema(description = "来源单据 ID", example = "200")
     private Long sourceDocId;
-    @Schema(description = "来源单据类型", example = "SALES")
-    private String sourceDocType;
+    @Schema(description = "来源单据类型", example = "118")
+    private Integer sourceDocType;
     @Schema(description = "来源单据编号", example = "SO20250101001")
     private String sourceDocCode;
@@ -88,15 +88,15 @@ public class MesQcOqcRespVO {
     @Schema(description = "本次检测数量", example = "10")
     @ExcelProperty("检测数量")
-    private Integer checkQuantity;
+    private BigDecimal checkQuantity;
     @Schema(description = "合格品数量", example = "9")
     @ExcelProperty("合格品数量")
-    private Integer qualifiedQuantity;
+    private BigDecimal qualifiedQuantity;
     @Schema(description = "不合格品数量", example = "1")
     @ExcelProperty("不合格品数量")
-    private Integer unqualifiedQuantity;
+    private BigDecimal unqualifiedQuantity;
     // ========== 缺陷统计 ==========
@@ -29,8 +29,8 @@ public class MesQcOqcSaveReqVO {
     @Schema(description = "来源单据 ID", example = "200")
     private Long sourceDocId;
-    @Schema(description = "来源单据类型", example = "SALES")
-    private String sourceDocType;
+    @Schema(description = "来源单据类型", example = "118")
+    private Integer sourceDocType;
     @Schema(description = "来源单据编号", example = "SO20250101001")
     private String sourceDocCode;
@@ -62,18 +62,18 @@ public class MesQcOqcSaveReqVO {
     @Schema(description = "本次检测数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @NotNull(message = "本次检测数量不能为空")
-    @Min(value = 1, message = "本次检测数量必须大于 0")
-    private Integer checkQuantity;
+    @DecimalMin(value = "0", message = "本次检测数量不能小于 0")
+    private BigDecimal checkQuantity;
     @Schema(description = "合格品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "9")
     @NotNull(message = "合格品数量不能为空")
-    @Min(value = 0, message = "合格品数量不能小于 0")
-    private Integer qualifiedQuantity;
+    @DecimalMin(value = "0", message = "合格品数量不能小于 0")
+    private BigDecimal qualifiedQuantity;
     @Schema(description = "不合格品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "不合格品数量不能为空")
-    @Min(value = 0, message = "不合格品数量不能小于 0")
-    private Integer unqualifiedQuantity;
+    @DecimalMin(value = "0", message = "不合格品数量不能小于 0")
+    private BigDecimal unqualifiedQuantity;
     // ========== 检验 ==========
@@ -101,7 +101,7 @@ public class MesQcOqcSaveReqVO {
         if (ObjUtil.hasNull(checkQuantity, qualifiedQuantity, unqualifiedQuantity)) {
             return true; // @NotNull 会处理 null
         }
-        return checkQuantity.equals(qualifiedQuantity + unqualifiedQuantity);
+        return checkQuantity.compareTo(qualifiedQuantity.add(unqualifiedQuantity)) == 0;
     }
 }
@@ -33,8 +33,8 @@ public class MesQcRqcRespVO {
     @Schema(description = "来源单据 ID", example = "200")
     private Long sourceDocId;
-    @Schema(description = "来源单据类型", example = "RTISSUE")
-    private String sourceDocType;
+    @Schema(description = "来源单据类型", example = "116")
+    private Integer sourceDocType;
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
@@ -35,8 +35,8 @@ public class MesQcRqcSaveReqVO {
     @Schema(description = "来源单据 ID", example = "200")
     private Long sourceDocId;
-    @Schema(description = "来源单据类型", example = "RTISSUE")
-    private String sourceDocType;
+    @Schema(description = "来源单据类型", example = "116")
+    private Integer sourceDocType;
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
@@ -78,6 +78,6 @@ public class MesWmBatchGenerateReqVO {
     /**
      * 质量状态
      */
-    private String qualityStatus;
+    private Integer qualityStatus;
 }
@@ -88,7 +88,7 @@ public class MesWmBatchRespVO {
     private String lotNumber;
     @Schema(description = "质量状态", example = "1")
-    private String qualityStatus;
+    private Integer qualityStatus;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -46,7 +46,7 @@ public class MesWmReturnSalesLineRespVO {
     private String batchCode;
     @Schema(description = "质量状态", example = "合格")
-    private String qualityStatus;
+    private Integer qualityStatus;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -36,7 +36,7 @@ public class MesWmReturnSalesLineSaveReqVO {
     private Long batchId;
     @Schema(description = "质量状态", example = "合格")
-    private String qualityStatus;
+    private Integer qualityStatus;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -47,7 +47,7 @@ public class MesQcOqcDO extends BaseDO {
      */
     private Long templateId;
-    // ========== 来源单据（TODO @芋艿：WM 模块迁移后接入） ==========
+    // ========== 来源单据 ==========
     /**
      * 来源单据 ID
@@ -55,8 +55,10 @@ public class MesQcOqcDO extends BaseDO {
     private Long sourceDocId;
     /**
      * 来源单据类型
+     *
+     * 关联 {@link cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants}
      */
-    private String sourceDocType;
+    private Integer sourceDocType;
     /**
      * 来源单据编号
      */
@@ -97,15 +99,15 @@ public class MesQcOqcDO extends BaseDO {
     /**
      * 本次检测数量
      */
-    private Integer checkQuantity;
+    private BigDecimal checkQuantity;
     /**
      * 合格品数量
      */
-    private Integer qualifiedQuantity;
+    private BigDecimal qualifiedQuantity;
     /**
      * 不合格品数量
      */
-    private Integer unqualifiedQuantity;
+    private BigDecimal unqualifiedQuantity;
     // ========== 缺陷统计 ==========
@@ -47,7 +47,7 @@ public class MesQcRqcDO extends BaseDO {
      */
     private Long templateId;
-    // ========== 来源单据（TODO @芋艿：WM 模块迁移后接入） ==========
+    // ========== 来源单据 ==========
     /**
      * 来源单据 ID
@@ -55,8 +55,10 @@ public class MesQcRqcDO extends BaseDO {
     private Long sourceDocId;
     /**
      * 来源单据类型
+     *
+     * 关联 {@link cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants}
      */
-    private String sourceDocType;
+    private Integer sourceDocType;
     /**
      * 来源单据行 ID
      */
@@ -113,7 +113,7 @@ public class MesWmBatchDO extends BaseDO {
     /**
      * 质量状态
      */
-    private String qualityStatus;
+    private Integer qualityStatus;
     /**
      * 备注
      */
@@ -68,7 +68,7 @@ public class MesWmProductSalesLineDO extends BaseDO {
      *
      * 枚举 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum}
      */
-    private String qualityStatus;
+    private Integer qualityStatus;
     /**
      * 备注
      */
@@ -54,7 +54,7 @@ public class MesWmReturnSalesLineDO extends BaseDO {
      *
      * 枚举 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum}
      */
-    private String qualityStatus;
+    private Integer qualityStatus;
     /**
      * 备注
      */
@@ -312,6 +312,7 @@ public interface ErrorCodeConstants {
     ErrorCode QC_OQC_NOT_PREPARE = new ErrorCode(1_040_607_002, "只有草稿状态的检验单才可操作");
     ErrorCode QC_OQC_QUANTITY_MISMATCH = new ErrorCode(1_040_607_004, "合格品与不合格品数量之和须等于检测数量");
     ErrorCode QC_OQC_NO_TEMPLATE = new ErrorCode(1_040_607_005, "当前产品未配置 OQC 检测模板");
+    ErrorCode QC_OQC_CHECK_RESULT_EMPTY = new ErrorCode(1_040_607_006, "完成检验单前，检测结果必须填写");
     // ========== MES 质量管理-出货检验行（1-040-607-100） ==========
     ErrorCode QC_OQC_LINE_NOT_EXISTS = new ErrorCode(1_040_607_100, "出货检验行不存在");
@@ -321,6 +322,7 @@ public interface ErrorCodeConstants {
     ErrorCode QC_RQC_NOT_PREPARE = new ErrorCode(1_040_608_002, "只有草稿状态的检验单才可操作");
     ErrorCode QC_RQC_QUANTITY_MISMATCH = new ErrorCode(1_040_608_004, "合格品与不合格品数量之和须等于检测数量");
     ErrorCode QC_RQC_NO_TEMPLATE = new ErrorCode(1_040_608_005, "当前产品未配置 RQC 检测模板");
+    ErrorCode QC_RQC_CHECK_RESULT_EMPTY = new ErrorCode(1_040_608_006, "完成检验单前，检测结果必须填写");
     // ========== MES 质量管理-退货检验行（1-040-608-100） ==========
     ErrorCode QC_RQC_LINE_NOT_EXISTS = new ErrorCode(1_040_608_100, "退货检验行不存在");
@@ -36,7 +36,7 @@ public enum MesWmArrivalNoticeStatusEnum implements ArrayValuable&lt;Integer&gt; {
      *
      * 对应方法：
      * 1. 不需要检验时：{@link MesWmArrivalNoticeService#submitArrivalNotice(Long)}
-     * 2. 或检验完成时：{@link MesWmArrivalNoticeService#approveArrivalNoticeWhenIqcComplete(Long, Long, Long, BigDecimal)}
+     * 2. 或检验完成时：{@link MesWmArrivalNoticeService#updateArrivalNoticeWhenIqcFinish(Long, Long, Long, BigDecimal)}
      */
     PENDING_RECEIPT(MesOrderStatusConstants.APPROVED, "待入库"),
     /**
@@ -102,8 +102,8 @@ public interface MesProFeedbackService {
      * @param materialScrapQty    料废数量
      * @param otherScrapQty       其他废品数量
      */
-    void completeFeedbackFromIpqc(Long feedbackId, BigDecimal qualifiedQty, BigDecimal unqualifiedQty,
-                                  BigDecimal laborScrapQty, BigDecimal materialScrapQty, BigDecimal otherScrapQty);
+    void updateProFeedbackWhenIpqcFinish(Long feedbackId, BigDecimal qualifiedQty, BigDecimal unqualifiedQty,
+                                         BigDecimal laborScrapQty, BigDecimal materialScrapQty, BigDecimal otherScrapQty);
 }
@@ -285,8 +285,8 @@ public class MesProFeedbackServiceImpl implements MesProFeedbackService {
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void completeFeedbackFromIpqc(Long feedbackId, BigDecimal qualifiedQty, BigDecimal unqualifiedQty,
-                                         BigDecimal laborScrapQty, BigDecimal materialScrapQty, BigDecimal otherScrapQty) {
+    public void updateProFeedbackWhenIpqcFinish(Long feedbackId, BigDecimal qualifiedQty, BigDecimal unqualifiedQty,
+                                                BigDecimal laborScrapQty, BigDecimal materialScrapQty, BigDecimal otherScrapQty) {
         // 1. 校验报工单存在且为待检验状态
         MesProFeedbackDO feedback = validateFeedbackExists(feedbackId);
         if (ObjUtil.notEqual(feedback.getStatus(), MesProFeedbackStatusEnum.UNCHECK.getStatus())) {
@@ -155,7 +155,7 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService {
         }
         if (Objects.equals(ipqc.getSourceDocType(), MesBizTypeConstants.PRO_FEEDBACK)) {
-            feedbackService.completeFeedbackFromIpqc(ipqc.getSourceDocId(),
+            feedbackService.updateProFeedbackWhenIpqcFinish(ipqc.getSourceDocId(),
                     ObjectUtil.defaultIfNull(ipqc.getQualifiedQuantity(), BigDecimal.ZERO),
                     ObjectUtil.defaultIfNull(ipqc.getUnqualifiedQuantity(), BigDecimal.ZERO),
                     ObjectUtil.defaultIfNull(ipqc.getLaborScrapQuantity(), BigDecimal.ZERO),
@@ -148,10 +148,10 @@ public class MesQcIqcServiceImpl implements MesQcIqcService {
         // 根据不同的来源单据类型，回写不同的单据
         if (Objects.equals(iqc.getSourceDocType(), MesBizTypeConstants.WM_ARRIVAL_NOTICE)) {
-            arrivalNoticeService.approveArrivalNoticeWhenIqcComplete(iqc.getSourceDocId(), iqc.getSourceLineId(),
+            arrivalNoticeService.updateArrivalNoticeWhenIqcFinish(iqc.getSourceDocId(), iqc.getSourceLineId(),
                     iqc.getId(), iqc.getQualifiedQuantity());
         } else if (Objects.equals(iqc.getSourceDocType(), MesBizTypeConstants.WM_OUTSOURCE_RECPT)) {
-            outsourceReceiptService.approveOutsourceReceiptWhenIqcComplete(iqc.getSourceDocId(), iqc.getSourceLineId(),
+            outsourceReceiptService.updateOutsourceReceiptWhenIqcFinish(iqc.getSourceDocId(), iqc.getSourceLineId(),
                     iqc.getId(), iqc.getQualifiedQuantity(), iqc.getUnqualifiedQuantity());
         } else {
             throw new IllegalArgumentException(
@@ -12,10 +12,12 @@ import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcMapper;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
 import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
 import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateDetailService;
+import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
@@ -56,6 +58,10 @@ public class MesQcOqcServiceImpl implements MesQcOqcService {
     @Lazy
     private MesMdItemService itemService;
     @Resource
+    @Lazy
+    private MesWmProductSalesLineService productSalesLineService;
+
+    @Resource
     private AdminUserApi adminUserApi;
     @Override
@@ -100,16 +106,47 @@ public class MesQcOqcServiceImpl implements MesQcOqcService {
     }
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void finishOqc(Long id) {
-        // 1. 校验存在 + 草稿状态
-        validateOqcStatusPrepare(id);
+        // 1.1 校验存在 + 草稿状态
+        MesQcOqcDO oqc = validateOqcStatusPrepare(id);
+        // 1.2 校验检测结论必填
+        if (oqc.getCheckResult() == null) {
+            throw exception(QC_OQC_CHECK_RESULT_EMPTY);
+        }
         // 2. 更新状态为已完成
         MesQcOqcDO updateObj = new MesQcOqcDO()
                 .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
         oqcMapper.updateById(updateObj);
-        // TODO @芋艿：WM 模块迁移后，更新销售出库单行的检验结果
+        // 3. 回写来源单据
+        writeBackSourceDoc(oqc);
+    }
+
+    /**
+     * 回写来源单据（OQC 完成后）
+     *
+     * <p>当来源为销售出库单时，回写行的 oqcId 和 qualityStatus
+     *
+     * @param oqc 出货检验单
+     */
+    private void writeBackSourceDoc(MesQcOqcDO oqc) {
+        if (oqc.getSourceDocType() == null) {
+            return;
+        }
+        if (oqc.getSourceLineId() == null) {
+            throw new IllegalArgumentException(
+                    "OQC 单[" + oqc.getId() + "] sourceDocType 非空但 sourceLineId 为空");
+        }
+
+        if (Objects.equals(oqc.getSourceDocType(), MesBizTypeConstants.WM_PRODUCT_SALES)) {
+            // 回写销售出库单行的 oqcId + qualityStatus
+            productSalesLineService.updateProductSalesLineWhenOqcFinish(oqc.getSourceLineId(), oqc.getId(), oqc.getCheckResult());
+        } else {
+            throw new IllegalArgumentException(
+                    "OQC 单[" + oqc.getId() + "] sourceDocType=" + oqc.getSourceDocType() + " 无法识别，无法回写来源单据");
+        }
     }
     @Override
@@ -190,8 +227,8 @@ public class MesQcOqcServiceImpl implements MesQcOqcService {
         BigDecimal criticalRate = BigDecimal.ZERO;
         BigDecimal majorRate = BigDecimal.ZERO;
         BigDecimal minorRate = BigDecimal.ZERO;
-        if (oqc.getCheckQuantity() != null && oqc.getCheckQuantity() > 0) {
-            BigDecimal checkQty = BigDecimal.valueOf(oqc.getCheckQuantity());
+        if (oqc.getCheckQuantity() != null && oqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) {
+            BigDecimal checkQty = oqc.getCheckQuantity();
             criticalRate = BigDecimal.valueOf(totalCritical).multiply(BigDecimal.valueOf(100))
                     .divide(checkQty, 2, RoundingMode.HALF_UP);
             majorRate = BigDecimal.valueOf(totalMajor).multiply(BigDecimal.valueOf(100))
@@ -12,9 +12,12 @@ import cn.iocoder.yudao.module.mes.dal.mysql.qc.rqc.MesQcRqcMapper;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
 import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateDetailService;
+import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueLineService;
+import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
@@ -51,6 +54,12 @@ public class MesQcRqcServiceImpl implements MesQcRqcService {
     @Resource
     @Lazy
     private MesQcDefectRecordService defectRecordService;
+    @Resource
+    @Lazy
+    private MesWmReturnIssueLineService returnIssueLineService;
+    @Resource
+    @Lazy
+    private MesWmReturnSalesLineService returnSalesLineService;
     @Resource
     private AdminUserApi adminUserApi;
@@ -95,10 +104,15 @@ public class MesQcRqcServiceImpl implements MesQcRqcService {
     }
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void finishRqc(Long id) {
         // 1.1 校验存在 + 草稿状态
         MesQcRqcDO rqc = validateRqcStatusPrepare(id);
-        // 1.2 校验合格品 + 不合格品 = 检测数量
+        // 1.2 校验检测结论必填
+        if (rqc.getCheckResult() == null) {
+            throw exception(QC_RQC_CHECK_RESULT_EMPTY);
+        }
+        // 1.3 校验合格品 + 不合格品 = 检测数量
         if (rqc.getCheckQuantity() != null && rqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) {
             BigDecimal qualified = rqc.getQualifiedQuantity() != null ? rqc.getQualifiedQuantity() : BigDecimal.ZERO;
             BigDecimal unqualified = rqc.getUnqualifiedQuantity() != null ? rqc.getUnqualifiedQuantity() : BigDecimal.ZERO;
@@ -111,7 +125,40 @@ public class MesQcRqcServiceImpl implements MesQcRqcService {
         MesQcRqcDO updateObj = new MesQcRqcDO().setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
         rqcMapper.updateById(updateObj);
-        // TODO @芋艿：WM 模块迁移后，更新来源退料/退货单行的质量状态
+        // 3. 回写来源单据
+        writeBackSourceDoc(rqc);
+    }
+
+    /**
+     * 回写来源单据（RQC 完成后）
+     *
+     * <p>根据 sourceDocType 分发：
+     * <ul>
+     *     <li>WM_RETURN_ISSUE（生产退料单）→ 回写行的 qualityStatus</li>
+     *     <li>WM_RETURN_SALES（销售退货单）→ 回写行的 qualityStatus</li>
+     * </ul>
+     *
+     * @param rqc 退货检验单
+     */
+    private void writeBackSourceDoc(MesQcRqcDO rqc) {
+        if (rqc.getSourceDocType() == null) {
+            return;
+        }
+        if (rqc.getSourceLineId() == null) {
+            throw new IllegalArgumentException(
+                    "RQC 单[" + rqc.getId() + "] sourceDocType 非空但 sourceLineId 为空");
+        }
+
+        if (Objects.equals(rqc.getSourceDocType(), MesBizTypeConstants.WM_RETURN_ISSUE)) {
+            // 回写生产退料单行的 qualityStatus
+            returnIssueLineService.updateReturnIssueLineWhenRqcFinish(rqc.getSourceLineId(), rqc.getCheckResult());
+        } else if (Objects.equals(rqc.getSourceDocType(), MesBizTypeConstants.WM_RETURN_SALES)) {
+            // 回写销售退货单行的 qualityStatus
+            returnSalesLineService.updateReturnSalesLineWhenRqcFinish(rqc.getSourceLineId(), rqc.getCheckResult());
+        } else {
+            throw new IllegalArgumentException(
+                    "RQC 单[" + rqc.getId() + "] sourceDocType=" + rqc.getSourceDocType() + " 无法识别，无法回写来源单据");
+        }
     }
     @Override
@@ -74,7 +74,7 @@ public interface MesWmArrivalNoticeLineService {
      * @param iqcId IQC 检验单编号
      * @param qualifiedQuantity 合格数量
      */
-    void updateByIqcComplete(Long lineId, Long iqcId, BigDecimal qualifiedQuantity);
+    void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, BigDecimal qualifiedQuantity);
     /**
      * 校验到货通知单行存在
@@ -63,7 +63,7 @@ public class MesWmArrivalNoticeLineServiceImpl implements MesWmArrivalNoticeLine
     /**
      * 初始化合格品数量：
      * 1. 如果不需要 IQC 检验，则合格品数量直接 = 接收数量；
-     * 2. 否则，合格品数量由对应的 IQC 检验单负责更新（见 {@link #updateByIqcComplete}）
+     * 2. 否则，合格品数量由对应的 IQC 检验单负责更新（见 {@link #updateArrivalNoticeLineWhenIqcFinish}）
      */
     private void initQualifiedQuantityIfNoIqc(MesWmArrivalNoticeLineDO line) {
         if (BooleanUtil.isFalse(line.getIqcCheckFlag())) {
@@ -100,7 +100,7 @@ public class MesWmArrivalNoticeLineServiceImpl implements MesWmArrivalNoticeLine
     }
     @Override
-    public void updateByIqcComplete(Long lineId, Long iqcId, BigDecimal qualifiedQuantity) {
+    public void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, BigDecimal qualifiedQuantity) {
         // 校验行存在
         validateArrivalNoticeLineExists(lineId);
         // 更新
@@ -71,7 +71,7 @@ public interface MesWmArrivalNoticeService {
      * @param iqcId IQC 检验单编号
      * @param qualifiedQuantity 合格数量
      */
-    void approveArrivalNoticeWhenIqcComplete(Long id, Long lineId, Long iqcId, BigDecimal qualifiedQuantity);
+    void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, BigDecimal qualifiedQuantity);
     /**
      * 完成到货通知单（待入库 → 已完成），内部调用
@@ -96,24 +96,23 @@ public class MesWmArrivalNoticeServiceImpl implements MesWmArrivalNoticeService 
             throw exception(WM_ARRIVAL_NOTICE_NO_LINE);
         }
-        // 2. 检查所有行的 iqcCheckFlag：如果没有需要检验的行，则直接审批通过
+        // 2. 检查所有行的 iqcCheckFlag：如果有需要检验的行，进入待质检状态
         boolean needCheck = CollectionUtils.anyMatch(lines,
                 line -> Boolean.TRUE.equals(line.getIqcCheckFlag()));
-        // TODO @AI：if return；并且不要取反；
-        if (!needCheck) {
-            // 不需要检验，直接进入待入库
-            arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
-                    .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus()));
-        } else {
+        if (needCheck) {
             // 需要检验，进入待质检
             arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                     .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus()));
+            return;
         }
+        // 不需要检验，直接进入待入库
+        arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
+                .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus()));
     }
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void approveArrivalNoticeWhenIqcComplete(Long id, Long lineId, Long iqcId, BigDecimal qualifiedQuantity) {
+    public void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, BigDecimal qualifiedQuantity) {
         // 1.1 校验到货通知单存在
         MesWmArrivalNoticeDO notice = validateArrivalNoticeExists(id);
         // 1.2 校验状态为待质检
@@ -122,14 +121,14 @@ public class MesWmArrivalNoticeServiceImpl implements MesWmArrivalNoticeService 
         }
         // 2. 更新到货通知单行：绑定 iqcId + 合格数量
-        arrivalNoticeLineService.updateByIqcComplete(lineId, iqcId, qualifiedQuantity);
+        arrivalNoticeLineService.updateArrivalNoticeLineWhenIqcFinish(lineId, iqcId, qualifiedQuantity);
         // 3.1 判断是否所有需检行都已完成
         List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(id);
         boolean hasUnchecked = CollectionUtils.anyMatch(lines,
                 line -> Boolean.TRUE.equals(line.getIqcCheckFlag()) && line.getIqcId() == null);
         if (hasUnchecked) {
-            log.info("[updateWhenIqcComplete][到货通知单({}) 还有未完成检验的行，暂不更新状态]", id);
+            log.info("[updateArrivalNoticeWhenIqcFinish][到货通知单({}) 还有未完成检验的行，暂不更新状态]", id);
             return;
         }
         // 3.2 所有行检验完成，更新主表状态 PENDING_QC → PENDING_RECEIPT
@@ -88,8 +88,8 @@ public interface MesWmOutsourceReceiptService {
      * @param qualifiedQuantity   合格品数量
      * @param unqualifiedQuantity 不合格品数量
      */
-    void approveOutsourceReceiptWhenIqcComplete(Long receiptId, Long lineId, Long iqcId,
-                                                BigDecimal qualifiedQuantity, BigDecimal unqualifiedQuantity);
+    void updateOutsourceReceiptWhenIqcFinish(Long receiptId, Long lineId, Long iqcId,
+                                             BigDecimal qualifiedQuantity, BigDecimal unqualifiedQuantity);
     /**
      * 校验外协入库单和行存在
@@ -209,8 +209,8 @@ public class MesWmOutsourceReceiptServiceImpl implements MesWmOutsourceReceiptSe
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void approveOutsourceReceiptWhenIqcComplete(Long receiptId, Long lineId, Long iqcId,
-                                                       BigDecimal qualifiedQuantity, BigDecimal unqualifiedQuantity) {
+    public void updateOutsourceReceiptWhenIqcFinish(Long receiptId, Long lineId, Long iqcId,
+                                                    BigDecimal qualifiedQuantity, BigDecimal unqualifiedQuantity) {
         // 1.1 校验入库单存在
         MesWmOutsourceReceiptDO receipt = validateOutsourceReceiptExists(receiptId);
         // 1.2 校验状态为待检验
 package cn.iocoder.yudao.module.mes.service.wm.productsales;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.line.MesWmProductSalesLinePageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.line.MesWmProductSalesLineSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
@@ -65,7 +66,15 @@ public interface MesWmProductSalesLineService {
      * @param pageReqVO 分页查询
      * @return 销售出库单行分页
      */
-    cn.iocoder.yudao.framework.common.pojo.PageResult<MesWmProductSalesLineDO> getProductSalesLinePage(
-            MesWmProductSalesLinePageReqVO pageReqVO);
+    PageResult<MesWmProductSalesLineDO> getProductSalesLinePage(MesWmProductSalesLinePageReqVO pageReqVO);
+
+    /**
+     * OQC 检验完成后，更新销售出库单行的 OQC 质检状态
+     *
+     * @param id 行 ID
+     * @param oqcId 质检单 ID
+     * @param checkResult 检验结果
+     */
+    void updateProductSalesLineWhenOqcFinish(Long id, Long oqcId, Integer checkResult);
 }
@@ -5,15 +5,16 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.line.MesW
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.line.MesWmProductSalesLineSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesLineMapper;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
-import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_SALES_LINE_NOT_EXISTS;
@@ -29,14 +30,8 @@ public class MesWmProductSalesLineServiceImpl implements MesWmProductSalesLineSe
     @Resource
     private MesWmProductSalesLineMapper productSalesLineMapper;
-
-    @Resource
-    @Lazy
-    private MesWmProductSalesService productSalesService;
-
     @Resource
     private MesWmProductSalesDetailService productSalesDetailService;
-
     @Resource
     private MesMdItemService itemService;
@@ -104,4 +99,12 @@ public class MesWmProductSalesLineServiceImpl implements MesWmProductSalesLineSe
         return line;
     }
+    @Override
+    public void updateProductSalesLineWhenOqcFinish(Long id, Long oqcId, Integer checkResult) {
+        Integer qualityStatus = Objects.equals(checkResult, MesQcCheckResultEnum.PASS.getType())
+                ? MesWmQualityStatusEnum.PASS.getStatus() : MesWmQualityStatusEnum.FAIL.getStatus();
+        productSalesLineMapper.updateById(new MesWmProductSalesLineDO()
+                .setId(id).setOqcId(oqcId).setQualityStatus(qualityStatus));
+    }
+
 }
@@ -82,4 +82,12 @@ public interface MesWmReturnIssueLineService {
      */
     void updateReturnIssueQualityStatusByIssueId(Long issueId, Integer issueType);
+    /**
+     * RQC 检验完成后，更新生产退料单行的质量状态
+     *
+     * @param id 行 ID
+     * @param checkResult 检验结果
+     */
+    void updateReturnIssueLineWhenRqcFinish(Long id, Integer checkResult);
+
 }
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line.MesWm
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueLineMapper;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnIssueTypeEnum;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import java.util.List;
+import java.util.Objects;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_ISSUE_LINE_NOT_EXISTS;
@@ -134,4 +136,11 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
         return MesWmQualityStatusEnum.FAIL.getStatus(); // 不合格
     }
+    @Override
+    public void updateReturnIssueLineWhenRqcFinish(Long id, Integer checkResult) {
+        Integer qualityStatus = Objects.equals(checkResult, MesQcCheckResultEnum.PASS.getType())
+                ? MesWmQualityStatusEnum.PASS.getStatus() : MesWmQualityStatusEnum.FAIL.getStatus();
+        issueLineMapper.updateById(new MesWmReturnIssueLineDO().setId(id).setQualityStatus(qualityStatus));
+    }
+
 }
@@ -82,6 +82,14 @@ public interface MesWmReturnSalesLineService {
      * @param returnId 退货单ID
      * @param qualityStatus 质量状态
      */
-    void updateQualityStatusByReturnId(Long returnId, String qualityStatus);
+    void updateQualityStatusByReturnId(Long returnId, Integer qualityStatus);
+
+    /**
+     * RQC 检验完成后，更新销售退货单行的质量状态
+     *
+     * @param id 行 ID
+     * @param checkResult 检验结果
+     */
+    void updateReturnSalesLineWhenRqcFinish(Long id, Integer checkResult);
 }
@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWm
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesLineMapper;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
@@ -14,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import java.util.List;
+import java.util.Objects;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.MD_ITEM_BATCH_REQUIRED;
@@ -102,7 +105,7 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ
     }
     @Override
-    public void updateQualityStatusByReturnId(Long returnId, String qualityStatus) {
+    public void updateQualityStatusByReturnId(Long returnId, Integer qualityStatus) {
         List<MesWmReturnSalesLineDO> lines = returnSalesLineMapper.selectListByReturnId(returnId);
         for (MesWmReturnSalesLineDO line : lines) {
             returnSalesLineMapper.updateById(new MesWmReturnSalesLineDO()
@@ -125,4 +128,12 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ
         }
     }
+    @Override
+    public void updateReturnSalesLineWhenRqcFinish(Long id, Integer checkResult) {
+        Integer qualityStatus = Objects.equals(checkResult, MesQcCheckResultEnum.PASS.getType())
+                ? MesWmQualityStatusEnum.PASS.getStatus()
+                : MesWmQualityStatusEnum.FAIL.getStatus();
+        returnSalesLineMapper.updateById(new MesWmReturnSalesLineDO().setId(id).setQualityStatus(qualityStatus));
+    }
+
 }
@@ -124,7 +124,7 @@ public class MesWmReturnSalesServiceImpl implements MesWmReturnSalesService {
         // DONE @AI：全部的行设置为待检验状态
         returnSalesLineService.updateQualityStatusByReturnId(id,
-                String.valueOf(MesWmQualityStatusEnum.PENDING.getStatus()));
+                MesWmQualityStatusEnum.PENDING.getStatus());
     }
     @Override
@@ -3,11 +3,12 @@
 <mapper namespace="cn.iocoder.yudao.module.mes.dal.mysql.qc.pendinginspect.MesQcPendingInspectMapper">
     <!--
-        待检任务查询（UNION ALL 多来源），目前已实现的来源：
+        待检任务查询（UNION ALL 多来源），已实现的来源：
         1. 到货通知单（IQC）：状态=待质检(2)，行的 iqc_check_flag=1 且 iqc_id IS NULL
         2. 外协入库单（IQC/OIQC）：状态=待检验(1)，行的 iqc_check=1 且 iqc_id IS NULL
-
-        TODO IPQC/OQC/RQC 来源待对应模块就绪后补充
+        3. 生产报工（IPQC）：状态=待检验(3)
+        4. 销售出库单（OQC）：行的 oqc_check=1 且 oqc_id IS NULL
+        5. 生产退料单（RQC）：状态=待检验(5)，行的 qc_flag=1 且 quality_status=0（待检）
     -->
     <select id="selectQcPendingPage" resultType="cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectRespVO">
         SELECT * FROM (
@@ -50,6 +51,64 @@
               AND rl.iqc_id IS NULL
               AND r.deleted = 0
               AND rl.deleted = 0
+
+            UNION ALL
+
+            <!-- 3. IPQC 来源：生产报工（状态=待检验） -->
+            SELECT
+                f.id AS sourceDocId,
+                ${@cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants@PRO_FEEDBACK} AS sourceDocType,
+                f.code AS sourceDocCode,
+                NULL AS sourceLineId,
+                f.feedback_time AS recordTime,
+                ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IPQC.type} AS qcType,
+                f.item_id AS itemId,
+                f.uncheck_quantity AS quantity,
+                NULL AS vendorId
+            FROM mes_pro_feedback f
+            WHERE f.status = ${@cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum@UNCHECK.status}
+              AND f.deleted = 0
+
+            UNION ALL
+
+            <!-- 4. OQC 来源：销售出库单行（oqc_check=1 且 oqc_id IS NULL） -->
+            SELECT
+                s.id AS sourceDocId,
+                ${@cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants@WM_PRODUCT_SALES} AS sourceDocType,
+                s.code AS sourceDocCode,
+                sl.id AS sourceLineId,
+                s.sales_date AS recordTime,
+                ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@OQC.type} AS qcType,
+                sl.item_id AS itemId,
+                sl.quantity AS quantity,
+                NULL AS vendorId
+            FROM mes_wm_product_sales s
+                JOIN mes_wm_product_sales_line sl ON s.id = sl.sales_id
+            WHERE sl.oqc_check = 1
+              AND sl.oqc_id IS NULL
+              AND s.deleted = 0
+              AND sl.deleted = 0
+
+            UNION ALL
+
+            <!-- 5. RQC 来源：生产退料单行（状态=待检验，行的 qc_flag=1 且 quality_status=0） -->
+            SELECT
+                ri.id AS sourceDocId,
+                ${@cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants@WM_RETURN_ISSUE} AS sourceDocType,
+                ri.code AS sourceDocCode,
+                ril.id AS sourceLineId,
+                ri.return_date AS recordTime,
+                ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type} AS qcType,
+                ril.item_id AS itemId,
+                ril.quantity AS quantity,
+                NULL AS vendorId
+            FROM mes_wm_return_issue ri
+                JOIN mes_wm_return_issue_line ril ON ri.id = ril.issue_id
+            WHERE ri.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnIssueStatusEnum@CONFIRMED.status}
+              AND ril.qc_flag = 1
+              AND ril.quality_status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum@PENDING.status}
+              AND ri.deleted = 0
+              AND ril.deleted = 0
         ) t
         <where>
             <if test="sourceDocCode != null and sourceDocCode != ''">
@@ -56,7 +56,7 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
     private MesWmProductProduceLineService produceLineService;
     @Test
-    public void testCompleteFeedbackFromIpqc_success_withUnqualified() {
+    public void testUpdateProFeedbackWhenIpqcFinish_success_withUnqualified() {
         // 准备数据：插入一条待检验状态的报工单
         Long taskId = randomLongId();
         Long workOrderId = randomLongId();
@@ -87,7 +87,7 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
         BigDecimal materialScrapQty = BigDecimal.valueOf(10);
         BigDecimal otherScrapQty = BigDecimal.valueOf(5);
-        feedbackService.completeFeedbackFromIpqc(feedback.getId(),
+        feedbackService.updateProFeedbackWhenIpqcFinish(feedback.getId(),
                 qualifiedQty, unqualifiedQty, laborScrapQty, materialScrapQty, otherScrapQty);
         // 断言 1：调用了 splitPendingAndFinishProduce
@@ -115,7 +115,7 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
     }
     @Test
-    public void testCompleteFeedbackFromIpqc_success_allQualified() {
+    public void testUpdateProFeedbackWhenIpqcFinish_success_allQualified() {
         // 准备数据：全部合格
         Long taskId = randomLongId();
         Long workOrderId = randomLongId();
@@ -136,7 +136,7 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
                 .thenReturn(List.of(qualifiedLine));
         // 调用
-        feedbackService.completeFeedbackFromIpqc(feedback.getId(),
+        feedbackService.updateProFeedbackWhenIpqcFinish(feedback.getId(),
                 BigDecimal.valueOf(50), BigDecimal.ZERO,
                 BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO);
@@ -151,17 +151,17 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
     }
     @Test
-    public void testCompleteFeedbackFromIpqc_feedbackNotExists() {
+    public void testUpdateProFeedbackWhenIpqcFinish_feedbackNotExists() {
         // 调用不存在的 feedbackId，应该抛异常
         Long feedbackId = randomLongId();
         assertThrows(Exception.class, () ->
-                feedbackService.completeFeedbackFromIpqc(feedbackId,
+                feedbackService.updateProFeedbackWhenIpqcFinish(feedbackId,
                         BigDecimal.TEN, BigDecimal.ZERO,
                         BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO));
     }
     @Test
-    public void testCompleteFeedbackFromIpqc_feedbackNotUncheck() {
+    public void testUpdateProFeedbackWhenIpqcFinish_feedbackNotUncheck() {
         // 准备数据：草稿状态（不是 UNCHECK），应该报错
         MesProFeedbackDO feedback = randomPojo(MesProFeedbackDO.class, o -> {
             o.setStatus(MesProFeedbackStatusEnum.PREPARE.getStatus());
@@ -170,7 +170,7 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
         // 调用，应该抛异常
         assertThrows(Exception.class, () ->
-                feedbackService.completeFeedbackFromIpqc(feedback.getId(),
+                feedbackService.updateProFeedbackWhenIpqcFinish(feedback.getId(),
                         BigDecimal.TEN, BigDecimal.ZERO,
                         BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO));
@@ -179,7 +179,7 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
     }
     @Test
-    public void testCompleteFeedbackFromIpqc_feedbackAlreadyFinished() {
+    public void testUpdateProFeedbackWhenIpqcFinish_feedbackAlreadyFinished() {
         // 准备数据：已完成状态，不能再次完成
         MesProFeedbackDO feedback = randomPojo(MesProFeedbackDO.class, o -> {
             o.setStatus(MesProFeedbackStatusEnum.FINISHED.getStatus());
@@ -188,7 +188,7 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
         // 调用，应该抛异常
         assertThrows(Exception.class, () ->
-                feedbackService.completeFeedbackFromIpqc(feedback.getId(),
+                feedbackService.updateProFeedbackWhenIpqcFinish(feedback.getId(),
                         BigDecimal.TEN, BigDecimal.ZERO,
                         BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO));
     }
@@ -88,7 +88,7 @@ public class MesQcIpqcServiceImplTest extends BaseDbUnitTest {
         // 断言 2：调用了 feedbackService.completeFeedbackFromIpqc，传递正确参数
         // 注意：数量经过 DB 存取后 scale 可能变化（例如 80 → 80.00），所以用 any() 匹配
-        verify(feedbackService).completeFeedbackFromIpqc(
+        verify(feedbackService).updateProFeedbackWhenIpqcFinish(
                 eq(sourceDocId),
                 any(BigDecimal.class),
                 any(BigDecimal.class),
@@ -119,7 +119,7 @@ public class MesQcIpqcServiceImplTest extends BaseDbUnitTest {
         ipqcService.finishIpqc(ipqc.getId());
         // 断言：所有数量参数都是 BigDecimal.ZERO（defaultIfNull 处理）
-        verify(feedbackService).completeFeedbackFromIpqc(
+        verify(feedbackService).updateProFeedbackWhenIpqcFinish(
                 eq(sourceDocId),
                 eq(BigDecimal.ZERO),
                 eq(BigDecimal.ZERO),
@@ -148,7 +148,7 @@ public class MesQcIpqcServiceImplTest extends BaseDbUnitTest {
         assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedIpqc.getStatus());
         // 断言 2：不应该调用 feedbackService
-        verify(feedbackService, never()).completeFeedbackFromIpqc(
+        verify(feedbackService, never()).updateProFeedbackWhenIpqcFinish(
                 anyLong(), any(), any(), any(), any(), any());
     }
@@ -58,7 +58,7 @@ public class MesQcIqcServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testFinishIqc_writeBack_arrivalNotice() {
-        // mock 数据：插入一条草稿状态的 IQC 单，来源为到货通知单
+        // 准备数据：插入一条草稿状态的 IQC 单，来源为到货通知单
         Long sourceDocId = randomLongId();
         Long sourceLineId = randomLongId();
         MesQcIqcDO iqc = randomPojo(MesQcIqcDO.class, o -> {
@@ -79,16 +79,16 @@ public class MesQcIqcServiceImplTest extends BaseDbUnitTest {
         MesQcIqcDO updatedIqc = iqcMapper.selectById(iqc.getId());
         assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedIqc.getStatus());
         // 断言：验证回写到货通知单（参数使用 any 避免 BigDecimal 精度问题）
-        verify(arrivalNoticeService).approveArrivalNoticeWhenIqcComplete(
+        verify(arrivalNoticeService).updateArrivalNoticeWhenIqcFinish(
                 eq(sourceDocId), eq(sourceLineId), eq(iqc.getId()), any(BigDecimal.class));
         // 断言：不应该调用外协入库单的回写
-        verify(outsourceReceiptService, never()).approveOutsourceReceiptWhenIqcComplete(
+        verify(outsourceReceiptService, never()).updateOutsourceReceiptWhenIqcFinish(
                 anyLong(), anyLong(), anyLong(), any(), any());
     }
     @Test
     public void testFinishIqc_writeBack_outsourceReceipt() {
-        // mock 数据：插入一条草稿状态的 IQC 单，来源为外协入库单
+        // 准备数据：插入一条草稿状态的 IQC 单，来源为外协入库单
         Long sourceDocId = randomLongId();
         Long sourceLineId = randomLongId();
         MesQcIqcDO iqc = randomPojo(MesQcIqcDO.class, o -> {
@@ -109,16 +109,16 @@ public class MesQcIqcServiceImplTest extends BaseDbUnitTest {
         MesQcIqcDO updatedIqc = iqcMapper.selectById(iqc.getId());
         assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedIqc.getStatus());
         // 断言：验证回写外协入库单（参数使用 any 避免 BigDecimal 精度问题）
-        verify(outsourceReceiptService).approveOutsourceReceiptWhenIqcComplete(
+        verify(outsourceReceiptService).updateOutsourceReceiptWhenIqcFinish(
                 eq(sourceDocId), eq(sourceLineId), eq(iqc.getId()), any(BigDecimal.class), any(BigDecimal.class));
         // 断言：不应该调用到货通知单的回写
-        verify(arrivalNoticeService, never()).approveArrivalNoticeWhenIqcComplete(
+        verify(arrivalNoticeService, never()).updateArrivalNoticeWhenIqcFinish(
                 anyLong(), anyLong(), anyLong(), any());
     }
     @Test
     public void testFinishIqc_writeBack_noSourceDoc() {
-        // mock 数据：sourceDocType 为空，不需要回写
+        // 准备数据：sourceDocType 为空，不需要回写
         MesQcIqcDO iqc = randomPojo(MesQcIqcDO.class, o -> {
             o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
             o.setCheckResult(1);
@@ -135,15 +135,15 @@ public class MesQcIqcServiceImplTest extends BaseDbUnitTest {
         MesQcIqcDO updatedIqc = iqcMapper.selectById(iqc.getId());
         assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedIqc.getStatus());
         // 断言：不应该调用任何回写
-        verify(arrivalNoticeService, never()).approveArrivalNoticeWhenIqcComplete(
+        verify(arrivalNoticeService, never()).updateArrivalNoticeWhenIqcFinish(
                 anyLong(), anyLong(), anyLong(), any());
-        verify(outsourceReceiptService, never()).approveOutsourceReceiptWhenIqcComplete(
+        verify(outsourceReceiptService, never()).updateOutsourceReceiptWhenIqcFinish(
                 anyLong(), anyLong(), anyLong(), any(), any());
     }
     @Test
     public void testFinishIqc_writeBack_sourceDocTypeDirtyData() {
-        // mock 数据：sourceDocType 非空但 sourceLineId 为空，应该抛异常
+        // 准备数据：sourceDocType 非空但 sourceLineId 为空，应该抛异常
         MesQcIqcDO iqc = randomPojo(MesQcIqcDO.class, o -> {
             o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
             o.setCheckResult(1);
@@ -159,7 +159,7 @@ public class MesQcIqcServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testFinishIqc_writeBack_unknownSourceDocType() {
-        // mock 数据：sourceDocType 无法识别
+        // 准备数据：sourceDocType 无法识别
         MesQcIqcDO iqc = randomPojo(MesQcIqcDO.class, o -> {
             o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
             o.setCheckResult(1);
@@ -173,4 +173,31 @@ public class MesQcIqcServiceImplTest extends BaseDbUnitTest {
         assertThrows(IllegalArgumentException.class, () -> iqcService.finishIqc(iqc.getId()));
     }
+    @Test
+    public void testFinishIqc_checkResultEmpty() {
+        // 准备数据：checkResult 为空，应该报错
+        MesQcIqcDO iqc = randomPojo(MesQcIqcDO.class, o -> {
+            o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+            o.setCheckResult(null); // 检测结论为空
+            o.setSourceDocType(null);
+        });
+        iqcMapper.insert(iqc);
+
+        // 调用，应该抛异常（检测结论必填）
+        assertThrows(Exception.class, () -> iqcService.finishIqc(iqc.getId()));
+    }
+
+    @Test
+    public void testFinishIqc_notDraftStatus() {
+        // 准备数据：已完成状态，不能再次完成
+        MesQcIqcDO iqc = randomPojo(MesQcIqcDO.class, o -> {
+            o.setStatus(MesQcStatusEnum.FINISHED.getStatus());
+            o.setCheckResult(1);
+        });
+        iqcMapper.insert(iqc);
+
+        // 调用，应该抛异常（不是草稿状态）
+        assertThrows(Exception.class, () -> iqcService.finishIqc(iqc.getId()));
+    }
+
 }
+package cn.iocoder.yudao.module.mes.service.qc.oqc;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcMapper;
+import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateDetailService;
+import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_OQC_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_OQC_NOT_PREPARE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+
+/**
+ * {@link MesQcOqcServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(MesQcOqcServiceImpl.class)
+public class MesQcOqcServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private MesQcOqcServiceImpl oqcService;
+
+    @Resource
+    private MesQcOqcMapper oqcMapper;
+
+    @MockitoBean
+    private MesWmProductSalesLineService productSalesLineService;
+    @MockitoBean
+    private MesQcOqcLineService oqcLineService;
+    @MockitoBean
+    private MesMdItemService itemService;
+    @MockitoBean
+    private MesQcTemplateDetailService templateDetailService;
+    @MockitoBean
+    private MesQcDefectRecordService defectRecordService;
+    @MockitoBean
+    private AdminUserApi adminUserApi;
+
+    @Test
+    public void testFinishOqc_success() {
+        // 准备参数
+        Long sourceLineId = randomLongId();
+        Integer checkResult = 1;
+
+        // mock 数据
+        MesQcOqcDO oqc = randomPojo(MesQcOqcDO.class, o -> {
+            o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+            o.setSourceDocType(MesBizTypeConstants.WM_PRODUCT_SALES);
+            o.setSourceLineId(sourceLineId);
+            o.setCheckResult(checkResult);
+        });
+        oqcMapper.insert(oqc);
+
+        // 调用
+        oqcService.finishOqc(oqc.getId());
+
+        // 断言：验证状态更新
+        MesQcOqcDO updatedOqc = oqcMapper.selectById(oqc.getId());
+        assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedOqc.getStatus());
+
+        // 断言：验证回写调用
+        verify(productSalesLineService).updateProductSalesLineWhenOqcFinish(eq(sourceLineId), eq(oqc.getId()), eq(checkResult));
+    }
+
+    @Test
+    public void testFinishOqc_notExists() {
+        // 准备参数
+        Long oqcId = randomLongId();
+
+        // 调用，并断言异常
+        assertServiceException(() -> oqcService.finishOqc(oqcId), QC_OQC_NOT_EXISTS);
+    }
+
+    @Test
+    public void testFinishOqc_statusNotDraft() {
+        // 准备参数
+        // mock 数据：状态为已完成
+        MesQcOqcDO oqc = randomPojo(MesQcOqcDO.class, o -> {
+            o.setStatus(MesQcStatusEnum.FINISHED.getStatus());
+        });
+        oqcMapper.insert(oqc);
+
+        // 调用，并断言异常
+        assertServiceException(() -> oqcService.finishOqc(oqc.getId()), QC_OQC_NOT_PREPARE);
+    }
+
+}
+package cn.iocoder.yudao.module.mes.service.qc.rqc;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.rqc.MesQcRqcMapper;
+import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateDetailService;
+import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueLineService;
+import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_RQC_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_RQC_NOT_PREPARE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+/**
+ * {@link MesQcRqcServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(MesQcRqcServiceImpl.class)
+public class MesQcRqcServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private MesQcRqcServiceImpl rqcService;
+
+    @Resource
+    private MesQcRqcMapper rqcMapper;
+
+    @MockitoBean
+    private MesWmReturnIssueLineService returnIssueLineService;
+    @MockitoBean
+    private MesWmReturnSalesLineService returnSalesLineService;
+    @MockitoBean
+    private MesQcRqcLineService rqcLineService;
+    @MockitoBean
+    private MesMdItemService itemService;
+    @MockitoBean
+    private MesQcTemplateDetailService templateDetailService;
+    @MockitoBean
+    private MesQcDefectRecordService defectRecordService;
+    @MockitoBean
+    private AdminUserApi adminUserApi;
+
+    @Test
+    public void testFinishRqc_successWithReturnIssue() {
+        // 准备参数
+        Long sourceLineId = randomLongId();
+        Integer checkResult = 1;
+
+        // mock 数据
+        MesQcRqcDO rqc = randomPojo(MesQcRqcDO.class, o -> {
+            o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+            o.setSourceDocType(MesBizTypeConstants.WM_RETURN_ISSUE);
+            o.setSourceLineId(sourceLineId);
+            o.setCheckResult(checkResult);
+            // 设置数量通过 finishRqc 的数量校验：合格 + 不合格 = 检测数量
+            o.setCheckQuantity(new java.math.BigDecimal("100"));
+            o.setQualifiedQuantity(new java.math.BigDecimal("80"));
+            o.setUnqualifiedQuantity(new java.math.BigDecimal("20"));
+        });
+        rqcMapper.insert(rqc);
+
+        // 调用
+        rqcService.finishRqc(rqc.getId());
+
+        // 断言：验证状态更新
+        MesQcRqcDO updatedRqc = rqcMapper.selectById(rqc.getId());
+        assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedRqc.getStatus());
+
+        // 断言：验证回写调用生产退料
+        verify(returnIssueLineService).updateReturnIssueLineWhenRqcFinish(eq(sourceLineId), eq(checkResult));
+        // 断言：未调用销售退货
+        verify(returnSalesLineService, never()).updateReturnSalesLineWhenRqcFinish(anyLong(), anyInt());
+    }
+
+    @Test
+    public void testFinishRqc_successWithReturnSales() {
+        // 准备参数
+        Long sourceLineId = randomLongId();
+        Integer checkResult = 1;
+
+        // mock 数据
+        MesQcRqcDO rqc = randomPojo(MesQcRqcDO.class, o -> {
+            o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+            o.setSourceDocType(MesBizTypeConstants.WM_RETURN_SALES);
+            o.setSourceLineId(sourceLineId);
+            o.setCheckResult(checkResult);
+            // 设置数量通过 finishRqc 的数量校验：合格 + 不合格 = 检测数量
+            o.setCheckQuantity(new java.math.BigDecimal("100"));
+            o.setQualifiedQuantity(new java.math.BigDecimal("90"));
+            o.setUnqualifiedQuantity(new java.math.BigDecimal("10"));
+        });
+        rqcMapper.insert(rqc);
+
+        // 调用
+        rqcService.finishRqc(rqc.getId());
+
+        // 断言：验证状态更新
+        MesQcRqcDO updatedRqc = rqcMapper.selectById(rqc.getId());
+        assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedRqc.getStatus());
+
+        // 断言：验证回写调用销售退货
+        verify(returnSalesLineService).updateReturnSalesLineWhenRqcFinish(eq(sourceLineId), eq(checkResult));
+        // 断言：未调用生产退料
+        verify(returnIssueLineService, never()).updateReturnIssueLineWhenRqcFinish(anyLong(), anyInt());
+    }
+
+    @Test
+    public void testFinishRqc_notExists() {
+        // 准备参数
+        Long rqcId = randomLongId();
+
+        // 调用，并断言异常
+        assertServiceException(() -> rqcService.finishRqc(rqcId), QC_RQC_NOT_EXISTS);
+    }
+
+    @Test
+    public void testFinishRqc_statusNotDraft() {
+        // 准备参数
+        // mock 数据：状态为已完成
+        MesQcRqcDO rqc = randomPojo(MesQcRqcDO.class, o -> {
+            o.setStatus(MesQcStatusEnum.FINISHED.getStatus());
+        });
+        rqcMapper.insert(rqc);
+
+        // 调用，并断言异常
+        assertServiceException(() -> rqcService.finishRqc(rqc.getId()), QC_RQC_NOT_PREPARE);
+    }
+
+}
@@ -23,7 +23,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 /**
- * {@link MesWmArrivalNoticeServiceImpl#approveArrivalNoticeWhenIqcComplete} 的单元测试
+ * {@link MesWmArrivalNoticeServiceImpl} 的单元测试
  *
  * @author 芋道源码
  */
@@ -40,7 +40,7 @@ public class MesWmArrivalNoticeServiceImplTest extends BaseDbUnitTest {
     private MesWmArrivalNoticeLineService arrivalNoticeLineService;
     @Test
-    public void testApproveArrivalNoticeWhenIqcComplete_success_allLinesChecked() {
+    public void testUpdateArrivalNoticeWhenIqcFinish_success_allLinesChecked() {
         // mock 数据：插入一条待质检的到货通知单
         MesWmArrivalNoticeDO notice = randomPojo(MesWmArrivalNoticeDO.class, o -> {
             o.setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus());
@@ -67,17 +67,17 @@ public class MesWmArrivalNoticeServiceImplTest extends BaseDbUnitTest {
                 .thenReturn(Arrays.asList(line1, line2));
         // 调用
-        arrivalNoticeService.approveArrivalNoticeWhenIqcComplete(noticeId, lineId, iqcId, qualifiedQuantity);
+        arrivalNoticeService.updateArrivalNoticeWhenIqcFinish(noticeId, lineId, iqcId, qualifiedQuantity);
         // 断言：行回写被调用
-        verify(arrivalNoticeLineService).updateByIqcComplete(eq(lineId), eq(iqcId), eq(qualifiedQuantity));
+        verify(arrivalNoticeLineService).updateArrivalNoticeLineWhenIqcFinish(eq(lineId), eq(iqcId), eq(qualifiedQuantity));
         // 断言：主表状态更新为待入库
         MesWmArrivalNoticeDO updatedNotice = arrivalNoticeMapper.selectById(noticeId);
         assertEquals(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus(), updatedNotice.getStatus());
     }
     @Test
-    public void testApproveArrivalNoticeWhenIqcComplete_success_hasUncheckedLines() {
+    public void testUpdateArrivalNoticeWhenIqcFinish_success_hasUncheckedLines() {
         // mock 数据：插入一条待质检的到货通知单
         MesWmArrivalNoticeDO notice = randomPojo(MesWmArrivalNoticeDO.class, o -> {
             o.setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus());
@@ -104,17 +104,17 @@ public class MesWmArrivalNoticeServiceImplTest extends BaseDbUnitTest {
                 .thenReturn(Arrays.asList(line1, line2));
         // 调用
-        arrivalNoticeService.approveArrivalNoticeWhenIqcComplete(noticeId, lineId, iqcId, qualifiedQuantity);
+        arrivalNoticeService.updateArrivalNoticeWhenIqcFinish(noticeId, lineId, iqcId, qualifiedQuantity);
         // 断言：行回写被调用
-        verify(arrivalNoticeLineService).updateByIqcComplete(eq(lineId), eq(iqcId), eq(qualifiedQuantity));
+        verify(arrivalNoticeLineService).updateArrivalNoticeLineWhenIqcFinish(eq(lineId), eq(iqcId), eq(qualifiedQuantity));
         // 断言：主表状态不变，仍然是待质检
         MesWmArrivalNoticeDO updatedNotice = arrivalNoticeMapper.selectById(noticeId);
         assertEquals(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus(), updatedNotice.getStatus());
     }
     @Test
-    public void testApproveArrivalNoticeWhenIqcComplete_noticeNotExists() {
+    public void testUpdateArrivalNoticeWhenIqcFinish_noticeNotExists() {
         // 准备参数
         Long noticeId = randomLongId();
         Long lineId = randomLongId();
@@ -123,12 +123,12 @@ public class MesWmArrivalNoticeServiceImplTest extends BaseDbUnitTest {
         // 调用，并断言异常
         assertServiceException(
-                () -> arrivalNoticeService.approveArrivalNoticeWhenIqcComplete(noticeId, lineId, iqcId, qualifiedQuantity),
+                () -> arrivalNoticeService.updateArrivalNoticeWhenIqcFinish(noticeId, lineId, iqcId, qualifiedQuantity),
                 WM_ARRIVAL_NOTICE_NOT_EXISTS);
     }
     @Test
-    public void testApproveArrivalNoticeWhenIqcComplete_statusNotPendingQc() {
+    public void testUpdateArrivalNoticeWhenIqcFinish_statusNotPendingQc() {
         // mock 数据：插入一条草稿状态的到货通知单（非待质检）
         MesWmArrivalNoticeDO notice = randomPojo(MesWmArrivalNoticeDO.class, o -> {
             o.setStatus(MesWmArrivalNoticeStatusEnum.PREPARE.getStatus());
@@ -142,7 +142,7 @@ public class MesWmArrivalNoticeServiceImplTest extends BaseDbUnitTest {
         // 调用，并断言异常
         assertServiceException(
-                () -> arrivalNoticeService.approveArrivalNoticeWhenIqcComplete(noticeId, lineId, iqcId, qualifiedQuantity),
+                () -> arrivalNoticeService.updateArrivalNoticeWhenIqcFinish(noticeId, lineId, iqcId, qualifiedQuantity),
                 WM_ARRIVAL_NOTICE_STATUS_NOT_PENDING_QC);
     }
@@ -26,7 +26,7 @@ import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 /**
- * {@link MesWmOutsourceReceiptServiceImpl#approveOutsourceReceiptWhenIqcComplete} 的单元测试
+ * {@link MesWmOutsourceReceiptServiceImpl} 的单元测试
  *
  * @author 芋道源码
  */
@@ -51,7 +51,7 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest {
     private MesMdItemService itemService;
     @Test
-    public void testApproveOutsourceReceiptWhenIqcComplete_success_bothQualifiedAndUnqualified() {
+    public void testUpdateOutsourceReceiptWhenIqcFinish_success_bothQualifiedAndUnqualified() {
         // mock 数据：插入一条待检验状态的外协入库单
         MesWmOutsourceReceiptDO receipt = randomPojo(MesWmOutsourceReceiptDO.class, o -> {
             o.setStatus(MesWmOutsourceReceiptStatusEnum.CONFIRMED.getStatus());
@@ -73,7 +73,7 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest {
         when(outsourceReceiptLineService.getOutsourceReceiptLine(eq(lineId))).thenReturn(line);
         // 调用
-        outsourceReceiptService.approveOutsourceReceiptWhenIqcComplete(
+        outsourceReceiptService.updateOutsourceReceiptWhenIqcFinish(
                 receiptId, lineId, iqcId, qualifiedQuantity, unqualifiedQuantity);
         // 断言：合格品行更新
@@ -94,7 +94,7 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest {
     }
     @Test
-    public void testApproveOutsourceReceiptWhenIqcComplete_success_onlyQualified() {
+    public void testUpdateOutsourceReceiptWhenIqcFinish_success_onlyQualified() {
         // mock 数据：插入一条待检验状态的外协入库单
         MesWmOutsourceReceiptDO receipt = randomPojo(MesWmOutsourceReceiptDO.class, o -> {
             o.setStatus(MesWmOutsourceReceiptStatusEnum.CONFIRMED.getStatus());
@@ -115,7 +115,7 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest {
         when(outsourceReceiptLineService.getOutsourceReceiptLine(eq(lineId))).thenReturn(line);
         // 调用
-        outsourceReceiptService.approveOutsourceReceiptWhenIqcComplete(
+        outsourceReceiptService.updateOutsourceReceiptWhenIqcFinish(
                 receiptId, lineId, iqcId, qualifiedQuantity, unqualifiedQuantity);
         // 断言：合格品行更新
@@ -129,7 +129,7 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest {
     }
     @Test
-    public void testApproveOutsourceReceiptWhenIqcComplete_receiptNotExists() {
+    public void testUpdateOutsourceReceiptWhenIqcFinish_receiptNotExists() {
         // 准备参数
         Long receiptId = randomLongId();
         Long lineId = randomLongId();
@@ -139,13 +139,13 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest {
         // 调用，并断言异常
         assertServiceException(
-                () -> outsourceReceiptService.approveOutsourceReceiptWhenIqcComplete(
+                () -> outsourceReceiptService.updateOutsourceReceiptWhenIqcFinish(
                         receiptId, lineId, iqcId, qualifiedQuantity, unqualifiedQuantity),
                 WM_OUTSOURCE_RECEIPT_NOT_EXISTS);
     }
     @Test
-    public void testApproveOutsourceReceiptWhenIqcComplete_statusNotConfirmed() {
+    public void testUpdateOutsourceReceiptWhenIqcFinish_statusNotConfirmed() {
         // mock 数据：插入一条草稿状态的外协入库单（非待检验状态）
         MesWmOutsourceReceiptDO receipt = randomPojo(MesWmOutsourceReceiptDO.class, o -> {
             o.setStatus(MesWmOutsourceReceiptStatusEnum.PREPARE.getStatus());
@@ -160,13 +160,13 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest {
         // 调用，并断言异常
         assertServiceException(
-                () -> outsourceReceiptService.approveOutsourceReceiptWhenIqcComplete(
+                () -> outsourceReceiptService.updateOutsourceReceiptWhenIqcFinish(
                         receiptId, lineId, iqcId, qualifiedQuantity, unqualifiedQuantity),
                 WM_OUTSOURCE_RECEIPT_STATUS_ERROR);
     }
     @Test
-    public void testApproveOutsourceReceiptWhenIqcComplete_lineNotExists() {
+    public void testUpdateOutsourceReceiptWhenIqcFinish_lineNotExists() {
         // mock 数据：插入一条待检验状态的外协入库单
         MesWmOutsourceReceiptDO receipt = randomPojo(MesWmOutsourceReceiptDO.class, o -> {
             o.setStatus(MesWmOutsourceReceiptStatusEnum.CONFIRMED.getStatus());
@@ -184,7 +184,7 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest {
         // 调用，并断言异常
         assertServiceException(
-                () -> outsourceReceiptService.approveOutsourceReceiptWhenIqcComplete(
+                () -> outsourceReceiptService.updateOutsourceReceiptWhenIqcFinish(
                         receiptId, lineId, iqcId, qualifiedQuantity, unqualifiedQuantity),
                 WM_OUTSOURCE_RECEIPT_LINE_NOT_EXISTS);
     }
+package cn.iocoder.yudao.module.mes.service.wm.productsales;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesLineMapper;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * {@link MesWmProductSalesLineServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(MesWmProductSalesLineServiceImpl.class)
+public class MesWmProductSalesLineServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private MesWmProductSalesLineServiceImpl productSalesLineService;
+
+    @Resource
+    private MesWmProductSalesLineMapper productSalesLineMapper;
+
+    @MockitoBean
+    private MesWmProductSalesService productSalesService;
+
+    @MockitoBean
+    private MesWmProductSalesDetailService productSalesDetailService;
+
+    @MockitoBean
+    private MesMdItemService itemService;
+
+    @Test
+    public void testUpdateProductSalesLineWhenOqcFinish_pass() {
+        // 准备参数
+        Long oqcId = randomLongId();
+        Integer checkResult = MesQcCheckResultEnum.PASS.getType();
+
+        // mock 数据
+        MesWmProductSalesLineDO lineDO = randomPojo(MesWmProductSalesLineDO.class);
+        productSalesLineMapper.insert(lineDO);
+
+        // 调用
+        productSalesLineService.updateProductSalesLineWhenOqcFinish(lineDO.getId(), oqcId, checkResult);
+
+        // 断言：验证 mapper 更新参数正确
+        MesWmProductSalesLineDO updateLine = productSalesLineMapper.selectById(lineDO.getId());
+        assertEquals(oqcId, updateLine.getOqcId());
+        assertEquals(MesWmQualityStatusEnum.PASS.getStatus(), updateLine.getQualityStatus());
+    }
+
+    @Test
+    public void testUpdateProductSalesLineWhenOqcFinish_fail() {
+        // 准备参数
+        Long oqcId = randomLongId();
+        Integer checkResult = MesQcCheckResultEnum.FAIL.getType();
+
+        // mock 数据
+        MesWmProductSalesLineDO lineDO = randomPojo(MesWmProductSalesLineDO.class);
+        productSalesLineMapper.insert(lineDO);
+
+        // 调用
+        productSalesLineService.updateProductSalesLineWhenOqcFinish(lineDO.getId(), oqcId, checkResult);
+
+        // 断言：验证 mapper 更新参数正确
+        MesWmProductSalesLineDO updateLine = productSalesLineMapper.selectById(lineDO.getId());
+        assertEquals(oqcId, updateLine.getOqcId());
+        assertEquals(MesWmQualityStatusEnum.FAIL.getStatus(), updateLine.getQualityStatus());
+    }
+
+}
+package cn.iocoder.yudao.module.mes.service.wm.returnissue;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueLineMapper;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * {@link MesWmReturnIssueLineServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(MesWmReturnIssueLineServiceImpl.class)
+public class MesWmReturnIssueLineServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private MesWmReturnIssueLineServiceImpl returnIssueLineService;
+
+    @Resource
+    private MesWmReturnIssueLineMapper returnIssueLineMapper;
+
+    @MockitoBean
+    private MesWmReturnIssueService issueService;
+
+    @MockitoBean
+    private MesMdItemService itemService;
+
+    @Test
+    public void testUpdateReturnIssueLineWhenRqcFinish_pass() {
+        // 准备参数
+        Integer checkResult = MesQcCheckResultEnum.PASS.getType();
+
+        // mock 数据
+        MesWmReturnIssueLineDO lineDO = randomPojo(MesWmReturnIssueLineDO.class);
+        returnIssueLineMapper.insert(lineDO);
+
+        // 调用
+        returnIssueLineService.updateReturnIssueLineWhenRqcFinish(lineDO.getId(), checkResult);
+
+        // 断言：验证 mapper 更新参数正确
+        MesWmReturnIssueLineDO updateLine = returnIssueLineMapper.selectById(lineDO.getId());
+        assertEquals(MesWmQualityStatusEnum.PASS.getStatus(), updateLine.getQualityStatus());
+    }
+
+    @Test
+    public void testUpdateReturnIssueLineWhenRqcFinish_fail() {
+        // 准备参数
+        Integer checkResult = MesQcCheckResultEnum.FAIL.getType();
+
+        // mock 数据
+        MesWmReturnIssueLineDO lineDO = randomPojo(MesWmReturnIssueLineDO.class);
+        returnIssueLineMapper.insert(lineDO);
+
+        // 调用
+        returnIssueLineService.updateReturnIssueLineWhenRqcFinish(lineDO.getId(), checkResult);
+
+        // 断言：验证 mapper 更新参数正确
+        MesWmReturnIssueLineDO updateLine = returnIssueLineMapper.selectById(lineDO.getId());
+        assertEquals(MesWmQualityStatusEnum.FAIL.getStatus(), updateLine.getQualityStatus());
+    }
+
+}
+package cn.iocoder.yudao.module.mes.service.wm.returnsales;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesLineMapper;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * {@link MesWmReturnSalesLineServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(MesWmReturnSalesLineServiceImpl.class)
+public class MesWmReturnSalesLineServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private MesWmReturnSalesLineServiceImpl returnSalesLineService;
+
+    @Resource
+    private MesWmReturnSalesLineMapper returnSalesLineMapper;
+
+    @MockitoBean
+    private MesWmReturnSalesService returnSalesService;
+
+    @MockitoBean
+    private MesMdItemService itemService;
+
+    @Test
+    public void testUpdateReturnSalesLineWhenRqcFinish_pass() {
+        // 准备参数
+        Integer checkResult = MesQcCheckResultEnum.PASS.getType();
+
+        // mock 数据
+        MesWmReturnSalesLineDO lineDO = randomPojo(MesWmReturnSalesLineDO.class);
+        returnSalesLineMapper.insert(lineDO);
+
+        // 调用
+        returnSalesLineService.updateReturnSalesLineWhenRqcFinish(lineDO.getId(), checkResult);
+
+        // 断言：验证 mapper 更新参数正确
+        MesWmReturnSalesLineDO updateLine = returnSalesLineMapper.selectById(lineDO.getId());
+        assertEquals(MesWmQualityStatusEnum.PASS.getStatus(), updateLine.getQualityStatus());
+    }
+
+    @Test
+    public void testUpdateReturnSalesLineWhenRqcFinish_fail() {
+        // 准备参数
+        Integer checkResult = MesQcCheckResultEnum.FAIL.getType();
+
+        // mock 数据
+        MesWmReturnSalesLineDO lineDO = randomPojo(MesWmReturnSalesLineDO.class);
+        returnSalesLineMapper.insert(lineDO);
+
+        // 调用
+        returnSalesLineService.updateReturnSalesLineWhenRqcFinish(lineDO.getId(), checkResult);
+
+        // 断言：验证 mapper 更新参数正确
+        MesWmReturnSalesLineDO updateLine = returnSalesLineMapper.selectById(lineDO.getId());
+        assertEquals(MesWmQualityStatusEnum.FAIL.getStatus(), updateLine.getQualityStatus());
+    }
+
+}
@@ -297,3 +297,151 @@ CREATE TABLE IF NOT EXISTS &quot;mes_wm_product_produce_detail&quot; (
     "tenant_id" bigint NOT NULL DEFAULT 0,
     PRIMARY KEY ("id")
 );
+
+
+-- ----------------------------
+-- MES 出货检验单（OQC）
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "mes_qc_oqc" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "code" varchar(64) NOT NULL,
+    "name" varchar(500) NOT NULL,
+    "template_id" bigint NOT NULL,
+    "source_doc_id" bigint DEFAULT NULL,
+    "source_doc_type" int DEFAULT NULL,
+    "source_doc_code" varchar(64) DEFAULT NULL,
+    "source_line_id" bigint DEFAULT NULL,
+    "client_id" bigint NOT NULL,
+    "batch_code" varchar(64) DEFAULT NULL,
+    "item_id" bigint NOT NULL,
+    "min_check_quantity" int DEFAULT 1,
+    "max_unqualified_quantity" int DEFAULT 0,
+    "out_quantity" decimal(14,2) NOT NULL,
+    "check_quantity" decimal(14,2) DEFAULT NULL,
+    "qualified_quantity" decimal(14,2) DEFAULT 0.00,
+    "unqualified_quantity" decimal(14,2) DEFAULT 0.00,
+    "critical_rate" decimal(14,2) DEFAULT 0.00,
+    "major_rate" decimal(14,2) DEFAULT 0.00,
+    "minor_rate" decimal(14,2) DEFAULT 0.00,
+    "critical_quantity" int DEFAULT 0,
+    "major_quantity" int DEFAULT 0,
+    "minor_quantity" int DEFAULT 0,
+    "check_result" tinyint DEFAULT NULL,
+    "out_date" timestamp DEFAULT NULL,
+    "inspect_date" timestamp DEFAULT NULL,
+    "inspector_user_id" bigint DEFAULT NULL,
+    "status" tinyint NOT NULL DEFAULT 0,
+    "remark" varchar(500) DEFAULT '',
+    "creator" varchar(64) DEFAULT '',
+    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar(64) DEFAULT '',
+    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    "tenant_id" bigint NOT NULL DEFAULT 0,
+    PRIMARY KEY ("id")
+);
+
+-- ----------------------------
+-- MES 退货检验单（RQC）
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "mes_qc_rqc" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "code" varchar(64) NOT NULL,
+    "name" varchar(500) NOT NULL,
+    "template_id" bigint NOT NULL,
+    "source_doc_id" bigint DEFAULT NULL,
+    "source_doc_type" int DEFAULT NULL,
+    "source_doc_code" varchar(64) DEFAULT NULL,
+    "source_line_id" bigint DEFAULT NULL,
+    "type" int DEFAULT NULL,
+    "item_id" bigint NOT NULL,
+    "batch_code" varchar(128) DEFAULT NULL,
+    "check_quantity" decimal(14,2) DEFAULT NULL,
+    "qualified_quantity" decimal(14,2) DEFAULT 0.00,
+    "unqualified_quantity" decimal(14,2) DEFAULT 0.00,
+    "check_result" tinyint DEFAULT NULL,
+    "inspect_date" timestamp DEFAULT NULL,
+    "inspector_user_id" bigint DEFAULT NULL,
+    "status" tinyint NOT NULL DEFAULT 0,
+    "remark" varchar(500) DEFAULT '',
+    "critical_quantity" int DEFAULT 0,
+    "major_quantity" int DEFAULT 0,
+    "minor_quantity" int DEFAULT 0,
+    "critical_rate" decimal(5,2) DEFAULT 0.00,
+    "major_rate" decimal(5,2) DEFAULT 0.00,
+    "minor_rate" decimal(5,2) DEFAULT 0.00,
+    "creator" varchar(64) DEFAULT '',
+    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar(64) DEFAULT '',
+    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    "tenant_id" bigint NOT NULL DEFAULT 0,
+    PRIMARY KEY ("id")
+);
+
+-- ----------------------------
+-- MES 销售出库单行
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "mes_wm_product_sales_line" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "sales_id" bigint NOT NULL,
+    "item_id" bigint NOT NULL,
+    "quantity" decimal(20,6) NOT NULL,
+    "batch_id" bigint DEFAULT NULL,
+    "material_stock_id" bigint DEFAULT NULL,
+    "oqc_check" tinyint DEFAULT NULL,
+    "oqc_id" bigint DEFAULT NULL,
+    "quality_status" int DEFAULT NULL,
+    "remark" varchar(500) DEFAULT NULL,
+    "creator" varchar(64) DEFAULT '',
+    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar(64) DEFAULT '',
+    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    "tenant_id" bigint NOT NULL DEFAULT 0,
+    PRIMARY KEY ("id")
+);
+
+-- ----------------------------
+-- MES 生产退料单行
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "mes_wm_return_issue_line" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "issue_id" bigint NOT NULL,
+    "material_stock_id" bigint DEFAULT NULL,
+    "item_id" bigint NOT NULL,
+    "quantity" decimal(12,2) NOT NULL DEFAULT 0.00,
+    "batch_id" bigint DEFAULT NULL,
+    "ipqc_id" bigint DEFAULT NULL,
+    "qc_flag" bit NOT NULL DEFAULT FALSE,
+    "quality_status" int DEFAULT NULL,
+    "remark" varchar(500) DEFAULT '',
+    "creator" varchar(64) DEFAULT '',
+    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar(64) DEFAULT '',
+    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    "tenant_id" bigint NOT NULL DEFAULT 0,
+    PRIMARY KEY ("id")
+);
+
+-- ----------------------------
+-- MES 销售退货单行
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "mes_wm_return_sales_line" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "return_id" bigint NOT NULL,
+    "item_id" bigint NOT NULL,
+    "quantity" decimal(12,2) NOT NULL DEFAULT 0.00,
+    "batch_id" bigint DEFAULT NULL,
+    "quality_status" int DEFAULT NULL,
+    "remark" varchar(500) DEFAULT '',
+    "creator" varchar(64) DEFAULT '',
+    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar(64) DEFAULT '',
+    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    "tenant_id" bigint NOT NULL DEFAULT 0,
+    PRIMARY KEY ("id")
+);
+