From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +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/CrossProcessBreakingDTO.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/CrossProcessBreakingDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/CrossProcessBreakingDTO.java
index 9fc64ce..08d2b45 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/CrossProcessBreakingDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/CrossProcessBreakingDTO.java
@@ -19,10 +19,20 @@
     private String responsibleProcess;
     @ExcelProperty("璐d换鐝粍")
     private String responsibleTeam;
+    @ExcelProperty("璐d换淇℃伅")
+    private String responsiblePersonnel;
+    @ExcelProperty("鎶ュ伐宸ュ簭")
+    private String thisProcess;
     @ExcelProperty("娆$牬绫诲瀷")
     private String breakageType;
     @ExcelProperty("娆$牬鍘熷洜")
     private String breakageReason;
+    @ExcelProperty("瀹�")
+    private Double childWidth;
+    @ExcelProperty("楂�")
+    private Double childHeight;
+    @ExcelProperty("鍘氬害")
+    private String thickness;
     @ExcelProperty("娆$牬鏁伴噺")
     private Integer breakageQuantity;
     @ExcelProperty("娆$牬闈㈢Н")
@@ -31,6 +41,15 @@
     private String project;
     @ExcelProperty("閿�鍞崟鍙�")
     private String orderId;
+    @ExcelProperty("娴佺▼鍗″彿")
+    private String processId;
     @ExcelProperty("鍗曠墖鍚嶇О")
     private String glassChild;
+    @ExcelProperty("缂栧彿")
+    private String code;
+    @ExcelProperty("鍒涘缓浜�")
+    private String creator;
+    @ExcelProperty("鎶ュ伐缂栧彿")
+    private String reportingWorkId;
+
 }

--
Gitblit v1.8.0