From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 9d99a9f..77cad71 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -157,7 +157,7 @@
List<DepotConf> data = getCacheDepotConf(companyId);
if (null == data) return null;
- return data.stream().filter(item -> item.getGrainSer().equals(serId))
+ return data.stream().filter(item -> (serId.equals(item.getGrainSer()) || serId.equals(item.getGasSer()) || serId.equals(item.getEsSer()) ))
.findAny().orElse(null);
}
@@ -195,6 +195,7 @@
List<DepotSerData> listAll = (List<DepotSerData>) redisUtil.get(key);
if (null == listAll || listAll.isEmpty()) {
log.error("娌℃湁鑾峰彇鍒颁粨搴撲笌鍒嗘満鐨勫叧绯绘暟鎹紝璇疯仈绯荤鐞嗗憳锛�");
+ return null;
}
Map<String, DepotSerData> tempMap = new HashMap<>();
@@ -330,6 +331,7 @@
param.setCompanyId(store.getCompanyId());
param.setDepotId(store.getDepotId());
param.setWeight(store.getStorageReal());
+ param.setDepotStatus(store.getDepotStatus());
commonMapper.updateDepotStorage(param);
}
--
Gitblit v1.9.3