From 9075639de65743f310d63a65700ce9a3b79247fe Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 07 十一月 2023 10:52:34 +0800
Subject: [PATCH] 调整品种信息
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index a841582..0f26f6b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -11,6 +11,7 @@
import com.fzzy.async.fzzy40.entity.Fz40DepotStore;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1208Rep;
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;
@@ -87,6 +88,9 @@
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)){
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
+ }
apiData.setLspzdm(mappingCode);
//绮鎬ц川
@@ -100,14 +104,21 @@
apiData.setShnd(fz40DepotStore.getFoodYear());
//浜у湴浠ｇ爜
- String cd = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
- apiData.setCd(cd);
+ mappingCode = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
+ if (StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiData.getHwdm().substring(2, 8);
+ }
+ apiData.setCd(mappingCode);
- apiData.setBgy(api1105.getBgy());
+ apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
//绮潈褰掑睘鍗曚綅
- apiData.setLqgsdwdm(api1102.getDwdm());
+ if (StringUtils.isEmpty(fz40DepotStore.getLqgsdwdm())) {
+ apiData.setLqgsdwdm(api1102.getDwdm());
+ } else {
+ apiData.setLqxzqhdm(fz40DepotStore.getLqgsdwdm());
+ }
//绮潈琛屾斂鍖哄垝浠ｇ爜
- apiData.setLqxzqhdm(api1102.getDwdm().substring(2, 8));
+ apiData.setLqxzqhdm(api1102.getXzqhdm());
//绠＄悊鏂瑰紡-榛樿鐩村偍
apiData.setGlfs("01");
//鏀跺偍鍦扮偣-榛樿搴撳唴
@@ -118,18 +129,21 @@
//璐т綅鐘舵��
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz40DepotStore.getDepotStatus());
apiData.setHwzt(mappingCode);
- if(null == fz40DepotStore.getStoreDate()){
+ if (null == fz40DepotStore.getStoreDate()) {
fz40DepotStore.setStoreDate(new Date());
}
//鍏ヤ粨鏃堕棿
apiData.setRcsj(fz40DepotStore.getStoreDate());
//灏佷粨鏃ユ湡
- if("3".equals(apiData.getHwzt())){
+ if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
apiData.setFcrq(DateUtils.addDays(fz40DepotStore.getStoreDate(), 10));
}
- //鍑轰粨瀹屾垚鏃堕棿
- if("1".equals(apiData.getHwzt())){
+
+ if ("1".equals(apiData.getHwzt())) {
+ //鍑轰粨瀹屾垚鏃堕棿
apiData.setCcwcsj(DateUtils.addDays(fz40DepotStore.getStoreDate(), 5));
+ //娓呬粨鏃堕棿
+ apiData.setQcsj(DateUtils.addDays(apiData.getCcwcsj(), 1));
}
//鍥藉埆
apiData.setGb("156");
@@ -147,9 +161,9 @@
//搴撳瓨姣忔鏂板
api1208List = api1208Rep.getDataById(apiData.getId());
- if(null == api1208List || api1208List.isEmpty()){
+ if (null == api1208List || api1208List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1208List.get(0).getCzbz());
}
--
Gitblit v1.9.3