From d52072155b4bc241b9efc0ad56a20c76c91c737d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 17 八月 2025 16:35:48 +0800
Subject: [PATCH] 入库质检单号更改

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 e5bb2b7..9207075 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -4,11 +4,13 @@
 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;
 import com.fzzy.async.fzzy40.repository.Fzzy40Sync1306Rep;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -18,7 +20,7 @@
 /**
  * 鐔忚捀浣滀笟鏁版嵁鍚屾
  *
- * @author chen
+ * @author czt
  * @date 2022-09-08 09:51
  */
 @Slf4j
@@ -31,7 +33,8 @@
     private ApiCommonService commonService;
     @Autowired
     private Api1306Rep api1306Rep;
-
+    @Autowired
+    private Api1303Rep api1303Rep;
     @Autowired
     private ApiLogRep apiLogRep;
 
@@ -61,6 +64,7 @@
             Api1306 api1306;
             Api1105 api1105;
             List<Api1306> api1306List;
+            List<Api1303> api1303List;
             for (Fz40DrugLog fz40DrugLog : list) {
                 //鑾峰彇璐т綅淇℃伅
                 api1105 = commonService.getApi1105Cache(fz40DrugLog.getDepotId());
@@ -75,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.getDataByBizId(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());
@@ -83,12 +93,13 @@
                 api1306.setNd(fz40DrugLog.getConcentration());
                 api1306.setLddwyyl(fz40DrugLog.getGrainDose());
                 api1306.setKjdwyyl(fz40DrugLog.getSpaceDose());
+                api1306.setSyff(StringUtils.isEmpty(fz40DrugLog.getSyff())?"0":fz40DrugLog.getSyff());
                 api1306.setZyyl(fz40DrugLog.getDose());
                 api1306.setSqrq(fz40DrugLog.getVentilateTime());
                 api1306.setSqff(fz40DrugLog.getVentilateMethod());
                 api1306.setSqjsslhqnd(fz40DrugLog.getAfterPh3());
                 api1306.setXzxgpj(fz40DrugLog.getEvaluate());
-                api1306.setZhgxsj(fz40DrugLog.getUpdateTime());
+                api1306.setZhgxsj(new Date());
 
                 api1306.setHwdm(api1105.getHwdm());
                 api1306.setKqdm(kqdm);

--
Gitblit v1.9.3