From 6d5ce70c3e2b536c8e4b74269be70029a57cb1cc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 11 五月 2026 15:36:32 +0800
Subject: [PATCH] feat(approve): 使用通用工具类优化审批流程ID生成逻辑
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 12 ++++++++++++
1 files changed, 12 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 8691a21..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,12 @@
@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;
@@ -44,6 +50,9 @@
//浜у搧瑙勬牸鍨嬪彿
@Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
+ //鏂欏彿
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
//鍗曚綅
@Excel(name = "鍗曚綅")
@@ -74,4 +83,7 @@
// 涓嶅悎鏍煎鐞嗙粨鏋�
@ApiModelProperty(value = "涓嶅悎鏍煎鐞嗙粨鏋�")
private String dealResult;
+
+ @ApiModelProperty(value = "鐢熶骇鎵瑰彿")
+ private String batchNo;
}
--
Gitblit v1.9.3