From da434f3e8ebf50ae7dbf6293e89c6c816b086bbb Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 09:07:53 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index a4d9a1b..4ac4219 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -166,6 +166,7 @@
@TableField("out_order_no")
private String outOrderNo;
+
/**
* 鐐夊彿\瀹㈡埛鍥惧彿
*/
@@ -195,6 +196,11 @@
@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);
@@ -287,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