From 5929fa552fd2d8cf9d4cad0d519c89728e4a6ada Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 23 三月 2026 16:03:16 +0800
Subject: [PATCH] Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_衡阳_鹏创电子
---
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