From f22c2bda5fbe1e016403c6585334cac15d256f49 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 12 六月 2024 19:17:35 +0800
Subject: [PATCH] 调整石嘴山省平台配置文件信息
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
index 2d0113b..6b292e0 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -8,14 +8,12 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1208Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Fz35Depot;
+import com.fzzy.async.fzzy35.entity.Fz35DepotStore;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1208Rep;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
@@ -59,7 +57,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz35Depot> list = fzzySync1208Rep.listDepot(deptId);
+ List<Fz35DepotStore> list = fzzySync1208Rep.listDepot(deptId, start, end);
if (null == list || list.isEmpty()) {
@@ -73,38 +71,38 @@
Api1208 apiData;
Api1105 api1105;
- // List<GbArea> gbAreaList;
List<Api1208> api1208List;
- for (Fz35Depot fz35Depot : list) {
+ for (Fz35DepotStore fz35DepotStore : list) {
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(fz35Depot.getId());
+ api1105 = commonService.getApi1105Cache(fz35DepotStore.getDepotId());
if (null == api1105) {
continue;
}
apiData = new Api1208();
+ apiData.setId(fz35DepotStore.getId());
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz35Depot.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz35DepotStore.getFoodVariety().substring(0,3));
apiData.setLspzdm(mappingCode);
//绮鎬ц川
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz35Depot.getFoodType());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz35DepotStore.getFoodType());
apiData.setLsxzdm(mappingCode);
//绮绛夌骇
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz35Depot.getFoodLevel());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz35DepotStore.getFoodLevel());
apiData.setLsdjdm(mappingCode);
- apiData.setShnd(fz35Depot.getFoodYear());
+ apiData.setShnd(fz35DepotStore.getFoodYear());
//浜у湴浠ｇ爜
- String cd = commonService.getFoodLocationIdFromCache(fz35Depot.getFoodLocation());
+ String cd = commonService.getFoodLocationIdFromCache(fz35DepotStore.getFoodLocation());
apiData.setCd(cd);
- apiData.setBgy(fz35Depot.getStoreKeeperName());
+ apiData.setBgy(api1105.getBgy());
//绮潈褰掑睘鍗曚綅
apiData.setLqgsdwdm(api1102.getDwdm());
//绮潈琛屾斂鍖哄垝浠ｇ爜
@@ -114,39 +112,46 @@
//鏀跺偍鍦扮偣-榛樿搴撳唴
apiData.setScdd("1");
//鍌ㄧ伯鏂瑰紡
- apiData.setClfs(fz35Depot.getStoreType());
+ apiData.setClfs(fz35DepotStore.getStoreType());
//璐т綅鐘舵��
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35Depot.getDepotStatus());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35DepotStore.getDepotStatus());
apiData.setHwzt(mappingCode);
+ if(null == fz35DepotStore.getStoreDate()){
+ fz35DepotStore.setStoreDate(new Date());
+ }
//鍏ヤ粨鏃堕棿
- apiData.setRcsj(fz35Depot.getStoreDate());
+ apiData.setRcsj(fz35DepotStore.getStoreDate());
//灏佷粨鏃ユ湡
if("3".equals(apiData.getHwzt())){
- apiData.setFcrq(DateUtils.addDays(fz35Depot.getStoreDate(), 10));
+ apiData.setFcrq(DateUtils.addDays(fz35DepotStore.getStoreDate(), 10));
}
//鍑轰粨瀹屾垚鏃堕棿
if("1".equals(apiData.getHwzt())){
- apiData.setCcwcsj(DateUtils.addDays(fz35Depot.getStoreDate(), 5));
+ apiData.setCcwcsj(fz35DepotStore.getFullDate());
}
//鍥藉埆
apiData.setGb("156");
- apiData.setSjsl(fz35Depot.getStorageReal());
- apiData.setJjsl(fz35Depot.getStorageReal());
+ apiData.setSjsl(fz35DepotStore.getStorageReal());
+ apiData.setJjsl(fz35DepotStore.getStorageReal());
apiData.setSjzlxg(6);
apiData.setLdtj(10000);
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(fz35DepotStore.getUpdateDate());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
- apiData.setBizId(fz35Depot.getId());
+ apiData.setBizId(fz35DepotStore.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
- api1208List = api1208Rep.getDataById(api1105.getHwdm());
+
+ //搴撳瓨姣忔鏂板
+ api1208List = api1208Rep.getDataById(apiData.getId());
if(null == api1208List || api1208List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1208List.get(0).getCzbz());
}
- apiData.setId(api1105.getHwdm());
+
//淇濆瓨鏁版嵁
api1208Rep.save(apiData);
}
--
Gitblit v1.9.3