From ceeac33daaa44f605e2bd5a9c443c9438795be0d Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期六, 07 十月 2023 16:17:07 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 3bed8e4..77d49d2 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -419,14 +419,15 @@
if (!Cools.isEmpty(mat.getStoreMaxDate())) {
- if (Cools.isEmpty(locDetl.getBatch())) {
- continue;
- } else if (locDetl.getBatch().length() != 8) {
- continue;
- }
+// if (Cools.isEmpty(locDetl.getBatch())) {
+// continue;
+// } else if (locDetl.getBatch().length() != 8) {
+// continue;
+// }
try {
- SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
- Date maxDate = simple.parse(locDetl.getBatch());
+// SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
+// Date maxDate = simple.parse(locDetl.getBatch());
+ Date maxDate = locDetl.getModiTime();
Calendar calendar = new GregorianCalendar();
calendar.setTime(maxDate);
// 鎶婃棩鏈熷線鍚庡鍔犱竴澶�,鏁存暟 寰�鍚庢帹,璐熸暟寰�鍓嶇Щ鍔�
@@ -443,7 +444,7 @@
abnormalLocDetlParam.setSpecs(mat.getSpecs());
abnormalLocDetlParam.setBatch(locDetl.getBatch());
if (now.compareTo(maxDate) > 0) {
- long difference = (now.getTime() - maxDate.getTime()) / (24 * 60 * 60 * 1000);
+ long difference = (now.getTime() - locDetl.getModiTime().getTime()) / (24 * 60 * 60 * 1000);
abnormalLocDetlParam.setNowTime(Integer.parseInt(String.valueOf(difference)));
result.add(abnormalLocDetlParam);
}
--
Gitblit v1.9.1