From de0202274ed147e89fdbba0a953936a3b9997ec7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 17:37:50 +0800
Subject: [PATCH] feat(mes): 更新IPQC过程检验功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
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 79d9bed..9289874 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
@@ -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;
@@ -44,7 +47,7 @@
// ========== 瀹㈡埛 ==========
- @Schema(description = "瀹㈡埛 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+ @Schema(description = "瀹㈡埛 ID", example = "10")
private Long clientId;
@Schema(description = "瀹㈡埛绠�绉�", example = "瀹㈡埛A")
@@ -69,9 +72,11 @@
private String itemName;
@Schema(description = "瑙勬牸鍨嬪彿", example = "100mm*50mm")
+ @ExcelProperty("瑙勬牸鍨嬪彿")
private String itemSpecification;
@Schema(description = "鍗曚綅鍚嶇О", example = "涓�")
+ @ExcelProperty("鍗曚綅")
private String unitName;
// ========== 鏁伴噺 ==========
@@ -82,7 +87,7 @@
@Schema(description = "鏈�澶т笉鍚堟牸鏁�", example = "0")
private Integer maxUnqualifiedQuantity;
- @Schema(description = "鏈鍑鸿揣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+ @Schema(description = "鏈鍑鸿揣鏁伴噺", example = "100")
@ExcelProperty("鍑鸿揣鏁伴噺")
private BigDecimal outQuantity;
@@ -121,8 +126,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("鍑鸿揣鏃ユ湡")
@@ -140,7 +152,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