From 1e123568c2f561013f5636e45dc0db30b17a3517 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 10 九月 2026 16:39:26 +0800
Subject: [PATCH] feat(basic): 添加产品条码功能并完善生产统计报表
---
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 0fa00eb..186b862 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -7,6 +7,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@@ -25,6 +26,13 @@
@Schema(description = "鎶ュ伐浜哄憳")
private String userName;
+
+ @Schema(description = "浣跨敤璁惧id(device_ledger.id)")
+ private Long deviceId;
+
+ @Schema(description = "璁惧鍚嶇О(鍐椾綑)")
+ @Excel(name = "浣跨敤璁惧")
+ private String deviceName;
@Schema(description = "鐢熶骇宸ュ簭宸ュ崟id")
private Long productionOperationTaskId;
@@ -56,4 +64,7 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+ @Schema(description = "宸ユ椂")
+ private BigDecimal workHour;
+
}
--
Gitblit v1.9.3