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/Mat.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index 83f7b0f..afd169f 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -3,6 +3,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zy.asrs.common.wms.service.TagService;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -41,6 +43,7 @@
      * 鎵�灞炲綊绫�
      */
     @ApiModelProperty(value= "鎵�灞炲綊绫�")
+    @TableField("tag_id")
     private Long tagId;
 
     /**
@@ -131,12 +134,14 @@
      * 鐢熶骇鏃ユ湡
      */
     @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @TableField("manu_date")
     private String manuDate;
 
     /**
      * 鍝侀」鏁�
      */
     @ApiModelProperty(value= "鍝侀」鏁�")
+    @TableField("item_num")
     private String itemNum;
 
     /**
@@ -161,6 +166,7 @@
      * 涓夋柟缂栫爜
      */
     @ApiModelProperty(value= "涓夋柟缂栫爜")
+    @TableField("three_code")
     private String threeCode;
 
     /**
@@ -173,12 +179,14 @@
      * 渚涘簲鍟嗙紪鐮�
      */
     @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+    @TableField("supp_code")
     private String suppCode;
 
     /**
      * 淇濊川鏈�
      */
     @ApiModelProperty(value= "淇濊川鏈�")
+    @TableField("dead_time")
     private String deadTime;
 
     /**
@@ -191,6 +199,7 @@
      * 娣诲姞浜哄憳
      */
     @ApiModelProperty(value= "娣诲姞浜哄憳")
+    @TableField("create_by")
     private Long createBy;
 
     /**
@@ -198,12 +207,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;
 
     /**
@@ -211,6 +222,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("update_time")
     private Date updateTime;
 
     /**
@@ -223,19 +235,24 @@
      * 浠撳簱ID
      */
     @ApiModelProperty(value= "浠撳簱ID")
+    @TableField("host_id")
     private Long hostId;
 
     //蹇靛垵浣跨敤浠ヤ笅棰濆瀛楁
     //涓昏浠撳簱
+    @TableField("main_host")
     private String mainHost;
 
     //涓昏鏉ユ簮
+    @TableField("main_source")
     private String mainSource;
 
     //寰幆鐩樼偣鐮�
+    @TableField("cycle_pick_code")
     private String cyclePickCode;
 
     //瀛樻斁浣嶇疆
+    @TableField("location_stock")
     private String locationStock;
 
     //鏉愯川
@@ -245,24 +262,30 @@
     private String decrees;
 
     //鍥惧彿
+    @TableField("img_num")
     private String imgNum;
 
     //閲囪喘鍗曚綅
+    @TableField("purchasing_units")
     private String purchasingUnits;
 
     //宸ヨ壓缂栧彿
+    @TableField("process_number")
     private String processNumber;
 
     //鎸囧畾bom
     private String bom;
 
     //瀹夊叏瀛橀噺
+    @TableField("safe_num")
     private String safeNum;
 
     //鏈�浣庤ˉ閲�
+    @TableField("mini_count")
     private String miniCount;
 
     //琛ヨ揣鍊嶉噺
+    @TableField("replenishment_num")
     private String replenishmentNum;
 
     //鑷畾涔�1
@@ -275,6 +298,7 @@
     private String tmp3;
 
     //鎸夐渶姹傝ˉ璐�
+    @TableField("replenishment_num")
     private String restockDemand;
 
     //澶辨晥
@@ -290,12 +314,14 @@
     private String height;
 
     //浼氳鍒嗙被
+    @TableField("accounting_class")
     private String accountingClass;
 
     //鎵瑰彿绠＄悊
     private String batch;
 
     //瀛樿揣鏍哥畻
+    @TableField("inventory_account")
     private String inventoryAccount;
 
 

--
Gitblit v1.9.1