访客系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
k94314517
2024-10-31 ced29c2161c1ef6bd2a2d80af36e6b0a3534da16 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java


@@ -321,6 +321,7 @@


                .selectAs(Platform::getName,PlatformJob::getPlatformName)


                .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)


                .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)


                .select(" case when t.total_num is null  then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id  ) else t.total_num end ioQty ")


                .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)


                .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)


                .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)


@@ -362,8 +363,9 @@


        IPage<PlatformJob> platformJobIPage = platformJobJoinMapper.selectJoinPage(page,PlatformJob.class,queryWrapper);


        platformJobIPage.getRecords().forEach(i->{


            i.dealTime();


            this.getWmsJobData(i);


            this.queryWaitNum(i);


            i.setTotalNum(i.getIoQty());


//            this.getWmsJobData(i);


//            this.queryWaitNum(i);


        });


        return PageData.from(platformJobIPage);


    }


@@ -374,7 +376,6 @@


            || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zyczh)


            || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxcxh)


                || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxczh)) {




            PlatformWmsJob platformWmsJob = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()


                    .eq(PlatformWmsJob::getIsdeleted,Constants.ZERO)


                    .eq(PlatformWmsJob::getJobId,platformJob.getId())


@@ -406,11 +407,7 @@


                    }else{


                        platformJob.setLockStatus(Constants.ONE);   //部分上锁


                    }




                }








            }


        } 


    }


@@ -441,7 +438,8 @@


                    sumWorkRate = sumWorkRate.add(linePlatformJob.getTotalNum());


                }


                //计算预计等待时间


                List<Platform> platformList = platformJoinMapper.selectList(new QueryWrapper<Platform>().lambda().eq(Platform::getIsdeleted,Constants.ZERO).eq(Platform::getGroupId,platformJob.getPlatformGroupId()));


                List<Platform> platformList = platformJoinMapper.selectList(new QueryWrapper<Platform>().lambda()


                        .eq(Platform::getIsdeleted,Constants.ZERO).eq(Platform::getGroupId,platformJob.getPlatformGroupId()));


                BigDecimal workRate = platformList.stream().map(m->m.getWorkRate()).reduce(BigDecimal.ZERO,BigDecimal::add);


                if(sumWorkRate.compareTo(BigDecimal.ZERO) > Constants.ZERO && workRate.compareTo(BigDecimal.ZERO)  > Constants.ZERO ){


                    BigDecimal sumMinute = sumWorkRate.divide(workRate,1, RoundingMode.HALF_DOWN).multiply(BigDecimal.valueOf(60L));


@@ -1685,10 +1683,11 @@


    @Override


    public PlatformWorkVO getPlatformWorkVOById(Integer platformId){


        //获取月台下的所有作业数据


        List<PlatformJob> platformJobList =  platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()


        List<PlatformJob> allPlatformJobList =  platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()


                .selectAll(PlatformJob.class)


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc  limit 1  ) as newStartDate  ")


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc  limit 1  ) as newCallDate  ")


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+" order by pl.CREATE_DATE desc  limit 1  ) as newStartDate  ")


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.CALLED.getKey()+" order by pl.CREATE_DATE desc  limit 1  ) as newCallDate  ")


                .select(" case when t.total_num is null  then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id  ) else t.total_num end ioQty ")


                .selectAs(Platform::getName,PlatformJob::getPlatformName)


                .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)


                .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)


@@ -1708,13 +1707,13 @@


                )


                .orderByDesc(PlatformJob::getId)


        );


        for (PlatformJob platformJob:platformJobList) {


            //处理WSM数量


            this.getWmsJobData(platformJob);


            //查询前方排队数量


            this.queryWaitNum(platformJob);


        }


        PlatformWorkVO platformWorkVO = PlatformGroupServiceImpl.getPlatformWorkVO(platformJoinMapper.selectById(platformId),platformJobList);


//        List<PlatformJob> platformJobList = allPlatformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),platformId)).collect(Collectors.toList());


//        for (PlatformJob platformJob:platformJobList) {


//            platformJob.setTotalNum(platformJob.getIoQty());


//            //查询前方排队数量


//            this.queryWaitNum(platformJob);


//        }


        PlatformWorkVO platformWorkVO = PlatformGroupServiceImpl.getPlatformWorkVO(platformJoinMapper.selectById(platformId),allPlatformJobList);


        return platformWorkVO;


    }




@@ -1766,8 +1765,8 @@


                    .selectAs(Platform::getWorkRate, PlatformJob::getWorkRate)


                    .selectAs(Platform::getName, PlatformJob::getPlatformName)


                    .select(" case when t.total_num is null  then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id  ) else t.total_num end workNum ")


                    .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc  limit 1  ) as newStartDate  ")


                    .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc  limit 1  ) as newCallDate  ")


                    .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+"  order by pl.CREATE_DATE desc  limit 1  ) as newStartDate  ")


                    .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.CALLED.getKey()+" order by pl.CREATE_DATE desc  limit 1  ) as newCallDate  ")


                    .leftJoin(Platform.class, Platform::getId, PlatformJob::getPlatformId)


                    .eq(PlatformJob::getStatus, Constants.PlatformJobStatus.WORKING.getKey())


                    .eq(PlatformJob::getPlatformId, platform.getId())


@@ -1967,8 +1966,8 @@


                .selectAs(Platform::getName,PlatformJob::getPlatformName)


                .selectAs(PlatformGroup::getWaitCallTime,PlatformJob::getWorktimeOutAlarmTime)


                .select(" case when t.total_num is null  then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id  ) else t.total_num end workNum ")


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc  limit 1  ) as newStartDate  ")


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc  limit 1  ) as newCallDate  ")


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+"  order by pl.CREATE_DATE desc  limit 1  ) as newStartDate  ")


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.CALLED.getKey()+" order by pl.CREATE_DATE desc  limit 1  ) as newCallDate  ")


                .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)


                .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)


                .eq(PlatformJob::getIsdeleted,Constants.ZERO)


@@ -2052,7 +2051,7 @@


        List<PlatformJob> platformJobList =  platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()


                .selectAll(PlatformJob.class)


                .selectAs(Platform::getName,PlatformJob::getPlatformName)


                .select(" ( now() >= DATE_ADD( ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 " +


                .select(" ( now() >= DATE_ADD( ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.CALLED.getKey()+" " +


                        "order by pl.CREATE_DATE desc  limit 1  )  ,INTERVAL t2.WAIT_CALL_TIME MINUTE) ) as isTimeOut   ")


                .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)


                .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)


@@ -2084,7 +2083,7 @@


                .selectAs(Platform::getWorkRate, PlatformJob::getWorkRate)


                .selectAs(Platform::getWorkTimeoutAlarmTime, PlatformJob::getWorktimeOutAlarmTime)


                .select(" case when t.total_num is null  then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id  ) else t.total_num end workNum ")


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc  limit 1  ) as newStartDate  ")


                .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+"  order by pl.CREATE_DATE desc  limit 1  ) as newStartDate  ")


                .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)


                .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())


                .eq(PlatformJob::getInOut,Constants.ONE)