From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 0c2e0b9..7481074 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -38,6 +38,18 @@
@Excel(name = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty = BigDecimal.ZERO;
+ /**
+ * 琛ヤ骇鏁伴噺
+ */
+ @Excel(name = "琛ヤ骇鏁伴噺")
+ private BigDecimal replenishQty;
+
+ /**
+ * 鍔犳斁鏁�
+ */
+ @Excel(name = "鍔犳斁鏁�")
+ private BigDecimal addQty;
+
//浜у搧鍚嶇О
@Excel(name = "浜у搧鍚嶇О")
private String productName;
@@ -74,10 +86,9 @@
private List<Team> teamList;
- /**
- * 琛ヤ骇鏁伴噺
- */
- private BigDecimal replenishQty;
+
+
+
@Data
@AllArgsConstructor
--
Gitblit v1.9.3