义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
ZengTao
2024-09-09 09bb613cb75774426df43ecd5152aeac35e5315c 
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java


@@ -30,6 +30,7 @@


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.scheduling.annotation.Async;


import org.springframework.scheduling.annotation.Scheduled;


import org.springframework.stereotype.Component;




@@ -80,6 +81,7 @@






    @Scheduled(fixedDelay = 300)


    @Async


    public void plcHomeEdgTask() {


        PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;


        String requestWord = plcParameterObject.getPlcParameter("requestWord").getValue();


@@ -129,6 +131,7 @@


    }




    @Scheduled(fixedDelay = 300)


    @Async


    public void plcShelfFull() {


        List<DownWorkstation> list = downGlassInfoService.queryWorkStationIsFull();


        if (CollectionUtils.isNotEmpty(list)) {


@@ -139,6 +142,7 @@


    }




    @Scheduled(fixedDelay = 1000)


    @Async


    public void dealDamageTask() {


        Date startDate = new Date();


        log.info("下片破损玻璃清除任务开始执行时间：{}", startDate);


@@ -149,6 +153,20 @@


            List<String> glassList = downGlassTaskList.stream().map(DownGlassTask::getGlassId).collect(Collectors.toList());


            //将任务表中的数据删除


            downGlassTaskService.remove(new LambdaQueryWrapper<DownGlassTask>().in(DownGlassTask::getTaskType, Const.GLASS_CACHE_TYPE_OUT_ALL).in(DownGlassTask::getGlassId, glassList));


            //清除下片玻璃信息表数据


            downGlassInfoService.remove(new LambdaQueryWrapper<DownGlassInfo>().in(DownGlassInfo::getGlassId, glassList));


            //下片数量-1


            for (DownGlassTask downGlassTask : downGlassTaskList


            ) {


                if (Const.GLASS_CACHE_TYPE_OUT_ALL.equals(downGlassTask.getTaskType())) {


                    downWorkstationService.update(


                            new LambdaUpdateWrapper<DownWorkstation>()


                                    .setSql("racks_number = racks_number-1")


                                    .eq(DownWorkstation::getWorkstationId, downGlassTask.getEndCell())


                    );




                }


            }


            List<Damage> damageList = downGlassTaskList.stream().map(e -> {


                Damage damage = new Damage();


                damage.setGlassId(e.getGlassId());


@@ -169,6 +187,7 @@


     * 更新已绑定工位流程卡的破损/拿走的数量信息


     */


    @Scheduled(fixedDelay = 1000)


    @Async


    public void updateWorkStationOtherCount() {


        Date startDate = new Date();


        log.info("下片破更新损玻璃数量任务开始执行时间：{}", startDate);


@@ -229,6 +248,7 @@


                    log.info("有空架子,将流程卡与架子好绑定，执行进片任务 结束");


                    //绑定流程卡


                    downWorkstationService.updateFlowCardIdAndCount(glassInfo.getFlowCardId(), list.get(0).getWorkstationId(), glassInfo.getLayer());


//                    downWorkstationService.updateFlowCardIdAndCount(glassInfo.getFlowCardId(), list.get(0).getId(), glassInfo.getLayer());


                    checkFlag = Boolean.TRUE;


                }


            }


@@ -277,12 +297,18 @@


        //将任务插入理片笼详情表


        DownStorageCageDetails downStorageCageDetails = new DownStorageCageDetails();


        BeanUtils.copyProperties(glassInfo, downStorageCageDetails);


        //当需要合并落架时不绑定层号


        if(glassInfo.getCombine()==0){


            downStorageCageDetails.setLayer(null);


        }


        downStorageCageDetails.setState(Const.GLASS_STATE_IN);


        downStorageCageDetails.setSlot(nearestEmpty.getSlot());


        downStorageCageDetails.setDeviceId(nearestEmpty.getDeviceId());


        downStorageCageDetailsService.save(downStorageCageDetails);


        //        生成进片任务


        initDownGlassTask(glassInfo, 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);


        //删除理片笼表拿走/破损数据数据


        damageService.deleteByGlassId(glassInfo.getGlassId());


    }




    public Boolean outTo(String glassStatus06, String out08Glassstate, String glassStatus11, String


@@ -299,6 +325,10 @@


        if (StringUtils.isNotBlank(glassId)) {


            GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));


            BeanUtils.copyProperties(glassInfo, cageDetails);


            //当需要合并落架时不绑定层号


            if(glassInfo.getCombine()==0){


                cageDetails.setLayer(null);


            }


            //获取当前笼子空格信息


            DownStorageCage empty = downStorageCageService.selectCacheEmpty(Integer.parseInt(currentSlot), Boolean.TRUE);


            cageDetails.setSlot(empty.getSlot());


@@ -367,11 +397,21 @@


        List<Integer> workList = new ArrayList();


        if (flag08) {


            if (!"2".equals(glassStatus11)) {


                workList.addAll(Const.G11_WORK_STATION);


                List<Integer> wroklistOne = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()


                        .eq(DownWorkstation::getEnableState, Const.SLOT_ON).in(DownWorkstation::getWorkstationId, Const.G11_WORK_STATION))


                        .stream()


                        .map(DownWorkstation::getWorkstationId)


                        .collect(Collectors.toList());


                workList.addAll(wroklistOne);


            }


        } else {


            if (!"2".equals(glassStatus06)) {


                workList.addAll(Const.G06_WORK_STATION);


                List<Integer> wroklistTwo = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()


                        .eq(DownWorkstation::getEnableState, Const.SLOT_ON).in(DownWorkstation::getWorkstationId, Const.G06_WORK_STATION))


                        .stream()


                        .map(DownWorkstation::getWorkstationId)


                        .collect(Collectors.toList());


                workList.addAll(wroklistTwo);


            }


        }


        List<Integer> workStationAll = Arrays.asList(1, 2, 3, 4, 5, 6);


@@ -580,15 +620,24 @@


            if (null != emptyDownWorkstation) {


                log.info("获取到空架子信息，绑定流程卡");


                downWorkstationService.updateFlowCardIdAndCount(downStorageCageDetails.getFlowCardId(), emptyDownWorkstation.getWorkstationId(), downStorageCageDetails.getLayer());


//                downWorkstationService.updateFlowCardIdAndCount(downStorageCageDetails.getFlowCardId(), emptyDownWorkstation.getId(), downStorageCageDetails.getLayer());


                endCell = emptyDownWorkstation.getWorkstationId();


            } else {


                //todo:增加虚拟工位,绑定流程卡


//                downWorkstationService.insertDownWorkstation();


//                endCell = Const.G13_WORK_STATION;


//                downWorkstationService.updateFlowCardIdAndCount(downStorageCageDetails.getFlowCardId(), emptyDownWorkstation.getId(), downStorageCageDetails.getLayer());


                log.info("没有空架子信息，无法绑定流程卡");


                return Boolean.FALSE;


            }


        } else {


            DownWorkstation workstation = downWorkstationService.getOne(new LambdaUpdateWrapper<DownWorkstation>()


                    .eq(DownWorkstation::getFlowCardId, downStorageCageDetails.getFlowCardId()).eq(DownWorkstation::getLayer, downStorageCageDetails.getLayer()));


            endCell = workstation.getWorkstationId();


            if (downStorageCageDetails.getWidth() > maxWidth || downStorageCageDetails.getHeight() > maxHeight) {


                endCell = Const.G13_WORK_STATION;


            } else {


                DownWorkstation workstation = downWorkstationService.getOne(new LambdaUpdateWrapper<DownWorkstation>()


                        .eq(DownWorkstation::getFlowCardId, downStorageCageDetails.getFlowCardId()).eq(DownWorkstation::getLayer, downStorageCageDetails.getLayer()));


                endCell = workstation.getWorkstationId();


            }


        }


        //更新落架玻璃数量


        if (endCell == Const.G13_WORK_STATION) {


@@ -610,6 +659,8 @@


        //生成任务信息


        GlassInfo glassInfo = new GlassInfo();


        BeanUtils.copyProperties(downStorageCageDetails, glassInfo);


        //删除理片笼表拿走/破损数据数据


        damageService.deleteByGlassId(glassInfo.getGlassId());


        return initDownGlassTask(glassInfo, downStorageCageDetails.getSlot(), endCell, taskType);


    }