最新版本541200007

jiangping

2025-05-09 451d1783bc66b1ec1625f707d8d56df04ffe45a5

最新版本541200007

 admin/src/views/business/retention.vue

@@ -10,9 +10,9 @@
          <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="人员类型" prop="queryUserType">
          <el-select v-model="searchForm.queryUserType" placeholder="请选择">
            <el-option label="访客" value="0"></el-option>
            <el-option label="相长期关方" value="1"></el-option>
          <el-select v-model="searchForm.type" placeholder="请选择">
            <el-option label="访客" value="1"></el-option>
            <el-option label="相长期关方" value="4"></el-option>
            <el-option label="内部员工" value="2"></el-option>
            <el-option label="货运司机" value="5"></el-option>
          </el-select>

 server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java

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

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

@@ -35,6 +35,7 @@
    TmsBasePageResponse<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsOrderNoFinishListRequest param);
    TmsOutboundCapabilityResponse getOutboundCapability(TmsFacrotyCodeListRequest param);
    List<TmsCircleStatusResultListResponse>  getCicleStatusList(TmsCircleStatusListRequest param);
    TmsGetOutCapabilityResponse getOutCapacity(TmsFacrotyCodeListRequest param);
    /**
     * åˆåŒè¯¦æƒ…接口
     * @param param å‚æ•°

 server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java

@@ -28,7 +28,8 @@
        String[] getInboundOutbound = new String[]{"/tms/zhyt/getInboundOutbound",  "【TMS】出入库记录查询"};//TMS出入库记录查询接口地址
        String[] getIntransitDetails = new String[]{"/tms/zhyt/getIntransitDetails",  "【TMS】在途明细列表"};//TMS在途明细列表接口地址
        String[] getSevenArrivalStatus = new String[]{"/tms/zhyt/getSevenArrivalStatus",  "【TMS】近7日到货情况"};//TMS近7日到货情况接口地址
        String[] getCurrentTransportationTask = new String[]{ "【TMS】/zhyt/getCurrentTransportationTask",  "【TMS】当前运输任务"};//TMS当前运输任务接口地址
        String[] getCurrentTransportationTask = new String[]{ "/tms/zhyt/getCurrentTransportationTask",  "【TMS】当前运输任务"};//TMS当前运输任务接口地址
        String[] getOutCapacity = new String[]{ "/tms/zhyt/getOutCapacity",  "【TMS】出库能力汇总接口"};//3.20TMS出库能力汇总接口接口地址
    }

    public  enum TopStatusLevel {

 server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGetOutCapabilityResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.doumee.service.business.third.model.response;

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

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

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms出库能力汇总返回参数")
public class TmsGetOutCapabilityResponse {
    /**
     * {
       "code":0,
       "data":{
              "currentOrderNum":0,  å½“前订单量
               "currentTransportNum":0, å½“前任务量-已配载未出库
               "currentNotTransportNum":0, å½“前任务量-无需调度
               "currentTransportVehicleNum":0,  å½“前任务量车次-已配载未出库
               "currentOutNum":0,  ä»Šæ—¥å‡ºåº“量
               "currentOutVehicleNum":0, ä»Šæ—¥å‡ºå£é‡è½¦æ¬¡
       },
       "message":"操作成功"
       }
     */

    @ApiModelProperty(value = "当前订单量" )
    private BigDecimal currentOrderNum;//     å½“日订单量
    @ApiModelProperty(value = "当前任务量-已配载未出库" )
    private BigDecimal currentTransportNum;//     å½“前任务量-已配载未出库
    @ApiModelProperty(value = "当前任务量-无需调度" )
    private BigDecimal currentNotTransportNum;//     å½“日订单量
    @ApiModelProperty(value = "当前任务量车次-已配载未出库" )
    private BigDecimal currentTransportVehicleNum;//     å½“前任务量车次-已配载未出库
    @ApiModelProperty(value = "今日出库量" )
    private BigDecimal currentOutNum;//     ä»Šæ—¥å‡ºåº“量
    @ApiModelProperty(value = "今日出口量车次" )
    private BigDecimal currentOutVehicleNum;//     ä»Šæ—¥å‡ºå£é‡è½¦æ¬¡


}

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

@@ -38,7 +38,7 @@
    @Autowired
    private BoardService boardService;
    @LoginNoRequired
    @ApiOperation("中心数据")
    @ApiOperation("中心数据（废弃）")
    @GetMapping("/centerData")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "查询类型厂区编码", required = false)
@@ -47,6 +47,16 @@
        WholeProvinceBoardVO data = boardService.centerProvinceData(  factoryCode);
        return ApiResponse.success(data);
    }
    @LoginNoRequired
    @ApiOperation("中心数据（更新版本）")
    @GetMapping("/centerDataNew")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "查询类型厂区编码", required = false)
    })
    public ApiResponse<WholeProvinceBoardVO> centerDataNew(@RequestParam(required = false) String factoryCode) {
        WholeProvinceBoardVO data = boardService.centerProvinceDataNew(  factoryCode);
        return ApiResponse.success(data);
    }


    @LoginNoRequired

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

@@ -17,11 +17,11 @@

    @ApiModelProperty(value = "【出库能力】当日订单里")
    private BigDecimal currentOrderNum;
    @ApiModelProperty(value = "【出库能力】当日计划量")
    @ApiModelProperty(value = "【出库能力】当日计划量（同城共库任务量+运输任务量）")
    private BigDecimal currentPlanNum;
    @ApiModelProperty(value = "【出库能力】无需配载的任务量")
    @ApiModelProperty(value = "【出库能力】无需配载的任务量(同城共库任务量)")
    private BigDecimal noNeedTransportOrderNum;
    @ApiModelProperty(value = "【出库能力】需配载的任务量")
    @ApiModelProperty(value = "【出库能力】需配载的任务量（运输任务量）")
    private BigDecimal needTransportOrderNum;
    @ApiModelProperty(value = "【出库能力】当前任务车次")
    private int currentPlanCarNum;
@@ -31,7 +31,7 @@
    @ApiModelProperty(value = "【出库能力】今日出库车次量")
    private int  crrentOutCarNum;

    @ApiModelProperty(value = "【出库能力】剩余任务量")
    @ApiModelProperty(value = "【出库能力】剩余任务量（同当日计划量）")
    private BigDecimal crrentRestNum;
    @ApiModelProperty(value = "【出库能力】剩余任务车次量")
    private int  crrentRestCarNum;

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

@@ -583,8 +583,9 @@
                record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
                        request.getData().getParamValues().getSrcName():request.getSrcName());
                //如果是访客通行
                if(request.getData()!=null&&request.getData().getParamValues()!=null &&
                        StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
                if(request.getData()!=null
                        &&request.getData().getParamValues()!=null
                        &&StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
                    //如果是访客进入，录入人员的在场数据记录
                    Retention r = getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType());
                    r.setCarNo(request.getData().getParamValues().getPlateNos());
@@ -598,7 +599,7 @@
                if(request.getData()!=null&&request.getData().getParamValues()!=null &&
                        !StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
                    inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
                    record.setInOrOut(Constants.ONE);
                    record.setInOrOut(Constants.ONE);//离园
                }
                if( request.getData().getParamValues()!=null
                        && StringUtils.isNotBlank(request.getData().getParamValues().getPlateNos())

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

@@ -2507,6 +2507,36 @@
     */
    @Override
    public  WholeProvinceBoardVO centerProvinceData(String  factoryCode){
        WholeProvinceBoardVO data = initWholeProvinceBoardVOData(factoryCode);
      /* 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())));//今日出库车次
            }
        }*/
        initOutboundCapability(data,factoryCode);
        return  data;

    }
    @Override
    public  WholeProvinceBoardVO centerProvinceDataNew(String  factoryCode){
        WholeProvinceBoardVO data = initWholeProvinceBoardVOData(factoryCode);

        initOutboundCapabilityNew(data,factoryCode);
        return  data;

    }

    private WholeProvinceBoardVO initWholeProvinceBoardVOData(String factoryCode) {
        WholeProvinceBoardVO data = new WholeProvinceBoardVO();
        data.setMaxAbility(new BigDecimal(0));
        data.setHoursAbility(new BigDecimal(0));
@@ -2535,24 +2565,42 @@
                }
            }
        }
      /*  Date date = new Date();
        TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
        param.setDateEnd(DateUtil.getShortTime(date));
        param.setDateStart(DateUtil.getShortTime(date));
        return  data;
    }

    private void initOutboundCapabilityNew(WholeProvinceBoardVO data, String code) {
        TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
        if(StringUtils.isNotBlank(code)){
            param.setFacrotyCodeList(new ArrayList<>());
            param.getFacrotyCodeList().add(code);//查询指定厂区
            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())));//今日出库车次
            }
        }*/
        initOutboundCapability(data,factoryCode);
        return  data;
        TmsGetOutCapabilityResponse result=  tmsService.getOutCapacity(param);
        if(result !=null){
            data.setCrrentOutNum(Constants.formatBigdecimal(result.getCurrentOutNum())  );//今日出库量
            data.setNeedTransportOrderNum(Constants.formatBigdecimal(result.getCurrentTransportNum()));//当前任务量-已配载未出库
            data.setNoNeedTransportOrderNum(Constants.formatBigdecimal(result.getCurrentNotTransportNum())  );//当前任务量-无需调度
            data.setCrrentRestNum(Constants.formatBigdecimal(result.getCurrentTransportNum()));//剩余任务量-已配载未出库
            data.setCurrentOrderNum(Constants.formatBigdecimal(result.getCurrentOrderNum())  );//当前订单量
            data.setCurrentPlanCarNum(Constants.formatBigdecimal(result.getCurrentTransportVehicleNum()).intValue() );//当前任务车次
            data.setCrrentRestCarNum(Constants.formatBigdecimal(result.getCurrentTransportVehicleNum()).intValue() );//剩余任务车次量
            data.setCrrentOutCarNum(Constants.formatBigdecimal(result.getCurrentOutVehicleNum()).intValue());//今日出库车次

            //当前任务量和剩余任务量，为（无需配载+需要配载的任务量之和）
            data.setCurrentPlanNum(data.getNeedTransportOrderNum().add(data.getNoNeedTransportOrderNum()));//当前任务量
            data.setCrrentRestNum(data.getCurrentPlanNum());//当前任务量

        }
        //处理单位成“箱”，一箱=5万支
        if(Constants.UNIT_TYPE == 1) {
            data.setMaxAbility(Constants.formatBigdecimal(data.getMaxAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
            data.setHoursAbility(Constants.formatBigdecimal(data.getHoursAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
            data.setCrrentRestNum(Constants.formatBigdecimal(data.getCrrentRestNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
            data.setCurrentPlanNum(Constants.formatBigdecimal(data.getCurrentPlanNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
            data.setCrrentOutNum(Constants.formatBigdecimal(data.getCrrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
            data.setCurrentOrderNum(Constants.formatBigdecimal(data.getCurrentOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
            data.setNoNeedTransportOrderNum(Constants.formatBigdecimal(data.getNoNeedTransportOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
            data.setNeedTransportOrderNum(Constants.formatBigdecimal(data.getNeedTransportOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
        }
    }
    private void initOutboundCapability(WholeProvinceBoardVO data, String code) {
        TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();

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

@@ -109,6 +109,7 @@
    TotalOutQtyNumVO totalOutQtyNum(int queryType,String factoryId);

    WholeProvinceBoardVO centerProvinceData(String factoryId);
    WholeProvinceBoardVO centerProvinceDataNew(String  factoryCode);

    List<LastSevenDaysOrderVo> arriveGoodsList(String factoryid);