From c6a2b472cde9dff4d21b95637ee6d99a412c785c Mon Sep 17 00:00:00 2001
From: 高 <gao@gaodeMacBook-Pro.local>
Date: 星期六, 10 十月 2026 17:21:40 +0800
Subject: [PATCH] feat(mes,crm): 新增质检单批量导入、检测结果台账与开票导入
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 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 469076d..1cfaee7 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
@@ -2,6 +2,9 @@
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -26,7 +29,8 @@
private String name;
@Schema(description = "IPQC 妫�楠岀被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @ExcelProperty("妫�楠岀被鍨�")
+ @ExcelProperty(value = "妫�楠岀被鍨�", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.MES_IPQC_TYPE)
private Integer type;
@Schema(description = "妫�楠屾ā鏉� ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
@@ -46,36 +50,11 @@
@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 = "鎵瑰彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "BC20250101")
+ @ExcelProperty("鎵瑰彿")
+ private String batchCode;
@Schema(description = "浜у搧鐗╂枡 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "50")
private Long itemId;
@@ -89,9 +68,11 @@
private String itemName;
@Schema(description = "瑙勬牸鍨嬪彿", example = "100mm*50mm")
+ @ExcelProperty("瑙勬牸鍨嬪彿")
private String itemSpecification;
@Schema(description = "鍗曚綅鍚嶇О", example = "涓�")
+ @ExcelProperty("鍗曚綅")
private String unitName;
// ========== 鏁伴噺 ==========
@@ -143,8 +124,15 @@
// ========== 妫�楠� ==========
@Schema(description = "妫�娴嬬粨鏋�", example = "1")
- @ExcelProperty("妫�娴嬬粨鏋�")
+ @ExcelProperty(value = "妫�娴嬬粨鏋�", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.MES_QC_CHECK_RESULT)
private Integer checkResult;
+
+ // ========== 妫�楠岄」鎸囨爣 ==========
+
+ @Schema(description = "妫�楠岄」鎸囨爣姹囨��", example = "澶栬:鑹ソ(OK), 灏哄:100.00mm(OK)")
+ @ExcelProperty("妫�楠岄」鎸囨爣")
+ private String indicatorResultSummary;
@Schema(description = "妫�娴嬫棩鏈�")
@ExcelProperty("妫�娴嬫棩鏈�")
@@ -158,7 +146,8 @@
private String inspectorNickname;
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
- @ExcelProperty("鐘舵��")
+ @ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.MES_ORDER_STATUS)
private Integer status;
@Schema(description = "澶囨敞", example = "澶囨敞")
--
Gitblit v1.9.3