义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
zhoushihao
2024-07-29 b610921461e3afa6f1f1271428136dead3372afe 
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java


@@ -21,6 +21,7 @@


import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;


import com.mes.common.S7object;


import com.mes.common.config.Const;


import com.mes.common.utils.RedisUtil;


import com.mes.damage.entity.Damage;


import com.mes.damage.service.DamageService;


import com.mes.device.PlcParameterObject;


@@ -65,6 +66,9 @@


    private TemperingGlassInfoService temperingGlassInfoService;


    @Resource


    private DamageService damageService;




    @Resource


    private RedisUtil redisUtil;




    private static final String REQUEST_WORD = "1";




@@ -179,11 +183,6 @@


        String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();


        String d04Id = plcParameterObject.getPlcParameter("D04ID").getValue();


        log.info("1、获取d01Id扫描ID为：{};获取d04Id扫描ID为：{};", d01Id, d04Id);


        //两条线都有进卧转立任务，直接结束


//        if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d04Id)) {


//            log.info("两条线都存在进片任务，结束任务");


//            return;


//        }


        //获取两条线卧转立是否有玻璃，且任务状态为1/2


        List<Integer> lineList = bigStorageCageFeedTaskService.querySitToUpGlass();


        if (CollectionUtils.isEmpty(lineList)) {


@@ -250,15 +249,19 @@


        Date startDate = new Date();


        log.info("大理片笼空车进片任务开始执行时间：{}", startDate);


        PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;


        String e02State = plcMesObject.getPlcParameter("E02State").getAddress();


        String e02State = plcMesObject.getPlcParameter("E02State").getValue();


        if (REQUEST_WORD.equals(e02State)) {


            log.info("出片忙碌，结束出片任务");


            return;


        }


        String mesToPLCAddress = plcMesObject.getPlcParameter("MESToPLC").getAddress();


        List<BigStorageCageOutTask> outingList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_NEW));


        Assert.isTrue(CollectionUtils.isEmpty(outingList), "有正在执行出片的任务，结束当前出片线程");




        List<BigStorageCageOutTask> outingList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>()


                .eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_NEW));


        if (CollectionUtils.isNotEmpty(outingList)) {


            log.info("有正在执行出片的任务，结束当前出片线程");


            return;


        }


        if (redisUtil.getCacheObject("temperingSwitch")) {


        //是否有正在钢化的玻璃


        List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()


                .selectAll(TemperingGlassInfo.class)


@@ -306,7 +309,8 @@


                }


            }


        }


        //未到齐 执行内部调度任务


        }


        //执行内部调度任务


        TemperingLayoutDTO temperingOccupySlot = bigStorageCageDetailsService.queryTemperingOccupySlot();


        if (null != temperingOccupySlot) {


            List<SlotSequenceDTO> slotSequenceList = bigStorageCageDetailsService.queryGlassMaxAndMin(temperingOccupySlot.getEngineerId(), temperingOccupySlot.getTemperingLayoutId());


@@ -315,12 +319,25 @@


                SlotSequenceDTO second = slotSequenceList.get(i + 1);


                int slotWidth = carWidth - first.getRemainWidth() - glassGap;


                if (first.getMinSequence() == second.getMaxSequence() + 1


                        && second.getRemainWidth() > slotWidth) {


                        && second.getRemainWidth() > slotWidth && slotWidth >= 0) {




                    List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()


                            .eq(BigStorageCageDetails::getSlot, first.getSlot()).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN));


                    List<BigStorageCageOutTask> outTasks = list.stream().map(e -> new BigStorageCageOutTask(e.getGlassId(), first.getSlot(), second.getSlot(),


                            e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1)).collect(Collectors.toList());


                            .eq(BigStorageCageDetails::getSlot, first.getSlot()).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)


                            .orderBy(Boolean.TRUE, sequenceOrder, BigStorageCageDetails::getTemperingFeedSequence));


                    if (CollectionUtils.isNotEmpty(list)) {


                        List<BigStorageCageOutTask> outTasks = new ArrayList<>();


                        int serialNumber = 1;


                        for (BigStorageCageDetails item : list) {


                            outTasks.add(new BigStorageCageOutTask(item.getGlassId(), first.getSlot(), second.getSlot(),


                                    item.getWidth() * 10, item.getHeight() * 10, 1, serialNumber++, Const.BIG_STORAGE_OUT_NEW));


                        }


                        //新增调度任务


                    bigStorageCageOutTaskService.saveBatch(outTasks);


                        //更新理片笼详情表调度的后的玻璃位置信息：生成任务后先将玻璃格子位置进行调整，玻璃状态改为调度中，新增调度完成任务，处理调度完成后玻璃状态改为100.


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


                        bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>().set(BigStorageCageDetails::getState, Const.GLASS_STATE_SCHEDULE_ING)


                                .set(BigStorageCageBaseInfo::getSlot, second.getSlot()).eq(BigStorageCageDetails::getGlassId, glassList));


                    }




                    //向plc写入确认字


                    int returnData = 0;


@@ -650,27 +667,36 @@


        List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();


        //打车剩余尺寸


        Integer remainWidth = carWidth;


        int trainNumber = 1;


        int serialNumber = 1;


        int maxX = 0;


        for (T e : list) {


            if (bigStorageCageOutTaskList.size() >= outCarMaxSize || e.getWidth() > remainWidth) {


                break;


            int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());


            if (bigStorageCageOutTaskList.size() >= outCarMaxSize || maxLength > remainWidth) {


                remainWidth = carWidth;


                trainNumber = trainNumber + 1;


                serialNumber = 1;


                maxX = 0;


                continue;


            }


            remainWidth = remainWidth - (int) e.getWidth() - glassGap;


            remainWidth = remainWidth - maxLength - glassGap;


            if (isTempering) {


                int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());


                if (maxX + minLength <= xMaxSize) {


                    bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,


                            e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1));


                            e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1));


                    maxX = Math.max(maxX, e.getXCoordinate());


                } else {


                    break;


                    remainWidth = carWidth;


                    trainNumber = trainNumber + 1;


                    serialNumber = 1;


                    maxX = 0;


                    continue;


                }




            } else {


                bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,


                        e.getWidth() * 10, e.getHeight(), 0, 0, 1));


                        e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1));


            }




        }


        Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "未获取出片数据，结束出片任务");


        log.info("获取出片任务数据{}条，执行保存", bigStorageCageOutTaskList.size());


@@ -680,9 +706,6 @@


        bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()


                .set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)


                .in(BigStorageCageDetails::getGlassId, glassIds));


        //更新笼子内格子的剩余尺寸(移至出片任务完成后)


//        updateSlotRemain(list, glassIds);




        int returnData = 0;


        int count = 1;


        while (returnData == 0) {