From fae4bd828a6b81b95f53e285fcb4749fbd80c7bf Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 04 九月 2023 17:31:46 +0800
Subject: [PATCH] 增加粮情层行转换配置
---
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..535937f 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
@@ -84,7 +84,7 @@
//閲嶆柊鎺掑簭
Collator sortChina = Collator.getInstance(Locale.CHINA);
- Collections.sort(list, (a, b) -> sortChina.compare(a.getId(), b.getId()));
+ Collections.sort(list, (a, b) -> sortChina.compare(a.getName(), b.getName()));
return list;
}
@@ -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