From 487c8086116b9f0d811eca37860822ce9e445d99 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 28 十月 2025 11:13:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/Mat.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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..1ccd199 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 = "鍝侀」鏁�")
@@ -185,6 +187,11 @@
@ApiModelProperty(value= "閲嶉噺")
@ExcelProperty(value = "閲嶉噺")
private Double weight;
+
+ @ApiModelProperty(value= "鏈�澶х粍鎵樹笂闄�")
+ @ExcelProperty(value = "鏈�澶х粍鎵樹笂闄�")
+ @TableField("up_qty")
+ private Double upQty;
/**
* 闀垮害
@@ -300,6 +307,11 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ @ApiModelProperty("搴撲綅绫诲瀷")
+ @TableField("loc_type")
+ @ExcelProperty(value = "搴撲綅绫诲瀷")
+ private Long locType;
+
/**
* 澶囨敞
*/
@@ -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