From fbddf74600d036ba46b311147847be978904e002 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 10 三月 2026 10:32:58 +0800
Subject: [PATCH] 出入库详单，导入，时间格式兼容yy/mm/dd
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
index 813f14a..1eb635b 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* @Description
@@ -123,7 +124,7 @@
//涓婚敭ID瑙勫垯锛歽yyyMMddHHmm_浠撳簱缂栫爜
lastData.setId(DateFormatUtils.format(new Date(), "yyyyMMddHHmm") + "_" + depot.getId() + "_HAND");
lastData.setCompanyId(depot.getCompanyId());
- lastData.setDeptId(depot.getId());
+ lastData.setDeptId(depot.getDeptId());
lastData.setDepotId(depot.getId());
lastData.setStorageReal(0.0);
lastData.setUpdateTime(new Date());
@@ -217,7 +218,7 @@
String key;
for (Depot depot : list) {
key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT, depot.getId());
- redisCache.setCacheObject(key, depot);
+ redisCache.setCacheObject(key, depot, 24, TimeUnit.HOURS);
}
}
@@ -254,6 +255,10 @@
Collection<String> keys = redisCache.keys(patten);
if (null != keys) {
for (String key : keys) {
+ if(null == redisCache.getCacheObject(key)){
+ list = new ArrayList<>();
+ break;
+ }
list.add((Depot) redisCache.getCacheObject(key));
}
}
@@ -264,7 +269,13 @@
setCacheDepotList(list, companyId);
}
if (!list.isEmpty()) {
- //閲嶆柊鎺掑簭
+ // 妫�鏌ユ槸鍚︽湁浠撳簱鐨勬帓搴忓彿涓虹┖
+ for (Depot depot : list) {
+ if (null == depot.getOrderNum()) {
+ //鎺掑簭鍙蜂负绌猴紝鍒欓粯璁ょ粰1
+ depot.setOrderNum(1);
+ }
+ }
Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
}
return list;
--
Gitblit v1.9.3