From a3776853fa6ff1c4a9805615a79852d54f700e3f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 20 七月 2024 09:21:04 +0800
Subject: [PATCH] 增加库位明细导出功能，曾加物料、单据、库存全局搜索功能

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java
index 64e74b7..ed97eeb 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java
@@ -3,6 +3,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.zy.asrs.common.wms.service.CstmrService;
 import com.zy.asrs.common.wms.service.DocTypeService;
 import com.zy.asrs.common.wms.service.ItemService;
@@ -15,10 +16,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -53,40 +50,47 @@
     /**
      * 璁㈠崟缂栧彿
      */
+    @TableField("order_no")
     @ApiModelProperty(value= "璁㈠崟缂栧彿")
     private String orderNo;
 
     /**
      * 鍗曟嵁鏃ユ湡
      */
+    @TableField("order_time")
     @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
     private String orderTime;
 
     /**
      * 鍗曟嵁绫诲瀷
      */
+    @TableField("doc_type")
     @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
     private Long docType;
 
     /**
      * 椤圭洰缂栧彿
      */
+    @TableField("item_id")
     @ApiModelProperty(value= "椤圭洰缂栧彿")
     private Long itemId;
 
     @ApiModelProperty(value= "")
+    @TableField("item_name")
     private String itemName;
 
     /**
      * 璋冩嫧椤圭洰缂栧彿
      */
     @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
+    @TableField("allot_item_id")
     private Long allotItemId;
 
     /**
      * 鍒濆绁ㄦ嵁鍙�
      */
     @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
+    @TableField("def_number")
     private String defNumber;
 
     /**
@@ -105,6 +109,7 @@
      * 瀹㈡埛
      */
     @ApiModelProperty(value= "瀹㈡埛")
+    @TableField("cstmr_name")
     private String cstmrName;
 
     /**
@@ -117,12 +122,14 @@
      * 鎿嶄綔浜哄憳
      */
     @ApiModelProperty(value= "鎿嶄綔浜哄憳")
+    @TableField("oper_memb")
     private String operMemb;
 
     /**
      * 鍚堣閲戦
      */
     @ApiModelProperty(value= "鍚堣閲戦")
+    @TableField("total_fee")
     private Double totalFee;
 
     /**
@@ -135,24 +142,28 @@
      * 浼樻儬閲戦
      */
     @ApiModelProperty(value= "浼樻儬閲戦")
+    @TableField("discount_fee")
     private Double discountFee;
 
     /**
      * 閿�鍞垨閲囪喘璐圭敤鍚堣
      */
     @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
+    @TableField("other_fee")
     private Double otherFee;
 
     /**
      * 瀹炰粯閲戦
      */
     @ApiModelProperty(value= "瀹炰粯閲戦")
+    @TableField("act_fee")
     private Double actFee;
 
     /**
      * 浠樻绫诲瀷 1: 鐜伴噾  2: 璁拌处  
      */
     @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾  2: 璁拌处  ")
+    @TableField("pay_type")
     private Integer payType;
 
     /**
@@ -165,18 +176,21 @@
      * 缁撶畻澶╂暟
      */
     @ApiModelProperty(value= "缁撶畻澶╂暟")
+    @TableField("account_day")
     private Integer accountDay;
 
     /**
      * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯  2: 璐у埌浠樻  
      */
     @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯  2: 璐у埌浠樻  ")
+    @TableField("post_fee_type")
     private Integer postFeeType;
 
     /**
      * 閭垂
      */
     @ApiModelProperty(value= "閭垂")
+    @TableField("post_fee")
     private Double postFee;
 
     /**
@@ -184,6 +198,7 @@
      */
     @ApiModelProperty(value= "浠樻鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("pay_time")
     private Date payTime;
 
     /**
@@ -191,18 +206,21 @@
      */
     @ApiModelProperty(value= "鍙戣揣鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("send_time")
     private Date sendTime;
 
     /**
      * 鐗╂祦鍚嶇О
      */
     @ApiModelProperty(value= "鐗╂祦鍚嶇О")
+    @TableField("ship_name")
     private String shipName;
 
     /**
      * 鐗╂祦鍗曞彿
      */
     @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+    @TableField("ship_code")
     private String shipCode;
 
     /**
@@ -221,6 +239,7 @@
      * 娣诲姞浜哄憳
      */
     @ApiModelProperty(value= "娣诲姞浜哄憳")
+    @TableField("create_by")
     private Long createBy;
 
     /**
@@ -228,12 +247,14 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("create_time")
     private Date createTime;
 
     /**
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("update_by")
     private Long updateBy;
 
     /**
@@ -241,6 +262,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("update_time")
     private Date updateTime;
 
     /**
@@ -253,6 +275,7 @@
      * 鎺堟潈鍟嗘埛
      */
     @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
+    @TableField("host_id")
     private Long hostId;
 
     public Order() {}

--
Gitblit v1.9.1