From 54b61daf58037385cb8d46404b12a95786c7c8f3 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 28 六月 2024 19:55:06 +0800
Subject: [PATCH] 上海省平台协议-增加数据相符性接口
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 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 d08232b..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());
@@ -179,11 +179,12 @@
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
- apiData.setPzjby(sysData.getEmptyWeightUser());
- apiData.setPzjly(sysData.getEmptyWeightUser());
+ apiData.setPzjby(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"鐩戠鍛�":sysData.getEmptyWeightUser());
+ apiData.setPzjly(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"璁￠噺鍛�":sysData.getEmptyWeightUser());
//姣涢噸淇℃伅
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));
}
@@ -191,8 +192,8 @@
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
- apiData.setMzjby(sysData.getFullWeightUser());
- apiData.setMzjly(sysData.getFullWeightUser());
+ apiData.setMzjby(StringUtils.isEmpty(sysData.getFullWeightUser())?"鐩戠鍛�":sysData.getFullWeightUser());
+ apiData.setMzjly(StringUtils.isEmpty(sysData.getFullWeightUser())?"璁￠噺鍛�":sysData.getFullWeightUser());
//鍑�閲�
apiData.setJz(sysData.getRecordWeight());
@@ -205,11 +206,26 @@
apiData.setCkjsdh(kqdm + sysData.getSettleId());
}
if(StringUtils.isNotEmpty(apiData.getHth())){
- api1206List = api1206Rep.getDataByHth(apiData.getHth());
- if(null != api1206List && api1206List.size() > 0){
+ api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
+ if(null == api1206List || api1206List.isEmpty()){
+ api1206List = api1206Rep.getDataByHth(apiData.getHth());
+ if(null != api1206List && api1206List.size() > 0){
+ apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
+ }
+ }else {
apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
}
}
+
+ apiData.setCchlx("01");
+ apiData.setXldd("搴撳唴");
+ apiData.setBz(StringUtils.isEmpty(sysData.getRemarks())?"鏆傛棤澶囨敞淇℃伅":sysData.getRemarks());
+ apiData.setBzbdbz(25);
+ apiData.setBzbjs(0);
+ apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"闂ㄥ矖浜�":sysData.getRegisterUser());
+ apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
+ apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser())?"鍊间粨鍛�":sysData.getHandleUser());
+ apiData.setZxzydw("澶栬仒鍗曚綅");
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(sysData.getUpdateTime());
@@ -218,8 +234,13 @@
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
- log.info("1201---鍚屾鏁版嵁锛歿}",apiData.toString());
-
+ 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());
@@ -242,7 +263,7 @@
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
-
+ apiData.setKzl(0 - fz40InoutRecordItem.getDe());
api1205List = api1205Rep.getDataById(apiData.getCkywdh());
if(null == api1205List || api1205List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
@@ -253,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