From 2edbc12731857e4f16e5e3a67c9372e9a192d694 Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Fri, 29 May 2026 19:09:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=AE=E6=94=B9,=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=8E=A8=E9=80=81=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=8D?= =?UTF-8?q?=E4=B8=BAcode=E4=B8=8D=E4=B8=BA200=E6=97=B6=20=20=20=E4=BC=9A?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8E=A8=E9=80=81=E6=88=90=E5=8A=9F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sinessDocumentOrderApplicationService.java | 22 ++++++++++++++++--- .../ErpCountryApplicationService.java | 18 ++++++++++++--- .../ErpEnterpriseUnitApplicationService.java | 18 ++++++++++++--- .../ExchangeRateApplicationService.java | 19 +++++++++++++--- .../MaterialInfoApplicationService.java | 18 ++++++++++++--- 5 files changed, 80 insertions(+), 15 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java index b0d93950f..cfb40e274 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java @@ -251,11 +251,27 @@ public class BusinessDocumentOrderApplicationService { gwLog.setResponseBody(responseString); if (response.getStatusLine().getStatusCode() == 200) { - gwLog.setStatus(2); - if (pushData.getId() != null) { +// gwLog.setStatus(2); +// if (pushData.getId() != null) { +// updatePushStatus(pushData.getId(), 3, new Date(), String.valueOf(pushBy), pushByName); +// } +// successCount++; + + JSONObject responseJson = JSONObject.parseObject(responseString); + + Integer dataCode = responseJson.getInteger("code"); + + if (dataCode != null && dataCode == 200) { + gwLog.setStatus(2); updatePushStatus(pushData.getId(), 3, new Date(), String.valueOf(pushBy), pushByName); + successCount++; + } else { + gwLog.setStatus(3); + gwLog.setErrorMsg(responseString); + updatePushStatus(pushData.getId(), 4, new Date(), String.valueOf(pushBy), pushByName); + failCount++; + failMsg.append("物料编码:").append(pushData.getMaterialCode()).append("失败;"); } - successCount++; } else { gwLog.setStatus(3); gwLog.setErrorMsg(responseString); diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java index ada4c5b42..04cbd0e98 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java @@ -153,9 +153,21 @@ public class ErpCountryApplicationService{ gwLog.setResponseBody(responseString); if (response.getStatusLine().getStatusCode() == 200) { - gwLog.setStatus(2); - updatePushStatus(dto.getId(), 3, new Date(), pushBy,pushByName); - successCount++; + JSONObject responseJson = JSONObject.parseObject(responseString); + + Integer dataCode = responseJson.getInteger("code"); + + if (dataCode != null && dataCode == 200) { + gwLog.setStatus(2); + updatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName); + successCount++; + } else { + gwLog.setStatus(3); + gwLog.setErrorMsg(responseString); + updatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName); + failCount++; + failMsg.append("erpCountryCode:").append(dto.getErpCountryCode()).append("失败;"); + } } else { gwLog.setStatus(3); gwLog.setErrorMsg(responseString); diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java index cf645126e..9d2964bd6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java @@ -159,9 +159,21 @@ public class ErpEnterpriseUnitApplicationService { gwLog.setResponseBody(responseString); if (response.getStatusLine().getStatusCode() == 200) { - gwLog.setStatus(2); - updatePushStatus(dto.getId(), 3, new Date(), pushBy,pushByName); - successCount++; + JSONObject responseJson = JSONObject.parseObject(responseString); + + Integer dataCode = responseJson.getInteger("code"); + + if (dataCode != null && dataCode == 200) { + gwLog.setStatus(2); + updatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName); + successCount++; + } else { + gwLog.setStatus(3); + gwLog.setErrorMsg(responseString); + updatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName); + failCount++; + failMsg.append("erpUnitCode:").append(dto.getErpCode()).append("失败;"); + } } else { gwLog.setStatus(3); gwLog.setErrorMsg(responseString); diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java index 7649e424d..9e66acf70 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java @@ -136,9 +136,22 @@ public class ExchangeRateApplicationService { gwLog.setResponseBody(responseString); if (response.getStatusLine().getStatusCode() == 200) { - gwLog.setStatus(2); - updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName); - successCount++; + JSONObject responseJson = JSONObject.parseObject(responseString); + + // 判断业务状态：data.code = 200 成功，data.code = 500 或其他 失败 + Integer dataCode = responseJson.getInteger("code"); + + if (dataCode != null && dataCode == 200) { // 业务也成功 + gwLog.setStatus(2); + updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName); + successCount++; + } else { + gwLog.setStatus(3); + gwLog.setErrorMsg(responseString); + updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName); + failCount++; + failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;"); + } } else { gwLog.setStatus(3); gwLog.setErrorMsg(responseString); diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java index 46bb9f600..2e669264d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java @@ -126,9 +126,21 @@ public class MaterialInfoApplicationService { gwLog.setResponseBody(responseString); if (response.getStatusLine().getStatusCode() == 200) { - gwLog.setStatus(2); - updatePushStatus(dto.getMaterialBaseInfoId(), 3, new Date(), pushBy, pushByName); - successCount++; + JSONObject responseJson = JSONObject.parseObject(responseString); + + Integer dataCode = responseJson.getInteger("code"); + + if (dataCode != null && dataCode == 200) { + gwLog.setStatus(2); + updatePushStatus(dto.getMaterialBaseInfoId(), 3, new Date(), pushBy, pushByName); + successCount++; + } else { + gwLog.setStatus(3); + gwLog.setErrorMsg(responseString); + updatePushStatus(dto.getMaterialBaseInfoId(), 4, new Date(), pushBy, pushByName); + failCount++; + failMsg.append("materialCode:").append(dto.getMaterialCode()).append("失败;"); + } } else { gwLog.setStatus(3); gwLog.setErrorMsg(responseString);