From 254da24705ba4daa8bf289a2c10b912fb8c53ad2 Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期二, 18 七月 2023 21:18:37 +0800 Subject: [PATCH] 增加V40接口-粮情、出入库 --- src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java index 3de9c9e..20589bd 100644 --- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java +++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java @@ -2,19 +2,19 @@ import com.fzzy.api.Constant; import com.fzzy.api.entity.Api1109; -import com.fzzy.api.entity.Api1201; import com.fzzy.api.entity.ApiLog; import com.fzzy.api.utils.ContextUtil; import com.fzzy.api.utils.FileUtil; import com.fzzy.api.view.repository.Api1109Rep; import com.fzzy.api.view.repository.ApiLogRep; import com.fzzy.async.fzzy35.entity.Fz35FileInfo; +import com.fzzy.async.fzzy35.entity.Fz35InoutRecord; import com.fzzy.async.fzzy35.repository.Fzzy35Sync1109Rep; +import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - import java.util.*; /** @@ -46,6 +46,8 @@ @Autowired private Fzzy35Sync1109Rep fzzySync1109Rep; + @Autowired + private Fzzy35Sync1202Rep fzzySync1202Rep; @Autowired private Api1109Rep api1109Rep; @Autowired @@ -85,8 +87,22 @@ String wjlx; String wjmc; List<Api1109> api1109List; + List<Fz35InoutRecord> listInout; for (Fz35FileInfo sysData : list) { if (StringUtils.isEmpty(sysData.getBizId())) { + continue; + } + //鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭� + listInout = fzzySync1202Rep.listInoutRecordById(sysData.getBizId()); + if(null == listInout || listInout.isEmpty()){ + continue; + } + //鑻ュ嚭鍏ュ簱淇℃伅涓哄垹闄ゆ垨鑰呴敊璇姸鎬侊紝鍒欎笉鍚屾 + if("DEL".equals(listInout.get(0).getRecordStatus()) || "ERROR".equals(listInout.get(0).getRecordStatus())){ + continue; + } + //鑻ュ嚭鍏ュ簱淇℃伅涓叆搴撻噸閲忎负绌烘垨涓�0锛屽垯涓嶅悓姝� + if(null == listInout.get(0).getRecordWeight() || listInout.get(0).getRecordWeight() == 0){ continue; } //鍙悓姝ョО閲� @@ -132,6 +148,8 @@ api1109List = api1109Rep.getDataByBizId(apiData.getBizId()); if(null == api1109List || api1109List.isEmpty()){ apiData.setCzbz(Constant.CZBZ_I); + }else { + apiData.setCzbz(api1109List.get(0).getCzbz()); } //淇濆瓨鏁版嵁 -- Gitblit v1.9.3