Merge remote-tracking branch 'origin/master'

jiangping

2024-12-26 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java

@@ -190,6 +190,41 @@
    }

    /**
     * 未完成订单列表接口
     * 根据区域ID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份，非需要），返回合同列表信息，按照时间倒序展示；
     * @param param 参数
     * @return TmsBaseResponse
     */
    @Override
    public    TmsBasePageResponse<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsOrderNoFinishListRequest param){
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.getNotFinishOrderList[0];
        TmsBaseResponse<TmsBasePageResponse<TmsOrderNoFinishListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getNotFinishOrderList[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsOrderNoFinishListResponse>> >(){});
        if(response ==null || response.getData() == null){
            return  new TmsBasePageResponse<>();
        }
        return  response.getData();

    }
    /**
     * 出库能力统计
     * 查询某个厂/全部厂的今日计划量、今日出库量、今日未出库量数据。
     * @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 参数
@@ -197,27 +232,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)
@@ -265,10 +279,10 @@
    @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");
        }
//        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],
@@ -317,6 +331,23 @@
        return result;
    }
    /**
     * 近7日到货情况(含明细)
     * @return TmsBaseResponse
     */
    @Override
    public  List<TmsSevenArrivalStatusAndDetailsResponse>   getSevenArrivalStatusAndDetails(TmsSevenArrivalDetailsRequest param ){
        List<TmsSevenArrivalStatusAndDetailsResponse> result = new ArrayList<>();
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.getSevenArrivalStatusAndDetails[0];
        TmsBaseResponse< List<TmsSevenArrivalStatusAndDetailsResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getSevenArrivalStatusAndDetails[1]
                ,JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse< List<TmsSevenArrivalStatusAndDetailsResponse>>>(){});
        if(response!=null && response.getData()!=null){
              result =response.getData();
        }
        return result;
    }
    /**
     * 指定时间范围内累计出库量
     * @return TmsBaseResponse
     */
@@ -334,6 +365,7 @@
        return result;
    }


    /**
     * 发起 tms接口请求
     * @param url