From c51af8389ffcf5780918ce653cc456366eccb19a Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 22 三月 2024 14:16:32 +0800
Subject: [PATCH] 优化出入库文件数据同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 c9295df..cc30aef 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -147,7 +147,6 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
- apiData.setGch(sysData.getPlateNum());
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
@@ -206,14 +205,21 @@
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.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("澶栬仒鍗曚綅");
@@ -249,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