From 9529f6d7c63b2483b9bf73888d1ead2388e0a292 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 25 二月 2025 11:55:27 +0800
Subject: [PATCH] 性质转变同步代码修改

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
index 003c130..b4a7093 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
@@ -65,7 +65,7 @@
 
             Api1210 apiData;
             Api1105 api1105;
-
+            List<Api1210> api1210List;
             for (Fz40InoutVarietyChange sysData : list) {
                 //鑾峰彇璐т綅淇℃伅
                 api1105 = commonService.getApi1105Cache(sysData.getDepotId());
@@ -78,29 +78,34 @@
                 apiData.setLssl(sysData.getNumber());
                 apiData.setHzsl(sysData.getChangeNumber());
                 apiData.setBzwh(sysData.getApprovalId());
-                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
-                if(StringUtils.isEmpty(mappingCode)){
-                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
-                }
+                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                 apiData.setLspzdm(mappingCode);
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                 apiData.setHzqlsxzdm(mappingCode);
-                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
+                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getNewFoodType());
                 apiData.setHzhlsxzdm(mappingCode);
                 apiData.setHzrq(sysData.getChangeTime());
-                apiData.setCcshr(sysData.getCcshr());
-                apiData.setZjshr(sysData.getZjshr());
-                apiData.setTjshr(sysData.getTjshr());
-                apiData.setKjshr(sysData.getKjshr());
-                apiData.setLdshr(sysData.getLdshr());
+                apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃壒浜�" : sysData.getCcshr());
+                apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃壒浜�" : sysData.getZjshr());
+                apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃壒浜�" : sysData.getTjshr());
+                apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃壒浜�" : sysData.getKjshr());
+                apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃壒浜�" : sysData.getLdshr());
                 apiData.setBz(sysData.getRemark());
-                apiData.setCzbz(Constant.CZBZ_I);
-                apiData.setZhgxsj(sysData.getUpdateTime());
+                apiData.setZhgxsj(new Date());
 
                 //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
                 apiData.setBizId(sysData.getId());
                 apiData.setKqdm(kqdm);
                 apiData.setSyncTime(new Date());
+                api1210List = api1210Rep.getDataById(apiData.getLsxzzbdh());
+                if (null == api1210List || api1210List.isEmpty()) {
+                    apiData.setCzbz(Constant.CZBZ_I);
+                } else {
+                    if (StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())) {
+                        apiData.setJhmxdh(api1210List.get(0).getJhmxdh());
+                    }
+                    apiData.setCzbz(api1210List.get(0).getCzbz());
+                }
                 //淇濆瓨鏁版嵁
                 api1210Rep.save(apiData);
 

--
Gitblit v1.9.3