From f4a412cebe9532833320bad81cc92e7930d7715a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 03 九月 2026 17:27:06 +0800
Subject: [PATCH] feat(mes): 优化MES模块功能与配置
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
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 d6cf184..d32c8b9 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
@@ -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;
@@ -31,6 +34,8 @@
// ========== 鏉ユ簮鍗曟嵁 ==========
@Schema(description = "鏉ユ簮鍗曟嵁绫诲瀷", example = "116")
+ @ExcelProperty(value = "鏉ユ簮鍗曟嵁绫诲瀷", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.MES_QC_SOURCE_DOC_TYPE)
private Integer sourceDocType;
@Schema(description = "鏉ユ簮鍗曟嵁 ID", example = "200")
@@ -40,12 +45,14 @@
private Long sourceLineId;
@Schema(description = "鏉ユ簮鍗曟嵁缂栫爜", example = "RT20250101001")
+ @ExcelProperty("鏉ユ簮鍗曟嵁缂栫爜")
private String sourceDocCode;
// ========== 妫�楠岀被鍨� ==========
@Schema(description = "妫�楠岀被鍨�", example = "1")
- @ExcelProperty("妫�楠岀被鍨�")
+ @ExcelProperty(value = "妫�楠岀被鍨�", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.MES_RQC_TYPE)
private Integer type;
// ========== 鐗╂枡 ==========
@@ -62,9 +69,11 @@
private String itemName;
@Schema(description = "瑙勬牸鍨嬪彿", example = "100mm*50mm")
+ @ExcelProperty("瑙勬牸鍨嬪彿")
private String itemSpecification;
@Schema(description = "鍗曚綅鍚嶇О", example = "涓�")
+ @ExcelProperty("鍗曚綅")
private String unitName;
@Schema(description = "鎵规鍙�", example = "BATCH001")
@@ -108,7 +117,8 @@
// ========== 妫�楠� ==========
@Schema(description = "妫�娴嬬粨鏋�", example = "1")
- @ExcelProperty("妫�娴嬬粨鏋�")
+ @ExcelProperty(value = "妫�娴嬬粨鏋�", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.MES_QC_CHECK_RESULT)
private Integer checkResult;
@Schema(description = "妫�娴嬫棩鏈�")
@@ -123,7 +133,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