From d613f1080234e13d12f2bad22650733b4477aa84 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 09 十二月 2025 16:52:40 +0800
Subject: [PATCH] 在制品报表添加厚度和相关功能

---
 north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
index 6195f1e..56d3cee 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
@@ -13,12 +13,14 @@
     private String orderId;
     @ExcelProperty("椤圭洰鍚嶇О")
     private String project;
+    @ExcelProperty("鎵规")
+    private String batch;
     @ExcelProperty("娴佺▼鍗″彿")
     private String processId;
     @ExcelProperty("璁㈠崟搴忓彿")
-    private String orderNumber;
+    private Integer orderNumber;
     @ExcelProperty("灏忕墖椤哄簭")
-    private String technologyNumber;
+    private Integer technologyNumber;
     @ExcelProperty("鎶ュ伐鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime reportingWorkTime;
@@ -40,5 +42,19 @@
     private String personnel;
     @ExcelProperty("鍗曠墖鍚嶇О")
     private String glassChild;
+    @ExcelProperty("缂栧彿")
+    private String glassNumber;
+    @ExcelProperty("瀹�")
+    private Double childWidth;
+    @ExcelProperty("楂�")
+    private Double childHeight;
+    @ExcelProperty("鍘氬害")
+    private String thickness;
+    @ExcelProperty("鎶ュ伐宸ュ簭")
+    private String thisProcess;
+    @ExcelProperty("鍒涘缓浜�")
+    private String creator;
+    @ExcelProperty("鎶ュ伐缂栧彿")
+    private String reportingWorkId;
 
 }

--
Gitblit v1.8.0