From 65c13f7dafe0945ccd9b657cc31c4d4bc3a94359 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期三, 02 七月 2025 19:38:39 +0800
Subject: [PATCH] 添加容器管理
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
index 6b5a23f..c6999f5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.asrs.service.MatService;
@@ -16,6 +17,7 @@
import com.zy.asrs.wms.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.experimental.Delegate;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -33,7 +35,6 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -183,15 +184,18 @@
return null;
}
- public String getMatId$(){
+ @Delegate(types = Mat.class)
+ public Mat getMatId$(){
MatService service = SpringUtils.getBean(MatService.class);
Mat mat = service.getById(this.matId);
- if (!Cools.isEmpty(mat)){
- return String.valueOf(mat.getId());
- }
- return null;
+ return mat;
}
+ public String getDewell$() {
+ return DateUtils.diff(new Date(), createTime) + "澶�";
+ }
+
+
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
--
Gitblit v1.9.1