最新版本541200007

doum

19 小时以前 5ffe34a87c27f73bc92b2ac0c58e6894ec61792b

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

@@ -1000,11 +1000,40 @@
                emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                SmsConstants.platformJobContent.platformJobCallIn,null,null
        );
        

        //公众号模板消息
        if(Objects.nonNull(platformJob.getDrivierPhone())) {
          this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobCallIn,platformJob);
            this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobCallIn,platformJob);
        }
        return platformJob;
    }
    public PlatformJob platformInParkBiz(PlatformJob platformJob,  Platform platform ){
        platformJob.setPlatformId(platform.getId());
        platformJob.setPlatformName(platform.getName());
        //判断是否需要填充进去
        if(StringUtils.isBlank(platformJob.getPlatforms())){
            platformJob.setPlatforms(platform.getId().toString());
            platformJob.setPlatformNames(platform.getName());
        }else{
            if(!Constants.equalsInteger(platform.getId(),platformJob.getPlatformId())){
                platformJob.setPlatforms(platformJob.getPlatforms() + "," +platformJob.getPlatformId().toString());
                platformJob.setPlatformNames(platformJob.getPlatformNames() + "," +platform.getName());
            }
        }

        PlatformJob oldPlatformJob = new PlatformJob();
        BeanUtils.copyProperties(platformJob,oldPlatformJob);
        platformJob.setPlatformId(platform.getId());
        platformJob.setInwaitDate(new Date());
        platformJob.setStatus(Constants.PlatformJobStatus.IN_WAIT.getKey());
        platformJob.setEditDate(new Date());
        platformJobMapper.updateById(platformJob);

        //存储操作日志
        savePlatformLog(Constants.PlatformJobLogType.IN_WAIT.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.IN_WAIT.getInfo());


        return platformJob;
    }

@@ -1207,7 +1236,7 @@
        ) ){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,业务状态已流转！");
        }
        

        Platform platform = platformJoinMapper.selectById(jobOperateDTO.getPlatformId());
        if(Objects.isNull(platform)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到月台信息");
@@ -1226,6 +1255,7 @@
        BeanUtils.copyProperties(platformJob,oldPlatformJob);

        platformJob.setCallDate(Objects.isNull(platformJob.getCallDate())?new Date():null);
        platformJob.setCallWay(0);
        platformJob.setCallUserId(Objects.isNull(jobOperateDTO.getLoginUserInfo())?null:jobOperateDTO.getLoginUserInfo().getId());
        platformJob.setStatus(Constants.PlatformJobStatus.CALLED.getKey());
        platformJob.setPlatformId(jobOperateDTO.getPlatformId());
@@ -1265,6 +1295,34 @@
                Constants.PlatformBroadcastContent.CALLING.getInfo()+ Constants.PlatformBroadcastContent.CALLING.getInfo() + Constants.PlatformBroadcastContent.CALLING.getInfo()
        );

        platformJob.setPlatformWmsCode(platform.getCode());
        return platformJob;
    }
    public PlatformJob platformCallNumberBiz( PlatformJob platformJob ,Platform platform ){
        platformJob.setPlatformId(platform.getId());
        PlatformJob oldPlatformJob = new PlatformJob();
        BeanUtils.copyProperties(platformJob,oldPlatformJob);
        platformJob.setCallDate(Objects.isNull(platformJob.getCallDate())?new Date():null);
        platformJob.setCallWay(Constants.ONE);
        platformJob.setStatus(Constants.PlatformJobStatus.CALLED.getKey());
        platformJob.setPlatformId(platform.getId());
        //判断是否需要填充进去
        if(StringUtils.isBlank(platformJob.getPlatforms())){
            platformJob.setPlatforms(platform.getId().toString());
            platformJob.setPlatformNames(platform.getName());
        }else{
            if(!Constants.equalsInteger(platform.getId(),platformJob.getPlatformId())){
                platformJob.setPlatforms(platformJob.getPlatforms() + "," +platform.getId().toString());
                platformJob.setPlatformNames(platformJob.getPlatformNames() + "," +platform.getName());
            }
        }
        platformJob.setEditDate(new Date());
        platformJobMapper.updateById(platformJob);

        //存储操作日志
        savePlatformLog(Constants.PlatformJobLogType.CALLED.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.CALLED.getInfo().replace("{data}",platform.getName()));
        platformJob.setPlatformName(platform.getName());
        platformJob.setPlatformWmsCode(platform.getCode());
        return platformJob;
    }
@@ -2576,6 +2634,7 @@
    }

    @Override
    @Transactional
    public void autoPlatformCallCar(WmsService wmsService){
        //查询当前开启的月台数据
        List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda().eq(PlatformGroup::getStatus,Constants.ZERO)
@@ -2608,6 +2667,8 @@
            log.error("========月台自动叫号============结束：无自动叫号月台");
            return;
        }

        List<PlatformJob> noticeList = new ArrayList<>();
        //循环所有自动叫号月台
        for (PlatformGroup platformGroup:autoCallGroup) {
            List<Platform> platforms = platformList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platformGroup.getId())).collect(Collectors.toList());
@@ -2615,23 +2676,30 @@
                log.error("========月台自动叫号============结束：无自动叫号月台-"+platformGroup.getName());
                continue;
            }
            log.error("========月台自动叫号============有自动叫号月台--"+platformGroup.getName());
            Boolean isDefaul = false;
            if(Constants.equalsInteger(platforms.size(),Constants.ONE)){
                isDefaul = true;
            }else{
                int t1 =0,t0=0;
                //查询月台组下的月台是否同时存在整托和散托月台
                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
                ){
                for(Platform i : platforms){
                    if(Constants.equalsInteger(i.getType(),Constants.ONE)){
                        t1 ++;
                    }else{
                        t0 ++;
                    }
                }
                if(t1 == 0 ||  t0 ==0){
                    isDefaul = true;
                }
            }


            for (Platform platform:platforms) {
                log.error("========月台自动叫号============开始处理找月台作业--"+platform.getName());
                //月台 叫号入园数量
                Integer workingNum = platform.getWorkingNum();
                Integer workingNum = Constants.formatIntegerNum(platform.getWorkingNum());
                //查询当前月台是否存在月台叫号数据 如果大于等于可叫号数量 则跳过
                Integer workNum = platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
@@ -2659,33 +2727,60 @@
                        .orderByDesc(PlatformJob::getStatus,PlatformJob::getUrgeTime)
                        .orderByAsc(PlatformJob::getSignDate));
                if(CollectionUtils.isEmpty(platformJobList)){
                    log.error("========月台自动叫号============结束：无满足条件的作业1-"+platform.getName());
                    log.error("========月台自动叫号============结束：无满足条件的集合1-"+platform.getName());
                    continue;
                }
                for (int i = 0; i < workingNum - workNum ; i++) {
                log.error("========月台自动叫号============有满足条件的作业集合--"+platform.getName());
                for (int i = 0; i < workingNum - workNum && platformJobList.size()>0; i++) {
                    if(platformJobList== null || platformJobList.size() ==0){
                        break;
                    }
                    PlatformJob platformJob  = this.getAutoCallJob(platformJobList,platform,isDefaul,platformGroup);
                    if(Objects.isNull(platformJob)){
                        log.error("========月台自动叫号============结束：无满足条件的作业2-"+platform.getName());
                        continue;
                        break;
                    }
                    JobOperateDTO jobOperateDTO = new JobOperateDTO();
                    jobOperateDTO.setJobId(platformJob.getId());
                    jobOperateDTO.setPlatformId(platform.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);
                    PlatformJob callPlatformJob = this.platformCallNumberBiz(platformJob,platform);
                    noticeList.add(callPlatformJob );
                    List<PlatformJob> newList = new ArrayList<>();
                    for(PlatformJob j :platformJobList ){
                        if(!Constants.equalsInteger(j.getId(),platformJob.getId())){
                            newList.add(j);
                        }
                        if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
                                && StringUtils.isNotBlank(platformJob.getBillCode())){
                            //通知WMS绑定月台信息
                            wmsService.orderPlatformBind(callPlatformJob);
                        }
                    }catch (Exception e){
                        log.error("月台自动叫号权限下发失败：{}"+JSONObject.toJSONString(platform));
                    }
                    platformJobList = newList;
//                    platformJobList = platformJobList.stream().filter(j->!Constants.equalsInteger(j.getId(),platformJob.getId())).collect(Collectors.toList());
                }
            }
        }
        if(noticeList.size()>0){
            for(PlatformJob platformJob : noticeList){
                //发送短信信息
                SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                        emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                        SmsConstants.platformJobContent.platformJobSingIn,platformJob.getPlatformName(),null
                );

                //公众号模板消息
                if(Objects.nonNull(platformJob.getDrivierPhone())){
                    this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobSingIn,platformJob);
                }
                //广播 led通知
                platformJob.setPlatformName(platformJob.getPlatformName());
                this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.CALLING.getInfo(),
                        Constants.PlatformBroadcastContent.CALLING.getInfo()+ Constants.PlatformBroadcastContent.CALLING.getInfo() + Constants.PlatformBroadcastContent.CALLING.getInfo()
                );
                try{
                    this.sendInPark(platformJob);
                    if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
                            && StringUtils.isNotBlank(platformJob.getBillCode())){
                        //通知WMS绑定月台信息
                        wmsService.orderPlatformBind(platformJob);
                    }
                }catch (Exception e){
                    log.error("月台自动叫号权限下发失败：{}"+JSONObject.toJSONString(platformJob));
                }

            }
        }
    }
@@ -2693,6 +2788,7 @@


    @Override
    @Transactional
    public void autoCallInParkCar(WmsService wmsService){
        //查询当前开启的月台数据
        List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda().eq(PlatformGroup::getStatus,Constants.ZERO)
@@ -2716,12 +2812,13 @@
                .lambda()
                .eq(Platform::getIsdeleted,Constants.ZERO)
                .eq(Platform::getStatus,Constants.ZERO)
                .isNotNull(Platform::getCallReadyNum)
//                .isNotNull(Platform::getCallReadyNum)
                .in(Platform::getGroupId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(platformList)){
            return;
        }
        List<PlatformJob> noticeList = new ArrayList<>();
        //循环所有自动叫号月台
        for (PlatformGroup platformGroup:autoCallGroup) {
            List<Platform> platforms = platformList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platformGroup.getId())).collect(Collectors.toList());
@@ -2743,7 +2840,7 @@
            }
            for (Platform platform:platforms) {
                //月台 叫号入园数量
                Integer callReadyNum = platform.getCallReadyNum();
                Integer callReadyNum = Constants.formatIntegerNum(platform.getCallReadyNum());
                //查询当前月台是否存在待开始作业数据 如果存在则直接跳过当前月台
                Integer callNum = platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
@@ -2752,6 +2849,7 @@
                if(callNum>=callReadyNum){
                    continue;
                };

                //查询月台下 可以进行叫号的数据
                List<PlatformJob> platformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>()
                        .lambda()
@@ -2764,25 +2862,40 @@
                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){
                        log.error("自动叫号入园权限下发失败：{}"+JSONObject.toJSONString(platform));
                for (int i = 0; i < callReadyNum - callNum && platformJobList.size()>0 ; i++) {
                    if(platformJobList== null || platformJobList.size() ==0){
                        break;
                    }
                    PlatformJob platformJob  = this.getAutoCallJob(platformJobList,platform,isDefaul,platformGroup);
                    if(platformJob ==null){
                        break;
                    }
                    PlatformJob callPlatformJob = this.platformInParkBiz(platformJob,platform);
                    noticeList.add(callPlatformJob);
                    platformJobList = platformJobList.stream().filter(j->!Constants.equalsInteger(j.getId(),platformJob.getId())).collect(Collectors.toList());
                }
            }
        }
        if(noticeList.size()>0){
            for(PlatformJob platformJob :noticeList){
                //发送短信信息
                SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                        emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                        SmsConstants.platformJobContent.platformJobCallIn,null,null
                );
                //公众号模板消息
                if(Objects.nonNull(platformJob.getDrivierPhone())) {
                    this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobCallIn,platformJob);
                }
                try{
                    this.sendInPark(platformJob);
                    if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
                            && StringUtils.isNotBlank(platformJob.getBillCode())){
                        //通知WMS绑定月台信息
                        wmsService.orderPlatformBind(platformJob);
                    }
                }catch (Exception e){
                    log.error("自动叫号入园权限下发失败：{}"+JSONObject.toJSONString(platformJob));
                }
            }
        }
@@ -2790,31 +2903,37 @@




    /**
     * 月台分配任务
     * @param platformJobList 所有月台下可以分配的任务
     * @param platform  月台
     * @param isDefaul  是否只有单类月台或者只有一个月台 true / false
     * @param platformGroup 月台组
     * @return
     */
    public PlatformJob getAutoCallJob(List<PlatformJob> platformJobList, Platform platform,Boolean isDefaul,PlatformGroup platformGroup){
        if(platformJobList.size() ==0){
            return  null;
        }
        if(isDefaul){
            //月台下只有一类月台 直接返回第一个任务
            return platformJobList.get(Constants.ZERO);
        }
        for (PlatformJob platformJob:platformJobList) {
            log.error("月台自动叫号========开始找作业："+platformJob.getId());
            //叫号入园 或者异常挂起 则直接进行叫号
            if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey())
                    || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
                return platformJob;
            }
            int typeParam = 1;// 0整托 1散件
            //根据月台组判断 叫号逻辑
            // 新库出库自动叫号规则
            // 1）如果单个运单仅包含单一品规，则自动分配至在整托盘月台进行作业；
            // 2）如果单个运单包含两个及以上的品规，则需要判断是否存在单个品规超过 500 件且该品规数量占整个运单任务量的 60%及以上，则自动分配至在整托盘 月台进行月台；
            // 3）如若不满足以上两点，则自动分配至散件月台进行作业；
            if(Constants.equalsInteger(platformGroup.getType(),Constants.ONE)){
                typeParam = 1;
                //装货月台 - 出库
                if(Constants.equalsInteger(platformJob.getOrigin(),Constants.ONE)){
                    // WM推送任务
@@ -2827,79 +2946,67 @@
                    //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)){
                    if(Constants.equalsInteger(materialNameSet.size(),Constants.ONE)){
                        //单一品类 且当前循环月台为整托盘月台
                        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;
                                }
                        typeParam = 0;// 0整托
                    }else  if(materialNameSet.size()> Constants.ONE){
                        boolean isZhengtuo = false;
                        //非单一品类
                        //如果单个运单包含两个及以上的品规，则需要判断是否存在单个品规超过 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(Constants.formatBigdecimal(quanlity).compareTo(compareTotal)>Constants.ZERO){
                                //超过规定数量 且当前月台为整托月台
                                isZhengtuo =true;
                                typeParam = 0;// 0整托
                            }
                        }
                    }
                    return null;
//                    //循环WMS任务 未分配至整托盘月台则直接分配到散托盘月台
//                    if(Constants.equalsInteger(platform.getType(),Constants.ONE)){
//                        return platformJob;
//                    }
                }else{
                    //物流车预约的任务 直接分配 散托盘月台
                    if(Constants.equalsInteger(platform.getType(),Constants.TWO)){
                        return platformJob;
                    }
                }
            }else{
                typeParam = 0;//默认整托
                //卸货月台 - 入库
                // 1）发货地为指定地区，如省外/芜湖，则自动分配至散件月台进行作业；（联营加工情况）
                // 2）其它场景，均自动分配至整托盘月台进行作业
                if(Objects.nonNull(platformJob.getWmsId())){
                if(Constants.equalsInteger(platformJob.getOrigin(),Constants.ONE)){
                    PlatformWmsJob platformWmsJob = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
                            .eq(PlatformWmsJob::getIsdeleted,Constants.ZERO)
                            .eq(PlatformWmsJob::getJobId,platformJob.getId())
                            .orderByDesc(PlatformWmsJob::getId)
                            .last(" limit 1")
                    );
                            .last(" limit 1"));
                    if(Objects.isNull(platformWmsJob)){
                        continue;
                    }
                    SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.IN_REPERTOTY_CODE);
                    if(Objects.nonNull(systemDictData)){
                    if( Objects.nonNull(systemDictData)){
                        //判断放置位置
                        if(platformWmsDetailMapper.selectCount(new QueryWrapper<PlatformWmsDetail>().lambda().eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
                                .eq(PlatformWmsDetail::getWmsJobId,platformWmsJob.getId())
                                .apply(" find_in_set(IN_REPERTOTY_CODE ,'"+systemDictData.getCode()+"')")
                                .eq(PlatformWmsDetail::getInRepertotyCode,"")
                                .isNotNull(PlatformWmsDetail::getInRepertotyCode)
                        ) > Constants.ZERO && Constants.equalsInteger(platform.getType(),Constants.ONE)){
                            return platformJob;
                        ) > Constants.ZERO ){//指定区域分配到散件月台
                            typeParam = 1;//
                        }
                    }
                    if(Constants.equalsInteger(platform.getType(),Constants.ZERO)){
                        return platformJob;
                    }
                }else{
                    //物流车预约的任务 直接分配 散托盘月台
                    if(Constants.equalsInteger(platform.getType(),Constants.ZERO)){
                        return platformJob;
                    }
                }
            }

            log.error("月台自动叫号========开始找作业结果："+platformJob.getId()+"============"+platform.getType()+"===="+typeParam);
            if(  Constants.equalsInteger(platform.getType(),typeParam)){
                log.error("月台自动叫号========找到了作业："+platform.getName() );
                return platformJob;
            }
        }
        return null;
    }



    @Override
    public void jobUrge(Integer jobId,LoginUserInfo loginUserInfo){
        if(Objects.isNull(jobId)){