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/entity/sd/Order.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
index 24840a4..555de90 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
@@ -1,59 +1,114 @@
package com.example.erp.entity.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.baomidou.mybatisplus.annotation.TableName;
+import com.example.erp.entity.mm.FinishedGoodsInventory;
import lombok.Data;
import java.time.LocalDate;
@Data
-@TableName("`order`")
+@TableName("sd.`order`")
public class Order {
@TableId(type = IdType.AUTO)
-
+ @ExcelProperty("id")
private Long id;
+ @ExcelProperty("璁㈠崟缂栧彿")
private String orderId;
+ @ExcelProperty("椤圭洰鍚嶇О")
private String project;
- private String customerId;
+ @ExcelProperty("瀹㈡埛缂栧彿")
+ private Integer customerId;
+ @ExcelProperty("瀹㈡埛鍚嶇О")
private String customerName;
+ @ExcelProperty("璁㈠崟绫诲瀷")
private String orderType;
+ @ExcelProperty("璁㈠崟鍒嗙被")
private String orderClassify;
+ @ExcelProperty("鍟嗘爣")
private String icon;
+ @ExcelProperty("鍖呰鏂瑰紡")
private String packType;
- private String deliveryDate;
+ @ExcelProperty("鍙戣揣鏃堕棿")
+ private LocalDate deliveryDate;
+ @ExcelProperty("鎵规")
private String batch;
+ @ExcelProperty("璁＄畻鏂瑰紡")
private Integer calculateType;
- private String salesmanId;
+ @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;
- private String perimeter;
+ @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 LocalDate createTime;
+ @ExcelProperty("淇敼鏃ユ湡")
private LocalDate updateTime;
+ @ExcelProperty("淇敼鐗堟湰鍙�")
+ private Integer version;
+ @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;
}
--
Gitblit v1.8.0