From b6faf70a938ca9e014d34b235dec449f2a21abb4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 30 六月 2025 17:03:13 +0800
Subject: [PATCH] 数据同步时，品种处理
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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 4bc8cfb..1411f45 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -87,7 +87,10 @@
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
+ 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);
//绮鎬ц川
@@ -108,13 +111,7 @@
apiData.setCd(mappingCode);
apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
- //绮潈褰掑睘鍗曚綅
- if (StringUtils.isEmpty(fz40DepotStore.getLqgsdwdm())) {
- apiData.setLqgsdwdm(api1102.getDwdm());
- } else {
- apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
- }
-
+ apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
apiData.setLqxzqhdm(api1102.getXzqhdm());
if (apiData.getLsxzdm().equals("121")) {
//鐪佺骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓虹渷绾�
@@ -123,6 +120,22 @@
if (apiData.getLsxzdm().equals("122")) {
//甯傜骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓哄競绾�
apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 4) + "00");
+ }
+
+ //绮潈褰掑睘鍗曚綅
+ if (null == apiData.getLqgsdwdm()) {
+ api1208List = api1208Rep.findDataByHwdm(api1105.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ apiData.setLqgsdwdm(api1208List.get(0).getLqgsdwdm());
+ apiData.setLqxzqhdm(api1208List.get(0).getLqxzqhdm());
+ apiData.setLqgstydwbm(api1208List.get(0).getLqgstydwbm());
+ }
+ }
+
+
+ //鑻ヤ负鍟嗗搧绮紝鍒欑伯鏉冩�ц川鍖哄垝浠ｇ爜涓簄ull
+ if ("200".equals(apiData.getLsxzdm())) {
+ apiData.setLqxzqhdm(null);
}
//绠＄悊鏂瑰紡-榛樿鐩村偍
@@ -159,9 +172,9 @@
if ("1".equals(apiData.getHwzt())) {
//鍑轰粨瀹屾垚鏃堕棿
- apiData.setCcwcsj(DateUtils.addDays(fz40DepotStore.getStoreDate(), 5));
+ apiData.setCcwcsj(fz40DepotStore.getOutDate());
//娓呬粨鏃堕棿
- apiData.setQcsj(DateUtils.addDays(apiData.getCcwcsj(), 1));
+ apiData.setQcsj(DateUtils.addHours(apiData.getCcwcsj(), 60));
}
//鍥藉埆
apiData.setGb("156");
--
Gitblit v1.9.3