From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
index 0b56788..6c7c5a7 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
@@ -26,9 +26,24 @@
     @Schema(description = "宸ュ簭鍚嶇О")
     private String operationName;
 
-    @Schema(description = "宸ュ崟绫诲瀷 姝e父 /杩斿伐杩斾慨")
+    @Schema(description = "宸ュ崟绫诲瀷 姝e父/杩斿伐杩斾慨")
     private String workOrderType;
+
+    @Schema(description = "鐢熶骇浠诲姟鏁�")
+    private Long productionTaskCount;
+
+    @Schema(description = "鑹搧鏁�")
+    private BigDecimal goodQuantity;
+
+    @Schema(description = "鎶ュ簾鏁伴噺")
+    private BigDecimal scrapQty;
 
     @Schema(description = "瀹屾垚杩涘害")
     private BigDecimal completionStatus;
+
+    @Schema(description = "鎶ュ伐浜哄憳鍚嶇О锛屽涓娇鐢ㄩ�楀彿鍒嗛殧")
+    private String userNames;
+
+    @Schema(description = "鏄惁缁撴潫锛�")
+    private Boolean endOrder;
 }

--
Gitblit v1.9.3