From 97fba4a0e38c0b8455d43d2935aa996676407361 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 08 十二月 2025 16:40:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliverySearchDTO.java |   74 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliverySearchDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliverySearchDTO.java
new file mode 100644
index 0000000..22de8e2
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliverySearchDTO.java
@@ -0,0 +1,74 @@
+package com.example.erp.dto.sd;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.example.erp.entity.sd.Order;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+
+@Data
+public class DeliverySearchDTO {
+    @ExcelProperty("缂栧彿")
+    private Long id;
+    @ExcelProperty("鍙戣揣鐘舵��")
+    private Integer deliveryState;
+    @ExcelProperty("鍑哄簱鐘舵��")
+    private Integer stockState;
+    @ExcelProperty("浠樻鏉′欢")
+    private String paymentTerms;
+    @ExcelProperty("鍙戣揣鍗曞彿")
+    private String deliveryId;
+    @ExcelProperty("璁㈠崟缂栧彿")
+    private String orderId;
+    @ExcelProperty("椤圭洰鍚嶇О")
+    private String project;
+    @ExcelProperty("瀹㈡埛缂栧彿")
+    private String customerId;
+    @ExcelProperty("瀹㈡埛鍚嶇О")
+    private String customerName;
+    @ExcelProperty("鍙戣揣鏃ユ湡")
+    private LocalDate deliveryDate;
+    @ExcelProperty("鏀粯鏂瑰紡")
+    private String payMethod;
+    @ExcelProperty("鏀粯鏃ユ湡")
+    private LocalDate payDate;
+    @ExcelProperty("閿�鍞汉id")
+    private String salesmanId;
+    @ExcelProperty("閿�鍞汉")
+    private String salesman;
+    @ExcelProperty("鍒涘缓浜篿d")
+    private String creatorId;
+    @ExcelProperty("鍒涘缓浜�")
+    private String creator;
+    @ExcelProperty("鑱旂郴浜�")
+    private String contacts;
+    @ExcelProperty("鑱旂郴鐢佃瘽")
+    private String contactNumber;
+    @ExcelProperty("閫佽揣鍦板潃")
+    private String deliveryAddress;
+    @ExcelProperty("闈㈢Н")
+    private Double area;
+    @ExcelProperty("鏁伴噺")
+    private Integer quantity;
+    @ExcelProperty("鎬婚噾棰�")
+    private Double money;
+    @ExcelProperty("鍏朵粬閲戦")
+    private Double otherMoney;
+    @ExcelProperty("杩愯垂閲戦")
+    private Double freight;
+    @ExcelProperty("杩愯垂鏁伴噺")
+    private Integer freightQuantity;
+    @ExcelProperty("杩愯垂鍗曚环")
+    private Double freightPrice;
+    @ExcelProperty("鎵撳嵃娆℃暟")
+    private Integer printingNumber;
+    @ExcelProperty("澶囨敞")
+    private String remarks;
+    @ExcelProperty("鍒涘缓鏃堕棿")
+    private LocalDate createTime;
+    @ExcelProperty("淇敼鏃堕棿")
+    private LocalDate updateTime;
+
+    private Order order;
+}

--
Gitblit v1.8.0