From 954480166aad6d24c9e9889906a0edf762f0da2a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 10 二月 2025 16:32:56 +0800
Subject: [PATCH] 优化库存同步

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
index 3fb99a6..379c302 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
@@ -3,13 +3,13 @@
 import com.fzzy.api.Constant;
 import com.fzzy.api.entity.*;
 import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1101Rep;
 import com.fzzy.api.view.repository.Api1102Rep;
 import com.fzzy.api.view.repository.Api1107Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
 import com.fzzy.async.fzzy40.entity.Fz40DeptDevice;
 import com.fzzy.async.fzzy40.repository.Fzzy40Sync1107Rep;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -28,8 +28,6 @@
     private Fzzy40Sync1107Rep fzzy40Sync1107Rep;
     @Autowired
     private ApiLogRep apiLogRep;
-    @Autowired
-    private Api1101Rep api1101Rep;
     @Autowired
     private Api1102Rep api1102Rep;
     @Autowired
@@ -55,35 +53,44 @@
         apiLog.setStatus(99);
         apiLog.setId(ContextUtil.getUUID());
         try {
-            List<Fz40DeptDevice> list = fzzy40Sync1107Rep.listDecixe(deptId);
+            List<Fz40DeptDevice> list = fzzy40Sync1107Rep.listDevice(deptId);
 
             if (null == list || list.isEmpty()) {
                 log.info("-------------娌℃湁鑾峰彇鍒拌澶囦俊鎭�------------------");
                 return;
             }
             Api1102 api1102 = api1102Rep.findById(kqdm).get();
-            Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
             Api1107 apiData;
-
+            List<Api1107> api1107List;
             for (Fz40DeptDevice sysData : list) {
                 apiData = new Api1107();
 
-                apiData.setBizId(sysData.getId());
                 apiData.setSbbh(sysData.getSbbh());
-                apiData.setDwdm(api1101.getDwdm());//鍗曚綅浠g爜
+                apiData.setDwdm(api1102.getDwdm());//鍗曚綅浠g爜
                 apiData.setKqdm(api1102.getKqdm());//搴撳尯浠g爜
                 apiData.setKqmc(api1102.getKqmc());//搴撳尯鍚嶇О
                 apiData.setSbyqmc(sysData.getSbyqmc());
                 apiData.setSbyqdm(sysData.getSbyqdm());
                 apiData.setSbggxh(sysData.getSbggxh());
-                apiData.setSccj(sysData.getSccj());
+                if (StringUtils.isEmpty(sysData.getSccj())) {
+                    apiData.setSccj("鐢熶骇鍘傚");
+                } else {
+                    apiData.setSccj(sysData.getSccj());
+                }
                 apiData.setScrq(sysData.getScrq());
                 apiData.setSbms(sysData.getSbms());
                 apiData.setSbzt(sysData.getSbzt());
                 apiData.setJdsj(sysData.getJdsj());
                 apiData.setJddw(sysData.getJddw());
-                apiData.setCzbz(Constant.CZBZ_I);
                 apiData.setZhgxsj(sysData.getUpdateTime());
+                apiData.setBizId(sysData.getSbbh());
+
+                api1107List = api1107Rep.getDataByBizId(apiData.getBizId());
+                if (null == api1107List || api1107List.isEmpty()) {
+                    apiData.setCzbz(Constant.CZBZ_I);
+                } else {
+                    apiData.setCzbz(api1107List.get(0).getCzbz());
+                }
 
                 //淇濆瓨鏁版嵁
                 api1107Rep.save(apiData);

--
Gitblit v1.9.3