From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 1a68af5..4009376 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -47,8 +47,8 @@
@ExcelProperty("瑙勬牸")
private String specs;
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ @ApiModelProperty(value= "鎵瑰彿")
+ @ExcelProperty("鎵瑰彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -158,6 +158,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "缁勫悎閿�")
+ private String mixNumber;
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
@@ -251,7 +254,7 @@
public long getStoreDate(){
long timeNow = new Date().getTime();
- long timeCreate = this.appeTime.getTime();
+ long timeCreate = (this.appeTime != null) ? this.appeTime.getTime() : 0L;
return (timeNow - timeCreate) /24/60/60/1000;
}
--
Gitblit v1.9.1