From 0bcf985811837c6423d6e964a1ff8e096d0b9ff2 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 09 七月 2025 09:03:49 +0800
Subject: [PATCH] #新增rgv设备/任务管理
---
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index ce546a1..0237818 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.NodeService;
import com.zy.system.entity.Host;
import com.zy.system.entity.User;
@@ -193,8 +194,8 @@
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- private Date updateTime;
+ @TableField("modi_time")
+ private Date modiTime;
/**
* 澶囨敞
@@ -202,9 +203,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鎷ユ湁鑰�
+ */
+ @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ private Integer owner;
+
public ManLocDetl() {}
- public ManLocDetl(Long hostId, String locNo,Long nodeId,String zpallet,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public ManLocDetl(Long hostId, String locNo,Long nodeId,String zpallet,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date modiTime,String memo) {
this.hostId = hostId;
this.nodeId = nodeId;
this.zpallet = zpallet;
@@ -226,7 +233,7 @@
this.createBy = createBy;
this.createTime = createTime;
this.updateBy = updateBy;
- this.updateTime = updateTime;
+ this.modiTime = modiTime;
this.memo = memo;
}
@@ -262,6 +269,15 @@
Host host = service.selectById(this.hostId);
if (!Cools.isEmpty(host)){
return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
}
return null;
}
@@ -316,10 +332,11 @@
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
+
}
--
Gitblit v1.9.1