From 92e9a4a4a5a48a575a5b9c996a02a23c3d815348 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 21 十月 2023 10:34:15 +0800
Subject: [PATCH] 优化上海接口字段

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 2a5e59c..1335dd4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -118,7 +118,6 @@
                 apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
 
                 //鑾峰彇鍚堝悓鍙�
-                apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
                 listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
                 if(null != listInoutNotice && listInoutNotice.size() >0){
                     if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
@@ -150,8 +149,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);
 
                 //妫�鏂ょ被鍨嬶紝榛樿0-绉伴噸鍏ュ簱
                 apiData.setJjlx("0");
@@ -213,6 +215,9 @@
 
                     int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                     for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
+                        if(fz40InoutRecordItem.getSettleWeight() <= 0){
+                            continue;
+                        }
                         apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                         apiData.setMz(fz40InoutRecordItem.getFullWeight());
                         apiData.setPz(fz40InoutRecordItem.getEmptyWeight());

--
Gitblit v1.9.3