From d28e133054b6fe033d8fcc4c930b646562b27dc1 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 18 Jul 2023 15:45:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=8C=BB=E9=99=A2404=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/zzzyy/ZzzyyClient.java | 16 ++++++++-------- .../service/thrsys/ThrSystemDetailService.java | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java index e15798f..ec223a8 100644 --- a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java @@ -141,7 +141,7 @@ public class ZzzyyClient implements BaseHttpClient { ZzzyyRequest zaZyRequest = new ZzzyyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialUnit")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsUnitRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_CORP_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_CORP_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -158,7 +158,7 @@ public class ZzzyyClient implements BaseHttpClient { ZzzyyRequest zaZyRequest = new ZzzyyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialDict")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_PI_QUERY_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PI_QUERY_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -192,7 +192,7 @@ public class ZzzyyClient implements BaseHttpClient { ZzzyyRequest zaZyRequest = new ZzzyyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialType")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsBusTypeRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_BUS_TYPE_QUERY_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_BUS_TYPE_QUERY_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -209,7 +209,7 @@ public class ZzzyyClient implements BaseHttpClient { ZzzyyRequest zaZyRequest = new ZzzyyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialApply")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderQueryRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_BUS_TYPE_QUERY_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_BUS_TYPE_QUERY_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -384,7 +384,7 @@ public class ZzzyyClient implements BaseHttpClient { uploadLog.setSubmitTime(new Date()); uploadLog.setBillNo(orderEntity.getBillNo()); uploadLog.setFromType(Constants.THIRD_ORDER_UPLOAD); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_ORDER_SUBMIT_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_ORDER_SUBMIT_URL), zaZyRequest); response = parserResult(response); if (StrUtil.isNotBlank(response)) { try { @@ -449,7 +449,7 @@ public class ZzzyyClient implements BaseHttpClient { ZzzyyRequest zaZyRequest = new ZzzyyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialStorage")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsInvProductsRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_INV_PI_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_INV_PI_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -466,7 +466,7 @@ public class ZzzyyClient implements BaseHttpClient { ZzzyyRequest zaZyRequest = new ZzzyyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialDept")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsWarehouseRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_WAREHOUSE_QUERY_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_WAREHOUSE_QUERY_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -543,7 +543,7 @@ public class ZzzyyClient implements BaseHttpClient { ZzzyyRequest zaZyRequest = new ZzzyyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_PRE_IN_ORDER_SUBMIT_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRE_IN_ORDER_SUBMIT_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); diff --git a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java index c9152b2..6d4ed14 100644 --- a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java +++ b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java @@ -30,4 +30,9 @@ public class ThrSystemDetailService { return thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + thrSystemDetailEntity.getValue(); } + public String getUrlExclude(String urlName) { + ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailDao.selectByKey(urlName, thirdSysConfig.getThirdId()); + return thirdSysConfig.getThirdSysConfig().getThirdSysUrl(); + } + }