From 3e8e2bfdfbcf06659d7734d3e1cb63fd0f46c35d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 03 一月 2025 15:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 101 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
index bf6d48f..2771377 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
@@ -1,17 +1,30 @@
package com.fzzy.async.fzzy40.impl;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1207;
+import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1207Rep;
import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40InoutStockChange;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1207Rep;
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.Date;
+import java.util.List;
+
/**
+ * 鍊掍粨淇℃伅
+ *
* @Author:YAN
*/
@Slf4j
@@ -19,17 +32,98 @@
public class Fzzy40Sync1207 {
@Autowired
- private Fzzy40Sync1202Rep fzzySync1202Rep;
- @Autowired
private Fzzy40Sync1207Rep fzzySync1207Rep;
- @Autowired
- private ApiTriggerService apiTriggerService;
- @Autowired
- private Api1207Rep api1207Rep;
@Autowired
private ApiCommonService commonService;
@Autowired
- private Api1102Rep api1102Rep;
+ private Api1207Rep api1207Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
@Autowired
private ApiLogRep apiLogRep;
+
+ /**
+ * 鍊掍粨淇℃伅鍚屾
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1207鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1207);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40InoutStockChange> list = fzzySync1207Rep.listStockChange(deptId, start, end);
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板�掍粨淇℃伅------------------");
+ return;
+ }
+
+ Api1207 apiData;
+ Api1105 api1105In;
+ Api1105 api1105Out;
+ List<Api1207> api1207List;
+ for (Fz40InoutStockChange sysData : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105Out = commonService.getApi1105Cache(sysData.getDepotIdOut());
+ if (null == api1105Out) {
+ continue;
+ }
+ //鑾峰彇璐т綅淇℃伅
+ api1105In = commonService.getApi1105Cache(sysData.getDepotIdIn());
+ if (null == api1105In) {
+ continue;
+ }
+ apiData = new Api1207();
+ apiData.setDcdh(kqdm + sysData.getId());
+ apiData.setDclx(sysData.getType());
+ apiData.setDcjhwjbh(sysData.getPlanCode());
+ apiData.setTzdh(sysData.getNoticeId());
+ apiData.setDcdw(kqdm);
+ apiData.setDrdw(kqdm);
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ apiData.setLspzdm(mappingCode);
+ apiData.setDchwdm(api1105Out.getHwdm());
+ apiData.setDrhwdm(api1105In.getHwdm());
+ apiData.setDcrq(sysData.getChangeDate());
+ apiData.setDcksrq(sysData.getChangeStartDate());
+ apiData.setDcjsrq(sysData.getChangeEndDate());
+ apiData.setDcsl(sysData.getNumber());
+ apiData.setBzw(sysData.getBzw());
+ apiData.setBzbjs(sysData.getBzbjs());
+ apiData.setZxzydw(sysData.getZxzydw());
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+
+ api1207List = api1207Rep.getDataById(apiData.getDcdh());
+ if (null == api1207List || api1207List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1207List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1207Rep.save(apiData);
+ log.info("1207---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---鍊掍粨淇℃伅鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍊掍粨淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
}
--
Gitblit v1.9.3