From 451d1783bc66b1ec1625f707d8d56df04ffe45a5 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 09 五月 2025 16:42:36 +0800 Subject: [PATCH] 最新版本541200007 --- server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java index f12f323..9c192ae 100644 --- a/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java +++ b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java @@ -288,12 +288,12 @@ public TmsEmployeeListResponse getEmployeeList(TmsEmployeeListRequest param){ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode() +TMSContants.InterfacePath.getEmployeeList[0]; - TmsBaseResponse<TmsEmployeeListResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getEmployeeList[1],JSONObject.toJSONString(param) - ,new TypeReference< TmsBaseResponse<TmsEmployeeListResponse>>(){}); - if(response ==null || response.getData() == null){ + TmsBaseResponse<List<TmsEmployeeListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getEmployeeList[1],JSONObject.toJSONString(param) + ,new TypeReference< TmsBaseResponse<List<TmsEmployeeListResponse>>>(){}); + if(response ==null || response.getData() == null || response.getData().size() ==0){ return new TmsEmployeeListResponse(); } - return response.getData(); + return response.getData().get(0); } /** * 鍑哄簱鑳藉姏缁熻 @@ -309,6 +309,22 @@ ,new TypeReference< TmsBaseResponse<TmsOutboundCapabilityResponse>>(){}); if(response ==null || response.getData() == null){ return new TmsOutboundCapabilityResponse(); + } + return response.getData(); + } + /** + * 鍑哄簱鑳藉姏姹囨�绘帴鍙� + * @param param 鍙傛暟 + * @return TmsBaseResponse + */ + @Override + public TmsGetOutCapabilityResponse getOutCapacity(TmsFacrotyCodeListRequest param){ + String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode() + +TMSContants.InterfacePath.getOutCapacity[0]; + TmsBaseResponse<TmsGetOutCapabilityResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getOutboundCapability[1],JSONObject.toJSONString(param) + ,new TypeReference< TmsBaseResponse<TmsGetOutCapabilityResponse>>(){}); + if(response ==null || response.getData() == null){ + return new TmsGetOutCapabilityResponse(); } return response.getData(); } @@ -357,8 +373,28 @@ TmsCircleStatusListRequest p1 = new TmsCircleStatusListRequest(); p1.setContractNumber(param.getContractNumber()); result.setCicleStatusList(getCicleStatusList(p1)); + result.setStartTransportDate(getStartTransportDateByList(result.getCicleStatusList())); return result; } + + private String getStartTransportDateByList(List<TmsCircleStatusResultListResponse> cicleStatusList) { + if(cicleStatusList!=null){ + for(TmsCircleStatusResultListResponse m :cicleStatusList){ + if(Constants.equalsInteger(m.getKey(),TMSContants.TopStatusLevel.clysz.getKey())){ + if(m.getSecondList()!=null){ + for(TmsCircleStatusListResponse c :m.getSecondList()){ + if(Constants.equalsInteger(c.getOrderStatus(),TMSContants.ChildStatusLevel.clqdapp.getOrderStatus())){ + return c.getRecordDate(); + } + } + } + } + } + } + + return null; + } + /** * 鍏ㄥ浗鍒拌揣鍦板垎甯冩煡璇㈡煡璇� * @param param 鍙傛暟 -- Gitblit v1.9.3