From b630f868ae5cb4bc2e92c48d275341d36d260499 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 12:58:07 +0800
Subject: [PATCH] feat(qc): 新增OQC出货检验功能及优化质量流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
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 d5d48f8..b91a0b2 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
@@ -50,34 +50,9 @@
@Schema(description = "鏉ユ簮鍗曟嵁缂栧彿", example = "FB20250101001")
private String sourceDocCode;
- // ========== 鐢熶骇鍏宠仈 ==========
-
- @Schema(description = "鐢熶骇宸ュ崟 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
- private Long workOrderId;
-
- @Schema(description = "宸ュ崟缂栧彿", example = "WO20250101001")
- @ExcelProperty("宸ュ崟缂栧彿")
- private String workOrderCode;
-
- @Schema(description = "宸ュ崟鍚嶇О", example = "鐢熶骇宸ュ崟A")
- private String workOrderName;
-
- @Schema(description = "鐢熶骇浠诲姟 ID", example = "20")
- private Long taskId;
-
- @Schema(description = "宸ヤ綅 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30")
- private Long workstationId;
-
- @Schema(description = "宸ヤ綅鍚嶇О", example = "宸ヤ綅A")
- @ExcelProperty("宸ヤ綅鍚嶇О")
- private String workstationName;
-
- @Schema(description = "宸ュ簭 ID", example = "40")
- private Long processId;
-
- @Schema(description = "宸ュ簭鍚嶇О", example = "缁勮")
- @ExcelProperty("宸ュ簭鍚嶇О")
- private String processName;
+ @Schema(description = "鎵瑰彿", example = "BC20250101")
+ @ExcelProperty("鎵瑰彿")
+ private String batchCode;
// ========== 鐗╂枡 ==========
@@ -153,6 +128,12 @@
@DictFormat(DictTypeConstants.MES_QC_CHECK_RESULT)
private Integer checkResult;
+ // ========== 妫�楠岄」鎸囨爣 ==========
+
+ @Schema(description = "妫�楠岄」鎸囨爣姹囨��", example = "澶栬:鑹ソ(OK), 灏哄:100.00mm(OK)")
+ @ExcelProperty("妫�楠岄」鎸囨爣")
+ private String indicatorResultSummary;
+
@Schema(description = "妫�娴嬫棩鏈�")
@ExcelProperty("妫�娴嬫棩鏈�")
private LocalDateTime inspectDate;
@@ -173,6 +154,29 @@
@ExcelProperty("澶囨敞")
private String remark;
+ // ========== 鎶ュ憡琛ㄥご涓庣瀛� ==========
+
+ @Schema(description = "閲囨牱鍦扮偣", example = "缃愬尯")
+ private String samplingLocation;
+
+ @Schema(description = "璇佷功缂栧彿/鍚堟牸璇佸彿", example = "V0028")
+ private String certificateNo;
+
+ @Schema(description = "鎵ц鏍囧噯", example = "GB/T6027")
+ private String executeStandard;
+
+ @Schema(description = "澶嶆牳浜虹敤鎴风紪鍙�", example = "1")
+ private Long auditUserId;
+
+ @Schema(description = "澶嶆牳浜烘樀绉�", example = "鏉庡洓")
+ private String auditNickname;
+
+ @Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
+ private Long approveUserId;
+
+ @Schema(description = "瀹℃牳浜烘樀绉�", example = "鐜嬩簲")
+ private String approveNickname;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
--
Gitblit v1.9.3