From ef5a518c3e2c1fe41aa60f56ca31ddafa0cb1561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:32:36 +0800
Subject: [PATCH] 添加产品汇总报表

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 2770396..d8663cc 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,5 +1,6 @@
 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;
@@ -10,12 +11,14 @@
 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 Integer customerId;
     private String customerName;
@@ -41,7 +44,7 @@
     private String otherRemarks;
     private Double area;
     private Long quantity;
-    private String perimeter;
+    private Double perimeter;
     private String verifierId;
     private String verifier;
     private String creatorId;
@@ -55,9 +58,12 @@
     private Integer delivery;
     private LocalDate createTime;
     private LocalDate updateTime;
+    @TableField(select = false,exist = false)
+    private Integer goodsQuantity;
 
     @TableField(value = "customer_id")
     private Customer  customer;
+    @TableField(select = false)
     private FinishedGoodsInventory finishedGoodsInventory;
 
 }

--
Gitblit v1.8.0