From 8f114bf53e12f37782d3fd908f83dc4d81b002de Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 18 三月 2026 01:26:51 +0800
Subject: [PATCH] 出入库同步修改
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java | 10 ++--
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1206.java | 4 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java | 4 +-
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java | 22 +++++-----
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java | 22 +++++-----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 22 +++++-----
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1204.java | 4 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 22 +++++-----
8 files changed, 55 insertions(+), 55 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 6914e75..db702a5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -236,17 +236,17 @@
if (StringUtils.isNotEmpty(sysData.getSettleId())) {
apiData.setRkjsdh(kqdm + sysData.getSettleId());
}
- if (StringUtils.isNotEmpty(apiData.getHth())) {
- 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());
- }
- }
+// if (StringUtils.isNotEmpty(apiData.getHth())) {
+// 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());
+// }
+// }
//鍏跺畠
apiData.setQtkl(0 - sysData.getDeOther());
//鍊间粨 鐜板満鎵ｉ噸
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
index bbb1b5f..31a0201 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
@@ -109,8 +109,8 @@
apiData.setKhhh(sysData.getBankCode());
apiData.setKhhmc(sysData.getBank());
apiData.setYhzh(sysData.getBankNum());
- apiData.setFphm("");
- apiData.setFpzt("");
+ apiData.setFphm(sysData.getFphm().isEmpty() ? "10000000" : sysData.getFphm());
+ apiData.setFpzt(sysData.getFpzt().isEmpty() ? "1" : sysData.getFpzt());
apiData.setFkdw(sysData.getPayUnit());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
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 e25cbd5..1550da5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -225,17 +225,17 @@
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());
- }
- }
+// 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("搴撳唴");
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
index 0607edb..a665dd3 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
@@ -83,11 +83,11 @@
apiData.setCkjsdh(kqdm + sysData.getId());
//鍚堝悓鍙�
- if(StringUtils.isNotEmpty(sysData.getContractId())){
+ if (StringUtils.isNotEmpty(sysData.getContractId())) {
apiData.setHth(api1102.getDwdm() + sysData.getContractId());
}
- if(StringUtils.isNotEmpty(sysData.getDepotId())){
+ if (StringUtils.isNotEmpty(sysData.getDepotId())) {
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
@@ -105,9 +105,9 @@
apiData.setKhhh(sysData.getBankCode());
apiData.setKhhmc(sysData.getBank());
apiData.setYhzh(sysData.getBankNum());
- apiData.setFkr(StringUtils.isEmpty(sysData.getPayUser())? "浠樻浜�":sysData.getPayUser());
- apiData.setFphm("");
- apiData.setFpzt("");
+ apiData.setFkr(StringUtils.isEmpty(sysData.getPayUser()) ? "浠樻浜�" : sysData.getPayUser());
+ apiData.setFphm(sysData.getFphm().isEmpty() ? "10000000" : sysData.getFphm());
+ apiData.setFpzt(sysData.getFpzt().isEmpty() ? "1" : sysData.getFpzt());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(new Date());
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java
index 91568f8..e8e283a 100644
--- a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java
@@ -237,17 +237,17 @@
if (StringUtils.isNotEmpty(sysData.getSettleId())) {
apiData.setRkjsdh(kqdm + sysData.getSettleId());
}
- if (StringUtils.isNotEmpty(apiData.getHth())) {
- 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());
- }
- }
+// if (StringUtils.isNotEmpty(apiData.getHth())) {
+// 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());
+// }
+// }
//鍏跺畠
apiData.setQtkl(0 - sysData.getDeOther());
//鍊间粨 鐜板満鎵ｉ噸
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1204.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1204.java
index 0430568..7cf99d5 100644
--- a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1204.java
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1204.java
@@ -111,8 +111,8 @@
apiData.setKhhh(sysData.getBankCode());
apiData.setKhhmc(sysData.getBank());
apiData.setYhzh(sysData.getBankNum());
- apiData.setFphm("");
- apiData.setFpzt("");
+ apiData.setFphm(sysData.getFphm().isEmpty() ? "10000000" : sysData.getFphm());
+ apiData.setFpzt(sysData.getFpzt().isEmpty() ? "1" : sysData.getFpzt());
apiData.setFkdw(sysData.getPayUnit());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java
index ae3e95a..93c9a46 100644
--- a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java
@@ -227,17 +227,17 @@
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());
- }
- }
+// 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("搴撳唴");
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1206.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1206.java
index ba24e13..ba669cc 100644
--- a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1206.java
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1206.java
@@ -106,8 +106,8 @@
apiData.setKhhmc(sysData.getBank());
apiData.setYhzh(sysData.getBankNum());
apiData.setFkr(StringUtils.isEmpty(sysData.getPayUser()) ? "浠樻浜�" : sysData.getPayUser());
- apiData.setFphm("");
- apiData.setFpzt("");
+ apiData.setFphm(sysData.getFphm().isEmpty() ? "10000000" : sysData.getFphm());
+ apiData.setFpzt(sysData.getFpzt().isEmpty() ? "1" : sysData.getFpzt());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(new Date());
--
Gitblit v1.9.3