From 900b7c3e7c0d887574a2fc62973749d6b479f95b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 14:59:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 0556824..da9a941 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -43,17 +44,18 @@
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
- @ExcelProperty("鎵瑰彿")
+ @ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty("瑙勬牸")
+ private String specs;
+
+ @ApiModelProperty(value= "璐у搧鐗瑰緛")
+ @ExcelProperty("璐у搧鐗瑰緛")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@ExcelProperty("鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
@ApiModelProperty(value= "鍨嬪彿")
private String model;
@@ -101,7 +103,7 @@
private Double weight;
@ApiModelProperty(value= "闀垮害")
- private Double length;
+ private Double man_length;
@ApiModelProperty(value= "浣撶Н")
private Double volume;
@@ -157,6 +159,30 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鎷ユ湁鑰�
+ */
+ @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ private Integer owner;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ private Integer standby1;
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ private Integer standby2;
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ private Integer standby3;
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
@@ -165,7 +191,14 @@
}
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;
+ }
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
@@ -248,6 +281,16 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public long getStoreDate(){
+ long timeNow = new Date().getTime();
+ if (this.appeTime == null){
+ return 0;
+ }
+ long timeCreate = this.appeTime.getTime();
+
+ return (timeNow - timeCreate) /24/60/60/1000;
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1