From 537671dd0a367dfa9ef3f0dd3d33db2d4838ceed Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 十二月 2024 16:25:17 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityInfoResponse.java | 45 +++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 113 ++++++++++++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 17 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java | 63 ++++-------
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityResponse.java | 23 ++++
7 files changed, 214 insertions(+), 49 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
index eabface..be422bb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
@@ -23,6 +23,7 @@
String[] getOutQtyAndVehicleQty = new String[]{"/tms/zhyt/getOutQtyAndVehicleQty", "銆怲MS銆戞寚瀹氭椂闂磋寖鍥村唴绱鍑哄簱閲�"};//3.8鎸囧畾鏃堕棿鑼冨洿鍐呯疮璁″嚭搴撻噺
String[] getSevenArrivalStatusAndDetails = new String[]{"/tms/zhyt/getSevenArrivalStatusAndDetails", "銆怲MS銆戣繎7鏃ュ埌璐ф儏鍐�(鍚槑缁�)"};//3.13杩�7鏃ュ埌璐ф儏鍐�(鍚槑缁�)
String[] getNotFinishOrderList = new String[]{"/tms/zhyt/getNotFinishOrderList", "銆怲MS銆戞湭瀹屾垚璁㈠崟"};//3.13鏈畬鎴愯鍗�
+ String[] getOutboundCapability = new String[]{"/tms/zhyt/getOutboundCapability", "銆怲MS銆戝嚭搴撹兘鍔涚粺璁�"};//3.14鍑哄簱鑳藉姏缁熻
}
public enum TopStatusLevel {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
index cff2395..bbe7b40 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
@@ -11,45 +11,30 @@
@Data
@ApiModel("tms鏈畬鎴愬悎鍚屽垪琛ㄨ繑鍥炲弬鏁�")
public class TmsOrderNoFinishListResponse {
- @ApiModelProperty(value = "钀ラ攢璁㈠崟缂栫爜" )
- private String orderNumber;// 瀛楃涓� 钀ラ攢璁㈠崟缂栫爜
- @ApiModelProperty(value = "鍚堝悓鍙�" )
- private String contractNumber;// 瀛楃涓� 鍚堝悓鍙�
+ @ApiModelProperty(value = "鍒跺崟鏃ユ湡" )
+ private String ncCreateDate ;// 瀛楃涓� 鍒跺崟鏃ユ湡 杩斿洖骞存湀鏃ワ紝姣斿锛�2024-07-08
+ @ApiModelProperty(value = "宸ュ巶鍚嶇О" )
+ private String factoryName;// 瀛楃涓� 宸ュ巶鍚嶇О
+ @ApiModelProperty(value = "宸ュ巶缂栫爜" )
+ private String factoryCode;// 瀛楃涓� 宸ュ巶缂栫爜
@ApiModelProperty(value = "杩愯緭鍗曞彿" )
- private String transportCode ;//瀛楃涓� 杩愯緭鍗曞彿
- @ApiModelProperty(value = "杩愯緭杞﹁締" )
- private String plateNumber;// 瀛楃涓� 杩愯緭杞﹁締
- @ApiModelProperty(value = "鐘舵��" )
- private Integer status;// 瀛楃涓� 鐘舵��
- @ApiModelProperty(value = "鐘舵�佹弿杩�" )
- private String statusDesc;// 瀛楃涓� 鐘舵��
- @ApiModelProperty(value = "浠诲姟涓嬭揪鏃堕棿" )
- private String transportDate;// 瀛楃涓� 浠诲姟涓嬭揪鏃堕棿
- @ApiModelProperty(value = "璁㈠崟鍒涘缓鏃ユ湡" )
- private String createDate ;//瀛楃涓� 璁㈠崟鍒涘缓鏃ユ湡
- @ApiModelProperty(value = "鍙戣揣鍦�" )
- private String deliveryEnterprise ;//瀛楃涓� 鍙戣揣鍦�
+ private String transportCode;// 瀛楃涓� 杩愯緭鍗曞彿
+ @ApiModelProperty(value = "杞︾墝鍙�" )
+ private String platNumber;// 瀛楃涓� 杞︾墝鍙�
+ @ApiModelProperty(value = "鍚堝悓鍙�" )
+ private String contractNumber;// 瀛楃涓� 鍚堝悓鍙�
+ @ApiModelProperty(value = "鐘舵�� 0鏈惎杩愶紱1鍦ㄩ�旓紱2鍒拌揣" )
+ private String status;// 瀛楃涓� 鐘舵�� 0 鏈惎杩愶紱1 鍦ㄩ�旓紱2 鍒拌揣
+ @ApiModelProperty(value = "鍒拌揪鏃堕棿" )
+ private String arrivedDate;// 瀛楃涓� 鍒拌揪鏃堕棿
+ @ApiModelProperty(value = "鍑哄簱鏃堕棿" )
+ private String outDate ;// 瀛楃涓� 鍑哄簱鏃堕棿
+ @ApiModelProperty(value = "杩愯緭璁″垝褰㈡垚鏃堕棿" )
+ private String transportDate;// 瀛楃涓� 杩愯緭璁″垝褰㈡垚鏃堕棿
+ @ApiModelProperty(value = "鏁伴噺(涓囨敮)" )
+ private String ncTotality;// 鏁板瓧 鏁伴噺(涓囨敮)
@ApiModelProperty(value = "鍒拌揣鍦�" )
- private String receiveEnterprise ;//瀛楃涓� 鍒拌揣鍦�
- @ApiModelProperty(value = "鍙告満濮撳悕" )
- private String driverName ;//瀛楃涓� 鍙告満濮撳悕
- @ApiModelProperty(value = "鍙告満鎵嬫満鍙�" )
- private String driverTel ;//瀛楃涓� 鍙告満鎵嬫満鍙�
- @ApiModelProperty(value = "棰勮鍒拌揪鏃堕棿" )
- private String plannedArrivedDate ;//瀛楃涓� 棰勮鍒拌揪鏃堕棿
- @ApiModelProperty(value = "杩愯緭閲�" )
- private String totalQty;// 鏁板瓧 杩愯緭閲�
- @ApiModelProperty(value = "鍙戣揣浠撳簱缁忓害" )
- private String deliveryLon;// 鏁板瓧 鍙戣揣浠撳簱缁忓害
- @ApiModelProperty(value = "鍙戣揣浠撳簱缁村害" )
- private String deliveryLat ;//鏁板瓧 鍙戣揣浠撳簱缁村害
- @ApiModelProperty(value = "鏀惰揣浠撳簱缁忓害" )
- private String receiveLon;// 鏁板瓧 鏀惰揣浠撳簱缁忓害
- @ApiModelProperty(value = "鏀惰揣浠撳簱缁村害" )
- private String receiveLat;// 鏁板瓧 鏀惰揣浠撳簱缁村害
- @ApiModelProperty(value = "杞﹁締缁忓害" )
- private String platLon ;//鏁板瓧 杞﹁締缁忓害
- @ApiModelProperty(value = "杞﹁締缁忓害" )
- private String platLat ;//鏁板瓧 杞﹁締缁忓害
-
+ private String arriveEnterprise;// 瀛楃涓� 鍒拌揣鍦�
+ @ApiModelProperty(value = "璁㈠崟绫诲瀷" )
+ private String dispatchType ;// 瀛楃涓� 璁㈠崟绫诲瀷
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityInfoResponse.java
new file mode 100644
index 0000000..20c8a1c
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityInfoResponse.java
@@ -0,0 +1,45 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍑哄簱鑳藉姏缁熻鏄庣粏杩斿洖鍙傛暟")
+public class TmsOutboundCapabilityInfoResponse {
+
+
+ @ApiModelProperty(value = "鍒跺崟鏃ユ湡" )
+ private String ncCreateDate ;// 瀛楃涓� 鍒跺崟鏃ユ湡 杩斿洖骞存湀鏃ワ紝姣斿锛�2024-07-08
+ @ApiModelProperty(value = "宸ュ巶鍚嶇О" )
+ private String factoryName;// 瀛楃涓� 宸ュ巶鍚嶇О
+ @ApiModelProperty(value = "宸ュ巶缂栫爜" )
+ private String factoryCode;// 瀛楃涓� 宸ュ巶缂栫爜
+ @ApiModelProperty(value = "杩愯緭鍗曞彿" )
+ private String transportCode;// 瀛楃涓� 杩愯緭鍗曞彿
+ @ApiModelProperty(value = "杞︾墝鍙�" )
+ private String platNumber;// 瀛楃涓� 杞︾墝鍙�
+ @ApiModelProperty(value = "鍚堝悓鍙�" )
+ private String contractNumber;// 瀛楃涓� 鍚堝悓鍙�
+ @ApiModelProperty(value = "鐘舵�� 0鏈惎杩愶紱1鍦ㄩ�旓紱2鍒拌揣" )
+ private String status;// 瀛楃涓� 鐘舵�� 0 鏈惎杩愶紱1 鍦ㄩ�旓紱2 鍒拌揣
+ @ApiModelProperty(value = "鍒拌揪鏃堕棿" )
+ private String arrivedDate;// 瀛楃涓� 鍒拌揪鏃堕棿
+ @ApiModelProperty(value = "鍑哄簱鏃堕棿" )
+ private String outDate ;// 瀛楃涓� 鍑哄簱鏃堕棿
+ @ApiModelProperty(value = "杩愯緭璁″垝褰㈡垚鏃堕棿" )
+ private String transportDate;// 瀛楃涓� 杩愯緭璁″垝褰㈡垚鏃堕棿
+ @ApiModelProperty(value = "鏁伴噺(涓囨敮)" )
+ private BigDecimal ncTotality;// 鏁板瓧 鏁伴噺(涓囨敮)
+ @ApiModelProperty(value = "鍒拌揣鍦�" )
+ private String arriveEnterprise;// 瀛楃涓� 鍒拌揣鍦�
+ @ApiModelProperty(value = "璁㈠崟绫诲瀷" )
+ private String dispatchType ;// 瀛楃涓� 璁㈠崟绫诲瀷
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityResponse.java
new file mode 100644
index 0000000..76efa34
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityResponse.java
@@ -0,0 +1,23 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍑哄簱鑳藉姏缁熻杩斿洖鍙傛暟")
+public class TmsOutboundCapabilityResponse {
+
+
+ @ApiModelProperty(value = "褰撴棩璁㈠崟閲�" )
+ private List<TmsOutboundCapabilityInfoResponse> currentDayOrderList;// 褰撴棩璁㈠崟閲�
+ @ApiModelProperty(value = "褰撴棩璁㈠崟閲�" )
+ private List<TmsOutboundCapabilityInfoResponse> currentDayAgoOrderList;// 鏄ㄦ棩鍙婁箣鍓嶈鍗曢噺
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 0c83707..a4a0975 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2137,6 +2137,10 @@
WholeProvinceBoardVO data = new WholeProvinceBoardVO();
data.setMaxAbility(new BigDecimal(0));
data.setHoursAbility(new BigDecimal(0));
+ data.setCurrentPlanNum(new BigDecimal(0));
+ data.setCurrentOrderNum(new BigDecimal(0));
+ data.setCrrentRestNum(new BigDecimal(0));
+ data.setCrrentOutNum(new BigDecimal(0));
List<TmsFactoryParam> paramList = factoryList();
String code = null;
if(paramList!=null){
@@ -2155,13 +2159,7 @@
}
}
}
- if(isDebug){
- data.setCurrentPlanNum(new BigDecimal(1220));
- data.setCurrentOrderNum(new BigDecimal(32340));
- data.setCrrentOutNum(new BigDecimal(3450));
- data.setCrrentRestNum(new BigDecimal(456450));
- }
- Date date = new Date();
+ /* Date date = new Date();
TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
param.setDateEnd(DateUtil.getShortTime(date));
param.setDateStart(DateUtil.getShortTime(date));
@@ -2169,16 +2167,111 @@
param.setFacrotyCodeList(new ArrayList<>());
param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
}
- List<TmsOutQtyAndVehicleQtyResponse> listSame= tmsService.getOutQtyAndVehicleQty(param);//鍘诲勾鍚屾湡
+ List<TmsOutQtyAndVehicleQtyResponse> listSame= tmsService.getOutQtyAndVehicleQty(param);
if(listSame!=null ){
for(TmsOutQtyAndVehicleQtyResponse model : listSame){
data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getTotalOutQty())));//浠婃棩鍑哄簱閲�
data.setCrrentOutCarNum(data.getCrrentOutCarNum()+(Constants.formatIntegerNum(model.getVehicleQty())));//浠婃棩鍑哄簱杞︽
}
- }
+ }*/
+ initOutboundCapability(data,factoryCode);
+
return data;
}
+ private void initOutboundCapability(WholeProvinceBoardVO data, String code) {
+ TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
+ if(StringUtils.isNotBlank(code)){
+ param.setFacrotyCodeList(new ArrayList<>());
+ param.getFacrotyCodeList().add(code);
+ }
+ TmsOutboundCapabilityResponse result= tmsService.getOutboundCapability(param);
+ if(result !=null){
+ List<String> planCodes = new ArrayList<>();
+ List<String> todayCodes = new ArrayList<>();
+ String todayDate = DateUtil.getShortTime(new Date());
+ if(result.getCurrentDayOrderList()!=null && result.getCurrentDayOrderList().size()>0){
+ for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayOrderList()){
+ data.setCurrentOrderNum(data.getCurrentOrderNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁㈠崟閲�
+ /**
+ * DISPATCH_TYPE in(1,2) 涓� TRANSPORT_CODE涓嶄负绌猴紝sum(NC_TOTALITY) + DISPATCH_TYPE not in(1,2) sum(NC_TOTALITY)
+ * 浠婃棩鍑哄簱涓嬭揪鐨勮鍒掍换鍔℃�婚噺
+ */
+ if(StringUtils.isNotBlank(model.getTransportCode())
+ && (StringUtils.equals("1",model.getDispatchType()) || StringUtils.equals("2",model.getDispatchType()))){
+ data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁㈠崟閲�
+ }
+ if(!(StringUtils.equals("1",model.getDispatchType()) || StringUtils.equals("2",model.getDispatchType()))){
+ data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁″垝閲�
+ }
+
+ /**
+ * 浠婃棩涓嬭揪鍑哄簱鐨勮鍒掍换鍔″搴旂殑杩愯緭杞︽鏁�
+ * TRANSPORT_CODE涓嶄负绌篶ount(transport_code )
+ */
+ if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),planCodes)){
+ planCodes.add(model.getTransportCode());
+ }
+ /**
+ * 浠婃棩涓嬭揪鍑哄簱鐨勮鍒掍换鍔″搴旂殑杩愯緭杞︽鏁�
+ * TRANSPORT_CODE涓嶄负绌篶ount(transport_code )
+ */
+ if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),planCodes)){
+ planCodes.add(model.getTransportCode());
+ }
+ /**
+ * out_date涓哄綋鏃�,sum(NC_TOTALITY) 浠婃棩瀹屾垚鐨勫嚭搴撲綔涓氫换鍔℃�婚噺
+ * TRANSPORT_CODE涓嶄负绌� 涓攐ut_date涓哄綋鏃� count(transport_code) 浠婃棩瀹屾垚鐨勫嚭搴撲綔涓氫换鍔＄殑杩愯緭杞︽鏁�
+ */
+ if(StringUtils.isNotBlank(model.getOutDate()) && model.getOutDate().length()> 10){
+ String tDate = model.getOutDate().substring(0,10);
+ if(tDate.equals(todayDate)){
+ //濡傛灉鏄綋鏃�
+ data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁㈠崟閲�
+ }
+ if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),todayCodes)){
+ todayCodes.add(model.getTransportCode());
+ }
+ }
+ }
+ }
+ if(result.getCurrentDayAgoOrderList()!=null && result.getCurrentDayAgoOrderList().size()>0){
+
+ for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayAgoOrderList()){
+ /**
+ * out_date涓虹┖锛宻um(NC_TOTALITY) 鏄ㄥぉ鏈畬鎴愬嚭搴撹鍒掍换鍔�
+ * out_date涓虹┖ 涓擳RANSPORT_CODE涓嶄负绌� * count(transport_code ) 鏄ㄥぉ鏈畬鎴愬嚭搴撹鍒掍换鍔¤溅娆�
+ */
+ if(StringUtils.isBlank(model.getOutDate())){
+ data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁″垝閲�
+ if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),planCodes)){
+ planCodes.add(model.getTransportCode());
+ }
+ }
+ }
+ }
+ data.setCurrentPlanCarNum(planCodes.size());//浠婃棩璁″垝杞︽
+ data.setCrrentOutCarNum(todayCodes.size());//浠婃棩鍑哄簱杞︽
+ }
+ data.setCrrentRestNum(data.getCurrentPlanNum().subtract(data.getCrrentOutNum()));
+ data.setCrrentRestCarNum(data.getCurrentPlanCarNum() -data.getCrrentOutCarNum());
+ if(data.getCrrentRestNum().compareTo(new BigDecimal(0)) <=0){
+ data.setCrrentRestNum(new BigDecimal(0));
+ }
+ if(data.getCrrentRestCarNum()<=0){
+ data.setCrrentRestCarNum(0);
+ }
+ }
+
+ private boolean notInList(String transportCode, List<String> planCodes) {
+ for(String s :planCodes){
+ if(StringUtils.equals(transportCode,s)){
+ return false;
+ }
+ }
+ return true;
+ }
+
/**
* 鍑哄簱鑳藉姏鏉庢案鍒�
* @return
@@ -2343,7 +2436,7 @@
String flag = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.SCREEN_SEVENT_ARRIVAL_STARTDATE).getCode();
if(StringUtils.equals(flag,"-1")){
startDate =DateUtil.getBeginDayOfMonth(0);
- date = DateUtil.addMonthToDate(startDate,7);
+ date = DateUtil.addDaysToDate(startDate,7);
}
param.setNcCreateDateFrom(DateUtil.getShortTime(startDate));
param.setNcCreateDateThrough(DateUtil.getShortTime(date));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index 540ce25..405f54a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -208,6 +208,23 @@
}
/**
+ * 鍑哄簱鑳藉姏缁熻
+ * 鏌ヨ鏌愪釜鍘�/鍏ㄩ儴鍘傜殑浠婃棩璁″垝閲忋�佷粖鏃ュ嚭搴撻噺銆佷粖鏃ユ湭鍑哄簱閲忔暟鎹��
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public TmsOutboundCapabilityResponse getOutboundCapability(TmsFacrotyCodeListRequest param){
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getOutboundCapability[0];
+ TmsBaseResponse<TmsOutboundCapabilityResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getOutboundCapability[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsOutboundCapabilityResponse>>(){});
+ if(response ==null || response.getData() == null){
+ return new TmsOutboundCapabilityResponse();
+ }
+ return response.getData();
+ }
+ /**
* 鍚堝悓鍒楄〃鎺ュ彛
* 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
* @param param 鍙傛暟
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
index 3be3e39..9266774 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -31,6 +31,7 @@
TmsBasePageResponse<TmsOrderListResponse> orderList(TmsOrderListRequest param);
List<TmsGisListResponse> gisList(TmsGisListRequest param);
TmsBasePageResponse<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsOrderNoFinishListRequest param);
+ TmsOutboundCapabilityResponse getOutboundCapability(TmsFacrotyCodeListRequest param);
List<TmsCircleStatusResultListResponse> getCicleStatusList(TmsCircleStatusListRequest param);
/**
* 鍚堝悓璇︽儏鎺ュ彛
--
Gitblit v1.9.3