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 | 52 ++++++++++++----------------------------------------
1 files changed, 12 insertions(+), 40 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 662b777..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
@@ -250,13 +250,15 @@
companyId = ContextUtil.getCompanyId();
}
List<Depot> list = new ArrayList<>();
- List<Depot> resultList = new ArrayList<>();
-
String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT) + "*";
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));
}
}
@@ -267,27 +269,16 @@
setCacheDepotList(list, companyId);
}
if (!list.isEmpty()) {
- //閲嶆柊鎺掑簭
- //妫�鏌ユ暟鎹槸鍚︿负绌�
- for (Depot depot : list) {
- if( null!=depot){
- resultList.add(depot);
- }
- }
- boolean hasNullOrderNum = true;
// 妫�鏌ユ槸鍚︽湁浠撳簱鐨勬帓搴忓彿涓虹┖
- for (Depot depot : resultList) {
- if ( null== depot.getOrderNum()) {
- hasNullOrderNum = true;
- break;
+ for (Depot depot : list) {
+ if (null == depot.getOrderNum()) {
+ //鎺掑簭鍙蜂负绌猴紝鍒欓粯璁ょ粰1
+ depot.setOrderNum(1);
}
}
- // 濡傛灉瀛樺湪鎺掑簭鍙蜂负绌虹殑浠撳簱锛屽垯涓嶈繘琛屾帓搴�
- if (!hasNullOrderNum) {
- Collections.sort(resultList, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
- }
+ Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
}
- return resultList;
+ return list;
}
/**
@@ -302,8 +293,6 @@
return null;
}
List<Depot> list = getCacheDepotList(companyId);
- List<Depot> resultList = new ArrayList<>();
-
if (null == list || list.isEmpty()) {
return null;
}
@@ -313,26 +302,9 @@
result.add(depot);
}
}
- if (!list.isEmpty()) {
+ if (!result.isEmpty()) {
//閲嶆柊鎺掑簭
- //妫�鏌ユ暟鎹槸鍚︿负绌�
- for (Depot depot : list) {
- if( null!=depot){
- resultList.add(depot);
- }
- }
- boolean hasNullOrderNum = true;
- // 妫�鏌ユ槸鍚︽湁浠撳簱鐨勬帓搴忓彿涓虹┖
- for (Depot depot : resultList) {
- if ( null== depot.getOrderNum()) {
- hasNullOrderNum = true;
- break;
- }
- }
- // 濡傛灉瀛樺湪鎺掑簭鍙蜂负绌虹殑浠撳簱锛屽垯涓嶈繘琛屾帓搴�
- if (!hasNullOrderNum) {
- Collections.sort(resultList, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
- }
+ Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
}
return result;
}
--
Gitblit v1.9.3