From 9cec6b5c40e716cba4ab687f1e8a61c9cd95b2d7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 25 四月 2025 09:26:12 +0800
Subject: [PATCH] 熏蒸备案自动上传，出库信息同步
---
src/main/java/com/fzzy/push/gd2023/GD2023PushService14.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 4 ++--
src/main/java/com/fzzy/push/impl/ComPushService90.java | 9 +++++++++
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 89ef9dd..757d152 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -93,7 +93,7 @@
if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
continue;
}
- if (!sysData.getProgress().equals("RECORD")){
+ if (!sysData.getProgress().equals("RECORD")) {
continue;
}
if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
@@ -238,7 +238,7 @@
apiData.setCchlx("01");
apiData.setXldd("搴撳唴");
apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "鏆傛棤澶囨敞淇℃伅" : sysData.getRemarks());
- apiData.setBzbdbz(sysData.getDbz());
+ apiData.setBzbdbz(sysData.getDbz() == null ? 25 : sysData.getDbz());
apiData.setBzbjs(sysData.getBzbjs());
apiData.setJjlx(sysData.getJjlx());
apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023PushService14.java b/src/main/java/com/fzzy/push/gd2023/GD2023PushService14.java
index 42074b3..e74c731 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023PushService14.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023PushService14.java
@@ -25,7 +25,7 @@
@Override
public String getProtocol() {
- return PushProtocol.SB_GD_2022.getCode();
+ return PushProtocol.SB_GD_2023.getCode();
}
@Override
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService90.java b/src/main/java/com/fzzy/push/impl/ComPushService90.java
index 4f82a3a..1491262 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService90.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService90.java
@@ -1,6 +1,7 @@
package com.fzzy.push.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
@@ -9,6 +10,9 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.gd2022.dto.Gd2022Api1023;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023Dtl;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023People;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023Way;
import com.fzzy.push.gd2023.dto.Gd2023Api1023;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api1115;
@@ -50,6 +54,7 @@
private Api9116Rep api9116Rep;
/*==========涓婃捣甯傚钩鍙板畾鍒舵帴鍙� -- 寮�濮�==========*/
+
/**
* 9101 鏁版嵁鐩哥鎬ф帴鍙�--涓婃捣甯傚钩鍙�
*/
@@ -441,6 +446,7 @@
/*==========涓婃捣甯傚钩鍙板畾鍒舵帴鍙� -- 缁撴潫==========*/
/*==========骞夸笢鐪佸钩鍙板畾鍒舵帴鍙� -- 寮�濮�==========*/
+
/**
* 9201 鐔忚捀澶囨鎺ュ彛
*/
@@ -458,6 +464,9 @@
ResponseDto responseDto;
for (Api9201 api9201 : items) {
+ api9201.setDtls(JSONArray.parseArray(api9201.getDtl(), Gd2022Api1023Dtl.class));
+ api9201.setPeoples(JSONArray.parseArray(api9201.getPeople(), Gd2022Api1023People.class));
+ api9201.setWays(JSONArray.parseArray(api9201.getWay(), Gd2022Api1023Way.class));
responseDto = apiRemoteService.pushData(param, api9201);
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(api9201.getCzbz())) {
--
Gitblit v1.9.3