From 76746dcdb6f0572c4b3349056421369aa7a34b09 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 十二月 2025 11:12:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
index 33695c0..4c98910 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
@@ -15,16 +15,18 @@
private String thisProcess;
@ExcelProperty("鎶ュ伐鐝粍")
private String teamsGroupsName;
+ @ExcelProperty("璁㈠崟缂栧彿")
+ private String orderId;
@ExcelProperty("椤圭洰鍚嶇О")
private String project;
@ExcelProperty("娴佺▼鍗″彿")
private String processId;
@ExcelProperty("搴忓彿")
- private String orderNumber;
+ private Integer orderNumber;
@ExcelProperty("瀹�")
- private String width;
+ private Integer width;
@ExcelProperty("楂�")
- private String height;
+ private Integer height;
// @ExcelProperty("褰㈢姸")
// private String shape;
// @ExcelProperty("鍘氬害")
@@ -32,9 +34,9 @@
@ExcelProperty("纾ㄨ竟绫诲瀷")
private String edgingType;
@ExcelProperty("瀹屽伐鏁伴噺")
- private String completedQuantity;
+ private Integer completedQuantity;
@ExcelProperty("瀹屽伐闈㈢Н")
- private String area;
+ private Double area;
@ExcelProperty("浜у搧鍚嶇О")
private String productName;
@ExcelProperty("缂栧彿")
@@ -47,4 +49,12 @@
private String workProcessName;
@ExcelProperty("鎶ュ伐璁惧")
private String deviceName;
+ @ExcelProperty("鎵规")
+ private String batch;
+ @ExcelProperty("璁㈠崟绫诲瀷")
+ private String orderType;
+ @ExcelProperty("鍦ㄥ埗鍝佸帤搴�")
+ private Double thicknessSum;
+ @ExcelProperty("骞虫柟姣背")
+ private Double thicknessArea;
}
--
Gitblit v1.8.0