From 6b1c7e3fa773aa75ea34b346d4104ba70064f52c Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期四, 31 八月 2023 14:35:53 +0800 Subject: [PATCH] 调整设备状态解析2 --- igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 3 ++- 1 files changed, 2 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..3cc6230 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); } @@ -330,6 +330,7 @@ param.setCompanyId(store.getCompanyId()); param.setDepotId(store.getDepotId()); param.setWeight(store.getStorageReal()); + param.setDepotStatus(store.getDepotStatus()); commonMapper.updateDepotStorage(param); } -- Gitblit v1.9.3