From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +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/task/vo/MesProTaskRespVO.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java
index b6f3266..33f8de4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java
@@ -1,40 +1,50 @@
package cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo;
+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;
+import java.util.List;
@Schema(description = "绠＄悊鍚庡彴 - MES 鐢熶骇浠诲姟 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesProTaskRespVO {
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id;
@Schema(description = "浠诲姟缂栫爜", example = "PT202503150001")
+ @ExcelProperty("浠诲姟缂栫爜")
private String code;
@Schema(description = "浠诲姟鍚嶇О", example = "娉ㄥ浠诲姟")
+ @ExcelProperty("浠诲姟鍚嶇О")
private String name;
@Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
private Long workOrderId;
@Schema(description = "宸ュ崟缂栫爜", example = "WO-001")
+ @ExcelProperty("鐢熶骇宸ュ崟缂栧彿")
private String workOrderCode;
@Schema(description = "宸ュ崟鍚嶇О", example = "鐢熶骇宸ュ崟-A")
+ @ExcelProperty("鐢熶骇宸ュ崟鍚嶇О")
private String workOrderName;
@Schema(description = "宸ヤ綔绔欑紪鍙�", example = "1")
private Long workstationId;
@Schema(description = "宸ヤ綔绔欑紪鐮�", example = "WS-001")
+ @ExcelProperty("宸ヤ綔绔欑紪鐮�")
private String workstationCode;
@Schema(description = "宸ヤ綔绔欏悕绉�", example = "娉ㄥ宸ヤ綔绔�")
+ @ExcelProperty("宸ヤ綔绔�")
private String workstationName;
@Schema(description = "宸ヨ壓璺嚎缂栧彿", example = "1")
@@ -44,45 +54,65 @@
private Long processId;
@Schema(description = "宸ュ簭鍚嶇О", example = "娉ㄥ")
+ @ExcelProperty("宸ュ簭")
private String processName;
+
+ @Schema(description = "鐝粍缂栧彿", example = "1")
+ private Long teamId;
+
+ @Schema(description = "鐝粍鍚嶇О", example = "杩愮淮涓�鐝�")
+ @ExcelProperty("鐝粍")
+ private String teamName;
@Schema(description = "浜у搧鐗╂枡缂栧彿", example = "100")
private Long itemId;
@Schema(description = "浜у搧缂栫爜", example = "P-001")
+ @ExcelProperty("鐗╂枡缂栫爜")
private String itemCode;
@Schema(description = "浜у搧鍚嶇О", example = "鐢佃矾鏉�")
+ @ExcelProperty("鐗╂枡鍚嶇О")
private String itemName;
@Schema(description = "瑙勬牸鍨嬪彿", example = "100x200mm")
+ @ExcelProperty("瑙勬牸鍨嬪彿")
private String itemSpecification;
@Schema(description = "璁￠噺鍗曚綅鍚嶇О", example = "涓�")
+ @ExcelProperty("鍗曚綅")
private String unitMeasureName;
@Schema(description = "鎺掍骇鏁伴噺", example = "100.00")
+ @ExcelProperty("璁″垝鏁伴噺")
private BigDecimal quantity;
@Schema(description = "宸茬敓浜ф暟閲�", example = "50.00")
+ @ExcelProperty("宸茬敓浜ф暟閲�")
private BigDecimal producedQuantity;
@Schema(description = "鍚堟牸鍝佹暟閲�", example = "48.00")
+ @ExcelProperty("鍚堟牸鏁伴噺")
private BigDecimal qualifyQuantity;
@Schema(description = "涓嶈壇鍝佹暟閲�", example = "2.00")
+ @ExcelProperty("涓嶅悎鏍兼暟閲�")
private BigDecimal unqualifyQuantity;
@Schema(description = "寰呮姤宸ユ暟閲�", example = "50.00")
+ @ExcelProperty("寰呯敓浜ф暟閲�")
private BigDecimal pendingQuantity;
@Schema(description = "鍦ㄩ�旀姤宸ユ暟閲�", example = "20.00")
+ @ExcelProperty("鍦ㄩ�旀姤宸ユ暟閲�")
private BigDecimal inTransitQuantity;
@Schema(description = "鍙姤宸ユ暟閲�", example = "30.00")
+ @ExcelProperty("鍙姤宸ユ暟閲�")
private BigDecimal reportableQuantity;
@Schema(description = "鎶ュ伐瀹屾垚鐜�(%)", example = "50.00")
+ @ExcelProperty("鎶ュ伐瀹屾垚鐜�(%)")
private BigDecimal feedbackRate;
@Schema(description = "璋冩暣鏁伴噺", example = "0")
@@ -92,39 +122,57 @@
private Long clientId;
@Schema(description = "瀹㈡埛鍚嶇О", example = "瀹㈡埛A")
+ @ExcelProperty("瀹㈡埛")
private String clientName;
@Schema(description = "寮�濮嬬敓浜ф椂闂�")
+ @ExcelProperty("寮�濮嬬敓浜ф椂闂�")
private LocalDateTime startTime;
@Schema(description = "鐢熶骇鏃堕暱锛堝伐浣滄棩锛�", example = "3")
+ @ExcelProperty("鐢熶骇鏃堕暱(宸ヤ綔鏃�)")
private Integer duration;
@Schema(description = "缁撴潫鐢熶骇鏃堕棿")
+ @ExcelProperty("缁撴潫鐢熶骇鏃堕棿")
private LocalDateTime endTime;
@Schema(description = "鐢樼壒鍥炬樉绀洪鑹�", example = "#00AEF3")
private String colorCode;
@Schema(description = "闇�姹傛棩鏈�")
+ @ExcelProperty("闇�姹傛棩鏈�")
private LocalDateTime requestDate;
@Schema(description = "瀹屾垚鏃ユ湡")
+ @ExcelProperty("瀹屾垚鏃ユ湡")
private LocalDateTime finishDate;
@Schema(description = "鍙栨秷鏃ユ湡")
+ @ExcelProperty("鍙栨秷鏃ユ湡")
private LocalDateTime cancelDate;
@Schema(description = "浠诲姟鐘舵��", example = "0")
+ @ExcelProperty("浠诲姟鐘舵��")
private Integer status;
@Schema(description = "鏄惁璐ㄦ锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭 checkFlag锛�", example = "true")
+ @ExcelProperty("鏄惁璐ㄦ")
private Boolean checkFlag;
+ @Schema(description = "鏄惁鍊掑啿锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭 backflushFlag锛�", example = "true")
+ @ExcelProperty("鏄惁鍊掑啿")
+ private Boolean backflushFlag;
+
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
+ @Schema(description = "鍋滃伐鍘嗗彶璁板綍")
+ private List<MesProTaskPauseRecordRespVO> pauseRecords;
+
}
--
Gitblit v1.9.3