From 381e02b9eccbe953b31d09f2af1c2ce77c816140 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 14:51:05 +0800
Subject: [PATCH] fix(mes): 隔离设备物料并支持销售产品映射
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
index 8b8f429..62b391f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -9,46 +11,56 @@
/**
* 绠＄悊鍚庡彴 - MES 閿�鍞��璐х浉鍏�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Schema(description = "绠＄悊鍚庡彴 - MES 閿�鍞��璐у崟 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesWmReturnSalesRespVO {
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id;
@Schema(description = "閫�璐у崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "RS202603010001")
+ @ExcelProperty("閫�璐у崟缂栧彿")
private String code;
@Schema(description = "閫�璐у崟鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "閿�鍞��璐�")
+ @ExcelProperty("閫�璐у崟鍚嶇О")
private String name;
@Schema(description = "閿�鍞鍗� ID", example = "1")
private Long saleOrderId;
@Schema(description = "閿�鍞鍗曠紪鍙�", example = "SO202603010001")
+ @ExcelProperty("閿�鍞鍗曠紪鍙�")
private String salesOrderCode;
@Schema(description = "瀹㈡埛 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long clientId;
@Schema(description = "瀹㈡埛鍚嶇О", example = "XX瀹㈡埛")
+ @ExcelProperty("瀹㈡埛")
private String clientName;
@Schema(description = "閫�璐ф棩鏈�")
+ @ExcelProperty("閫�璐ф棩鏈�")
private LocalDate returnDate;
@Schema(description = "閫�璐у師鍥�", example = "璐ㄩ噺闂")
+ @ExcelProperty("閫�璐у師鍥�")
private String returnReason;
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ @ExcelProperty("鐘舵��")
private Integer status;
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
}
\ No newline at end of file
--
Gitblit v1.9.3