From 9dcf20387a41fc71501a5243ee25b74c806b464f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 26 三月 2026 15:48:56 +0800
Subject: [PATCH] 生产详情返回报废数量，重新计算合格数量等值
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 22 +++++++++++++++++++++-
1 files changed, 21 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 5ef224b..4618ba0 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
@@ -34,6 +33,16 @@
@Excel(name = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty = BigDecimal.ZERO;
+ // 涓嶈壇鏁伴噺
+ @ApiModelProperty(value = "涓嶈壇鏁伴噺")
+ @Excel(name = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity = BigDecimal.ZERO;
+
+ // 鍚堟牸鏁伴噺
+ @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+ @Excel(name = "鍚堟牸鏁伴噺")
+ private BigDecimal qualifiedQty = BigDecimal.ZERO;
+
//浜у搧鍚嶇О
@Excel(name = "浜у搧鍚嶇О")
private String productName;
@@ -55,9 +64,20 @@
private LocalDate schedulingDate;
private String schedulingUserName;
private String customerName;
+ //宸ュ簭
+ @Excel(name = "宸ュ簭")
private String process;
+ // 宸ュ簭鍚堟牸鐜�
+ private BigDecimal processQualifiedRate;
+ // 瀹為檯鍚堟牸鐜�
+ private BigDecimal actualQualifiedRate;
private BigDecimal workHours;
private BigDecimal wages;
+ // 鍏朵粬鏁版嵁
+ private String otherData;
+ // 涓嶅悎鏍煎鐞嗙粨鏋�
+ @ApiModelProperty(value = "涓嶅悎鏍煎鐞嗙粨鏋�")
+ private String dealResult;
}
--
Gitblit v1.9.3