From 190589f5b186e338f707804527985db623c1084f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 28 七月 2025 17:08:45 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
index e8b1411..7c4df34 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
@@ -7,6 +7,8 @@
public class WorkInProgressDTO {
@ExcelProperty("宸ュ簭")
private String thisProcess;
+ @ExcelProperty("閿�鍞崟鍙�")
+ private String orderId;
@ExcelProperty("娴佺▼鍗″彿")
private String processId;
@ExcelProperty("瀹㈡埛鍚嶇О")
@@ -35,6 +37,12 @@
private Double stockArea;
@ExcelProperty("鎴愬搧鍚嶇О")
private String productName;
+ @ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
+ private String glassName;
@ExcelProperty("寮挗鍗婂緞")
private String bendRadius;
+ @ExcelProperty("缂栧彿")
+ private String glassNumber;
+ @ExcelProperty("涓婂伐搴忔姤宸ョ彮缁�")
+ private String teamsGroupsName;
}
--
Gitblit v1.8.0