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 |   20 ++++++++++++++++++--
 1 files changed, 18 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 a7a0cd0..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,10 +87,24 @@
             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;
+                }
                 //鍙悓姝ョО閲�
                 if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
                     wjlx = "";

--
Gitblit v1.9.3