From 2d036d97788c6a489d573386da4a1534e20bed99 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 03 十一月 2023 09:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 e07fc33..4b0f543 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());
+                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0,3));
                 apiData.setLspzdm(mappingCode);
 
                 //绮鎬ц川
@@ -101,8 +101,11 @@
                 apiData.setShnd(fz40DepotStore.getFoodYear());
 
                 //浜у湴浠g爜
-                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(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
                 //绮潈褰掑睘鍗曚綅

--
Gitblit v1.9.3