From 63817fb8bd1933714c4a51d552f15b6e4342c976 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 29 十二月 2023 09:14:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index fe8f30b..92345a0 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
@@ -44,6 +45,7 @@
      */
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
     @TableField("order_no")
+    @ExcelProperty({"鍗曟嵁", "鍗曟嵁缂栧彿"})
     private String orderNo;
 
 
@@ -51,6 +53,7 @@
      * 鏁伴噺
      */
     @ApiModelProperty(value= "鏁伴噺")
+    @ExcelProperty({"鍗曟嵁", "鏁伴噺"})
     private Double anfme;
 
     /**
@@ -61,6 +64,7 @@
      */
     @ApiModelProperty(value= "浣滀笟鏁伴噺")
     @TableField("work_qty")
+    @ExcelProperty({"鍗曟嵁", "浣滀笟鏁伴噺"})
     private Double workQty;
 
     /**
@@ -70,18 +74,21 @@
      *  鍑哄簱 : qty 馃憜
      */
     @ApiModelProperty(value= "瀹屾垚鏁伴噺")
+    @ExcelProperty({"鍗曟嵁", "瀹屾垚鏁伴噺"})
     private Double qty;
 
     /**
      * 鍟嗗搧缂栫爜
      */
     @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+    @ExcelProperty({"鍗曟嵁", "鍟嗗搧缂栫爜"})
     private String matnr;
 
     /**
      * 鍟嗗搧鍚嶇О
      */
     @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ExcelProperty({"鍗曟嵁", "鍟嗗搧鍚嶇О"})
     private String maktx;
 
     /**
@@ -94,6 +101,7 @@
      * 瑙勬牸
      */
     @ApiModelProperty(value= "瑙勬牸")
+    @ExcelProperty({"鍗曟嵁", "瑙勬牸"})
     private String specs;
 
     /**
@@ -181,6 +189,7 @@
      * 閲嶉噺
      */
     @ApiModelProperty(value= "閲嶉噺")
+    @ExcelProperty({"鍗曟嵁", "閲嶉噺"})
     private Double weight;
 
     /**
@@ -297,15 +306,31 @@
     private String memo;
 
     /**
+     * 婧愪粨搴�
+     */
+    @ApiModelProperty(value= "婧愪粨搴�")
+    @TableField("source_loc_name")
+    private String sourceLocName;
+
+    /**
+     * 鐩爣浠撳簱
+     */
+    @ApiModelProperty(value= "鐩爣浠撳簱")
+    @TableField("target_loc_name")
+    private String targetLocName;
+
+    /**
      * 鎷ユ湁鑰�
      */
     @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠   ")
+    @ExcelProperty({"鍗曟嵁", "璐т富ID"})
     private Integer owner;
 
     /**
      * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
      */
     @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
+    @ExcelProperty({"鍗曟嵁", "璐х墿褰㈡�両D"})
     private Integer payment;
 
     /**
@@ -478,6 +503,13 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
     }
 
+    public String getTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.createTime);
+    }
+
     public String getUpdateBy$(){
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.updateBy);

--
Gitblit v1.9.1