From 4c6b38c84b14e90bd0844046645c61796746696c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 09 三月 2024 14:18:03 +0800
Subject: [PATCH] 出库结算信息加入货位字段，上传不使用
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..e01d57b 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,8 +205,13 @@
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());
}
}
--
Gitblit v1.9.3