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/OrderSearchDTO.java |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 109 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderSearchDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderSearchDTO.java
new file mode 100644
index 0000000..af1b762
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderSearchDTO.java
@@ -0,0 +1,109 @@
+package com.example.erp.dto.sd;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.entity.mm.FinishedGoodsInventory;
+import com.example.erp.entity.sd.Customer;
+import lombok.Data;
+
+@Data
+public class OrderSearchDTO {
+    @TableId(type = IdType.AUTO)
+    @ExcelProperty("id")
+    private Long id;
+    @ExcelProperty("璁㈠崟缂栧彿")
+    private String orderId;
+    @ExcelProperty("椤圭洰鍚嶇О")
+    private String project;
+    @ExcelProperty("瀹㈡埛缂栧彿")
+    private Integer customerId;
+    @ExcelProperty("瀹㈡埛鍚嶇О")
+    private String customerName;
+    @ExcelProperty("璁㈠崟绫诲瀷")
+    private String orderType;
+    @ExcelProperty("璁㈠崟鍒嗙被")
+    private String orderClassify;
+    @ExcelProperty("鍟嗘爣")
+    private String icon;
+    @ExcelProperty("鍖呰鏂瑰紡")
+    private String packType;
+    @ExcelProperty("鍙戣揣鏃堕棿")
+    private String deliveryDate;
+    @ExcelProperty("鎵规")
+    private String batch;
+    @ExcelProperty("璁＄畻鏂瑰紡")
+    private Integer calculateType;
+    @ExcelProperty("閿�鍞汉鍛榠d")
+    private Integer salesmanId;
+    @ExcelProperty("閿�鍞憳")
+    private String salesman;
+    @ExcelProperty("閾濇潯鏂瑰紡")
+    private String alType;
+    @ExcelProperty("閲戦")
+    private Double money;
+    @ExcelProperty("鍚堝悓缂栧彿")
+    private String contractId;
+    @ExcelProperty("瀹㈡埛鎵规")
+    private String customerBatch;
+    @ExcelProperty("鑱旂郴浜�")
+    private String contacts;
+    @ExcelProperty("鑱旂郴鐢佃瘽")
+    private String contactNumber;
+    @ExcelProperty("鍙戣揣鍦板潃")
+    private String deliveryAddress;
+    @ExcelProperty("鍏朵粬閲戦")
+    private Double otherMoney;
+    @ExcelProperty("鍏朵粬閲戦澶囨敞")
+    private String otherMoneyRemarks;
+    @ExcelProperty("鍔犲伐瑕佹眰")
+    private String processingNote;
+    @ExcelProperty("鍏朵粬澶囨敞")
+    private String otherRemarks;
+    @ExcelProperty("闈㈢Н")
+    private Double area;
+    @ExcelProperty("璁㈠崟鎬绘暟")
+    private Long quantity;
+    @ExcelProperty("璁㈠崟鍛ㄩ暱")
+    private Double perimeter;
+    @ExcelProperty("瀹℃牳浜篿d")
+    private String verifierId;
+    @ExcelProperty("瀹℃牳浜�")
+    private String verifier;
+    @ExcelProperty("鍒涘缓浜篿d")
+    private String creatorId;
+    @ExcelProperty("鍒涘缓浜�")
+    private String creator;
+    @ExcelProperty("涓嬪崟")
+    private Integer createOrder;
+    @ExcelProperty("宸ヨ壓瀹℃牳")
+    private Integer processReview;
+    @ExcelProperty("璁㈠崟瀹℃牳")
+    private Integer orderReview;
+    @ExcelProperty("鐢熶骇璁㈠崟")
+    private Integer productionOrder;
+    @ExcelProperty("娴佺▼鍗�")
+    private Integer processingCard;
+    @ExcelProperty("鍏ュ簱")
+    private Integer warehousing;
+    @ExcelProperty("鍙戣揣")
+    private Integer delivery;
+    @ExcelProperty("鎵撳嵃娆℃暟")
+    private Integer printingNumber;
+    @ExcelProperty("鍒涘缓鏃ユ湡")
+    @TableField(update = "false")
+    private String createTime;
+    @ExcelProperty("淇敼鏃ユ湡")
+    private String updateTime;
+    @TableField(select = false,exist = false)
+    private Integer goodsQuantity;
+    @TableField(select = false,exist = false)
+    private String timeOut;
+
+    @TableField(value = "customer_id")
+    private Customer customer;
+    @TableField(select = false)
+    private FinishedGoodsInventory finishedGoodsInventory;
+
+}
\ No newline at end of file

--
Gitblit v1.8.0