From dc66963d36e0a479e7334092241834b60bf8bbe2 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 27 十月 2023 19:42:43 +0800
Subject: [PATCH] 优化武汉接口

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index bcfea4f..27f300c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -114,7 +114,6 @@
             apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
 
             //鑾峰彇鍚堝悓鍙�
-            apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getCkywdh());
             listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
             if(null != listInoutNotice && listInoutNotice.size() >0){
                 if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
@@ -147,8 +146,11 @@
             apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
 
             //浜у湴浠g爜
-            String cddm = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
-            apiData.setCddm(cddm);
+            mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
+            if(StringUtils.isEmpty(mappingCode)){
+                mappingCode = apiData.getHwdm().substring(2,8);
+            }
+            apiData.setCddm(mappingCode);
 
             //鐨噸淇℃伅
             apiData.setPz(sysData.getEmptyWeight());
@@ -200,6 +202,9 @@
 
                 int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                 for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
+                    if(fz40InoutRecordItem.getSettleWeight() <= 0){
+                        continue;
+                    }
                     apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                     apiData.setMz(fz40InoutRecordItem.getFullWeight());
                     apiData.setPz(fz40InoutRecordItem.getEmptyWeight());

--
Gitblit v1.9.3