From 44b6b79dd5dee0ebbd2d11b08abbc2be275bed58 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 16:10:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/Mat.java | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index f666131..54ac096 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;
@@ -77,6 +79,21 @@
@ApiModelProperty(value= "鍒悕")
@ExcelProperty(value = "鍒悕")
private String name;
+
+ /**
+ * 褰掗浂闃堝��
+ */
+ @ApiModelProperty(value= "褰掗浂闃堝��")
+ @ExcelProperty(value = "褰掗浂闃堝��")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ @ExcelProperty(value = "姣忓叕鏂ら暱搴�")
+ private Double volume;
/**
* 瑙勬牸
@@ -164,20 +181,13 @@
private String manuDate;
/**
- * 鍝侀」鏁�
+ * 鍝侀」鏁�/鏈�澶х粍鎵樻暟閲�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
@ExcelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
- @TableField("safe_qty")
- private Double safeQty;
/**
* 閲嶉噺
@@ -186,19 +196,17 @@
@ExcelProperty(value = "閲嶉噺")
private Double weight;
+ @ApiModelProperty(value= "鏈�澶х粍鎵樹笂闄�")
+ @ExcelProperty(value = "鏈�澶х粍鎵樹笂闄�")
+ @TableField("up_qty")
+ private Double upQty;
+
/**
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
@TableField("man_length")
private Double manLength;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- @ExcelProperty(value = "浣撶Н")
- private Double volume;
/**
* 涓夋柟缂栫爜
@@ -299,6 +307,11 @@
@TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+
+ @ApiModelProperty("搴撲綅绫诲瀷")
+ @TableField("loc_type")
+ @ExcelProperty(value = "搴撲綅绫诲瀷")
+ private Long locType;
/**
* 澶囨敞
@@ -416,6 +429,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