From 33ad92a73de17e8d72f30632ced04dca5719f76e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 22 四月 2025 15:51:55 +0800
Subject: [PATCH] 数据同步调整
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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 0f26f6b..6f50be0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -87,10 +87,7 @@
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- 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));
- }
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
apiData.setLspzdm(mappingCode);
//绮鎬ц川
@@ -111,20 +108,48 @@
apiData.setCd(mappingCode);
apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
- //绮潈褰掑睘鍗曚綅
- if (StringUtils.isEmpty(fz40DepotStore.getLqgsdwdm())) {
- apiData.setLqgsdwdm(api1102.getDwdm());
- } else {
- apiData.setLqxzqhdm(fz40DepotStore.getLqgsdwdm());
- }
- //绮潈琛屾斂鍖哄垝浠ｇ爜
+ apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
apiData.setLqxzqhdm(api1102.getXzqhdm());
+ if (apiData.getLsxzdm().equals("121")) {
+ //鐪佺骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓虹渷绾�
+ apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 2) + "0000");
+ }
+ 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);
+ }
+
//绠＄悊鏂瑰紡-榛樿鐩村偍
- apiData.setGlfs("01");
+ if (StringUtils.isEmpty(fz40DepotStore.getManageType())) {
+ apiData.setGlfs("01");
+ } else {
+ apiData.setGlfs(fz40DepotStore.getManageType());
+ }
+
//鏀跺偍鍦扮偣-榛樿搴撳唴
apiData.setScdd("1");
//鍌ㄧ伯鏂瑰紡
apiData.setClfs(fz40DepotStore.getStoreType());
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if ("2".equals(apiData.getClfs())) {
+ apiData.setBclbs((int) (fz40DepotStore.getStorageReal() / 25));
+ }
//璐т綅鐘舵��
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz40DepotStore.getDepotStatus());
@@ -136,14 +161,17 @@
apiData.setRcsj(fz40DepotStore.getStoreDate());
//灏佷粨鏃ユ湡
if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
- apiData.setFcrq(DateUtils.addDays(fz40DepotStore.getStoreDate(), 10));
+ if (null == fz40DepotStore.getFullDate()) {
+ fz40DepotStore.setFullDate(DateUtils.addDays(fz40DepotStore.getStoreDate(), 30));
+ }
+ apiData.setFcrq(fz40DepotStore.getFullDate());
}
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