From ab8b3af2bc6460dba2a807d27004e128d772ab24 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 12 七月 2024 09:30:09 +0800
Subject: [PATCH] 增城配置
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 1630c63..88861f4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -109,7 +109,7 @@
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.setCyr(sysData.getUserName().trim());
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
@@ -184,6 +184,7 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ apiData.setKzl(0-sysData.getDeCheck()+sysData.getAddCheck()-sysData.getDeHandle()-sysData.getDePackage()-sysData.getDeOther());
if (null == sysData.getFullWeightTime()) {
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
}
@@ -234,7 +235,12 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
log.info("1205---鍚屾鏁版嵁锛歿}",apiData.toString());
-
+ api1205List = api1205Rep.getDataById(apiData.getCkywdh());
+ if(null == api1205List || api1205List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1205List.get(0).getCzbz());
+ }
//鍒ゆ柇鏄惁涓鸿埞杩�
if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
@@ -268,12 +274,6 @@
idNum ++;
}
}else {
- api1205List = api1205Rep.getDataById(apiData.getCkywdh());
- if(null == api1205List || api1205List.isEmpty()){
- apiData.setCzbz(Constant.CZBZ_I);
- }else {
- apiData.setCzbz(api1205List.get(0).getCzbz());
- }
//淇濆瓨鏁版嵁
api1205Rep.save(apiData);
}
--
Gitblit v1.9.3