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/LocDetl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index a816f62..5ec4d48 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -3,6 +3,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.zy.asrs.common.utils.Synchro;
 import com.zy.asrs.common.wms.service.DocTypeService;
 import com.zy.asrs.common.wms.service.LocMastService;
@@ -11,10 +12,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;
@@ -42,6 +39,7 @@
      * 搴撲綅鍙�
      */
     @ApiModelProperty(value= "搴撲綅鍙�")
+    @TableField("loc_no")
     private String locNo;
 
     /**
@@ -72,6 +70,7 @@
     private String batch;
 
     @ApiModelProperty(value= "")
+    @TableField("order_no")
     private String orderNo;
 
     /**
@@ -117,12 +116,15 @@
     private String manu;
 
     @ApiModelProperty(value= "")
+    @TableField("manu_date")
     private String manuDate;
 
     @ApiModelProperty(value= "")
+    @TableField("item_num")
     private String itemNum;
 
     @ApiModelProperty(value= "")
+    @TableField("safe_qty")
     private Double safeQty;
 
     @ApiModelProperty(value= "")
@@ -135,21 +137,26 @@
     private Double volume;
 
     @ApiModelProperty(value= "")
+    @TableField("three_code")
     private String threeCode;
 
     @ApiModelProperty(value= "")
     private String supp;
 
     @ApiModelProperty(value= "")
+    @TableField("supp_code")
     private String suppCode;
 
     @ApiModelProperty(value= "")
+    @TableField("be_batch")
     private Integer beBatch;
 
     @ApiModelProperty(value= "")
+    @TableField("dead_time")
     private String deadTime;
 
     @ApiModelProperty(value= "")
+    @TableField("dead_warn")
     private Integer deadWarn;
 
     @ApiModelProperty(value= "")
@@ -165,6 +172,7 @@
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("modi_user")
     private Long modiUser;
 
     /**
@@ -172,12 +180,14 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("modi_time")
     private Date modiTime;
 
     /**
      * 鍒涘缓鑰�
      */
     @ApiModelProperty(value= "鍒涘缓鑰�")
+    @TableField("appe_user")
     private Long appeUser;
 
     /**
@@ -185,6 +195,7 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("appe_time")
     private Date appeTime;
 
     /**
@@ -197,6 +208,7 @@
      * 鎺堟潈鍟嗘埛
      */
     @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
+    @TableField("host_id")
     private Long hostId;
 
     @ApiModelProperty(value= "璐т富")

--
Gitblit v1.9.1