From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 111 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 33 deletions(-)
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 e49a6fc..615705c 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
@@ -2,8 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.tms.model.request.*;
@@ -11,24 +9,15 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
-import com.doumee.core.wms.model.request.*;
-import com.doumee.core.wms.model.response.WmsBaseDataResponse;
-import com.doumee.core.wms.model.response.WmsBaseResponse;
-import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
-import com.doumee.service.business.impl.SmsEmailServiceImpl;
import com.doumee.service.business.third.TmsService;
-import com.doumee.service.business.third.WmsService;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -208,27 +197,6 @@
*/
@Override
public TmsBasePageResponse<TmsOrderListResponse> orderList(TmsOrderListRequest param){
- if(param == null){
- param = new TmsOrderListRequest();
- }
- if(param.getParameters() == null){
- param.setParameters( new TmsOrderListParamRequest());
- }
- if(param.getPager() == null){
- param.setPager( new TmsOrderListPagerRequest());
- }
- if(param.getPager().getPage() == null){
- param.getPager().setPage(1);
- }
- if(param.getPager().getRows() == null){
- param.getPager().setRows(10);
- }
- if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
- param.getParameters().setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
- }
- if(param.getParameters().getContractNumbers()==null || param.getParameters().getContractNumbers().size()==0){
- param.getParameters().setContractNumbers(null);
- }
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getOrderList[0];
TmsBaseResponse<TmsBasePageResponse<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
@@ -252,7 +220,8 @@
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getOrderDetailByContractNumber[0];
- TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderDetailByContractNumber[1],param.getContractNumber()
+ TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderDetailByContractNumber[1]
+ ,param.getContractNumber()
,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
if(response!=null && response.getData()!=null){
result =response.getData();
@@ -267,6 +236,82 @@
result.setCicleStatusList(getCicleStatusList(p1));
return result;
}
+ /**
+ * 鍏ㄥ浗鍒拌揣鍦板垎甯冩煡璇㈡煡璇�
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsDistributionOfDeliveryLocResponse> getDistributionOfDeliveryLocations(TmsFacrotyCodeListRequest param){
+ List<TmsDistributionOfDeliveryLocResponse> result = new ArrayList<>();
+ if( param.getFacrotyCodeList() == null || param.getFacrotyCodeList().size() == 0){
+ param.setFacrotyCodeList(new ArrayList<>());
+ param.getFacrotyCodeList().add("0");
+ }
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getDistributionOfDeliveryLocations[0];
+ TmsBaseResponse< List<TmsDistributionOfDeliveryLocResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getDistributionOfDeliveryLocations[1],
+ JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse< List<TmsDistributionOfDeliveryLocResponse>>>(){});
+ if(response!=null && response.getData()!=null){
+ result =response.getData();
+ }
+
+ return result;
+ }
+ /**
+ * 瀹炴椂搴撳瓨鏌ヨ
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsInventoryListResponse> getRealTimeInventory( ){
+ List<TmsInventoryListResponse> result = new ArrayList<>();
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getRealTimeInventory[0];
+ TmsBaseResponse< List<TmsInventoryListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getRealTimeInventory[1]
+ ,"{}"
+ ,new TypeReference< TmsBaseResponse< List<TmsInventoryListResponse>>>(){});
+ if(response!=null && response.getData()!=null){
+ result =response.getData();
+ }
+
+ return result;
+ }
+ /**
+ * 鏌ヨ5涓巶鐨勮繍鍔涜祫婧愬埄鐢ㄦ儏鍐�
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsTotalAndReportVehicleQtyResponse> getTotalAndReportVehicleQty( ){
+ List<TmsTotalAndReportVehicleQtyResponse> result = new ArrayList<>();
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getTotalAndReportVehicleQty[0];
+ TmsBaseResponse< List<TmsTotalAndReportVehicleQtyResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getTotalAndReportVehicleQty[1]
+ ,"{}"
+ ,new TypeReference< TmsBaseResponse< List<TmsTotalAndReportVehicleQtyResponse>>>(){});
+ if(response!=null && response.getData()!=null){
+ result =response.getData();
+ }
+
+ return result;
+ }
+ /**
+ * 鎸囧畾鏃堕棿鑼冨洿鍐呯疮璁″嚭搴撻噺
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsOutQtyAndVehicleQtyResponse> getOutQtyAndVehicleQty(TmsOutQtyAndVehicleQtyRequest param ){
+ List<TmsOutQtyAndVehicleQtyResponse> result = new ArrayList<>();
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getOutQtyAndVehicleQty[0];
+ TmsBaseResponse< List<TmsOutQtyAndVehicleQtyResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOutQtyAndVehicleQty[1]
+ ,JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse< List<TmsOutQtyAndVehicleQtyResponse>>>(){});
+ if(response!=null && response.getData()!=null){
+ result =response.getData();
+ }
+ return result;
+ }
/**
* 鍙戣捣 tms鎺ュ彛璇锋眰
--
Gitblit v1.9.3