From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 65e93c2..5518c27 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -33,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;
@@ -40,6 +50,9 @@
//浜у搧瑙勬牸鍨嬪彿
@Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
+ //鏂欏彿
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
//鍗曚綅
@Excel(name = "鍗曚綅")
@@ -57,11 +70,20 @@
//宸ュ簭
@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;
+ @ApiModelProperty(value = "鐢熶骇鎵瑰彿")
+ private String batchNo;
}
--
Gitblit v1.9.3