From 8faa1d379ed06d8913b096007f8a6e7fd248b4ea Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 06 三月 2024 19:05:30 +0800
Subject: [PATCH] 优化上海接口，出入库信息绑定结算单号
---
src/main/java/com/fzzy/api/view/repository/Api1204Rep.java | 3 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 9 +++++++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 10 +++++++---
src/main/java/com/fzzy/api/view/repository/Api1206Rep.java | 3 +++
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java
index 2de818d..10c3eb7 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java
@@ -29,4 +29,7 @@
@Query("from Api1204 where hth=:hth ")
List<Api1204> getDataByHth(@Param("hth") String hth);
+
+ @Query("from Api1204 where hth=:hth and hwdm=:hwdm")
+ List<Api1204> getDataByHthAndHwdm(@Param("hth") String hth, @Param("hwdm") String hwdm);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java
index 8612390..d4b25f4 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java
@@ -28,4 +28,7 @@
@Query("from Api1206 where hth=:hth ")
List<Api1206> getDataByHth(@Param("hth") String hth);
+
+ @Query("from Api1206 where hth=:hth and hwdm=:hwdm")
+ List<Api1206> getDataByHthAndHwdm(@Param("hth") String hth, @Param("hwdm") String hwdm);
}
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 77c0db5..595c078 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -211,8 +211,13 @@
apiData.setRkjsdh(kqdm + sysData.getSettleId());
}
if(StringUtils.isNotEmpty(apiData.getHth())){
- api1204List = api1204Rep.getDataByHth(apiData.getHth());
- if(null != api1204List && api1204List.size() > 0){
+ api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
+ if(null == api1204List || api1204List.isEmpty()){
+ api1204List = api1204Rep.getDataByHth(apiData.getHth());
+ if(null != api1204List && api1204List.size() > 0){
+ apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
+ }
+ }else {
apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
}
}
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..7ffa409 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -205,12 +205,16 @@
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.setZhgxsj(sysData.getUpdateTime());
--
Gitblit v1.9.3