From 5cd9288f8ff95696ebbb88fa9c5a7f0322aeb699 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 28 十月 2025 13:42:31 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java | 14 ++++++++++++--
1 files changed, 12 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 9de34c0..7fab252 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;
@@ -42,5 +44,13 @@
private String glassChild;
@ExcelProperty("缂栧彿")
private String glassNumber;
+ @ExcelProperty("瀹�")
+ private Double childWidth;
+ @ExcelProperty("楂�")
+ private Double childHeight;
+ @ExcelProperty("鎶ュ伐宸ュ簭")
+ private String thisProcess;
+ @ExcelProperty("鍒涘缓浜�")
+ private String creator;
}
--
Gitblit v1.8.0