From 5e57b2bcae40a2e49c9ceac706696cb838c35078 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 06 六月 2025 11:15:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 73febfb..4ac4219 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -158,12 +158,14 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
-
+ @TableField("pro_type")
+ private String proType;
/**
* 璁㈠崟鍙�
*/
@TableField("out_order_no")
private String outOrderNo;
+
/**
* 鐐夊彿\瀹㈡埛鍥惧彿
@@ -177,6 +179,8 @@
@TableField("pg_no")
private String sPgNO;
+ @TableField("i_no")
+ private String i_no;
private String temp1;
@@ -185,6 +189,18 @@
private String temp3;
+
+ @TableField("i_no")
+ private Integer iNo;
+
+ @TableField("packing")
+ private String packing;
+
+ @TableField("ware_id")
+ private String wareId;
+
+ @TableField("ware_name")
+ private String wareName;
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -277,13 +293,16 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public long getStoreDate(){
- long timeNow = new Date().getTime();
+ public Long getStoreDate() {
+ if (this.appeTime == null) {
+ return null; // 鎴栬�呰繑鍥� -1L銆�0L锛岀湅浣犵殑涓氬姟閫昏緫
+ }
+ long timeNow = System.currentTimeMillis();
long timeCreate = this.appeTime.getTime();
-
- return (timeNow - timeCreate) /24/60/60/1000;
+ return (timeNow - timeCreate) / (24 * 60 * 60 * 1000);
}
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1