From d1b7f2eb67cd87edc4b5eb11def5acba07c75698 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 21 十二月 2023 15:09:27 +0800
Subject: [PATCH] 根据上海新接口规则进行调整
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
index beaf755..8d24882 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -4,6 +4,7 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1303Rep;
import com.fzzy.api.view.repository.Api1306Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40DrugLog;
@@ -32,7 +33,8 @@
private ApiCommonService commonService;
@Autowired
private Api1306Rep api1306Rep;
-
+ @Autowired
+ private Api1303Rep api1303Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -62,6 +64,7 @@
Api1306 api1306;
Api1105 api1105;
List<Api1306> api1306List;
+ List<Api1303> api1303List;
for (Fz40DrugLog fz40DrugLog : list) {
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(fz40DrugLog.getDepotId());
@@ -76,7 +79,13 @@
api1306.setCfdm(api1105.getHwdm().substring(0,25));
api1306.setXzkssj(fz40DrugLog.getStart());
api1306.setXzjssj(fz40DrugLog.getEnd());
- api1306.setHcjcdh(fz40DrugLog.getPestBatchId());
+ //璁剧疆铏妫�娴嬪崟鍙�
+ api1306.setHcjcdh(api1105.getHwdm() + fz40DrugLog.getPestBatchId());
+ api1303List = api1303Rep.getDataByHcjcdh(fz40DrugLog.getPestBatchId());
+ if (null != api1303List || api1303List.size() > 0) {
+ api1306.setHcjcdh(api1303List.get(0).getHcjcdh());
+ }
+
api1306.setDjcxz(fz40DrugLog.getNum());
api1306.setCgxzfs(fz40DrugLog.getMode());
api1306.setHlxzfs(fz40DrugLog.getRecirMode());
--
Gitblit v1.9.3