From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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/sd/OrderDTO.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 54 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java
new file mode 100644
index 0000000..d593aca
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java
@@ -0,0 +1,54 @@
+package com.example.erp.dto.sd;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.example.erp.entity.sd.Order;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class OrderDTO extends Order {
+    @ExcelProperty("浜у搧Id")
+    private Integer productId;
+    @ExcelProperty("浜у搧鍚嶇О")
+    private String productName;
+    @ExcelProperty("璁㈠崟搴忓彿")
+    private Integer orderNumber;
+    @ExcelProperty("瀹�")
+    private Double width;
+    @ExcelProperty("楂�")
+    private Double height;
+    @ExcelProperty("鏁伴噺")
+    private Long quantity;
+    @ExcelProperty("寮挗寮у害")
+    private Integer bendRadius;
+    @ExcelProperty("瀹為檯鎬婚潰绉�")
+    private Double grossArea;
+    @ExcelProperty("缁撶畻鎬婚潰绉�")
+    private Double computeGrossArea;
+    @ExcelProperty("閲嶉噺")
+    private Double weights;
+    @ExcelProperty("褰㈢姸")
+    private String shape;
+    @ExcelProperty("纾ㄨ竟绫诲瀷")
+    private String edgingType;
+    @ExcelProperty("澶囨敞")
+    private String remarks;
+    @ExcelProperty("鍛ㄩ暱")
+    private Double perimeter;
+    @ExcelProperty("鍗曚环")
+    private Double price;
+    @ExcelProperty("鎬婚噾棰�")
+    private Double grossAmount;
+    @ExcelProperty("涓�绾х被鍒�")
+    private String levelOne;
+    @ExcelProperty("浜岀骇绫诲埆")
+    private String levelTwo;
+    @ExcelProperty("鎬诲帤搴�")
+    private String totalThickness;
+    @ExcelProperty("瀹㈡埛绠�绉�")
+    private String customerAbbreviation;
+    @ExcelProperty("璁㈠崟鍔犲伐瑕佹眰")
+    private String processingNotes;
+}

--
Gitblit v1.8.0