From d48d966dfde7a0c31bd81466559e5e8d681dc200 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 21 十月 2023 16:16:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 59 ++++-------------------------------------------------------
1 files changed, 4 insertions(+), 55 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 8ba9a5d..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
@@ -7,10 +7,7 @@
import com.ld.igds.common.dto.THDto;
import com.ld.igds.common.mapper.CommonMapper;
import com.ld.igds.constant.Constant;
-import com.ld.igds.constant.DepotStatus;
import com.ld.igds.constant.RedisConst;
-import com.ld.igds.inout.InoutConstant;
-import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.models.Depot;
import com.ld.igds.models.DepotConf;
import com.ld.igds.models.DepotStore;
@@ -19,7 +16,6 @@
import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.dom4j.CDATA;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -72,6 +68,7 @@
public List<Depot> getCacheDepotList(String companyId, String deptId) {
if (null == deptId) return null;
String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT);
+
Set<String> keys = redisUtil.keys(patten);
if (null == keys) return null;
@@ -160,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);
}
@@ -198,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<>();
@@ -316,56 +314,6 @@
}
@Override
- public void initInoutDepotStore(InoutData data) {
-
- //鍏堜粠缂撳瓨涓幏鍙栦笅淇℃伅锛屾煡鐪嬫槸鍚﹀凡缁忓垵濮嬪寲杩囨暟鎹紝濡傛灉鏈夊垯鐩存帴璺宠繃锛屽鏋滄病鏈夊垯閲嶆柊楠岃瘉
- // String key = RedisConst.buildKey(data.getDepotId(), "DEPOT_STORE", depotStatus);
-// String tag = (String) redisUtil.get(key);
-// if (null != tag) return;
-
-
- //鑾峰彇褰撳墠浠撳簱鏈�鍚庝竴涓簱瀛樿褰�
- DepotStore depotStore = getLastDepotStore(data.getDepotId());
-
- //濡傛灉鏈夋暟鎹紝骞朵笖鐘舵�佺被涓�鑷达紝琛ㄧず缂撳瓨娌℃湁浜嗭紝浣嗘槸宸茬粡鍋氳繃鍒濆鍖�
-// if (null != depotStore && depotStatus.equals(depotStore.getDepotStatus())) {
-// redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60);
-// return;
-// }
-
- //浠庢潵娌℃湁鍋氫釜搴撳瓨绠＄悊璋冩暣
-// if (null == depotStore) {
-// Depot depot = this.getCacheDepot(data.getCompanyId(), data.getDepotId());
-// depotStore = new DepotStore(depot, depotStatus);
-// if (null != data.getFoodYear()) {
-// depotStore.setFoodYear(data.getFoodYear());
-// }
-//
-// } else { //鏈夎褰曪紝浣嗘槸鐘舵�佷笌褰撳墠浣滀笟涓嶄竴鑷达紝涔熼渶瑕佸垵濮嬪寲
-// depotStore.setDepotStatus(depotStatus);
-// depotStore.setUpdateDate(new Date());
-// depotStore.setUpdateUser(null);
-// }
-
- depotStore.setId(null);
- if (InoutConstant.TYPE_OUT.equals(data.getType())) {
- depotStore.setOutDate(new Date());
- } else {
- depotStore.setStoreDate(new Date());
- }
-
- if (null != data.getFoodYear()) {
- depotStore.setFoodYear(data.getFoodYear());
- }
- depotStore.setRemark("绯荤粺鐢熸垚璁板綍锛岀‘璁よ皟鏁�");
-
- addDepotStore(depotStore, false);
- commonMapper.updateDepotStatus(depotStore.getCompanyId(), depotStore.getDepotId(), depotStore.getDepotStatus());
-
- // redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60);
- }
-
- @Override
public DepotStore getLastDepotStore(String depotId) {
return commonMapper.getLastDepotStore(depotId);
}
@@ -383,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