From 047545d48c78f39e8cf4082dbcdd2be15654470f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 11 十二月 2025 16:12:20 +0800
Subject: [PATCH] 订单bom界面bom查询bug,部分情况重量不显示bug

---
 north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 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 6096d02..f72f0ba 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
@@ -29,9 +29,17 @@
     @ExcelProperty("鏁伴噺")
     private Integer quantity;
     @ExcelProperty("鍗曚环")
-    private Integer price;
+    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("瀹㈡埛缂栧彿")
@@ -60,6 +68,16 @@
     private String orderId;
     @ExcelProperty("璁㈠崟搴忓彿")
     private Integer orderNumber;
+    @ExcelProperty("妤煎眰缂栧彿")
+    private String buildingNumber;
+    @ExcelProperty("绠卞彿")
+    private String boxNo;
+    @ExcelProperty("鎵规")
+    private String batch;
+    @ExcelProperty("瀹�")
+    private Double width;
+    @ExcelProperty("楂�")
+    private Double height;
     @ExcelProperty("澶囨敞")
     private String deliveryDetailRemakes;
     @ExcelProperty("鎶ヨ〃鏃ユ湡")
@@ -67,4 +85,5 @@
 
 
 
+
 }

--
Gitblit v1.8.0