From f7e9d18d1065a065bf06b859dc42e4ac40acda3f Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 25 十二月 2023 14:47:54 +0800
Subject: [PATCH] 熏蒸备案调整

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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 dcb39c9..66e3766 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -105,12 +105,16 @@
             //璐т綅浠g爜
             apiData.setHwdm(api1105.getHwdm());
             apiData.setYwlx(Constant.INOUT_TYPE_1);
+            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
+            apiData.setCyr(sysData.getUserName());
+
+            //榛樿涓�涓殢渚垮��
+            apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
+
+            apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());
 
             //閫氱煡鍗曞彿
             apiData.setCktzdh(sysData.getNoticeId());
-
-            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
-
             //鑾峰彇鍚堝悓鍙�
             listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
             if (null != listInoutNotice && listInoutNotice.size() > 0) {
@@ -122,7 +126,7 @@
                     }
                 }
                 if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
-                    List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getContractId());
+                    List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
                     if(null != api1404List && api1404List.size() > 0){
                         apiData.setJhmxh(api1404List.get(0).getJhmxdh());
                     }
@@ -188,7 +192,7 @@
             }
             apiData.setCmsj(sysData.getCompleteTime());
             if(StringUtils.isNotEmpty(sysData.getSettleId())){
-                apiData.setCkjsdh(sysData.getSettleId());
+                apiData.setCkjsdh(kqdm + sysData.getSettleId());
             }
 
             //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
@@ -210,6 +214,9 @@
 
                 int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                 for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
+                    if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
+                        continue;
+                    }
                     if(fz40InoutRecordItem.getSettleWeight() <= 0){
                         continue;
                     }

--
Gitblit v1.9.3