From 09d3c4a46e1b67415a716251acea7a1c592c8af7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 09:00:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260811' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java | 15 +++++++++++++--
1 files changed, 13 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..beb178f 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,11 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
+ @Schema(description = "宸ュ簭杩涘害鍒楄〃")
+ private java.util.List<MesProWorkOrderProcessProgressVO> processProgressList;
+
+ @Schema(description = "鐢熶骇鐘舵�� (0: 寰呯敓浜�, 1: 鐢熶骇涓�, 2: 鐢熶骇瀹屾垚)")
+ @ExcelProperty("鐢熶骇鐘舵��")
+ private Integer productionStatus;
+
}
--
Gitblit v1.9.3