From 6146ab970705d0233a12b9fe475f9756e3271aa1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 02 四月 2025 08:43:16 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
index 797b1cb..da879fb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
@@ -18,20 +18,36 @@
private String deliveryId;
@ExcelProperty("鍙戣揣搴忓彿")
private Integer deliveryNumber;
+ @ExcelProperty("浜у搧Id")
+ private Integer productId;
+ @ExcelProperty("浜у搧")
+ private String productName;
@ExcelProperty("浠樻鏉′欢")
private String paymentTerms;
@ExcelProperty("椤圭洰鍚嶇О")
private String project;
@ExcelProperty("鏁伴噺")
private Integer quantity;
+ @ExcelProperty("鍗曚环")
+ private Double price;
@ExcelProperty("闈㈢Н")
private Double area;
+ @ExcelProperty("鍏朵粬閲戦")
+ private Double otherMoney;
+ @ExcelProperty("杩愯垂閲戦")
+ private Double freight;
+ @ExcelProperty("杩愯垂鍗曚环")
+ private Double freightPrice;
+ @ExcelProperty("杩愯垂鏁伴噺")
+ private Double freightQuantity;
@ExcelProperty("閲戦")
private Double money;
@ExcelProperty("瀹㈡埛缂栧彿")
private String customerId;
@ExcelProperty("瀹㈡埛鍚嶇О")
private String customerName;
+ @ExcelProperty("瀹㈡埛绠�绉�")
+ private String customerAbbreviation;
@ExcelProperty("閫佽揣鏃ユ湡")
private LocalDate deliveryDate;
@ExcelProperty("鏀粯鏂瑰紡")
@@ -59,4 +75,5 @@
+
}
--
Gitblit v1.8.0