From bccb2a6b67d31fd9bb846b2bc605a8b90c228033 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 24 五月 2024 18:18:41 +0800
Subject: [PATCH] 优化船运数据同步

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 2372af9..58f2391 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -113,7 +113,7 @@
                 apiData.setHwdm(api1105.getHwdm());
                 apiData.setYwlx(Constant.INOUT_TYPE_2);
                 apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
-                apiData.setCyr(sysData.getUserName());
+                apiData.setCyr(sysData.getUserName().trim());
 
                 //榛樿涓�涓殢渚垮��
                 apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
@@ -248,7 +248,7 @@
                 //04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤
                 apiData.setCchlx("01");
                 apiData.setLdd("瑁呯伯鍦扮偣");
-                apiData.setQzbwslkl(0.0);
+                apiData.setQzsfzkl(0.0);
                 apiData.setQzzzzkl(0.0);
                 apiData.setQzgwcmkl(0.0);
                 apiData.setQzhhkl(0.0);
@@ -257,11 +257,17 @@
                 apiData.setQzsmlkl(0.0);
                 apiData.setQzzjmlkl(0.0);
                 apiData.setQzqtkl(0.0);
+                apiData.setZkhyy("澧炴墸浠峰師鍥�");
                 apiData.setZxzydw(api1105.getBgdw());
                 if (sysData.getCompanyId().equals("5329")) {
                     apiData.setLqgsdwdm("91440604MA56D2AM1X");
                 }
-
+                api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+                if (null == api1202List || api1202List.isEmpty()) {
+                    apiData.setCzbz(Constant.CZBZ_I);
+                } else {
+                    apiData.setCzbz(api1202List.get(0).getCzbz());
+                }
                 //鍒ゆ柇鏄惁涓鸿埞杩�
                 if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
                     listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
@@ -284,6 +290,7 @@
                         apiData.setJz(fz40InoutRecordItem.getSettleWeight());
                         apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
                         apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
+                        apiData.setQtkl(0 - fz40InoutRecordItem.getDe());
                         api1202List = api1202Rep.getDataById(apiData.getRkywdh());
                         if (null == api1202List || api1202List.isEmpty()) {
                             apiData.setCzbz(Constant.CZBZ_I);
@@ -294,12 +301,6 @@
                         idNum++;
                     }
                 } else {
-                    api1202List = api1202Rep.getDataById(apiData.getRkywdh());
-                    if (null == api1202List || api1202List.isEmpty()) {
-                        apiData.setCzbz(Constant.CZBZ_I);
-                    } else {
-                        apiData.setCzbz(api1202List.get(0).getCzbz());
-                    }
                     //淇濆瓨鏁版嵁
                     api1202Rep.save(apiData);
                 }

--
Gitblit v1.9.3