From cf062ef5e93d98733d3e4f647c51fed86ef3e9aa Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 25 三月 2024 21:24:28 +0800
Subject: [PATCH] 修改上海接口配置
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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 0975df3..cc30aef 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -44,6 +44,8 @@
@Autowired
private Api1205Rep api1205Rep;
@Autowired
+ private Api1206Rep api1206Rep;
+ @Autowired
private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@@ -82,6 +84,7 @@
Api1105 api1105;
List<Fz40InoutNoticeOut> listInoutNotice;
List<Api1205> api1205List;
+ List<Api1206> api1206List;
List<Fz40InoutRecordItem> listInoutRecordItem;
for (Fz40InoutRecord sysData : list) {
if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
@@ -176,8 +179,8 @@
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());
@@ -188,8 +191,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());
@@ -197,9 +200,29 @@
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
+ //缁撶畻鍗曞彿
if(StringUtils.isNotEmpty(sysData.getSettleId())){
apiData.setCkjsdh(kqdm + sysData.getSettleId());
}
+ if(StringUtils.isNotEmpty(apiData.getHth())){
+ 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.setBzbdbz(25);
+ 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());
@@ -208,7 +231,7 @@
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
- log.info("1201---鍚屾鏁版嵁锛歿}",apiData.toString());
+ log.info("1205---鍚屾鏁版嵁锛歿}",apiData.toString());
//鍒ゆ柇鏄惁涓鸿埞杩�
if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
@@ -232,7 +255,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);
--
Gitblit v1.9.3