From 1c5afb4320feceb5584e875dc375482b46bd5bb7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 23 四月 2025 10:01:31 +0800
Subject: [PATCH] 数据同步调整

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 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 72d6d97..6f50be0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -108,7 +108,7 @@
                 apiData.setCd(mappingCode);
 
                 apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
-
+                apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
                 apiData.setLqxzqhdm(api1102.getXzqhdm());
                 if (apiData.getLsxzdm().equals("121")) {
                     //鐪佺骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠g爜涓虹渷绾�
@@ -120,15 +120,18 @@
                 }
 
                 //绮潈褰掑睘鍗曚綅
-                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());
+                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());
+                    }
                 }
 
+
                 //鑻ヤ负鍟嗗搧绮紝鍒欑伯鏉冩�ц川鍖哄垝浠g爜涓簄ull
-                if("200".equals(apiData.getLsxzdm())){
+                if ("200".equals(apiData.getLsxzdm())) {
                     apiData.setLqxzqhdm(null);
                 }
 
@@ -166,9 +169,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