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 | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 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 608a5f1..7481074 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -6,12 +6,15 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductionProductMain;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@ExcelIgnoreUnannotated
@@ -34,6 +37,18 @@
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
@Excel(name = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty = BigDecimal.ZERO;
+
+ /**
+ * 琛ヤ骇鏁伴噺
+ */
+ @Excel(name = "琛ヤ骇鏁伴噺")
+ private BigDecimal replenishQty;
+
+ /**
+ * 鍔犳斁鏁�
+ */
+ @Excel(name = "鍔犳斁鏁�")
+ private BigDecimal addQty;
//浜у搧鍚嶇О
@Excel(name = "浜у搧鍚嶇О")
@@ -65,4 +80,21 @@
private Long auditUserId;
private String auditUserName;
+ private Long deviceId;
+ private String deviceName;
+ private String workMinutes;
+
+ private List<Team> teamList;
+
+
+
+
+
+ @Data
+ @AllArgsConstructor
+ @NoArgsConstructor
+ public static class Team {
+ private Long userId;
+ private String userName;
+ }
}
--
Gitblit v1.9.3