From 33ad92a73de17e8d72f30632ced04dca5719f76e Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期二, 22 四月 2025 15:51:55 +0800 Subject: [PATCH] 数据同步调整 --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 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..0607edb 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; } //鏍规嵁搴撳尯浠g爜鑾峰彇搴撳尯淇℃伅 - Api1102 api1201 = api1102Rep.findById(kqdm).get(); + Api1102 api1102 = api1102Rep.findById(kqdm).get(); Api1206 apiData; + Api1105 api1105; List<Api1206> api1206List; for (Fz40InoutSettle sysData : list) { @@ -79,7 +84,13 @@ //鍚堝悓鍙� if(StringUtils.isNotEmpty(sysData.getContractId())){ - apiData.setHth(api1201.getDwdm() + sysData.getContractId()); + apiData.setHth(api1102.getDwdm() + sysData.getContractId()); + } + + if(StringUtils.isNotEmpty(sysData.getDepotId())){ + api1105 = commonService.getApi1105Cache(sysData.getDepotId()); + //璐т綅浠g爜 + apiData.setHwdm(api1105.getHwdm()); } //缁撶畻閲嶉噺銆佺粨绠楀崟浠枫�佺粨绠楅噾棰濄�佺粨绠楁椂闂� -- Gitblit v1.9.3