自动叫号业务与WMS获取车辆是否在园接口

rk

2025-09-24 6c82e309443f491eda73a95c01386becec69224b

自动叫号业务与WMS获取车辆是否在园接口

 server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml

@@ -15,7 +15,7 @@
      password: nacos
      config:
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_dev
        namespace: dev_renkang
#        namespace: dev_renkang
        username: nacos
        password: nacos
@@ -25,7 +25,7 @@
      discovery:
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dev_renkang
        namespace: dmvisit
        namespace: dev_renkang
        username: nacos
        password: nacos
      # å®‰å…¨é…ç½®

 server/meeting/meeting_service/src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@
#    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
#    username: doumee
#    password: rtjgfEr@&0c0m
    url: jdbc:mysql://10.50.250.178:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Atwl@2024
    driver-class-name: com.mysql.cj.jdbc.Driver

 server/system_gateway/src/main/resources/bootstrap-dev.yml

@@ -7,7 +7,7 @@
      discovery:
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit_dev
        namespace: dev_renkang
        username: nacos
        password: nacos
    gateway:

 server/system_timer/src/main/resources/bootstrap-dev.yml

@@ -25,6 +25,6 @@
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_dev
        namespace: dev_renkang
        username: nacos
        password: nacos

 server/visits/admin_timer/src/main/resources/bootstrap-dev.yml

@@ -23,7 +23,7 @@
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit
        namespace: dev_renkang
        username: nacos
        password: nacos


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java

@@ -10,6 +10,7 @@
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsCarInParkDataResponse;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,6 +20,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
@@ -101,6 +104,9 @@
        }
        return result;
    }



    @ApiOperation("【WMS】推送取消出库单通知任务")
    @LoginNoRequired
    @PostMapping("/push/cancelOutbound")
@@ -144,4 +150,28 @@
        return result;
    }




    @ApiOperation("【WMS】获取车辆是否入园")
    @LoginNoRequired
    @PostMapping("/push/carInParkInfo")
    public WmsBaseResponse carInParkInfo(@RequestBody WmsBaseRequest<String> param) {
        int success = Constants.ZERO;
        WmsBaseResponse result = null;
        try {
            result = wmsService.getCarInPark(param);
        }catch (BusinessException e){
            log.error("【WMS】获取车辆是否入园===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【WMS】获取车辆是否入园===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/carInParkInfo", "获取车辆是否入园",JSONObject.toJSONString(param),
                    success, JSONObject.toJSONString(result),Constants.ONE);
        }
        return result;
    }
}

 server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml

@@ -16,7 +16,7 @@
      discovery:
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit_dev
        namespace: dev_renkang
        username: nacos
        password: nacos
knife4j:

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsCarInParkDataResponse.java

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

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

import java.util.Date;
import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("WMS接口处理获取车辆是否入园返回data参数")
public class WmsCarInParkDataResponse {

    @ApiModelProperty(value = "入厂时间" ,example = "1")
    private Date eventDate;

    @ApiModelProperty(value = "车牌号" ,example = "1")
    private String carNo;

    @ApiModelProperty(value = "是否在园" ,example = "1")
    private Boolean inPark;

}

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

@@ -12,6 +12,7 @@
import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.dao.business.dao.UserActionMapper;
import com.doumee.service.business.third.WmsService;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -407,7 +408,7 @@
                                .apply(" ( t.status = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_GROUP_ID = "+pageWrap.getModel().getPlatformGroupId()+" ) ")
                )
//                .like(PlatformJob::getArriveDate,DateUtil.dateTypeToString(new Date(),"yyyy-MM-dd"))
                .orderByDesc(PlatformJob::getStatus)
                .orderByDesc(PlatformJob::getStatus,PlatformJob::getUrgeTime)
                .orderByAsc(PlatformJob::getSignDate)
        ;
        IPage<PlatformJob> platformJobIPage = platformJobJoinMapper.selectJoinPage(page,PlatformJob.class,queryWrapper);
@@ -1376,7 +1377,6 @@
        platformJob.setEditDate(new Date());
        platformJobMapper.updateById(platformJob);

        //TODO è°ƒèµ·WMS é€šçŸ¥æœˆå°è½¬ç§»
        //存储操作日志
        savePlatformLog(Constants.PlatformJobLogType.TRANSFERING.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.TRANSFERING.getInfo().replace("{data}",oldPlatform.getName()));
@@ -2570,4 +2570,308 @@
        return platformJob;
    }




    public void autoPlatformCallCar(WmsService wmsService){
        //查询当前开启的月台数据
        List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda().eq(PlatformGroup::getStatus,Constants.ZERO)
                .eq(PlatformGroup::getIsdeleted,Constants.ZERO).eq(PlatformGroup::getAutoCall,Constants.ONE)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(allPlatformGroup)){
            return;
        }
        //过滤当前时间段不在时间内的月台组  AUTO_CALL_END_TIME AUTO_CALL_START_TIME
        Integer nowHm = Integer.valueOf(DateUtil.getFomartDate(new Date(),"HH:mm").replaceAll(":",""));
        List<PlatformGroup> autoCallGroup = allPlatformGroup.stream().filter(
                i->StringUtils.isNotBlank(i.getAutoCallStartTime())&&StringUtils.isNotBlank(i.getAutoCallEndTime())
                && Integer.valueOf(i.getAutoCallStartTime().replaceAll(":","")) < nowHm
                && Integer.valueOf(i.getAutoCallEndTime().replaceAll(":","")) > nowHm
        ).collect(Collectors.toList());
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(autoCallGroup)){
            return;
        }
        //查询所有月台
        List<Platform> platformList = platformJoinMapper.selectList(new QueryWrapper<Platform>()
                .lambda()
                .eq(Platform::getIsdeleted,Constants.ZERO)
                .eq(Platform::getStatus,Constants.ZERO)
                .in(Platform::getId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(platformList)){
            return;
        }
        //循环所有自动叫号月台
        for (PlatformGroup platformGroup:autoCallGroup) {
            List<Platform> platforms = platformList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platformGroup.getId())).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(platforms)){
                continue;
            }
            Boolean isDefaul = false;
            if(Constants.equalsInteger(platforms.size(),Constants.ONE)){
                isDefaul = true;
            }else{
                //查询月台组下的月台是否同时存在整托和散托月台
                if((
                    ((platforms.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).collect(Collectors.toList()).size()>Constants.ZERO)?Constants.ONE:Constants.ZERO)
                            +
                    ((platforms.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList()).size()>Constants.ZERO)?Constants.ONE:Constants.ZERO)
                    )==Constants.ONE
                ){
                    isDefaul = true;
                }
            }
            for (Platform platform:platforms) {

                //月台 å«å·å…¥å›­æ•°é‡
                Integer workingNum = platform.getWorkingNum();
                //查询当前月台是否存在月台叫号数据 å¦‚果大于等于可叫号数量 åˆ™è·³è¿‡
                Integer workNum = platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getPlatformId,platform.getId())
                        .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())).intValue();
                if(workNum>=workingNum){
                    continue;
                };

                //查询月台下 å¯ä»¥è¿›è¡Œå«å·çš„数据
                List<PlatformJob> platformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>()
                                .lambda()
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getPlatformGroupId, platformGroup.getId())
                        .apply(" ( " +
                                " ( t.`STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and t.PLATFORM_GROUP_ID = "+platformGroup.getId()+"  )" +
                                " or  " +
                                " (t.`STATUS` = "+Constants.PlatformJobStatus.IN_WAIT.getKey()+" and and t.PLATFORM_ID = "+platform.getId()+" )  " +
                                " or " +
                                "  (t.`STATUS` = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_ID = "+platform.getId()+" )  " +
                                ") "
                        )
                        //排序方式 æœˆå°ä½œä¸šç±»åž‹ ï¼ˆè½¬ç§»ä¸­ >叫号入园）>  åŠ æ€¥ >  ç­¾åˆ°æ—¶é—´
                        .orderByDesc(PlatformJob::getStatus,PlatformJob::getUrgeTime)
                        .orderByAsc(PlatformJob::getSignDate));
                if(CollectionUtils.isEmpty(platformJobList)){
                    continue;
                }
                for (int i = 0; i < workingNum - workNum ; i++) {
                    PlatformJob platformJob  = this.getAutoCallJob(platformJobList,platform,isDefaul,platformGroup);
                    JobOperateDTO jobOperateDTO = new JobOperateDTO();
                    jobOperateDTO.setJobId(platformJob.getId());
                    PlatformJob callPlatformJob = this.platformCallNumber(jobOperateDTO);
                    platformJobList = platformJobList.stream().filter(j->!Constants.equalsInteger(j.getId(),platformJob.getId())).collect(Collectors.toList());
                    try{
                        if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
                            this.sendInPark(platformJob);
                        }
                        if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
                                && StringUtils.isNotBlank(platformJob.getBillCode())){
                            //通知WMS绑定月台信息
                            wmsService.orderPlatformBind(callPlatformJob);
                        }
                    }catch (Exception e){
                        logger.error("月台自动叫号权限下发失败：{}"+JSONObject.toJSONString(platform));
                    }
                }
            }
        }
    }



    public void autoCallInParkCar(WmsService wmsService){
        //查询当前开启的月台数据
        List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda().eq(PlatformGroup::getStatus,Constants.ZERO)
                .eq(PlatformGroup::getIsdeleted,Constants.ZERO).eq(PlatformGroup::getAutoCall,Constants.ONE)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(allPlatformGroup)){
            return;
        }
        //过滤当前时间段不在时间内的月台组  AUTO_CALL_END_TIME  AUTO_CALL_START_TIME
        Integer nowHm = Integer.valueOf(DateUtil.getFomartDate(new Date(),"HH:mm").replaceAll(":",""));
        List<PlatformGroup> autoCallGroup = allPlatformGroup.stream().filter(
                i->StringUtils.isNotBlank(i.getAutoCallStartTime())&&StringUtils.isNotBlank(i.getAutoCallEndTime())
                        && Integer.valueOf(i.getAutoCallStartTime().replaceAll(":","")) < nowHm
                        && Integer.valueOf(i.getAutoCallEndTime().replaceAll(":","")) > nowHm
        ).collect(Collectors.toList());
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(autoCallGroup)){
            return;
        }
        //查询所有月台
        List<Platform> platformList = platformJoinMapper.selectList(new QueryWrapper<Platform>()
                .lambda()
                .eq(Platform::getIsdeleted,Constants.ZERO)
                .eq(Platform::getStatus,Constants.ZERO)
                .in(Platform::getId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(platformList)){
            return;
        }
        //循环所有自动叫号月台
        for (PlatformGroup platformGroup:autoCallGroup) {
            List<Platform> platforms = platformList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platformGroup.getId())).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(platforms)){
                continue;
            }
            Boolean isDefaul = false;
            if(Constants.equalsInteger(platforms.size(),Constants.ONE)){
                isDefaul = true;
            }else{
                //查询月台组下的月台是否同时存在整托和散托月台
                if((((platforms.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).collect(Collectors.toList()).size()>Constants.ZERO)?Constants.ONE:Constants.ZERO)
                                +
                                ((platforms.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList()).size()>Constants.ZERO)?Constants.ONE:Constants.ZERO)
                )==Constants.ONE
                ){
                    isDefaul = true;
                }
            }
            for (Platform platform:platforms) {
                //月台 å«å·å…¥å›­æ•°é‡
                Integer callReadyNum = platform.getCallReadyNum();
                //查询当前月台是否存在待开始作业数据 å¦‚果存在则直接跳过当前月台
                Integer callNum = platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getPlatformId,platform.getId())
                        .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey())).intValue();
                if(callNum>=callReadyNum){
                    continue;
                };
                //查询月台下 å¯ä»¥è¿›è¡Œå«å·çš„数据
                List<PlatformJob> platformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>()
                        .lambda()
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getPlatformGroupId, platformGroup.getId())
                        .apply("  t.`STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and t.PLATFORM_GROUP_ID = "+platformGroup.getId()+" ) ")
                        //排序方式 æœˆå°ä½œä¸šç±»åž‹ ï¼ˆå¼‚常挂起>叫号入园）>  åŠ æ€¥ >  ç­¾åˆ°æ—¶é—´
                        .orderByDesc(PlatformJob::getStatus,PlatformJob::getUrgeTime)
                        .orderByAsc(PlatformJob::getSignDate));
                if(CollectionUtils.isEmpty(platformJobList)){
                    continue;
                }
                for (int i = 0; i < callReadyNum - callNum ; i++) {
                    PlatformJob platformJob  = this.getAutoCallJob(platformJobList,platform,isDefaul,platformGroup);
                    JobOperateDTO jobOperateDTO = new JobOperateDTO();
                    jobOperateDTO.setJobId(platformJob.getId());
                    jobOperateDTO.setPlatformId(platform.getId());
                    PlatformJob callPlatformJob = this.platformInPark(jobOperateDTO);
                    platformJobList = platformJobList.stream().filter(j->!Constants.equalsInteger(j.getId(),platformJob.getId())).collect(Collectors.toList());
                    try{
                        if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
                            this.sendInPark(platformJob);
                        }
                        if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
                                && StringUtils.isNotBlank(platformJob.getBillCode())){
                            //通知WMS绑定月台信息
                            wmsService.orderPlatformBind(callPlatformJob);
                        }
                    }catch (Exception e){
                        logger.error("自动叫号入园权限下发失败：{}"+JSONObject.toJSONString(platform));
                    }
                }
            }
        }
    }



    /**
     * æœˆå°åˆ†é…ä»»åŠ¡
     * @param platformJobList æ‰€æœ‰æœˆå°ä¸‹å¯ä»¥åˆ†é…çš„任务
     * @param platform  æœˆå°
     * @param isDefaul  æ˜¯å¦åªæœ‰å•ç±»æœˆå°æˆ–者只有一个月台 true / false
     * @param platformGroup æœˆå°ç»„
     * @return
     */
    public PlatformJob getAutoCallJob(List<PlatformJob> platformJobList, Platform platform,Boolean isDefaul,PlatformGroup platformGroup){
        if(isDefaul){
            //月台下只有一类月台 ç›´æŽ¥è¿”回第一个任务
            return platformJobList.get(Constants.ZERO);
        }
        for (PlatformJob platformJob:platformJobList) {
            //叫号入园 æˆ–者异常挂起 åˆ™ç›´æŽ¥è¿›è¡Œå«å·
            if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey())
                    || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
                return platformJob;
            }
            //根据月台组判断 å«å·é€»è¾‘
            // æ–°åº“出库自动叫号规则
            // 1）如果单个运单仅包含单一品规，则自动分配至在整托盘月台进行作业；
            // 2）如果单个运单包含两个及以上的品规，则需要判断是否存在单个品规超过 500 ä»¶ä¸”该品规数量占整个运单任务量的 60%及以上，则自动分配至在整托盘 æœˆå°è¿›è¡Œæœˆå°ï¼›
            // 3）如若不满足以上两点，则自动分配至散件月台进行作业；
            if(Constants.equalsInteger(platformGroup.getType(),Constants.ONE)){
                //装货月台 - å‡ºåº“
                if(Objects.nonNull(platformJob.getWmsId())){
                    // WM推送任务
                    List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda()
                            .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
                            .eq(PlatformWmsDetail::getJobId,platformJob.getId()));
                    if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(platformWmsDetailList)){
                        continue;
                    }
                    //WMS推送任务 è¿å•ä»…包含单一品规（商品类型只有一类），则自动分配至在整托盘月台进行作业；
                    List<String> materialNameList = platformWmsDetailList.stream().map(i->i.getMaterialName()).collect(Collectors.toList());
                    Set<String> materialNameSet = new HashSet<>(materialNameList);
                    if(Constants.equalsInteger(materialNameSet.size(),Constants.ONE)&&Constants.equalsInteger(platform.getType(),Constants.ZERO)){
                        //单一品类 ä¸”当前循环月台为整托盘月台
                        return platformJob;
                    }else if(!Constants.equalsInteger(materialNameSet.size(),Constants.ONE)){
                        if(Constants.equalsInteger(platform.getType(),Constants.ZERO)){
                            //非单一品类
                            //如果单个运单包含两个及以上的品规，则需要判断是否存在单个品规超过 500 ä»¶ä¸”该品规数量占整个运单任务量的 60%及以上，则自动分配至在整托盘 æœˆå°è¿›è¡Œæœˆå°ï¼›
                            BigDecimal total = platformWmsDetailList.stream().map(i->i.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add);
                            BigDecimal compareTotal = new BigDecimal("500");
                            if((total.multiply(new BigDecimal("0.6")).compareTo(compareTotal)>Constants.ZERO)){
                                compareTotal = total.multiply(new BigDecimal("0.6"));
                            }
                            for (String name:materialNameSet) {
                                BigDecimal quanlity = platformWmsDetailList.stream().filter(i->i.getMaterialName().equals(name)).map(i->i.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add);
                                if(quanlity.compareTo(compareTotal)>Constants.ZERO){
                                    //超过规定数量 ä¸”当前月台为整托月台
                                    return platformJob;
                                }
                            }
                        }
                    }
                    //循环WMS任务 æœªåˆ†é…è‡³æ•´æ‰˜ç›˜æœˆå°åˆ™ç›´æŽ¥åˆ†é…åˆ°æ•£æ‰˜ç›˜æœˆå°
                    if(Constants.equalsInteger(platform.getType(),Constants.ONE)){
                        return platformJob;
                    }
                }else{
                    //物流车预约的任务 ç›´æŽ¥åˆ†é… æ•£æ‰˜ç›˜æœˆå°
                    if(Constants.equalsInteger(platform.getType(),Constants.TWO)){
                        return platformJob;
                    }
                }
            }else{
                //卸货月台 - å…¥åº“
                // 1）发货地为指定地区，如省外/芜湖，则自动分配至散件月台进行作业；（联营加工情况）
                // 2）其它场景，均自动分配至整托盘月台进行作业
                if(Objects.nonNull(platformJob.getWmsId())){
                    PlatformWmsJob platformWmsJob = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
                            .eq(PlatformWmsJob::getIsdeleted,Constants.ZERO)
                            .eq(PlatformWmsJob::getJobId,platformJob.getId())
                            .orderByDesc(PlatformWmsJob::getId)
                            .last(" limit 1")
                    );
                    if(Objects.isNull(platformWmsJob)){
                        continue;
                    }
                    //TODO æš‚无入库的数据
                    if(platformWmsJob.getCarrierName().equals("1") && Constants.equalsInteger(platform.getType(),Constants.ONE)){
                        return platformJob;
                    }
                    if(Constants.equalsInteger(platform.getType(),Constants.ZERO)){
                        return platformJob;
                    }
                }else{
                    //物流车预约的任务 ç›´æŽ¥åˆ†é… æ•£æ‰˜ç›˜æœˆå°
                    if(Constants.equalsInteger(platform.getType(),Constants.ZERO)){
                        return platformJob;
                    }
                }
            }
        }
        return null;
    }

}

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

@@ -11,6 +11,7 @@
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.WmsCarInParkDataResponse;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
@@ -845,4 +846,37 @@
        response.getData().add(rData);
        return  response;
    }


    @Override
    public WmsBaseResponse<List<WmsCarInParkDataResponse>> getCarInPark(WmsBaseRequest<String> param) {
        try {
            WmsBaseResponse<List<WmsCarInParkDataResponse>> wmsBaseResponse = new WmsBaseResponse();
            List<Retention> retentionList =  retentionMapper.selectList(new QueryWrapper<Retention>().lambda()
                            .eq(Retention::getIsdeleted,Constants.ZERO)
                    .in(Retention::getCarNo,param.getData()));
            List  list = new ArrayList<>();
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(retentionList)){
                for (String carNo:param.getData()) {
                    WmsCarInParkDataResponse wmsCarInParkDataResponse = new WmsCarInParkDataResponse();
                    wmsCarInParkDataResponse.setCarNo(carNo);
                    List<Retention> retentions = retentionList.stream().filter(i->i.getCarNo().equals(carNo)).collect(Collectors.toList());
                    wmsCarInParkDataResponse.setInPark(retentions.size()>Constants.ZERO?true:false);
                    if(wmsCarInParkDataResponse.getInPark()){
                        wmsCarInParkDataResponse.setEventDate(retentions.get(Constants.ZERO).getEventDate());
                    }
                    list.add(wmsCarInParkDataResponse);
                }

            }
            wmsBaseResponse.setSuccess(true);
            wmsBaseResponse.setMessage("获取成功");
            wmsBaseResponse.setData(list);
            return wmsBaseResponse;
        }catch (Exception e){
            log.error("【WMS】出库取消通知任务业务处理===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
    }

}

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

@@ -6,6 +6,7 @@
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsCarInParkDataResponse;
import com.doumee.dao.business.model.PlatformJob;

import java.util.List;
@@ -59,4 +60,6 @@


    void computjobTotalNum(List<Integer> jobList);

    WmsBaseResponse<List<WmsCarInParkDataResponse>> getCarInPark(WmsBaseRequest<String> param);
}