最新版本541200007

jiangping

2024-12-20 9a68feaae561aee105a14430f86dc231c7c6c04b

最新版本541200007

 admin/src/components/business/OperaTmsFactoryParamWindow.vue

@@ -27,7 +27,6 @@
    </el-form>
  </GlobalWindow>
</template>

<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'

 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -3420,4 +3420,165 @@
    }



    // èŽ·å–本周的开始时间
    public static Date getBeginDayOfWeek(int addYears) {
        Date date = new Date();
        if (date == null) {
            return null;
        }
        Calendar cal = Calendar.getInstance();
        cal.setTime(date);
        cal.set(Calendar.YEAR,getNowYearNum()+addYears);
        int dayofweek = cal.get(Calendar.DAY_OF_WEEK);
        if (dayofweek == 1) {
            dayofweek += 7;
        }
        cal.add(Calendar.DATE, 2 - dayofweek);
        return getDayStartTime(cal.getTime());
    }

    // èŽ·å–本周的结束时间
    public static Date getEndDayOfWeek(int addYears) {
        Calendar cal = Calendar.getInstance();
        cal.setTime(getBeginDayOfWeek(addYears));
        cal.add(Calendar.DAY_OF_WEEK, 6);
        Date weekEndSta = cal.getTime();
        return getDayEndTime(weekEndSta);
    }

    // èŽ·å–上周的开始时间
    public static Date getBeginDayOfLastWeek() {
        Date date = new Date();
        if (date == null) {
            return null;
        }
        Calendar cal = Calendar.getInstance();
        cal.setTime(date);
        cal.set(Calendar.YEAR,getNowYearNum());
        int dayofweek = cal.get(Calendar.DAY_OF_WEEK);
        if (dayofweek == 1) {
            dayofweek += 7;
        }
        cal.add(Calendar.DATE, 2 - dayofweek - 7);
        return getDayStartTime(cal.getTime());
    }

    // èŽ·å–上周的结束时间
    public static Date getEndDayOfLastWeek() {
        Calendar cal = Calendar.getInstance();
        cal.setTime(getBeginDayOfLastWeek());
        cal.add(Calendar.DAY_OF_WEEK, 6);
        Date weekEndSta = cal.getTime();
        return getDayEndTime(weekEndSta);
    }

    // èŽ·å–本月的开始时间
    public static Date getBeginDayOfMonth(int addYears) {
        Calendar calendar = Calendar.getInstance();
        calendar.set(getNowYearNum()+addYears, getNowMonthNum() - 1, 1);
        return getDayStartTime(calendar.getTime());
    }

    // èŽ·å–本月的结束时间
    public static Date getEndDayOfMonth(int addYears) {
        Calendar calendar = Calendar.getInstance();
        calendar.set(getNowYearNum()+addYears, getNowMonthNum() - 1, 1);
        int day = calendar.getActualMaximum(5);
        calendar.set(getNowYearNum()+addYears, getNowMonthNum() - 1, day);
        return getDayEndTime(calendar.getTime());
    }

    // èŽ·å–上月的开始时间
    public static Date getBeginDayOfLastMonth() {
        Calendar calendar = Calendar.getInstance();
        calendar.set(getNowYearNum(), getNowMonthNum() - 2, 1);
        return getDayStartTime(calendar.getTime());
    }

    // èŽ·å–上月的结束时间
    public static Date getEndDayOfLastMonth() {
        Calendar calendar = Calendar.getInstance();
        calendar.set(getNowYearNum(), getNowMonthNum() - 2, 1);
        int day = calendar.getActualMaximum(5);
        calendar.set(getNowYearNum(), getNowMonthNum() - 2, day);
        return getDayEndTime(calendar.getTime());
    }

    // èŽ·å–本年的开始时间
    public static Date getBeginDayOfYear(int addYears) {
        Calendar cal = Calendar.getInstance();
        cal.set(Calendar.YEAR, getNowYearNum()+addYears);
        cal.set(Calendar.MONTH, Calendar.JANUARY);
        cal.set(Calendar.DATE, 1);
        return getDayStartTime(cal.getTime());
    }

    // èŽ·å–本年的结束时间
    public static java.util.Date getEndDayOfYear(int addYears){
        Calendar cal = Calendar.getInstance();
        cal.set(Calendar.YEAR, getNowYearNum()+addYears);
        cal.set(Calendar.MONTH, Calendar.DECEMBER);
        cal.set(Calendar.DATE, 31);
        return getDayEndTime(cal.getTime());
    }

    // èŽ·å–当天的开始时间
    public static java.util.Date getDayBegin() {
        Calendar cal = new GregorianCalendar();
        cal.set(Calendar.HOUR_OF_DAY, 0);
        cal.set(Calendar.MINUTE, 0);
        cal.set(Calendar.SECOND, 0);
        cal.set(Calendar.MILLISECOND, 0);
        return cal.getTime();
    }

    // èŽ·å–当天的结束时间
    public static java.util.Date getDayEnd() {
        Calendar cal = new GregorianCalendar();
        cal.set(Calendar.HOUR_OF_DAY, 23);
        cal.set(Calendar.MINUTE, 59);
        cal.set(Calendar.SECOND, 59);
        return cal.getTime();
    }


    // èŽ·å–某个日期的开始时间
    public static Timestamp getDayStartTime(Date d) {
        Calendar calendar = Calendar.getInstance();
        if (null != d)
            calendar.setTime(d);
        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
                calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
        calendar.set(Calendar.MILLISECOND, 0);
        return new Timestamp(calendar.getTimeInMillis());
    }

    // èŽ·å–某个日期的结束时间
    public static Timestamp getDayEndTime(Date d) {
        Calendar calendar = Calendar.getInstance();
        if (null != d)
            calendar.setTime(d);
        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
                calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
        calendar.set(Calendar.MILLISECOND, 999);
        return new Timestamp(calendar.getTimeInMillis());
    }


    // èŽ·å–今年是哪一年
    public static Integer getNowYearNum() {
        Date date = new Date();
        GregorianCalendar gc = (GregorianCalendar) Calendar.getInstance();
        gc.setTime(date);
        return Integer.valueOf(gc.get(1));
    }

    // èŽ·å–本月是哪一月
    public static int getNowMonthNum() {
        Date date = new Date();
        GregorianCalendar gc = (GregorianCalendar) Calendar.getInstance();
        gc.setTime(date);
        return gc.get(2) + 1;
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java

@@ -10,6 +10,7 @@
import com.doumee.core.tms.model.response.TmsBasePageResponse;
import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
import com.doumee.core.tms.model.response.TmsOrderNoFinishListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.TmsFactoryParam;
@@ -48,26 +49,11 @@
    @LoginNoRequired
    @ApiOperation("中心数据")
    @GetMapping("/centerData")
    public ApiResponse<WholeProvinceBoardVO> centerData() {
        WholeProvinceBoardVO data = new WholeProvinceBoardVO();
        Random random = new Random();

        data.setYearOutTotal(BigDecimal.valueOf(random.nextInt(200)));
        data.setYearOutTotalOnYear(BigDecimal.valueOf(random.nextInt(10)));
        data.setYearOutTimes(random.nextInt(200));
        data.setYearProvinceRata(BigDecimal.valueOf(random.nextInt(100)).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP));

        data.setYearInPlanTotal(BigDecimal.valueOf(random.nextInt(200)));
        data.setYearInTotal(BigDecimal.valueOf(random.nextInt(data.getYearInPlanTotal().intValue())));
        data.setYearInTotalOnYear(BigDecimal.valueOf(random.nextInt(10)));
        data.setYearInTimes(random.nextInt(200));

        data.setOutPlanTotal(BigDecimal.valueOf(random.nextInt(200)));
        data.setOutPlanTimes(random.nextInt(200));
        data.setOutTotal(BigDecimal.valueOf(random.nextInt(data.getOutPlanTotal().intValue())));
        data.setOutTimes(random.nextInt(data.getOutPlanTimes()));
        data.setOutRata(BigDecimal.valueOf(random.nextInt(100)));

    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "查询类型厂区编码", required = false)
    })
    public ApiResponse<WholeProvinceBoardVO> centerData(@RequestParam String factoryCode) {
        WholeProvinceBoardVO data = boardService.centerProvinceData(  factoryCode);
        return ApiResponse.success(data);
    }

@@ -75,43 +61,24 @@
    @LoginNoRequired
    @ApiOperation("近七日到货情况")
    @GetMapping("/arriveGoodsList")
    public ApiResponse<List<ArriveGoodsVO>> arriveGoodsList() {
        List<ArriveGoodsVO> list = new ArrayList<>();
        Random random = new Random();
        List<String> dayList = DateUtil.getBeforDays(new Date(),7);
        for (String str:dayList) {
            ArriveGoodsVO data = new ArriveGoodsVO();
            data.setDateStr(str);
            data.setArriveNum(new BigDecimal(random.nextInt(1000)));
            data.setInTransitNum(new BigDecimal(random.nextInt(1000)));
            list.add(data);

        }
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "查询类型厂区编码", required = false)
    })
    public ApiResponse<List<LastSevenDaysOrderVo>>  arriveGoodsList(@RequestParam String factoryCode) {
        List<LastSevenDaysOrderVo> list = boardService.arriveGoodsList(factoryCode);
        return ApiResponse.success(list);
    }


    @LoginNoRequired
    @ApiOperation("当前运输任务")
    @GetMapping("/transportTaskList")
    public ApiResponse<List<TransportTaskVO>> transportTaskList() {
        List<TransportTaskVO> list = new ArrayList<>();
        Random random = new Random();
        for (int i = 1; i < 11; i++) {
            TransportTaskVO data = new TransportTaskVO();
            data.setCarNo("皖A8" + random.nextInt(9) + random.nextInt(9) + random.nextInt(9) + random.nextInt(9));
            data.setStatusStr("到达卸货地");
            data.setAddress("安徽合肥");
            data.setTaskDate(new Date());
            list.add(data);
        }
        return ApiResponse.success(list);
    }
    @LoginNoRequired
    @ApiOperation("订单在途跟踪-累计出库量")
    @GetMapping("/totalOutQtyNum")
    public ApiResponse<TotalOutQtyNumVO> totalOutQtyNum() {
        TotalOutQtyNumVO result = boardService.totalOutQtyNum();
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "查询类型 0本月 1本周 2本年", required = false),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "查询类型厂区编码", required = false)
    })
    public ApiResponse<TotalOutQtyNumVO> totalOutQtyNum(@RequestParam Integer type,@RequestParam String factoryCode) {
        TotalOutQtyNumVO result = boardService.totalOutQtyNum(type,factoryCode);

        return ApiResponse.success(result);
    }
@@ -150,44 +117,29 @@
    @LoginNoRequired
    @ApiOperation("地图本月本年总出库量统计集合（按省份）")
    @GetMapping("/mapYearAndMonthOutList")
    public ApiResponse<List<WholeProvinceMapVO>> mapYearAndMonthOutList( ) {
        List<WholeProvinceMapVO>  list = boardService.mapYearAndMonthOutList();
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "查询类型厂区编码", required = false)
    })
    public ApiResponse<List<WholeProvinceMapVO>> mapYearAndMonthOutList( @RequestParam String factoryCode) {
        List<WholeProvinceMapVO>  list = boardService.mapYearAndMonthOutList(factoryCode);
        return ApiResponse.success(list);
    }


    @ApiOperation("订单任务合同列表接口")
    @LoginNoRequired
    @PostMapping("/orderList")
    public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody 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);
        }
        return  ApiResponse.success(tmsService.orderList(param));
    @GetMapping("/orderList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "查询类型厂区编码", required = false)
    })
    public ApiResponse<List<TmsOrderNoFinishListResponse>> orderNoFinishList(@RequestParam String factoryCode)   {
        List<TmsOrderNoFinishListResponse> list = boardService.orderNoFinishList(factoryCode);
        return  ApiResponse.success(list);
    }
    @ApiOperation("合同详情接口")
    @LoginNoRequired
    @PostMapping("/orderInfo")
    public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request )   {

        return ApiResponse.success(tmsService.orderInfo(request));
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java

@@ -21,6 +21,8 @@
        String[] getGis = new String[]{"/tms/zhyt/getGis",  "【TMS】根据运输单号查询gis轨"};//TMS根据运输单号查询gis轨接口地址
        String[] getOrderStatusByContractNumber = new String[]{"/tms/zhyt/getOrderStatusByContractNumber",  "【TMS】单生命周期"};//3.8订单生命周期
        String[] getOutQtyAndVehicleQty = new String[]{"/tms/zhyt/getOutQtyAndVehicleQty",  "【TMS】指定时间范围内累计出库量"};//3.8指定时间范围内累计出库量
        String[] getSevenArrivalStatusAndDetails = new String[]{"/tms/zhyt/getSevenArrivalStatusAndDetails",  "【TMS】近7日到货情况(含明细)"};//3.13近7日到货情况(含明细)
        String[] getNotFinishOrderList = new String[]{"/tms/zhyt/getNotFinishOrderList",  "【TMS】未完成订单"};//3.13未完成订单
    }

    public  enum TopStatusLevel {

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsSevenArrivalDetailsRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms近7日到货情况(含明细)请求参数")
public class TmsSevenArrivalDetailsRequest {
    private String ncCreateDateFrom;//    å­—符串    è®¢å•å¼€å§‹æ—¥æœŸ 2024-12-19
    private String ncCreateDateThrough    ;//    å­—符串    è®¢å•ç»“束日期 2024-12-19
    private List<String> facrotyCodeList;//是    é›†åˆ    çƒŸåŽ‚集合
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java

@@ -60,4 +60,6 @@
    private String    plannedArrivedDate; //        çŠ¶æ€æè¿°
    private long timeStamp;//时间戳



}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms未完成合同列表返回参数")
public class TmsOrderNoFinishListResponse {
    @ApiModelProperty(value = "营销订单编码" )
    private String    orderNumber;//    å­—符串    è¥é”€è®¢å•ç¼–码
    @ApiModelProperty(value = "合同号" )
    private String    contractNumber;//    å­—符串    åˆåŒå·
    @ApiModelProperty(value = "运输单号" )
    private String    transportCode    ;//字符串    è¿è¾“单号
    @ApiModelProperty(value = "运输车辆" )
    private String       plateNumber;//    å­—符串    è¿è¾“车辆
    @ApiModelProperty(value = "状态" )
    private String      status;//    å­—符串    çŠ¶æ€
    @ApiModelProperty(value = "任务下达时间" )
    private String     transportDate;//    å­—符串    ä»»åŠ¡ä¸‹è¾¾æ—¶é—´
    @ApiModelProperty(value = "订单创建日期" )
    private String     createDate    ;//字符串    è®¢å•åˆ›å»ºæ—¥æœŸ
    @ApiModelProperty(value = "发货地" )
    private String     deliveryEnterprise    ;//字符串    å‘货地
    @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    ;//数字    è½¦è¾†ç»åº¦

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutQtyAndVehicleQtyResponse.java

@@ -18,9 +18,9 @@
    @ApiModelProperty(value = "累计出库量")
    private BigDecimal totalOutQty;//数字    ç´¯è®¡å‡ºåº“量
    @ApiModelProperty(value = "省外累计出库量")
    private String outSideProvinceOutQty;//    æ•°å­—    çœå¤–累计出库量
    private BigDecimal outSideProvinceOutQty;//    æ•°å­—    çœå¤–累计出库量
    @ApiModelProperty(value = "省内累计出库量")
    private String inSideProvinceOutQty;//    æ•°å­—    çœå†…累计出库量
    private BigDecimal inSideProvinceOutQty;//    æ•°å­—    çœå†…累计出库量
    @ApiModelProperty(value = "累计出库车次")
    private BigDecimal vehicleQty;//数字    ç´¯è®¡å‡ºåº“车次
    private Integer vehicleQty;//数字    ç´¯è®¡å‡ºåº“车次
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsSevenArrivalStatusAndDetailsResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
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 TmsSevenArrivalStatusAndDetailsResponse {

    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 = "状态\t0  æœªå¯è¿ï¼›1   åœ¨é€”ï¼›2  åˆ°è´§")
    private Integer  status;//    çŠ¶æ€    0  æœªå¯è¿ï¼›1   åœ¨é€”ï¼›2  åˆ°è´§
    @ApiModelProperty(value = "仓库名称")
    private String  repertotyName;//    ä»“库名称
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java

@@ -72,9 +72,9 @@
    @ExcelColumn(name="总出库能力（万支）")
    private BigDecimal num2;

    @ApiModelProperty(value = "扩展字段3")
    @ExcelColumn(name="扩展字段3")
    private String param3;
    @ApiModelProperty(value = "8小时出库能力（万支）", example = "1")
    @ExcelColumn(name="8小时出库能力（万支）")
    private BigDecimal param3;

    @ApiModelProperty(value = "扩展字段4")
    @ExcelColumn(name="扩展字段4")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/LastSevenDaysOrderInfoVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.doumee.dao.web.response.platformReport;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * é€šç”¨
 *
 * @Author : Rk
 * @create 2024/10/25 10:59
 */
@Data
public class LastSevenDaysOrderInfoVo {

    @ApiModelProperty(value = "日期")
    private String dateStr;
    @ApiModelProperty(value = "状态 0未启动 1运输中 2已到货")
    private Integer status;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/LastSevenDaysOrderVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package com.doumee.dao.web.response.platformReport;

import com.doumee.core.tms.model.response.TmsSevenArrivalStatusAndDetailsResponse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * é€šç”¨
 *
 * @Author : Rk
 * @create 2024/10/25 10:59
 */
@Data
public class LastSevenDaysOrderVo {

    @ApiModelProperty(value = "日期")
    private String dateStr;
    @ApiModelProperty(value = "未启动数量")
    private int waitNum;
    @ApiModelProperty(value = "运输中数量")
    private int ingNum;
    @ApiModelProperty(value = "已到货数量")
    private int doneNum;
    @ApiModelProperty(value = "未启动集合")
    private List<TmsSevenArrivalStatusAndDetailsResponse> waitList;
    @ApiModelProperty(value = "运输中集合")
    private List<TmsSevenArrivalStatusAndDetailsResponse> ingList;
    @ApiModelProperty(value = "已到货集合")
    private List<TmsSevenArrivalStatusAndDetailsResponse> doneList;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TotalOutQtyNumVO.java

@@ -27,5 +27,7 @@
    private BigDecimal sameInNum;
    @ApiModelProperty(value = "去年同期出库量（省外）")
    private BigDecimal sameOutNum;
    @ApiModelProperty(value = "累计车次数量")
    private int totalCarNum;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java

@@ -15,69 +15,29 @@
@Data
public class WholeProvinceBoardVO {

    @ApiModelProperty(value = "累计出库量  - å¹´åº¦")
    private BigDecimal yearOutTotal;
    @ApiModelProperty(value = "【出库能力】当日订单里")
    private BigDecimal currentOrderNum;

    @ApiModelProperty(value = "累计出库量  - å¹´åº¦åŒæ¯”")
    private BigDecimal yearOutTotalOnYear;
    @ApiModelProperty(value = "【出库能力】当日计划量")
    private BigDecimal currentPlanNum;
    @ApiModelProperty(value = "【出库能力】当日计划车次量")
    private int currentPlanCarNum;

    @ApiModelProperty(value = "累计出库车次 - å¹´åº¦")
    private Integer yearOutTimes;
    @ApiModelProperty(value = "【出库能力】今日出库量")
    private BigDecimal  crrentOutNum;
    @ApiModelProperty(value = "【出库能力】今日出库车次量")
    private int  crrentOutCarNum;

    @ApiModelProperty(value = "省内占比")
    private BigDecimal yearProvinceRata;
    @ApiModelProperty(value = "【出库能力】剩余任务量")
    private BigDecimal crrentRestNum;
    @ApiModelProperty(value = "【出库能力】剩余任务车次量")
    private int  crrentRestCarNum;


    @ApiModelProperty(value = "累计入库量  - å¹´åº¦")
    private BigDecimal yearInTotal;
    @ApiModelProperty(value = "【出库能力】8小时出库能力")
    private BigDecimal hoursAbility;

    @ApiModelProperty(value = "累计入库量  - å¹´åº¦åŒæ¯”")
    private BigDecimal yearInTotalOnYear;

    @ApiModelProperty(value = "累计入库车次 - å¹´åº¦")
    private Integer yearInTimes;

    @ApiModelProperty(value = "计划入库量 - å¹´åº¦")
    private BigDecimal yearInPlanTotal;



    @ApiModelProperty(value = "今日计划出库量")
    private BigDecimal outPlanTotal;

    @ApiModelProperty(value = "今日计划出库次数")
    private Integer outPlanTimes;

    @ApiModelProperty(value = "今日出库量")
    private BigDecimal outTotal;

    @ApiModelProperty(value = "今日出库次数")
    private Integer outTimes;

    @ApiModelProperty(value = "出库能力占比")
    private BigDecimal outRata;

    @ApiModelProperty(value = "近七日到货情况" , hidden = true)
    private List<ArriveGoodsVO> arriveGoodsList;

    @ApiModelProperty(value = "当前运输任务" , hidden = true)
    private List<TransportTaskVO> transportTaskList;


    @ApiModelProperty(value = "进销存运营 - 7日" , hidden = true)
    private List<WholeProvinceZxtDetailVO> salesOperationWeekList;

    @ApiModelProperty(value = "进销存运营 - æœˆåº¦" , hidden = true)
    private List<WholeProvinceZxtDetailVO> salesOperationMonthList;

    @ApiModelProperty(value = "进销存运营 - å¹´åº¦" , hidden = true)
    private List<WholeProvinceZxtDetailVO> salesOperationYearList;

    @ApiModelProperty(value = "库存利用率" , hidden = true)
    private List<StockRataVO> stockRataVOListList;




    @ApiModelProperty(value = "【出库能力】最大出库能力")
    private BigDecimal maxAbility;

}

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

@@ -176,13 +176,7 @@
        if (pageWrap.getModel().getParam4() != null) {
             queryWrapper.eq(TmsFactoryParam::getParam4, pageWrap.getModel().getParam4());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.orderByAsc( TmsFactoryParam::getSortnum);
        return PageData.from(tmsFactoryParamMapper.selectPage(page, queryWrapper));
    }


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

@@ -1,5 +1,7 @@
package com.doumee.service.business.impl.thrid;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
@@ -14,12 +16,11 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKCarOpenService;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.tms.model.request.TmsFacrotyCodeListRequest;
import com.doumee.core.tms.model.request.TmsOutQtyAndVehicleQtyRequest;
import com.doumee.core.tms.model.response.TmsDistributionOfDeliveryLocResponse;
import com.doumee.core.tms.model.response.TmsInventoryListResponse;
import com.doumee.core.tms.model.response.TmsOutQtyAndVehicleQtyResponse;
import com.doumee.core.tms.model.response.TmsTotalAndReportVehicleQtyResponse;
import com.doumee.core.tms.model.request.TmsSevenArrivalDetailsRequest;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
@@ -42,6 +43,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
@@ -88,6 +90,9 @@
    private PlatformGroupMapper platformGroupMapper;
    @Autowired
    private TmsService tmsService;

    @Value("${debug_model}")
    private Boolean isDebug;
    /**
     * èŽ·å–区域树形结构数据
     * @return
@@ -1042,7 +1047,7 @@
                    .isNotNull(PlatformLog::getParam3)
                    .ne(PlatformLog::getParam3,Constants.ZERO+""));
            if(platformLogList!=null && platformLogList.size()>0){
                return new BigDecimal((double)(platformLogList.stream().map(m->Long.valueOf(m.getParam3())).reduce(Long.valueOf(0),Long::sum))/(double)60);
                return new BigDecimal((double)(platformLogList.stream().map(m->Long.valueOf(m.getParam3())).reduce(Long.valueOf(0),Long::sum))/(double)3600);
            }
        }
        return r;
@@ -1861,6 +1866,9 @@
                curtotalNum += Constants.formatIntegerNum(workEfficiencyVO.getWorkNum()) ;
            }
            workEfficiencyVO.setTotalWorkNum(curtotalNum);//累计值
            if(System.currentTimeMillis() < curTime){
                workEfficiencyVO.setTotalWorkNum(0);
            }
            workEfficiencyVOList.add(workEfficiencyVO);
        }
        return workEfficiencyVOList;
@@ -2042,7 +2050,7 @@
        }
    }
    /**
     * å‡ºåº“能力李永利
     * å‡ºåº“能力
     * @return
     */
    @Override
@@ -2058,13 +2066,17 @@
        if(paramList!=null){
            String startDate = DateUtil.formatDate(new Date(),"yyyy-MM-dd");
            String endDate = DateUtil.formatDate(new Date(),"yyyy-MM-dd");
            if(isDebug){
                  startDate =  "2024-12-01";
                  endDate =   "2024-12-05";
            }
            for(TmsFactoryParam p : paramList){
                WholeProvinceZxtDetailVO t = new WholeProvinceZxtDetailVO();
                t.setFactoryName(p.getName());
                t.setCurrentNum(new BigDecimal(0));
                t.setUseRate(new BigDecimal(0));
                t.setTotalNum(Constants.formatBigdecimal(p.getNum2()));//总出库能力
                if(StringUtils.isBlank(p.getCode())){
                t.setTotalNum(Constants.formatBigdecimal(p.getParam3()));//8小时出库能力
                if(StringUtils.isNotBlank(p.getCode())){
                    param.setFacrotyCodeList(new ArrayList<>());
                    param.setDateStart(startDate);
                    param.setDateEnd(endDate);
@@ -2086,11 +2098,62 @@
        return result;
    }
    /**
     * å…¨èº«å‡ºåº“能力
     * @return
     */
    @Override
    public  WholeProvinceBoardVO centerProvinceData(String  factoryCode){
        WholeProvinceBoardVO data = new WholeProvinceBoardVO();
        data.setMaxAbility(new BigDecimal(0));
        data.setHoursAbility(new BigDecimal(0));
        List<TmsFactoryParam> paramList = factoryList();
        String code = null;
        if(paramList!=null){
            //处理最大出库能力和8小时出库能力
            for(TmsFactoryParam param : paramList){
                if(StringUtils.isNotBlank(factoryCode)){
                    if(StringUtils.equals(param.getCode(),factoryCode)){
                        data.setHoursAbility(data.getHoursAbility().add(Constants.formatBigdecimal(param.getParam3())));
                        data.setMaxAbility(data.getMaxAbility().add(Constants.formatBigdecimal(param.getNum2())));
                        code = param.getCode();
                        break;
                    }
                }else{
                    data.setHoursAbility(data.getHoursAbility().add(Constants.formatBigdecimal(param.getParam3())));
                    data.setMaxAbility(data.getMaxAbility().add(Constants.formatBigdecimal(param.getNum2())));
                }
            }
        }
        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();
        TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
        param.setDateEnd(DateUtil.getShortTime(date));
        param.setDateStart(DateUtil.getShortTime(date));
        if(StringUtils.isNotBlank(code)){
            param.setFacrotyCodeList(new ArrayList<>());
            param.getFacrotyCodeList().add(code);//查询指定厂区
        }
        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())));//今日出库车次
            }
        }
        return  data;

    }
    /**
     * å‡ºåº“能力李永利
     * @return
     */
    @Override
    public    TotalOutQtyNumVO totalOutQtyNum(int queryType){
    public    TotalOutQtyNumVO totalOutQtyNum(int type,String code){
        TotalOutQtyNumVO  data = new TotalOutQtyNumVO();
        data.setCurrentInNum(new BigDecimal(0));
        data.setLastInNum(new BigDecimal(0));
@@ -2100,6 +2163,68 @@
        data.setLastOutNum(new BigDecimal(0));
        data.setSameOutNum(new BigDecimal(0));

        Date sameStart = DateUtil.getBeginDayOfMonth(-1);
        Date sameEnd = DateUtil.getEndDayOfMonth(-1);
        Date curStart = DateUtil.getBeginDayOfMonth(0);
        Date curEnd = DateUtil.getEndDayOfMonth(0);
        Date lastStart = DateUtil.getBeginDayOfLastMonth();
        Date lastEnd = DateUtil.getEndDayOfLastMonth();
        if(type ==1){
            //本周
            sameStart= DateUtil.getBeginDayOfWeek(-1);
            sameEnd= DateUtil.getEndDayOfWeek(-1);
            curStart= DateUtil.getBeginDayOfWeek(0);
            curEnd= DateUtil.getEndDayOfWeek(0);
            lastStart = DateUtil.getBeginDayOfLastWeek();
            lastEnd= DateUtil.getEndDayOfLastWeek();
        }else if(type == 2){
            curStart= DateUtil.getBeginDayOfYear(0);
            curEnd= DateUtil.getEndDayOfYear(0);
            lastStart= DateUtil.getBeginDayOfYear(-1);
            lastEnd= DateUtil.getEndDayOfYear(-1);
            sameStart = null;
            sameEnd =null;
        }
        TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
        if(StringUtils.isNotBlank(code)){
            param.setFacrotyCodeList(new ArrayList<>());
            param.getFacrotyCodeList().add(code);
        }
        if(type !=2){
            //本年的不需要查去年同周期
            param.setDateEnd(DateUtil.getShortTime(sameEnd));
            param.setDateStart(DateUtil.getShortTime(sameStart));
            List<TmsOutQtyAndVehicleQtyResponse> listSame=  tmsService.getOutQtyAndVehicleQty(param);//去年同期
            if(listSame!=null ){
                for(TmsOutQtyAndVehicleQtyResponse model : listSame){
                    data.setSameOutNum(data.getSameOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
                    data.setSameInNum(data.getSameInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
                }
            }
        }
        param.setDateEnd(DateUtil.getShortTime(curEnd));
        param.setDateStart(DateUtil.getShortTime(curStart));
        List<TmsOutQtyAndVehicleQtyResponse> listCur =  tmsService.getOutQtyAndVehicleQty(param);//本周期
        if(listCur!=null ){
            for(TmsOutQtyAndVehicleQtyResponse model : listCur){
                data.setCurrentOutNum(data.getCurrentOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
                data.setCurrentInNum(data.getCurrentInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
                data.setTotalCarNum(data.getTotalCarNum()+Constants.formatIntegerNum(model.getVehicleQty()));//累计车次
            }
        }
        param.setDateEnd(DateUtil.getShortTime(lastEnd));
        param.setDateStart(DateUtil.getShortTime(lastStart));
        List<TmsOutQtyAndVehicleQtyResponse> listLast =  tmsService.getOutQtyAndVehicleQty(param);//上周期
        if(listCur!=null ){
            for(TmsOutQtyAndVehicleQtyResponse model : listLast){
                data.setLastOutNum(data.getLastOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
                data.setLastInNum(data.getLastInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
            }
        }
        if(type == 2){//本年的
            data.setSameOutNum(data.getLastOutNum());
            data.setSameInNum(data.getLastInNum());
        }
        return data;
    }
    /**
@@ -2107,20 +2232,13 @@
     * @return
     */
    @Override
    public    List<WholeProvinceMapVO> mapYearAndMonthOutList(){
    public    List<WholeProvinceMapVO> mapYearAndMonthOutList(String code){
        List<WholeProvinceMapVO> result = new ArrayList<>();
        List<TmsFactoryParam> paramList =factoryList();
        if(paramList!=null && paramList.size()>0){
            List<String> codes = new ArrayList<>();
            for(TmsFactoryParam p : paramList){
                if(StringUtils.isBlank(p.getCode())){
                    continue;
                }
                codes.add(p.getCode());
            }
            if(codes.size()>0){
                TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
                param.setFacrotyCodeList(codes);
        if(StringUtils.isNotBlank(code)){
            param.setFacrotyCodeList(new ArrayList<>());
            param.getFacrotyCodeList().add(code);
        }
                List<TmsDistributionOfDeliveryLocResponse> response  = tmsService.getDistributionOfDeliveryLocations(param);//查询出库量
                if(response!=null &&response.size()>0){
                    for(TmsDistributionOfDeliveryLocResponse model : response){
@@ -2134,9 +2252,6 @@
                            result.add(tt);
                        }
                    }
                }
            }

        }
        return result;
    }
@@ -2165,6 +2280,65 @@
        return paramList;
    }
    /**
     * èŽ·å–未完成订单集合
     * @return TmsBaseResponse
     */
    @Override
    public   List<TmsOrderNoFinishListResponse>  orderNoFinishList(String code){
        TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
        if(StringUtils.isNotBlank(code)){
            param.setFacrotyCodeList(new ArrayList<>());
            param.getFacrotyCodeList().add(code);//查询指定厂区
        }
        List<TmsOrderNoFinishListResponse> infoList =   tmsService.getNotFinishOrderList(param);//查询出库量
        return infoList;
    }
    /**
     * è¿‘七日到货情况
     * @return
     */
    @Override
    public  List<LastSevenDaysOrderVo> arriveGoodsList(String code){
        List<LastSevenDaysOrderVo> list = new ArrayList<>();
        TmsSevenArrivalDetailsRequest param = new TmsSevenArrivalDetailsRequest();
        if(StringUtils.isNotBlank(code)){
            param.setFacrotyCodeList(new ArrayList<>());
            param.getFacrotyCodeList().add(code);//查询指定厂区
        }
        List<TmsSevenArrivalStatusAndDetailsResponse> infoList =   tmsService.getSevenArrivalStatusAndDetails(param);//查询出库量
        Date date = new Date();
        for (int i = 0; i < 7; i++) {
            LastSevenDaysOrderVo model = new LastSevenDaysOrderVo();
            Date td = DateUtil.addDaysToDate(date,-i);
            model.setDateStr(DateUtil.getShortTime(td));
            dealGoodsListFromResponse(model,infoList);
        }
        return list;
    }
    private void dealGoodsListFromResponse(  LastSevenDaysOrderVo model, List<TmsSevenArrivalStatusAndDetailsResponse> list) {
        model.setIngList(new ArrayList<>());
        model.setWaitList(new ArrayList<>());
        model.setDoneList(new ArrayList<>());
        if(list ==null || list.size()==0){
            return;
        }
        for(TmsSevenArrivalStatusAndDetailsResponse temp : list){
            if(StringUtils.equals(temp.getNcCreateDate(),model.getDateStr())){
                if(Constants.equalsInteger(temp.getStatus(),Constants.ZERO)){
                    model.getWaitList().add(temp);
                }else if(Constants.equalsInteger(temp.getStatus(),Constants.ONE)){
                    model.getIngList().add(temp);
                }else if(Constants.equalsInteger(temp.getStatus(),Constants.TWO)){
                    model.getDoneList().add(temp);
                }
            }
        }
        model.setDoneNum(model.getDoneList().size());
        model.setIngNum(model.getIngList().size());
        model.setWaitNum(model.getWaitList().size());
    }

    /**
     * å‡ºåº“能力李永利
     * @return
     */

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

@@ -190,6 +190,24 @@
    }

    /**
     * æœªå®Œæˆè®¢å•åˆ—表接口
     * æ ¹æ®åŒºåŸŸID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份，非需要），返回合同列表信息，按照时间倒序展示；
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    @Override
    public    List<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsFacrotyCodeListRequest param){
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.getNotFinishOrderList[0];
        TmsBaseResponse<List<TmsOrderNoFinishListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getNotFinishOrderList[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<List<TmsOrderNoFinishListResponse>> >(){});
        if(response ==null || response.getData() == null){
            return  new ArrayList<>();
        }
        return  response.getData();

    }
    /**
     * åˆåŒåˆ—表接口
     * æ ¹æ®åŒºåŸŸID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份，非需要），返回合同列表信息，按照时间倒序展示；
     * @param param å‚æ•°
@@ -244,10 +262,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],
@@ -296,6 +314,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
     */
@@ -313,6 +348,7 @@
        return result;
    }


    /**
     * å‘èµ· tms接口请求
     * @param url

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java

@@ -2,6 +2,7 @@

import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.tms.model.response.TmsOrderNoFinishListResponse;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
@@ -99,7 +100,13 @@

    List<TmsFactoryParam> factoryList();

    List<WholeProvinceMapVO> mapYearAndMonthOutList();
    List<WholeProvinceMapVO> mapYearAndMonthOutList(String factoryId);

    TotalOutQtyNumVO totalOutQtyNum(int queryType);
    TotalOutQtyNumVO totalOutQtyNum(int queryType,String factoryId);

    WholeProvinceBoardVO centerProvinceData(String factoryId);

    List<LastSevenDaysOrderVo> arriveGoodsList(String factoryid);

    List<TmsOrderNoFinishListResponse> orderNoFinishList(String factoryCode);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java

@@ -30,6 +30,7 @@
     */
    TmsBasePageResponse<TmsOrderListResponse> orderList(TmsOrderListRequest param);
    List<TmsGisListResponse>  gisList(TmsGisListRequest param);
    List<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsFacrotyCodeListRequest param);
    List<TmsCircleStatusResultListResponse>  getCicleStatusList(TmsCircleStatusListRequest param);
    /**
     * åˆåŒè¯¦æƒ…接口
@@ -56,7 +57,11 @@
     * @return TmsBaseResponse
     */
      List<TmsTotalAndReportVehicleQtyResponse>   getTotalAndReportVehicleQty( );

    /**
     * è¿‘7日到货情况(含明细)
     * @return TmsBaseResponse
     */
       List<TmsSevenArrivalStatusAndDetailsResponse>   getSevenArrivalStatusAndDetails(TmsSevenArrivalDetailsRequest param );
    /**
     * æŒ‡å®šæ—¶é—´èŒƒå›´å†…累计出库量
     * @param param
@@ -64,4 +69,5 @@
     */

    List<TmsOutQtyAndVehicleQtyResponse>   getOutQtyAndVehicleQty(TmsOutQtyAndVehicleQtyRequest param );

}