From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 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..40770f9 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.NodeService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.Host;
import com.zy.system.entity.User;
import com.zy.system.service.HostService;
@@ -169,6 +170,12 @@
private Integer status;
/**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
+
+ /**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
@@ -193,8 +200,8 @@
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- private Date updateTime;
+ @TableField("modi_time")
+ private Date modiTime;
/**
* 澶囨敞
@@ -202,9 +209,19 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value = "棰勭暀1")
+ private String temp1;
+ @ApiModelProperty(value = "棰勭暀2")
+ private String temp2;
+ @ApiModelProperty(value = "棰勭暀3")
+ private String temp3;
+ @ApiModelProperty(value = "棰勭暀4")
+ private String temp4;
+
+
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 +243,7 @@
this.createBy = createBy;
this.createTime = createTime;
this.updateBy = updateBy;
- this.updateTime = updateTime;
+ this.modiTime = modiTime;
this.memo = memo;
}
@@ -316,10 +333,26 @@
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);
}
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+ public long getStoreDate(){
+ if (Cools.isEmpty(this.createTime)){
+ this.createTime = new Date();
+ }
+ long timeNow = new Date().getTime();
+ long timeCreate = this.createTime.getTime();
+
+
+ return (timeNow - timeCreate) /24/60/60/1000;
+ }
+
}
--
Gitblit v1.9.1