From 5408d461787ce97a546d6f24740a9247a3d9db86 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 09:25:04 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java
index 3b281f2..8df973f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -118,7 +119,7 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Integer hostId;
/**
* 娣诲姞浜哄憳
@@ -131,6 +132,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -144,6 +146,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
@@ -167,7 +170,7 @@
this.flagLogic = flagLogic;
this.status = status;
this.deleted = deleted;
- this.tenantId = tenantId;
+ this.hostId = tenantId;
this.createBy = createBy;
this.createTime = createTime;
this.updateBy = updateBy;
@@ -175,27 +178,23 @@
this.memo = memo;
}
-// Container container = new Container(
-// null, // 鍚嶇О
-// null, // 瀹瑰櫒缂栫爜[闈炵┖]
-// null, // 瀹瑰櫒绫诲瀷[闈炵┖]
-// null, // 浣跨敤娆℃暟[闈炵┖]
-// null, // 闀垮害
-// null, // 瀹藉害
-// null, // 楂樺害
-// null, // 鏈夋晥鏈�
-// null, // 鏄惁鍥炴敹[闈炵┖]
-// null, // 鏄惁铏氭嫙[闈炵┖]
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
-
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case "1":
+ return " 閽㈡墭鐩�";
+ case "2":
+ return " 鏈ㄦ墭鐩�";
+ case "3":
+ return " 濉戞枡鏂欐";
+ case "4":
+ return "鎵樼洏绗肩";
+ case "5":
+ return "閽㈡枡鏋�";
+ default:
+ return String.valueOf(this.type);
+ }
+ }
public String getVaildTime$(){
if (Cools.isEmpty(this.vaildTime)){
--
Gitblit v1.9.1