✨ feat(mes): 更新质检标志字段，优化相关逻辑

将多个类中的质检标志字段从 `iqcCheck` 和 `qcFlag` 更新为 `iqcCheckFlag` 和 `rqcCheckFlag`，以提高代码一致性和可读性。同时，更新相关逻辑以自动计算质量状态，确保系统在处理质检时的准确性。

✨ feat(mes): 更新质检标志字段，优化相关逻辑
将多个类中的质检标志字段从 `iqcCheck` 和 `qcFlag` 更新为 `iqcCheckFlag` 和 `rqcCheckFlag`，以提高代码一致性和可读性。同时，更新相关逻辑以自动计算质量状态，确保系统在处理质检时的准确性。
YunaiV
1 parent 1a10d8f1
Showing 21 changed files with 72 additions and 63 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.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/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.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/returnissue/MesWmReturnIssueLineDO.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/dal/dataobject/wm/salesnotice/MesWmSalesNoticeLineDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java
@@ -47,7 +47,7 @@ public class MesWmOutsourceReceiptLineRespVO {
     private String lotNumber;
     @Schema(description = "是否需要质检")
-    private Boolean iqcCheck;
+    private Boolean iqcCheckFlag;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -42,7 +42,7 @@ public class MesWmOutsourceReceiptLineSaveReqVO {
     private String lotNumber;
     @Schema(description = "是否需要质检")
-    private Boolean iqcCheck;
+    private Boolean iqcCheckFlag;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -41,7 +41,7 @@ public class MesWmProductSalesLineRespVO {
     private String batchCode;
     @Schema(description = "是否出厂检验", example = "true")
-    private Boolean oqcCheck;
+    private Boolean oqcCheckFlag;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -38,7 +38,7 @@ public class MesWmReturnIssueLineRespVO {
     private Long batchId;
     @Schema(description = "是否需要质检", example = "false")
-    private Boolean qcFlag;
+    private Boolean rqcCheckFlag;
     @Schema(description = "质量状态", example = "0")
     private Integer qualityStatus;
@@ -32,7 +32,7 @@ public class MesWmReturnIssueLineSaveReqVO {
     @Schema(description = "是否需要质检", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
     @NotNull(message = "是否需要质检不能为空")
-    private Boolean qcFlag;
+    private Boolean rqcCheckFlag;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -46,7 +46,7 @@ public class MesWmReturnSalesLineRespVO {
     private Long rqcId;
     @Schema(description = "是否需要质检", example = "true")
-    private Boolean qcFlag;
+    private Boolean rqcCheckFlag;
     @Schema(description = "批次号", example = "B001")
     private String batchCode;
@@ -36,7 +36,7 @@ public class MesWmReturnSalesLineSaveReqVO {
     private Long batchId;
     @Schema(description = "是否需要质检", example = "true")
-    private Boolean qcFlag;
+    private Boolean rqcCheckFlag;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -41,7 +41,7 @@ public class MesWmSalesNoticeLineRespVO {
     private BigDecimal quantity;
     @Schema(description = "是否检验", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-    private Boolean oqcCheck;
+    private Boolean oqcCheckFlag;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -35,7 +35,7 @@ public class MesWmSalesNoticeLineSaveReqVO {
     @Schema(description = "是否检验", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @NotNull(message = "是否检验不能为空")
-    private Boolean oqcCheck;
+    private Boolean oqcCheckFlag;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -76,7 +76,7 @@ public class MesWmOutsourceReceiptLineDO extends BaseDO {
     /**
      * 是否需要质检
      */
-    private Boolean iqcCheck;
+    private Boolean iqcCheckFlag;
     /**
      * 质量状态
      *
@@ -56,7 +56,7 @@ public class MesWmProductSalesLineDO extends BaseDO {
     /**
      * 是否出厂检验
      */
-    private Boolean oqcCheck;
+    private Boolean oqcCheckFlag;
     /**
      * 出厂检验单 ID
      *
@@ -58,7 +58,7 @@ public class MesWmReturnIssueLineDO extends BaseDO {
     /**
      * 是否需要质检
      */
-    private Boolean qcFlag;
+    private Boolean rqcCheckFlag;
     /**
      * 质量状态
      *
@@ -56,7 +56,7 @@ public class MesWmReturnSalesLineDO extends BaseDO {
     /**
      * 是否需要质检
      */
-    private Boolean qcFlag;
+    private Boolean rqcCheckFlag;
     /**
      * 质量状态
      *
@@ -54,7 +54,7 @@ public class MesWmSalesNoticeLineDO extends BaseDO {
     /**
      * 是否检验
      */
-    private Boolean oqcCheck;
+    private Boolean oqcCheckFlag;
     /**
      * 备注
      */
@@ -37,12 +37,8 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei
         // 插入
         MesWmOutsourceReceiptLineDO line = BeanUtils.toBean(createReqVO, MesWmOutsourceReceiptLineDO.class);
-        // 根据 iqcCheck 字段，设置 qualityStatus
-        if (line.getIqcCheck() != null && line.getIqcCheck()) {
-            line.setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus());
-        } else {
-            line.setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus());
-        }
+        // 质量状态自动赋值
+        line.setQualityStatus(calculateQualityStatus(line.getIqcCheckFlag()));
         lineMapper.insert(line);
         return line.getId();
     }
@@ -56,12 +52,8 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei
         // 更新
         MesWmOutsourceReceiptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmOutsourceReceiptLineDO.class);
-        // 根据 iqcCheck 字段，设置 qualityStatus
-        if (updateObj.getIqcCheck() != null && updateObj.getIqcCheck()) {
-            updateObj.setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus());
-        } else {
-            updateObj.setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus());
-        }
+        // 质量状态自动赋值
+        updateObj.setQualityStatus(calculateQualityStatus(updateObj.getIqcCheckFlag()));
         lineMapper.updateById(updateObj);
     }
@@ -109,4 +101,17 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei
         lineMapper.insert(line);
     }
+    /**
+     * 根据 iqcCheckFlag，计算质量状态
+     *
+     * @param iqcCheckFlag 是否需要质检
+     * @return 质量状态
+     */
+    private Integer calculateQualityStatus(Boolean iqcCheckFlag) {
+        if (Boolean.TRUE.equals(iqcCheckFlag)) {
+            return MesWmQualityStatusEnum.PENDING.getStatus(); // 待检
+        }
+        return MesWmQualityStatusEnum.PASS.getStatus(); // 不需检验，默认合格
+    }
+
 }
@@ -123,7 +123,7 @@ public class MesWmProductSalesLineServiceImpl implements MesWmProductSalesLineSe
         Long salesId = currentLine.getSalesId();
         List<MesWmProductSalesLineDO> allLines = productSalesLineMapper.selectListBySalesId(salesId);
         boolean hasNg = CollectionUtils.anyMatch(allLines,
-                line -> Boolean.TRUE.equals(line.getOqcCheck())
+                line -> Boolean.TRUE.equals(line.getOqcCheckFlag())
                         && Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus()));
         if (hasNg) {
             log.info("[updateProductSalesLineWhenOqcFinish][销售出库单({}) 存在质检不合格行，取消出库单]", salesId);
@@ -51,7 +51,7 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
         // 插入
         MesWmReturnIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnIssueLineDO.class);
         // 质量状态自动赋值
-        line.setQualityStatus(calculateQualityStatus(line.getQcFlag(), issue.getType()));
+        line.setQualityStatus(calculateQualityStatus(line.getRqcCheckFlag(), issue.getType()));
         issueLineMapper.insert(line);
         return line.getId();
     }
@@ -68,7 +68,7 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
         // 更新
         MesWmReturnIssueLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueLineDO.class);
         // 质量状态自动赋值
-        updateObj.setQualityStatus(calculateQualityStatus(updateObj.getQcFlag(), issue.getType()));
+        updateObj.setQualityStatus(calculateQualityStatus(updateObj.getRqcCheckFlag(), issue.getType()));
         issueLineMapper.updateById(updateObj);
     }
@@ -113,7 +113,7 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
     public void updateReturnIssueQualityStatusByIssueId(Long issueId, Integer issueType) {
         List<MesWmReturnIssueLineDO> lines = issueLineMapper.selectListByIssueId(issueId);
         for (MesWmReturnIssueLineDO line : lines) {
-            Integer newStatus = calculateQualityStatus(line.getQcFlag(), issueType);
+            Integer newStatus = calculateQualityStatus(line.getRqcCheckFlag(), issueType);
             if (ObjUtil.notEqual(newStatus, line.getQualityStatus())) {
                 issueLineMapper.updateById(new MesWmReturnIssueLineDO()
                         .setId(line.getId()).setQualityStatus(newStatus));
@@ -122,14 +122,14 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
     }
     /**
-     * 根据 qcFlag 和退料类型，计算质量状态
+     * 根据 rqcCheckFlag 和退料类型，计算质量状态
      *
-     * @param qcFlag 是否需要质检
+     * @param rqcCheckFlag 是否需要质检
      * @param issueType 退料类型
      * @return 质量状态
      */
-    private Integer calculateQualityStatus(Boolean qcFlag, Integer issueType) {
-        if (Boolean.TRUE.equals(qcFlag)) {
+    private Integer calculateQualityStatus(Boolean rqcCheckFlag, Integer issueType) {
+        if (Boolean.TRUE.equals(rqcCheckFlag)) {
             return MesWmQualityStatusEnum.PENDING.getStatus(); // 待检
         }
         if (MesWmReturnIssueTypeEnum.REMAINDER.getType().equals(issueType)) {
@@ -164,7 +164,7 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
                     .setQuantity(unqualifiedQuantity)
                     .setBatchId(sourceLine.getBatchId())
                     .setRqcId(sourceLine.getRqcId())
-                    .setQcFlag(sourceLine.getQcFlag())
+                    .setRqcCheckFlag(sourceLine.getRqcCheckFlag())
                     .setQualityStatus(MesWmQualityStatusEnum.FAIL.getStatus())
                     .setRemark(sourceLine.getRemark());
             issueLineMapper.insert(unqualifiedLine);
@@ -52,7 +52,8 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ
         // 插入
         MesWmReturnSalesLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnSalesLineDO.class);
-        line.setQualityStatus(calculateQualityStatus(line.getQcFlag()));
+        // 质量状态自动赋值
+        line.setQualityStatus(calculateQualityStatus(line.getRqcCheckFlag()));
         returnSalesLineMapper.insert(line);
         return line.getId();
     }
@@ -68,7 +69,8 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ
         // 更新
         MesWmReturnSalesLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnSalesLineDO.class);
-        updateObj.setQualityStatus(calculateQualityStatus(updateObj.getQcFlag()));
+        // 质量状态自动赋值
+        updateObj.setQualityStatus(calculateQualityStatus(updateObj.getRqcCheckFlag()));
         returnSalesLineMapper.updateById(updateObj);
     }
@@ -113,7 +115,7 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ
     public void updateQualityStatusByReturnId(Long returnId, Integer qualityStatus) {
         List<MesWmReturnSalesLineDO> lines = returnSalesLineMapper.selectListByReturnId(returnId);
         for (MesWmReturnSalesLineDO line : lines) {
-            Integer newStatus = calculateQualityStatus(line.getQcFlag());
+            Integer newStatus = calculateQualityStatus(line.getRqcCheckFlag());
             if (ObjUtil.notEqual(newStatus, line.getQualityStatus())) {
                 returnSalesLineMapper.updateById(new MesWmReturnSalesLineDO()
                         .setId(line.getId()).setQualityStatus(newStatus));
@@ -121,8 +123,8 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ
         }
     }
-    private Integer calculateQualityStatus(Boolean qcFlag) {
-        if (Boolean.TRUE.equals(qcFlag)) {
+    private Integer calculateQualityStatus(Boolean rqcCheckFlag) {
+        if (Boolean.TRUE.equals(rqcCheckFlag)) {
             return MesWmQualityStatusEnum.PENDING.getStatus(); // 待检
         }
         return MesWmQualityStatusEnum.PASS.getStatus(); // 不需检验，默认合格
@@ -167,7 +169,7 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ
                     .setQuantity(unqualifiedQuantity)
                     .setBatchId(sourceLine.getBatchId())
                     .setRqcId(sourceLine.getRqcId())
-                    .setQcFlag(sourceLine.getQcFlag())
+                    .setRqcCheckFlag(sourceLine.getRqcCheckFlag())
                     .setQualityStatus(MesWmQualityStatusEnum.FAIL.getStatus())
                     .setRemark(sourceLine.getRemark());
             returnSalesLineMapper.insert(unqualifiedLine);
@@ -5,11 +5,11 @@
     <!--
         待检任务查询（UNION ALL 多来源），已实现的来源：
         1. 到货通知单（IQC）：单据状态=待质检(2)，行的 iqc_check_flag=1 且 iqc_id 为空
-        2. 外协入库单（IQC）：单据状态=待检验(1)，行的 iqc_check=1 且 iqc_id 为空
+        2. 外协入库单（IQC）：单据状态=待检验(1)，行的 iqc_check_flag=1 且 iqc_id 为空
         3. 生产报工（IPQC）：单据状态=待检验(3)
-        4. 销售出库单（OQC）：无单据状态要求，行的 oqc_check=1 且 oqc_id 为空
-        5. 生产退料单（RQC）：单据状态=待检验(1)，行的 qc_flag=1 且 quality_status=0(待检)
-        6. 销售退货单（RQC）：单据状态=待检验(1)，行的 qc_flag=1 且 quality_status=0(待检)
+        4. 销售出库单（OQC）：无单据状态要求，行的 oqc_check_flag=1 且 oqc_id 为空
+        5. 生产退料单（RQC）：单据状态=待检验(1)，行的 rqc_check_flag=1 且 rqc_id 为空 且 quality_status=0(待检)
+        6. 销售退货单（RQC）：单据状态=待检验(1)，行的 rqc_check_flag=1 且 rqc_id 为空 且 quality_status=0(待检)
     -->
     <select id="selectQcPendingPage" resultType="cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectRespVO">
         SELECT * FROM (
@@ -56,7 +56,7 @@
             FROM mes_wm_outsource_receipt r
                 JOIN mes_wm_outsource_receipt_line rl ON r.id = rl.receipt_id
             WHERE r.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmOutsourceReceiptStatusEnum@CONFIRMED.status}
-              AND rl.iqc_check = 1
+              AND rl.iqc_check_flag = 1
               AND rl.iqc_id IS NULL
               AND r.deleted = 0
               AND rl.deleted = 0
@@ -84,7 +84,7 @@
             UNION ALL
-            <!-- 4. OQC 来源：销售出库单行（oqc_check=1 且 oqc_id IS NULL） -->
+            <!-- 4. OQC 来源：销售出库单行（oqc_check_flag=1 且 oqc_id IS NULL） -->
             SELECT
                 s.id AS sourceDocId,
                 ${@cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants@WM_PRODUCT_SALES} AS sourceDocType,
@@ -101,14 +101,14 @@
                 s.client_id AS clientId
             FROM mes_wm_product_sales s
                 JOIN mes_wm_product_sales_line sl ON s.id = sl.sales_id
-            WHERE sl.oqc_check = 1
+            WHERE sl.oqc_check_flag = 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） -->
+            <!-- 5. RQC 来源：生产退料单行（状态=待检验，行的 rqc_check_flag=1 且 rqc_id IS NULL 且 quality_status=0） -->
             SELECT
                 ri.id AS sourceDocId,
                 ${@cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants@WM_RETURN_ISSUE} AS sourceDocType,
@@ -126,7 +126,8 @@
             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.rqc_check_flag = 1
+              AND ril.rqc_id IS NULL
               AND ril.quality_status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum@PENDING.status}
               AND ri.deleted = 0
               AND ril.deleted = 0
@@ -151,7 +152,8 @@
             FROM mes_wm_return_sales r
                 JOIN mes_wm_return_sales_line rl ON r.id = rl.return_id
             WHERE r.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum@CONFIRMED.status}
-              AND rl.qc_flag = 1
+              AND rl.rqc_check_flag = 1
+              AND rl.rqc_id IS NULL
               AND rl.quality_status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum@PENDING.status}
               AND r.deleted = 0
               AND rl.deleted = 0
@@ -48,7 +48,7 @@ public class MesWmProductSalesLineServiceImplTest extends BaseDbUnitTest {
         // mock 数据
         MesWmProductSalesLineDO lineDO = randomPojo(MesWmProductSalesLineDO.class, o -> {
-            o.setOqcCheck(true);         // 需要 OQC 检验
+            o.setOqcCheckFlag(true);         // 需要 OQC 检验
             o.setQualityStatus(null);    // 初始为空
         });
         productSalesLineMapper.insert(lineDO);
@@ -70,7 +70,7 @@ public class MesWmProductSalesLineServiceImplTest extends BaseDbUnitTest {
         // mock 数据
         MesWmProductSalesLineDO lineDO = randomPojo(MesWmProductSalesLineDO.class, o -> {
-            o.setOqcCheck(true);
+            o.setOqcCheckFlag(true);
             o.setQualityStatus(null);
         });
         productSalesLineMapper.insert(lineDO);
@@ -90,14 +90,14 @@ public class MesWmProductSalesLineServiceImplTest extends BaseDbUnitTest {
         Long salesId = randomLongId();
         MesWmProductSalesLineDO line1 = randomPojo(MesWmProductSalesLineDO.class, o -> {
             o.setSalesId(salesId);
-            o.setOqcCheck(true);
+            o.setOqcCheckFlag(true);
             o.setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus());
         });
         productSalesLineMapper.insert(line1);
         MesWmProductSalesLineDO line2 = randomPojo(MesWmProductSalesLineDO.class, o -> {
             o.setSalesId(salesId);
-            o.setOqcCheck(true);
+            o.setOqcCheckFlag(true);
             o.setQualityStatus(null); // 待检
         });
         productSalesLineMapper.insert(line2);
@@ -116,14 +116,14 @@ public class MesWmProductSalesLineServiceImplTest extends BaseDbUnitTest {
         Long salesId = randomLongId();
         MesWmProductSalesLineDO line1 = randomPojo(MesWmProductSalesLineDO.class, o -> {
             o.setSalesId(salesId);
-            o.setOqcCheck(true);
+            o.setOqcCheckFlag(true);
             o.setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus());
         });
         productSalesLineMapper.insert(line1);
         MesWmProductSalesLineDO line2 = randomPojo(MesWmProductSalesLineDO.class, o -> {
             o.setSalesId(salesId);
-            o.setOqcCheck(true);
+            o.setOqcCheckFlag(true);
             o.setQualityStatus(null);
         });
         productSalesLineMapper.insert(line2);
@@ -138,18 +138,18 @@ public class MesWmProductSalesLineServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testUpdateProductSalesLineWhenOqcFinish_skipNonOqcCheckLines() {
-        // 准备数据：同一出库单下 2 行，第 1 行不需要 OQC 检验（oqcCheck=false），第 2 行需要检验且不合格
+        // 准备数据：同一出库单下 2 行，第 1 行不需要 OQC 检验（oqcCheckFlag=false），第 2 行需要检验且不合格
         Long salesId = randomLongId();
         MesWmProductSalesLineDO line1 = randomPojo(MesWmProductSalesLineDO.class, o -> {
             o.setSalesId(salesId);
-            o.setOqcCheck(false); // 不需要 OQC 检验
+            o.setOqcCheckFlag(false); // 不需要 OQC 检验
             o.setQualityStatus(null);
         });
         productSalesLineMapper.insert(line1);
         MesWmProductSalesLineDO line2 = randomPojo(MesWmProductSalesLineDO.class, o -> {
             o.setSalesId(salesId);
-            o.setOqcCheck(true);
+            o.setOqcCheckFlag(true);
             o.setQualityStatus(null);
         });
         productSalesLineMapper.insert(line2);
@@ -391,7 +391,7 @@ CREATE TABLE IF NOT EXISTS &quot;mes_wm_product_sales_line&quot; (
     "quantity" decimal(20,6) NOT NULL,
     "batch_id" bigint DEFAULT NULL,
     "material_stock_id" bigint DEFAULT NULL,
-    "oqc_check" tinyint DEFAULT NULL,
+    "oqc_check_flag" tinyint DEFAULT NULL,
     "oqc_id" bigint DEFAULT NULL,
     "quality_status" int DEFAULT NULL,
     "remark" varchar(500) DEFAULT NULL,
@@ -415,7 +415,7 @@ CREATE TABLE IF NOT EXISTS &quot;mes_wm_return_issue_line&quot; (
     "quantity" decimal(12,2) NOT NULL DEFAULT 0.00,
     "batch_id" bigint DEFAULT NULL,
     "rqc_id" bigint DEFAULT NULL,
-    "qc_flag" bit NOT NULL DEFAULT FALSE,
+    "rqc_check_flag" bit NOT NULL DEFAULT FALSE,
     "quality_status" int DEFAULT NULL,
     "remark" varchar(500) DEFAULT '',
     "creator" varchar(64) DEFAULT '',
@@ -437,7 +437,7 @@ CREATE TABLE IF NOT EXISTS &quot;mes_wm_return_sales_line&quot; (
     "quantity" decimal(12,2) NOT NULL DEFAULT 0.00,
     "batch_id" bigint DEFAULT NULL,
     "rqc_id" bigint DEFAULT NULL,
-    "qc_flag" bit NOT NULL DEFAULT FALSE,
+    "rqc_check_flag" bit NOT NULL DEFAULT FALSE,
     "quality_status" int DEFAULT NULL,
     "remark" varchar(500) DEFAULT '',
     "creator" varchar(64) DEFAULT '',