From 59a7f326f8df2bd145d5cd04e09f1769fa80b568 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:49:46 +0800
Subject: [PATCH] 拣货单增加按照日期查找搜索，明细里面显示批号，包号，牌号
---
src/main/java/com/zy/asrs/entity/Pla.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index a1b0d29..3f3c68c 100644
--- a/src/main/java/com/zy/asrs/entity/Pla.java
+++ b/src/main/java/com/zy/asrs/entity/Pla.java
@@ -278,6 +278,9 @@
}
public String getPackageNo$(){
+ if(Cools.isEmpty(packageNo)){
+ return null;
+ }
if(packageNo < 10){
return "00" + packageNo;
}else if(packageNo < 100){
@@ -292,13 +295,13 @@
if (Cools.isEmpty(this.pakinTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH").format(this.pakinTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pakinTime);
}
public String getStockFreezeDate$() {
if (Cools.isEmpty(this.stockFreezeDate)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd").format(this.stockFreezeDate);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.stockFreezeDate);
}
}
--
Gitblit v1.9.1