From 1f7c36424e8f48a5917ac6c77e2e47979c469a28 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 26 八月 2026 09:00:14 +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/workorder/vo/MesProWorkOrderRespVO.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
index 70e1530..714bf36 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
@@ -61,13 +61,17 @@
@ExcelProperty("鍗曚綅")
private String unitMeasureName;
- @Schema(description = "鐢熶骇鏁伴噺", example = "100.00")
- @ExcelProperty("鐢熶骇鏁伴噺")
+ @Schema(description = "璁㈠崟鏁伴噺", example = "100.00")
+ @ExcelProperty("璁㈠崟鏁伴噺")
private BigDecimal quantity;
@Schema(description = "宸茬敓浜ф暟閲�", example = "50.00")
@ExcelProperty("宸茬敓浜ф暟閲�")
private BigDecimal quantityProduced;
+
+ @Schema(description = "瀹屽伐杩涘害", example = "50.00")
+ @ExcelProperty("瀹屽伐杩涘害")
+ private BigDecimal completionProgress;
@Schema(description = "璋冩暣鏁伴噺", example = "0")
@ExcelProperty("璋冩暣鏁伴噺")
@@ -134,4 +138,23 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
+ @Schema(description = "宸ュ簭杩涘害鍒楄〃")
+ private java.util.List<MesProWorkOrderProcessProgressVO> processProgressList;
+
+ @Schema(description = "鐢熶骇鐘舵�� (0: 寰呯敓浜�, 1: 鐢熶骇涓�, 2: 鐢熶骇瀹屾垚)")
+ @ExcelProperty("鐢熶骇鐘舵��")
+ private Integer productionStatus;
+
+ @Schema(description = "鏄惁鎶ュ伐瀹℃壒")
+ @ExcelProperty("鏄惁鎶ュ伐瀹℃壒")
+ private Boolean feedbackApprove;
+
+ @Schema(description = "BPM 娴佺▼瀹氫箟 Key")
+ @ExcelProperty("BPM 娴佺▼瀹氫箟 Key")
+ private String processDefinitionKey;
+
+ @Schema(description = "鎶ュ伐瑙掕壊 (澶氫釜瑙掕壊閫楀彿鍒嗛殧)")
+ @ExcelProperty("鎶ュ伐瑙掕壊")
+ private String feedbackRole;
+
}
--
Gitblit v1.9.3