From 3495965b99dfcbf191eefb8294a8de05bedc160a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 04 九月 2026 13:40:34 +0800
Subject: [PATCH] feat(mes): 新增批量查询方法并优化IPQC/IQC导出功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..cec6752 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")
@@ -89,9 +93,11 @@
private String itemName;
@Schema(description = "瑙勬牸鍨嬪彿", example = "100mm*50mm")
+ @ExcelProperty("瑙勬牸鍨嬪彿")
private String itemSpecification;
@Schema(description = "鍗曚綅鍚嶇О", example = "涓�")
+ @ExcelProperty("鍗曚綅")
private String unitName;
// ========== 鏁伴噺 ==========
@@ -143,8 +149,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 +171,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