From 07ff6686da8e9922a6f5a4f276e69d045e12a044 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 15:59:23 +0800
Subject: [PATCH] 调整上海接口:粮食管理相关同步

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 4ebdc94..03c7f7d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -46,7 +46,7 @@
      * @param start  璧峰鏃堕棿
      * @param end    鎴鏃堕棿
      */
-    public void syncData(String deptId, Date start, Date end) {
+    public void syncData(String kqdm, String deptId, Date start, Date end) {
         log.info("-------------1306鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
         //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
         ApiLog apiLog = new ApiLog();
@@ -75,8 +75,8 @@
                 api1306 = new Api1306();
 
                 BeanUtils.copyProperties(fz40DrugLog, api1306);
-                api1306.setXzzydh(fz40DrugLog.getId());
-                api1306.setCfdm(fz40DrugLog.getDepotId());
+                api1306.setXzzydh(api1105.getHwdm().substring(0,25) + fz40DrugLog.getId());
+                api1306.setCfdm(api1105.getHwdm().substring(0,25));
                 api1306.setXzkssj(fz40DrugLog.getStart());
                 api1306.setXzjssj(fz40DrugLog.getEnd());
                 api1306.setHcjcdh(fz40DrugLog.getPestBatchId());
@@ -94,10 +94,13 @@
                 api1306.setXzxgpj(fz40DrugLog.getEvaluate());
                 api1306.setZhgxsj(fz40DrugLog.getUpdateTime());
 
+                api1306.setHwdm(api1105.getHwdm());
+                api1306.setKqdm(kqdm);
+                api1306.setBizId(fz40DrugLog.getId());
                 api1306List = api1306Rep.getDataById(api1306.getXzzydh());
-                if(null == api1306List || api1306List.isEmpty()){
+                if (null == api1306List || api1306List.isEmpty()) {
                     api1306.setCzbz(Constant.CZBZ_I);
-                }else {
+                } else {
                     api1306.setCzbz(api1306List.get(0).getCzbz());
                 }
 

--
Gitblit v1.9.3