From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 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 b2f33b8..7121e25 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 = "浜у搧鍚嶇О")
@@ -68,5 +83,32 @@
private Long deviceId;
private String deviceName;
private String workMinutes;
+ private String personWorkMinutes;
+ private List<Team> teamList;
+
+ @ApiModelProperty("鎶ュ伐鐝粍浜哄憳浜ч噺鏃堕暱鏄庣粏")
+ private List<Person> personList;
+
+
+
+
+
+ @Data
+ @AllArgsConstructor
+ @NoArgsConstructor
+ public static class Team {
+ private Long userId;
+ private String userName;
+ }
+
+ @Data
+ @AllArgsConstructor
+ @NoArgsConstructor
+ public static class Person {
+ private Long userId;
+ private String userName;
+ private BigDecimal quantity; // 璇ヤ汉鍛樹骇閲�
+ private Integer workHour; // 璇ヤ汉鍛樼敓浜ф椂闀�(鍒嗛挓)
+ }
}
--
Gitblit v1.9.3