From 51ee242a62364a98af86b9bd3b9d191cd75c2f18 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 13 一月 2026 17:29:06 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/Mat.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bee0346..063e250 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.enums.ContainerType;
+import com.zy.asrs.service.BasContainerService;
import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -164,7 +166,7 @@
private String manuDate;
/**
- * 鍝侀」鏁�
+ * 鍝侀」鏁�/鏈�澶х粍鎵樻暟閲�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
@ExcelProperty(value = "鍝侀」鏁�")
@@ -186,18 +188,23 @@
@ExcelProperty(value = "閲嶉噺")
private Double weight;
+ @ApiModelProperty(value= "鏈�澶х粍鎵樹笂闄�")
+ @ExcelProperty(value = "鏈�澶х粍鎵樹笂闄�")
+ @TableField("up_qty")
+ private Double upQty;
+
/**
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- @ExcelProperty(value = "闀垮害")
- private Double length;
+ @TableField("man_length")
+ private Double manLength;
/**
* 浣撶Н
*/
@ApiModelProperty(value= "浣撶Н")
- @ExcelProperty(value = "浣撶Н")
+ @ExcelProperty(value = "姣忓叕鏂ら暱搴�")
private Double volume;
/**
@@ -300,6 +307,11 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ @ApiModelProperty("搴撲綅绫诲瀷")
+ @TableField("loc_type")
+ @ExcelProperty(value = "搴撲綅绫诲瀷")
+ private Long locType;
+
/**
* 澶囨敞
*/
@@ -327,7 +339,7 @@
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,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ 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,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -348,7 +360,7 @@
this.itemNum = itemNum;
this.safeQty = safeQty;
this.weight = weight;
- this.length = length;
+ this.manLength = manLength;
this.volume = volume;
this.threeCode = threeCode;
this.supp = supp;
@@ -416,6 +428,20 @@
return null;
}
+ public String getLocType$(){
+ if (Cools.isEmpty(locType)) {
+ return "鏂欑";
+ }
+ if (locType.equals(ContainerType.CONTAINER_TYPE_BOX.type)) {
+ return ContainerType.CONTAINER_TYPE_BOX.desc;
+ } else if (locType.equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
+ return ContainerType.CONTAINER_TYPE_SALVER.desc;
+ } else if (locType.equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
+ return ContainerType.CONTAINER_TYPE_CAGE.desc;
+ }
+ return null;
+ }
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
--
Gitblit v1.9.1