diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardRespVO.java
index 59e2c7e..4e3fca9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardRespVO.java
@@ -32,13 +32,13 @@ public class MesProCardRespVO {
     @ExcelProperty("工单名称")
     private String workOrderName;
 
+    @Schema(description = "产品物料编号", example = "200")
+    private Long itemId;
+
     @Schema(description = "批次号", example = "BATCH-001")
     @ExcelProperty("批次号")
     private String batchCode;
 
-    @Schema(description = "产品物料编号", example = "200")
-    private Long itemId;
-
     @Schema(description = "产品编码", example = "P-001")
     @ExcelProperty("产品编码")
     private String itemCode;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardSaveReqVO.java
index be96ca1..812f581 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardSaveReqVO.java
@@ -22,13 +22,13 @@ public class MesProCardSaveReqVO {
     @NotNull(message = "生产工单不能为空")
     private Long workOrderId;
 
-    @Schema(description = "批次号", example = "BATCH-001")
-    private String batchCode;
-
     @Schema(description = "产品物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
     @NotNull(message = "产品物料不能为空")
     private Long itemId;
 
+    @Schema(description = "批次号", example = "BATCH-001")
+    private String batchCode;
+
     @Schema(description = "流转数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
     @NotNull(message = "流转数量不能为空")
     private BigDecimal transferedQuantity;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueRespVO.java
index 74e6836..d728ab1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueRespVO.java
@@ -22,21 +22,21 @@ public class MesProTaskIssueRespVO {
     @Schema(description = "工作站编号", example = "1")
     private Long workstationId;
 
+    @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
+    private String sourceDocType;
+
     @Schema(description = "来源单据编号", example = "1")
     private Long sourceDocId;
 
+    @Schema(description = "来源单据行编号", example = "1")
+    private Long sourceLineId;
+
     @Schema(description = "来源单据编码", example = "DOC-001")
     private String sourceDocCode;
 
-    @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
-    private String sourceDocType;
-
     @Schema(description = "投料批次", example = "BATCH-001")
     private String batchCode;
 
-    @Schema(description = "来源单据行编号", example = "1")
-    private Long sourceLineId;
-
     @Schema(description = "产品物料编号", example = "100")
     private Long itemId;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueSaveReqVO.java
index 7c2339a..e97df77 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueSaveReqVO.java
@@ -23,22 +23,22 @@ public class MesProTaskIssueSaveReqVO {
     @Schema(description = "工作站编号", example = "1")
     private Long workstationId;
 
+    @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
+    private String sourceDocType;
+
     @Schema(description = "来源单据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "来源单据编号不能为空")
     private Long sourceDocId;
 
+    @Schema(description = "来源单据行编号", example = "1")
+    private Long sourceLineId;
+
     @Schema(description = "来源单据编码", example = "DOC-001")
     private String sourceDocCode;
 
-    @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
-    private String sourceDocType;
-
     @Schema(description = "投料批次", example = "BATCH-001")
     private String batchCode;
 
-    @Schema(description = "来源单据行编号", example = "1")
-    private Long sourceLineId;
-
     @Schema(description = "产品物料编号", example = "100")
     private Long itemId;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java
index 10bd8a3..469076d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java
@@ -34,12 +34,12 @@ public class MesQcIpqcRespVO {
 
     // ========== 来源单据 ==========
 
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "304")
     private Integer sourceDocType;
 
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcRespVO.java
index ab51d36..0c19e1c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcRespVO.java
@@ -30,12 +30,12 @@ public class MesQcIqcRespVO {
 
     // ========== 来源单据 ==========
 
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "100")
     private Integer sourceDocType;
 
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java
index 8c314bb..79d9bed 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java
@@ -30,12 +30,12 @@ public class MesQcOqcRespVO {
 
     // ========== 来源单据 ==========
 
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "118")
     private Integer sourceDocType;
 
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
 
@@ -51,12 +51,12 @@ public class MesQcOqcRespVO {
     @ExcelProperty("客户简称")
     private String clientNickname;
 
+    // ========== 物料 ==========
+
     @Schema(description = "批次号", example = "BC20250101")
     @ExcelProperty("批次号")
     private String batchCode;
 
-    // ========== 物料 ==========
-
     @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
     private Long itemId;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java
index d4ecc07..98c20eb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java
@@ -26,12 +26,12 @@ public class MesQcOqcSaveReqVO {
 
     // ========== 来源单据 ==========
 
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "118")
     private Integer sourceDocType;
 
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
 
@@ -41,11 +41,11 @@ public class MesQcOqcSaveReqVO {
     @NotNull(message = "客户不能为空")
     private Long clientId;
 
+    // ========== 物料 ==========
+
     @Schema(description = "批次号", example = "BC20250101")
     private String batchCode;
 
-    // ========== 物料 ==========
-
     @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
     @NotNull(message = "产品物料不能为空")
     private Long itemId;
@@ -74,9 +74,8 @@ public class MesQcOqcSaveReqVO {
 
     // ========== 检验 ==========
 
-    @Schema(description = "检测人员用户 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "检测人员不能为空")
-    private Long inspectorUserId;
+    @Schema(description = "检测结果", example = "1")
+    private Integer checkResult;
 
     @Schema(description = "出货日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "出货日期不能为空")
@@ -86,8 +85,9 @@ public class MesQcOqcSaveReqVO {
     @NotNull(message = "检测日期不能为空")
     private LocalDateTime inspectDate;
 
-    @Schema(description = "检测结果", example = "1")
-    private Integer checkResult;
+    @Schema(description = "检测人员用户 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "检测人员不能为空")
+    private Long inspectorUserId;
 
     @Schema(description = "备注", example = "备注")
     private String remark;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/vo/MesQcPendingInspectRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/vo/MesQcPendingInspectRespVO.java
index 6e7f5c9..effe2a5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/vo/MesQcPendingInspectRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/vo/MesQcPendingInspectRespVO.java
@@ -10,17 +10,16 @@ import java.time.LocalDateTime;
 @Data
 public class MesQcPendingInspectRespVO {
 
-    @Schema(description = "来源单据 ID", example = "100")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型（MesBizTypeConstants）", example = "100")
     private Integer sourceDocType;
 
-    @Schema(description = "来源单据编号", example = "AN2025001")
-    private String sourceDocCode;
+    @Schema(description = "来源单据 ID", example = "100")
+    private Long sourceDocId;
 
     @Schema(description = "来源单据行 ID", example = "200")
     private Long sourceLineId;
+    @Schema(description = "来源单据编号", example = "AN2025001")
+    private String sourceDocCode;
 
     @Schema(description = "检验类型（MesQcTypeEnum）", example = "1")
     private Integer qcType;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java
index df8d1bc..d6cf184 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java
@@ -30,12 +30,12 @@ public class MesQcRqcRespVO {
 
     // ========== 来源单据 ==========
 
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "116")
     private Integer sourceDocType;
 
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
 
@@ -85,6 +85,26 @@ public class MesQcRqcRespVO {
     @ExcelProperty("不合格数量")
     private BigDecimal unqualifiedQuantity;
 
+    // ========== 缺陷统计 ==========
+
+    @Schema(description = "致命缺陷率（%）", example = "5.00")
+    private BigDecimal criticalRate;
+
+    @Schema(description = "严重缺陷率（%）", example = "10.00")
+    private BigDecimal majorRate;
+
+    @Schema(description = "轻微缺陷率（%）", example = "15.00")
+    private BigDecimal minorRate;
+
+    @Schema(description = "致命缺陷数量", example = "5")
+    private Integer criticalQuantity;
+
+    @Schema(description = "严重缺陷数量", example = "10")
+    private Integer majorQuantity;
+
+    @Schema(description = "轻微缺陷数量", example = "15")
+    private Integer minorQuantity;
+
     // ========== 检验 ==========
 
     @Schema(description = "检测结果", example = "1")
@@ -110,26 +130,6 @@ public class MesQcRqcRespVO {
     @ExcelProperty("备注")
     private String remark;
 
-    // ========== 缺陷统计 ==========
-
-    @Schema(description = "致命缺陷数量", example = "5")
-    private Integer criticalQuantity;
-
-    @Schema(description = "严重缺陷数量", example = "10")
-    private Integer majorQuantity;
-
-    @Schema(description = "轻微缺陷数量", example = "15")
-    private Integer minorQuantity;
-
-    @Schema(description = "致命缺陷率（%）", example = "5.00")
-    private BigDecimal criticalRate;
-
-    @Schema(description = "严重缺陷率（%）", example = "10.00")
-    private BigDecimal majorRate;
-
-    @Schema(description = "轻微缺陷率（%）", example = "15.00")
-    private BigDecimal minorRate;
-
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java
index 3b9fbf1..ae9629d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java
@@ -32,12 +32,12 @@ public class MesQcRqcSaveReqVO {
 
     // ========== 来源单据 ==========
 
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "116")
     private Integer sourceDocType;
 
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java
index cbab924..63cc752 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java
@@ -21,15 +21,14 @@ public class MesWmMiscIssueRespVO {
     @Schema(description = "杂项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer type;
 
+    @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
+    private String sourceDocType;
     @Schema(description = "来源单据ID", example = "1")
     private Long sourceDocId;
 
     @Schema(description = "来源单据编号", example = "DOC20260302001")
     private String sourceDocCode;
 
-    @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
-    private String sourceDocType;
-
     @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime issueDate;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueSaveReqVO.java
index 2758b7e..61922d9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueSaveReqVO.java
@@ -26,15 +26,14 @@ public class MesWmMiscIssueSaveReqVO {
     @NotNull(message = "杂项类型不能为空")
     private Integer type;
 
+    @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
+    private String sourceDocType;
     @Schema(description = "来源单据ID", example = "1")
     private Long sourceDocId;
 
     @Schema(description = "来源单据编号", example = "DOC20260302001")
     private String sourceDocCode;
 
-    @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
-    private String sourceDocType;
-
     @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "出库日期不能为空")
     private LocalDateTime issueDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java
index e29fc87..effeabf 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java
@@ -21,15 +21,14 @@ public class MesWmMiscReceiptRespVO {
     @Schema(description = "杂项类型", example = "1")
     private Integer type;
 
+    @Schema(description = "来源单据类型", example = "WORK_ORDER")
+    private String sourceDocType;
     @Schema(description = "来源单据 ID", example = "1")
     private Long sourceDocId;
 
     @Schema(description = "来源单据编码", example = "WO2026030001")
     private String sourceDocCode;
 
-    @Schema(description = "来源单据类型", example = "WORK_ORDER")
-    private String sourceDocType;
-
     @Schema(description = "入库日期")
     private LocalDateTime receiptDate;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptSaveReqVO.java
index 1815c05..40db6f7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptSaveReqVO.java
@@ -26,15 +26,14 @@ public class MesWmMiscReceiptSaveReqVO {
     @NotNull(message = "杂项类型不能为空")
     private Integer type;
 
+    @Schema(description = "来源单据类型", example = "WORK_ORDER")
+    private String sourceDocType;
     @Schema(description = "来源单据 ID", example = "1")
     private Long sourceDocId;
 
     @Schema(description = "来源单据编码", example = "WO2026030001")
     private String sourceDocCode;
 
-    @Schema(description = "来源单据类型", example = "WORK_ORDER")
-    private String sourceDocType;
-
     @Schema(description = "入库日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "入库日期不能为空")
     private LocalDateTime receiptDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java
index b4aa8bd..b09695d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java
@@ -14,21 +14,20 @@ public class MesWmReturnVendorDetailSaveReqVO {
     @Schema(description = "编号", example = "1024")
     private Long id;
 
+    @Schema(description = "退货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "退货单编号不能为空")
+    private Long returnId;
     @Schema(description = "退货单行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "退货单行编号不能为空")
     private Long lineId;
 
-    @Schema(description = "退货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "退货单编号不能为空")
-    private Long returnId;
+    @Schema(description = "库存记录编号", example = "1")
+    private Long materialStockId;
 
     @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "物料编号不能为空")
     private Long itemId;
 
-    @Schema(description = "库存记录编号", example = "1")
-    private Long materialStockId;
-
     @Schema(description = "退货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00")
     @NotNull(message = "退货数量不能为空")
     @DecimalMin(value = "0", inclusive = false, message = "退货数量必须大于 0")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcDO.java
index 73dfc42..4dfcaae 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcDO.java
@@ -51,16 +51,16 @@ public class MesQcRqcDO extends BaseDO {
     // ========== 来源单据 ==========
 
     /**
-     * 来源单据 ID
-     */
-    private Long sourceDocId;
-    /**
      * 来源单据类型
      *
      * 关联 {@link cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants}
      */
     private Integer sourceDocType;
     /**
+     * 来源单据 ID
+     */
+    private Long sourceDocId;
+    /**
      * 来源单据行 ID
      */
     private Long sourceLineId;
diff --git a/yudao-module-mes/src/test/resources/sql/create_tables.sql b/yudao-module-mes/src/test/resources/sql/create_tables.sql
index 881ac06..77922be 100644
--- a/yudao-module-mes/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-mes/src/test/resources/sql/create_tables.sql
@@ -381,7 +381,6 @@ CREATE TABLE IF NOT EXISTS "mes_wm_product_produce_detail" (
     PRIMARY KEY ("id")
 );
 
-
 -- ----------------------------
 -- MES 出货检验单（OQC）
 -- ----------------------------
@@ -390,8 +389,8 @@ CREATE TABLE IF NOT EXISTS "mes_qc_oqc" (
     "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_id" bigint DEFAULT NULL,
     "source_line_id" bigint DEFAULT NULL,
     "source_doc_code" varchar(64) DEFAULT NULL,
     "client_id" bigint NOT NULL,
@@ -432,8 +431,8 @@ CREATE TABLE IF NOT EXISTS "mes_qc_rqc" (
     "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_id" bigint DEFAULT NULL,
     "source_line_id" bigint DEFAULT NULL,
     "source_doc_code" varchar(64) DEFAULT NULL,
     "type" int DEFAULT NULL,
@@ -442,17 +441,17 @@ CREATE TABLE IF NOT EXISTS "mes_qc_rqc" (
     "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,
     "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(14,2) DEFAULT 0.00,
-    "major_rate" decimal(14,2) DEFAULT 0.00,
-    "minor_rate" decimal(14,2) DEFAULT 0.00,
     "creator" varchar(64) DEFAULT '',
     "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updater" varchar(64) DEFAULT '',
@@ -706,17 +705,17 @@ CREATE TABLE IF NOT EXISTS "mes_wm_batch" (
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS "mes_wm_material_stock" (
     "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "quantity" decimal(14,2) DEFAULT NULL,
-    "receipt_time" timestamp DEFAULT NULL,
-    "vendor_id" bigint DEFAULT NULL,
-    "item_type_id" bigint DEFAULT NULL,
-    "item_id" bigint DEFAULT NULL,
-    "batch_id" bigint DEFAULT NULL,
-    "batch_code" varchar(255) DEFAULT NULL,
-    "warehouse_id" bigint DEFAULT NULL,
-    "location_id" bigint DEFAULT NULL,
-    "area_id" bigint DEFAULT NULL,
-    "frozen" bit DEFAULT FALSE,
+    \"item_type_id\" bigint DEFAULT NULL,
+    \"item_id\" bigint DEFAULT NULL,
+    \"batch_id\" bigint DEFAULT NULL,
+    \"batch_code\" varchar(255) DEFAULT NULL,
+    \"warehouse_id\" bigint DEFAULT NULL,
+    \"location_id\" bigint DEFAULT NULL,
+    \"area_id\" bigint DEFAULT NULL,
+    \"vendor_id\" bigint DEFAULT NULL,
+    \"quantity\" decimal(14,2) DEFAULT NULL,
+    \"receipt_time\" timestamp DEFAULT NULL,
+    \"frozen\" bit DEFAULT FALSE,
     "creator" varchar(64) DEFAULT '',
     "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updater" varchar(64) DEFAULT '',