From 7594c1e78092208fb07acecbf4d9d57ba12af7d3 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期四, 25 五月 2023 12:02:30 +0800
Subject: [PATCH] 优化非正常状态的出入库数据下的文件信息不同步
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 358b420..20589bd 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -7,13 +7,14 @@
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.FileInfo;
+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 +47,8 @@
@Autowired
private Fzzy35Sync1109Rep fzzySync1109Rep;
@Autowired
+ private Fzzy35Sync1202Rep fzzySync1202Rep;
+ @Autowired
private Api1109Rep api1109Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -72,7 +75,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
+ List<Fz35FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒版枃浠朵俊鎭�------------------");
@@ -83,8 +86,23 @@
Api1109 apiData;
String wjlx;
String wjmc;
- for (FileInfo sysData : list) {
+ 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;
}
//鍙悓姝ョО閲�
@@ -120,7 +138,6 @@
apiData.setWjlx(wjlx);
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
@@ -128,6 +145,13 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
+ api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
+ if(null == api1109List || api1109List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1109List.get(0).getCzbz());
+ }
+
//淇濆瓨鏁版嵁
api1109Rep.save(apiData);
log.info("1109---鍚屾鏁版嵁锛歿}", apiData.toString());
--
Gitblit v1.9.3