From 98ac5d4fd994172e106f66588062f5e79c9955b8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 23 九月 2023 16:54:27 +0800
Subject: [PATCH] 优化出入库及检验接口同步数据时各流程的时间前后

---
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
index 0f5faab..31d24c9 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
@@ -9,8 +9,11 @@
 import com.fzzy.api.view.repository.Api1102Rep;
 import com.fzzy.api.view.repository.Api1201Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy35.entity.Fz35InoutCustomer;
 import com.fzzy.async.fzzy35.entity.Fz35MContract;
 import com.fzzy.async.fzzy35.repository.Fzzy35Sync1201Rep;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1212Rep;
+import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +39,9 @@
     private Api1102Rep api1102Rep;
     @Autowired
     private ApiLogRep apiLogRep;
+
+    @Autowired
+    private Fzzy35Sync1212Rep fzzySync1212Rep;
 
 
     /**
@@ -70,6 +76,7 @@
 
             Api1201 apiData;
             List<Api1201> api1201List;
+            List<Fz35InoutCustomer> listCustomer;
             for (Fz35MContract sysData : list) {
 
                 apiData = new Api1201();
@@ -79,20 +86,24 @@
                 apiData.setDwdm(api1201.getDwdm());
 
                 //涓氬姟绫诲瀷
-                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HT_YWLX, sysData.getType());
-                apiData.setYwlx(mappingCode);
+                apiData.setYwlx(sysData.getType());
                 //瀹㈡埛绫诲瀷
-                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_KHLX, sysData.getCustomerType());
-                apiData.setKhlx(mappingCode);
-
-                apiData.setKhtyshxydm(StringUtils.isEmpty(sysData.getCustomerId()) ? "100000000000000000" :sysData.getCustomerId());
+                apiData.setKhlx(sysData.getCustomerType());
+                //浼佷笟瀹㈡埛锛岄渶瑕佽缃俊鐢ㄧ爜
+                if ("1".equals(sysData.getCustomerType())) {
+                    listCustomer = fzzySync1212Rep.getDataById(sysData.getCustomerId());
+                    if (null == listCustomer || listCustomer.isEmpty()) {
+                        continue;
+                    }
+                    apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
+                }
 
                 apiData.setKhmc(sysData.getCustomerName());
-                apiData.setFddbr(sysData.getCustomerSignUser());
+                apiData.setFddbr(StringUtils.isEmpty(sysData.getCustomerSignUser()) ? null : sysData.getCustomerSignUser());
 
                 apiData.setQdrq(sysData.getSigningTime());
 
-                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                 apiData.setLspzdm(mappingCode);
 
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodVariety());
@@ -107,9 +118,10 @@
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_JSYHTYZX, "");
                 apiData.setJsyhtyzx(mappingCode);
 
+                apiData.setJsyhtyzx("1");
+
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getCustomerBank());
                 apiData.setKhfkhh(mappingCode);
-
                 apiData.setKhfzh(sysData.getCustomerBankAccount());
 
                 apiData.setKhqyr(sysData.getCustomerSignUser());

--
Gitblit v1.9.3