diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index eb19d41c7..d4b0edc7a 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -164,7 +164,8 @@ b.user_remark as userRemarkShipper, b.push_status, b.push_time, - b.push_by + b.push_by, + b.push_by_name FROM "USER" a LEFT JOIN user_shipper b ON a.user_id = b.user_id left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName 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 bed7494c7..3216a2028 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 @@ -44,9 +44,10 @@ import java.util.*; @Slf4j public class BusinessDocumentOrderApplicationService { - private static final String PUSH_API_URL = "http://10.33.0.100/ktms-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME_I = "saveBill_i"; private static final String API_NAME_E = "saveBill_e"; + private static final String VERIFY = "tjPZMT9fwhZRnv+eTXKF75QXmXzCn7phPagmoUQsvsh2ZTWDjuRxHAgcP0GZENHP"; @Autowired private BusinessDocumentOrderDomainService businessDocumentOrderDomainService; @@ -216,6 +217,7 @@ public class BusinessDocumentOrderApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); + httpPost.setHeader("verify", VERIFY); if(pushData.getIeType().equals("I")) { httpPost.setHeader("apiName", API_NAME_I); @@ -250,6 +252,7 @@ public class BusinessDocumentOrderApplicationService { } catch (IOException e) { gwLog.setStatus(3); gwLog.setErrorMsg(e.getMessage()); + gwLog.setResponseBody("请求异常：" + e.getMessage()); gwLogMapper.updateById(gwLog); if (pushData.getId() != null) { updatePushStatus(pushData.getId(), 4, new Date(), String.valueOf(pushBy), pushByName); diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java index 37f1aefa7..5ce1d0038 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java @@ -33,8 +33,9 @@ import java.util.Map; @Slf4j public class BusinessPartnerApplicationService { - private static final String PUSH_API_URL = "http://10.33.0.100/ktms-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "saveCorporation"; + private static final String VERIFY = "tjPZMT9fwhZRnv+eTXKF75QXmXzCn7phPagmoUQsvsh2ZTWDjuRxHAgcP0GZENHP"; @Resource @@ -117,7 +118,7 @@ public class BusinessPartnerApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); - + httpPost.setHeader("verify", VERIFY); try{ CloseableHttpResponse response = httpClient.execute(httpPost); String responseString = EntityUtils.toString(response.getEntity()); @@ -142,6 +143,7 @@ public class BusinessPartnerApplicationService { } catch (IOException e) { gwLog.setStatus(3); gwLog.setErrorMsg(e.getMessage()); + gwLog.setResponseBody("请求异常：" + e.getMessage()); gwLogMapper.updateById(gwLog); updatePushStatus(Long.valueOf(businessPartnerDTO.getShipperId()),4, new Date(), pushBy,pushByName); failCount++; 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 8ad209ce9..7ab2f9017 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 @@ -34,8 +34,9 @@ import java.util.Map; @Service @Slf4j public class ErpCountryApplicationService{ - private static final String PUSH_API_URL = "http://10.33.0.100/ktms-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "saveCountry"; + private static final String VERIFY = "tjPZMT9fwhZRnv+eTXKF75QXmXzCn7phPagmoUQsvsh2ZTWDjuRxHAgcP0GZENHP"; @Resource private ErpCountryMapper erpCountryMapper; @@ -139,6 +140,7 @@ public class ErpCountryApplicationService{ httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); + httpPost.setHeader("verify", VERIFY); try { CloseableHttpResponse response = httpClient.execute(httpPost); @@ -161,6 +163,7 @@ public class ErpCountryApplicationService{ } catch (IOException e) { gwLog.setStatus(3); gwLog.setErrorMsg(e.getMessage()); + gwLog.setResponseBody("请求异常：" + e.getMessage()); gwLogMapper.updateById(gwLog); updatePushStatus(dto.getId(), 4, new Date(), pushBy,pushByName); failCount++; 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 7fe0ea1a7..8183cab5e 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 @@ -36,8 +36,9 @@ import java.util.Map; @Slf4j public class ErpEnterpriseUnitApplicationService { - private static final String PUSH_API_URL = "http://10.33.0.100/ktms-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "saveUnit"; + private static final String VERIFY = "tjPZMT9fwhZRnv+eTXKF75QXmXzCn7phPagmoUQsvsh2ZTWDjuRxHAgcP0GZENHP"; @Resource private ErpEnterpriseUnitMapper erpEnterpriseUnitMapper; @@ -135,6 +136,7 @@ public class ErpEnterpriseUnitApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); + httpPost.setHeader("verify", VERIFY); try { CloseableHttpResponse response = httpClient.execute(httpPost); @@ -157,6 +159,7 @@ public class ErpEnterpriseUnitApplicationService { } catch (IOException e) { gwLog.setStatus(3); gwLog.setErrorMsg(e.getMessage()); + gwLog.setResponseBody("请求异常：" + e.getMessage()); gwLogMapper.updateById(gwLog); updatePushStatus(dto.getId(), 4, new Date(), pushBy,pushByName); failCount++; 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 db4498b18..e04ba6238 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 @@ -29,8 +29,9 @@ import java.util.*; @Slf4j public class ExchangeRateApplicationService { - private static final String PUSH_API_URL = "http://10.33.0.100/ktms-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "saveCurr"; + private static final String VERIFY = "tjPZMT9fwhZRnv+eTXKF75QXmXzCn7phPagmoUQsvsh2ZTWDjuRxHAgcP0GZENHP"; @Resource private WlhyServiceFeign wlhyServiceFeign; @@ -123,6 +124,7 @@ public class ExchangeRateApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); + httpPost.setHeader("verify", VERIFY); try { CloseableHttpResponse response = httpClient.execute(httpPost); @@ -145,6 +147,7 @@ public class ExchangeRateApplicationService { } catch (IOException e) { gwLog.setStatus(3); gwLog.setErrorMsg(e.getMessage()); + gwLog.setResponseBody("请求异常：" + e.getMessage()); gwLogMapper.updateById(gwLog); updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName); failCount++; 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 e5b650fd5..64277b4a4 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 @@ -32,8 +32,9 @@ import java.util.Map; @Slf4j public class MaterialInfoApplicationService { - private static final String PUSH_API_URL = "http://10.33.0.100/ktms-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "saveOrgGoods"; + private static final String VERIFY = "tjPZMT9fwhZRnv+eTXKF75QXmXzCn7phPagmoUQsvsh2ZTWDjuRxHAgcP0GZENHP"; @Resource private GwLogMapper gwLogMapper; @@ -119,6 +120,7 @@ public class MaterialInfoApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); + httpPost.setHeader("verify", VERIFY); try { CloseableHttpResponse response = httpClient.execute(httpPost); @@ -141,6 +143,7 @@ public class MaterialInfoApplicationService { } catch (IOException e) { gwLog.setStatus(3); gwLog.setErrorMsg(e.getMessage()); + gwLog.setResponseBody("请求异常：" + e.getMessage()); gwLogMapper.updateById(gwLog); updatePushStatus(dto.getMaterialBaseInfoId(), 4, new Date(), pushBy, pushByName); failCount++;