From f646df3f4fa190bb2fac0d9c752880b16c636dd3 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 09 一月 2024 15:41:00 +0800
Subject: [PATCH] 优化上海接口-性质转变加入计划明细单号
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 21 ++++++++++++++++-----
1 files changed, 16 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..054561f 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,18 @@
//璐т綅浠ｇ爜
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());
+
+ if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
+ sysData.setUserId("410183199003187055");
+ }
//閫氱煡鍗曞彿
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 +128,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 +194,7 @@
}
apiData.setCmsj(sysData.getCompleteTime());
if(StringUtils.isNotEmpty(sysData.getSettleId())){
- apiData.setCkjsdh(sysData.getSettleId());
+ apiData.setCkjsdh(kqdm + sysData.getSettleId());
}
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
@@ -210,6 +216,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;
}
@@ -217,6 +226,8 @@
apiData.setMz(fz40InoutRecordItem.getFullWeight());
apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
+ apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
+ apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
api1205List = api1205Rep.getDataById(apiData.getCkywdh());
if(null == api1205List || api1205List.isEmpty()){
--
Gitblit v1.9.3