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 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 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 9c211bd..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,36 +134,39 @@
* 鐢熶骇鏃ユ湡
*/
@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
+ @TableField("item_num")
private String itemNum;
/**
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ private String weight;
/**
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- private Double length;
+ private String length;
/**
* 浣撶Н
*/
@ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ private String volume;
/**
* 涓夋柟缂栫爜
*/
@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,18 +314,20 @@
private String height;
//浼氳鍒嗙被
+ @TableField("accounting_class")
private String accountingClass;
//鎵瑰彿绠＄悊
private String batch;
//瀛樿揣鏍哥畻
+ @TableField("inventory_account")
private String inventoryAccount;
public Mat() {}
- public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, String units, String barcode, String origin, String manu, String manuDate, String itemNum, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId) {
+ public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, String units, String barcode, String origin, String manu, String manuDate, String itemNum, String weight, String length, String volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId, String mainHost, String mainSource, String cyclePickCode, String locationStock, String material, String decrees, String imgNum, String purchasingUnits, String processNumber, String bom, String safeNum, String miniCount, String replenishmentNum, String tmp1, String tmp2, String tmp3, String restockDemand, String lapse, String shortcuts, String width, String height, String accountingClass, String batch, String inventoryAccount) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -334,6 +360,30 @@
this.updateTime = updateTime;
this.memo = memo;
this.hostId = hostId;
+ this.mainHost = mainHost;
+ this.mainSource = mainSource;
+ this.cyclePickCode = cyclePickCode;
+ this.locationStock = locationStock;
+ this.material = material;
+ this.decrees = decrees;
+ this.imgNum = imgNum;
+ this.purchasingUnits = purchasingUnits;
+ this.processNumber = processNumber;
+ this.bom = bom;
+ this.safeNum = safeNum;
+ this.miniCount = miniCount;
+ this.replenishmentNum = replenishmentNum;
+ this.tmp1 = tmp1;
+ this.tmp2 = tmp2;
+ this.tmp3 = tmp3;
+ this.restockDemand = restockDemand;
+ this.lapse = lapse;
+ this.shortcuts = shortcuts;
+ this.width = width;
+ this.height = height;
+ this.accountingClass = accountingClass;
+ this.batch = batch;
+ this.inventoryAccount = inventoryAccount;
}
// Mat manMat = new Mat(
--
Gitblit v1.9.1