From dadeff7f68d36c6a369c8d2d30cbe210d1be9a6c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 06 十一月 2023 22:06:30 +0800
Subject: [PATCH] 同步入库信息和库存

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java |   22 +++++++++++++---------
 1 files changed, 13 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 4b0f543..be7a4b5 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,7 @@
                 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().substring(0, 3));
                 apiData.setLspzdm(mappingCode);
 
                 //绮鎬ц川
@@ -102,14 +102,18 @@
 
                 //浜у湴浠g爜
                 mappingCode = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
-                if(StringUtils.isEmpty(mappingCode)){
-                    mappingCode = apiData.getHwdm().substring(2,8);
+                if (StringUtils.isEmpty(mappingCode)) {
+                    mappingCode = apiData.getHwdm().substring(2, 8);
                 }
                 apiData.setCd(mappingCode);
 
                 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());
+                }
                 //绮潈琛屾斂鍖哄垝浠g爜
                 apiData.setLqxzqhdm(api1102.getXzqhdm());
                 //绠$悊鏂瑰紡-榛樿鐩村偍
@@ -122,17 +126,17 @@
                 //璐т綅鐘舵��
                 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()) || "4".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));
                     //娓呬粨鏃堕棿
@@ -154,9 +158,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