From beddea151f8995d56efa0e133ddfa4e567f5a671 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 14 五月 2026 14:28:58 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_西宁_青铝绿行

---
 src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 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..34310c7 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,39 @@
     @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;
+
+    @Schema(description = "绫诲瀷 鍖哄垎璁℃椂鍜岃浠�(0璁℃椂1璁′欢)")
+    private Integer type;
+
+    @Schema(description = "鐝粍闀垮悕绉�")
+    private String leaderName;
+
+    @Schema(description = "鐝粍闀跨敤鎴稩D")
+    private Long leaderUserId;
+
+    @Schema(description = "鐝粍鍥㈠憳鐢ㄦ埛ID")
+    private Long teamUserId;
+
+    @Schema(description = "鐝粍鍥㈠憳鍚嶇О")
+    private String teamUserName;
 }

--
Gitblit v1.9.3