From 8c45ea14ec9922ca0885b7ce048ee47e80dfaeee Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 25 三月 2026 17:02:17 +0800
Subject: [PATCH] 出入库结算同步修改
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
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 5a57bfc..0567db4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
@@ -2,8 +2,10 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1206;
import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1206Rep;
@@ -38,6 +40,8 @@
private Api1102Rep api1102Rep;
@Autowired
private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiCommonService commonService;
/**
* 绮鍑哄簱缁撶畻
@@ -58,18 +62,19 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- //鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
+ //鑾峰彇绮鍑哄簱缁撶畻淇℃伅
List<Fz40InoutSettle> list = fzzySync1204Rep.listInoutSettle(deptId, INOUT_TYPE_OUT, start, end);
if (null == list || list.isEmpty()) {
- log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷嚭搴撶粨绠椾俊鎭�------------------");
return;
}
//鏍规嵁搴撳尯浠ｇ爜鑾峰彇搴撳尯淇℃伅
- Api1102 api1201 = api1102Rep.findById(kqdm).get();
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
Api1206 apiData;
+ Api1105 api1105;
List<Api1206> api1206List;
for (Fz40InoutSettle sysData : list) {
@@ -78,8 +83,14 @@
apiData.setCkjsdh(kqdm + sysData.getId());
//鍚堝悓鍙�
- if(StringUtils.isNotEmpty(sysData.getContractId())){
- apiData.setHth(api1201.getDwdm() + sysData.getContractId());
+ if (StringUtils.isNotEmpty(sysData.getContractId())) {
+ apiData.setHth(api1102.getDwdm() + sysData.getContractId());
+ }
+
+ if (StringUtils.isNotEmpty(sysData.getDepotId())) {
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ //璐т綅浠ｇ爜
+ apiData.setHwdm(api1105.getHwdm());
}
//缁撶畻閲嶉噺銆佺粨绠楀崟浠枫�佺粨绠楅噾棰濄�佺粨绠楁椂闂�
@@ -94,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(StringUtils.isEmpty(sysData.getFphm()) ? "10000000" : sysData.getFphm());
+ apiData.setFpzt(StringUtils.isEmpty(sysData.getFpzt()) ? "1" : sysData.getFpzt());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(new Date());
--
Gitblit v1.9.3