From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 2372af9..ff4b9d5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -48,6 +48,8 @@
@Autowired
private Api1204Rep api1204Rep;
@Autowired
+ private Api1208Rep api1208Rep;
+ @Autowired
private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@@ -113,7 +115,7 @@
apiData.setHwdm(api1105.getHwdm());
apiData.setYwlx(Constant.INOUT_TYPE_2);
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());
@@ -143,6 +145,10 @@
}
}
}
+
+ //绮潈鍗曚綅褰掑睘浠ｇ爜
+ List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? apiData.getHwdm().substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm());
apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃" : sysData.getUserAddress());
@@ -207,17 +213,17 @@
apiData.setBzbjs(sysData.getBzbjs());
apiData.setCmsj(sysData.getCompleteTime());
//缁撶畻鍗曞彿
- if(StringUtils.isNotEmpty(sysData.getSettleId())){
+ if (StringUtils.isNotEmpty(sysData.getSettleId())) {
apiData.setRkjsdh(kqdm + sysData.getSettleId());
}
- if(StringUtils.isNotEmpty(apiData.getHth())){
+ if (StringUtils.isNotEmpty(apiData.getHth())) {
api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
- if(null == api1204List || api1204List.isEmpty()){
+ if (null == api1204List || api1204List.isEmpty()) {
api1204List = api1204Rep.getDataByHth(apiData.getHth());
- if(null != api1204List && api1204List.size() > 0){
+ if (null != api1204List && api1204List.size() > 0) {
apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
}
- }else {
+ } else {
apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
}
}
@@ -242,13 +248,13 @@
apiData.setBz(null == sysData.getRemarks() ? "澶囨敞" : sysData.getRemarks());
apiData.setKlyy("鎵ｉ噺鍘熷洜");
- apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
- apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
+ apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
+ apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
//01:琛ㄧず澶у瀷姹借溅鍙风墝,榛勫簳榛戝瓧锛� 02:琛ㄧず灏忓瀷姹借溅鍙风墝,钃濆簳鐧藉瓧锛� 03:琛ㄧず鏂拌兘婧愭苯杞﹀彿鐗�,缁垮簳榛� 瀛楋紱
//04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤
apiData.setCchlx("01");
apiData.setLdd("瑁呯伯鍦扮偣");
- apiData.setQzbwslkl(0.0);
+ apiData.setQzsfzkl(0.0);
apiData.setQzzzzkl(0.0);
apiData.setQzgwcmkl(0.0);
apiData.setQzhhkl(0.0);
@@ -257,11 +263,17 @@
apiData.setQzsmlkl(0.0);
apiData.setQzzjmlkl(0.0);
apiData.setQzqtkl(0.0);
+ apiData.setZkhyy("澧炴墸浠峰師鍥�");
apiData.setZxzydw(api1105.getBgdw());
if (sysData.getCompanyId().equals("5329")) {
apiData.setLqgsdwdm("91440604MA56D2AM1X");
}
-
+ api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ if (null == api1202List || api1202List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1202List.get(0).getCzbz());
+ }
//鍒ゆ柇鏄惁涓鸿埞杩�
if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
@@ -284,6 +296,7 @@
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
+ apiData.setQtkl(0 - fz40InoutRecordItem.getDe());
api1202List = api1202Rep.getDataById(apiData.getRkywdh());
if (null == api1202List || api1202List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
@@ -294,12 +307,6 @@
idNum++;
}
} else {
- api1202List = api1202Rep.getDataById(apiData.getRkywdh());
- if (null == api1202List || api1202List.isEmpty()) {
- apiData.setCzbz(Constant.CZBZ_I);
- } else {
- apiData.setCzbz(api1202List.get(0).getCzbz());
- }
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
}
--
Gitblit v1.9.3