From 039201538c28a0f64858acd12e108345fc1c88c1 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 20 三月 2026 14:59:32 +0800
Subject: [PATCH] 根据工单id查询报工数据返回不合格处理

---
 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9e5e121..0c62aef 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -10,7 +10,6 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Data
 @ExcelIgnoreUnannotated
@@ -33,6 +32,10 @@
     @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
     @Excel(name = "鎶ュ簾鏁伴噺")
     private BigDecimal scrapQty = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+    @Excel(name = "鍚堟牸鏁伴噺")
+    private BigDecimal qualifiedQty = BigDecimal.ZERO;
 
     //浜у搧鍚嶇О
     @Excel(name = "浜у搧鍚嶇О")
@@ -61,5 +64,10 @@
     private BigDecimal workHours;
     private BigDecimal wages;
 
+    // 鍏朵粬鏁版嵁
+    private String otherData;
 
+    // 涓嶅悎鏍煎鐞嗙粨鏋�
+    @ApiModelProperty(value = "涓嶅悎鏍煎鐞嗙粨鏋�")
+    private String dealResult;
 }

--
Gitblit v1.9.3