From 1458532478eedbd82947e6ee8515f881d4a4912a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 16:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java | 125 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 125 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java
new file mode 100644
index 0000000..b7c2622
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java
@@ -0,0 +1,125 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo;
+
+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 cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠＄悊鍚庡彴 - MES 鐢熶骇涓昏鍒� Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class MesProMpsRespVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @ExcelProperty("缂栧彿")
+ private Long id;
+
+ @Schema(description = "MPS 缂栫爜", example = "MPS-001")
+ @ExcelProperty("MPS 缂栫爜")
+ private String code;
+
+ @Schema(description = "鐘舵��", example = "0")
+ @ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.MES_PRO_MPS_STATUS)
+ private Integer status;
+
+ // ========== 鏉ユ簮淇℃伅 ==========
+
+ @Schema(description = "閿�鍞鍗旾D", example = "100")
+ private Long saleOrderId;
+
+ @Schema(description = "閿�鍞鍗曞彿", example = "SO-001")
+ @ExcelProperty("閿�鍞鍗曞彿")
+ private String saleOrderNo;
+
+ @Schema(description = "閿�鍞鍗曟槑缁咺D", example = "200")
+ private Long saleOrderItemId;
+
+ // ========== 浜у搧淇℃伅 ==========
+
+ @Schema(description = "浜у搧缂栧彿", example = "100")
+ private Long productId;
+
+ @Schema(description = "浜у搧缂栫爜", example = "P-001")
+ @ExcelProperty("浜у搧缂栫爜")
+ private String productCode;
+
+ @Schema(description = "浜у搧鍚嶇О", example = "鐢佃矾鏉� A")
+ @ExcelProperty("浜у搧鍚嶇О")
+ private String productName;
+
+ @Schema(description = "瑙勬牸鍨嬪彿", example = "100x200mm")
+ @ExcelProperty("瑙勬牸鍨嬪彿")
+ private String productSpecification;
+
+ @Schema(description = "鍗曚綅鍚嶇О", example = "涓�")
+ @ExcelProperty("鍗曚綅")
+ private String unitMeasureName;
+
+ @Schema(description = "璁″垝鐢熶骇鏁伴噺", example = "100.00")
+ @ExcelProperty("璁″垝鐢熶骇鏁伴噺")
+ private BigDecimal quantity;
+
+ @Schema(description = "宸茬敓浜ф暟閲�", example = "50.00")
+ @ExcelProperty("宸茬敓浜ф暟閲�")
+ private BigDecimal quantityProduced;
+
+ // ========== 瀹㈡埛淇℃伅 ==========
+
+ @Schema(description = "瀹㈡埛缂栧彿", example = "300")
+ private Long clientId;
+
+ @Schema(description = "瀹㈡埛缂栫爜", example = "C-001")
+ @ExcelProperty("瀹㈡埛缂栫爜")
+ private String clientCode;
+
+ @Schema(description = "瀹㈡埛鍚嶇О", example = "瀹㈡埛 A")
+ @ExcelProperty("瀹㈡埛鍚嶇О")
+ private String clientName;
+
+ // ========== 鏃堕棿淇℃伅 ==========
+
+ @Schema(description = "闇�姹傛棩鏈�")
+ @ExcelProperty("闇�姹傛棩鏈�")
+ private LocalDateTime requestDate;
+
+ @Schema(description = "涓嬪彂鏃ユ湡")
+ @ExcelProperty("涓嬪彂鏃ユ湡")
+ private LocalDateTime issueDate;
+
+ @Schema(description = "瀹屾垚鏃ユ湡")
+ @ExcelProperty("瀹屾垚鏃ユ湡")
+ private LocalDateTime finishDate;
+
+ // ========== 鐢熶骇宸ュ崟鍏宠仈 ==========
+
+ @Schema(description = "鐢熶骇宸ュ崟ID", example = "500")
+ private Long workOrderId;
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栫爜", example = "WO-001")
+ @ExcelProperty("鐢熶骇宸ュ崟缂栫爜")
+ private String workOrderCode;
+
+ // ========== 鍚堝苟涓嬪彂鏍囪瘑 ==========
+
+ @Schema(description = "鏄惁鍚堝苟涓嬪彂", example = "0")
+ private Integer mergeFlag;
+
+ @Schema(description = "鍚堝苟鎵规鍙�", example = "MERGE-001")
+ private String mergeBatchNo;
+
+ @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