From dfd793f14e51c48c3322f1b36f543179043bd45d Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 22 十月 2023 18:25:27 +0800
Subject: [PATCH] 更新仓内抓拍

---
 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