Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-11-12 ae1459d90f53ac81177e75790d859c6a12e7ed54

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java

@@ -117,6 +117,8 @@
    private static final String ALARM_TYPE = "中空大理片";
    private static final String ALARM_CODE_SIZE = "sizeSame";
    private static final String ALARM_CODE_ID = "idSame";
    private static final String ALARM_CODE_SLOT = "slotLess";
    private static final String ALARM_CODE_OVER = "overSize";

    /**
     * 直通格子
@@ -157,14 +159,17 @@

        List<BigStorageCageTask> inTaskList = new ArrayList();
        Integer from = s7DataZKDLPOne.getFrom1();
        List<Integer> states = s7DataZKDLPOne.getStates();
        List<String> glassIdList = new ArrayList<>();
        List<String> requestWords = s7DataZKDLPOne.getIds();
        for (int i = 1; i <= 6; i++) {
            String requestWord = requestWords.get(i - 1);
            Integer state = states.get(i - 1);
            if (null != requestWord && !requestWord.isEmpty()) {
                BigStorageCageTask task = new BigStorageCageTask();
                task.setGlassId(requestWord);
                task.setStartSlot(from);
                task.setTaskState(state);
                inTaskList.add(task);
                glassIdList.add(requestWord);
                continue;
@@ -172,6 +177,12 @@
        }
        if (CollectionUtil.isEmpty(inTaskList)) {
            log.info("当前大车无进片玻璃，结束进片任务");
            return;
        }
        //玻璃状态存在卧转立上结束
        List<BigStorageCageTask> unTaskList = inTaskList.stream().filter(e -> e.getTaskState() < 1).collect(Collectors.toList());
        if (CollectionUtil.isNotEmpty(unTaskList)) {
            log.info("存在未上车的玻璃信息,玻璃：{}", unTaskList);
            return;
        }
        log.info("获取任务的玻璃id：{}", glassIdList);
@@ -236,6 +247,13 @@
                    .ge(HollowBigStorageCage::getMaxThickness, entry.getKey()));
            if (count < entry.getValue()) {
                log.info("笼内格子剩余数量不足，结束本次进片");
                ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
                alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
                alarmInfo.setAlarmModule(ALARM_MODULE);
                alarmInfo.setAlarmType(ALARM_TYPE);
                alarmInfo.setAlarmCode(ALARM_CODE_SLOT);
                alarmInfo.setAlarmMessage(count + "");
                productAlarmInfoService.save(alarmInfo);
                //向plc发送报警:笼内格子剩余数量不足
                s7DataZKDLPOne = new S7DataZKDLPOne();
                s7DataZKDLPOne.setAlramSignal(16);
@@ -450,6 +468,7 @@
            //nothing
            log.info("二/三线线空闲状态获取异常");
        }

        List<Integer> resultList = new ArrayList<>();
        if (redisUtil.getCacheObject("priorityHollowSwitch")) {
            resultList = TWO_LINE_FIRST;
@@ -458,6 +477,20 @@
        }

        HollowGlassOutRelationInfo hollowGlassOutRelationInfo = null;

        //直通台有玻璃时将中空出片队列中对应玻璃id的格子号替换未直通台
        HollowBigStorageCageDetails details = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
                .eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT)
                .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL).last("limit 1"));
        if (details != null) {
            hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.getOne(
                    new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
                            .eq(HollowGlassOutRelationInfo::getFlowCardId, details.getFlowCardId())
                            .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
                            .orderByAsc(HollowGlassOutRelationInfo::getId)
                            .last("limit 1")
            );
        }
        int cell = -1;
        for (Integer i : resultList) {
            if (null == hollowGlassOutRelationInfo) {
@@ -496,14 +529,27 @@
            //是否有正在中空的玻璃:中空小片表筛选未出笼的玻璃信息
//            获取当前中空任务未完成出片的玻璃信息
            List<HollowGlassQueueInfo> unFinishHollowQueueList = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>()
                    .eq(HollowGlassQueueInfo::getFlowCardId, hollowGlassOutRelationInfo.getFlowCardId())
                    .eq(HollowGlassQueueInfo::getCell, hollowGlassOutRelationInfo.getCell())
                    .eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
                    .eq(HollowGlassQueueInfo::getRelationId, hollowGlassOutRelationInfo.getId())
                    .orderByAsc(HollowGlassQueueInfo::getHollowSequence));
            if (CollectionUtil.isNotEmpty(unFinishHollowQueueList)) {
                log.info("有正在出片的中空任务");
                Integer isPair = unFinishHollowQueueList.get(0).getIsPair();
                hollowOutGlassByIsPair(unFinishHollowQueueList, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(), hollowGlassOutRelationInfo.getIsForce());
            //按照任务信息过滤筛选需要出片及调度的玻璃队列
            List<HollowGlassQueueInfo> resultQueue = computeOutHollowQueue(unFinishHollowQueueList, hollowGlassOutRelationInfo);
            log.info("中空出片任务计算后的出片队列为：{}", resultQueue);
            if (CollectionUtil.isNotEmpty(resultQueue)) {
                //直通台有玻璃时将中空出片队列中对应玻璃id的格子号替换未直通台
                log.info("中空大理片直通台玻璃信息{}", details);
                if (details != null) {
                    resultQueue.stream().forEach(e -> {
                        if (e.getGlassId().equals(details.getGlassId())) {
                            e.setSlot(THROUGH_SLOT);
                            e.setDeviceId(0);
                            log.info("将中空队列中的格子号替换为直通台{}", e);
                        }
                    });
                }
                log.info("有正在出片的中空任务:{}", hollowGlassOutRelationInfo);
                Integer isPair = resultQueue.get(0).getIsPair();
                hollowOutGlassByIsPair(resultQueue, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(), hollowGlassOutRelationInfo.getIsForce());
                Date endDate = new Date();
                log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
                return;
@@ -553,6 +599,7 @@
        log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
        return;
    }


    @Scheduled(fixedDelay = 1000)
    public void finishInBigStorageTask() throws Exception {
@@ -856,22 +903,77 @@
    @Scheduled(fixedDelay = 1000)
    public void inCarTask() {
        //读取协议数据
        S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
        //汇报字为1 启动字为1是  清除所有任务信息
        //启动字和汇报字是否均为0
        S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
        log.info("进片任务读取s7DataZKDLPOne:{}", s7DataZKDLPOne);
        Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
        if (!inkageEntity) {
            log.info("当前为非联机状态，结束进片任务");
            return;
        }
        Integer requestEntity = s7DataZKDLPOne.getRequestMes();
        if (StringUtils.isNotBlank(s7DataZKDLPOne.getId7()) && requestEntity == 0) {
            //汇报字为1 启动字为1是  清除所有任务信息
            if (s7DataZKDLPOne.getId7().equals(s7DataZKDLPOne.getId1())) {
                //todo:清空任务
                S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
                sendTask.setFrom7(0);
                sendTask.setId7("");
                s7SerializerZKDLPOne.write(sendTask);
                log.info("清除所有任务信息{}", sendTask);
                s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
                log.info("清空任务后再读取{}", s7DataZKDLPOne);
            }
            log.info("存在任务，结束");
            return;
        }
        if (1 != requestEntity) {
            log.info("当前未收到进片请求，结束进片任务");
            return;
        }
        if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())) {
            log.info("当前存在进片任务，结束");
            return;
        }
        if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())) {
            log.info("当前存在进片任务请求，结束本次大笼子调度");
            return;
        }
        //有请求信号
        List<String> glassIdList = hollowGlassQueueInfoService.queryNeedInCarGlass();
        if (CollectionUtil.isEmpty(glassIdList)) {
            return;
        }
        List<HollowBigStorageCageDetails> list = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
        int count = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
                .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
                .in(HollowBigStorageCageDetails::getDeviceId, 5)
                .in(HollowBigStorageCageDetails::getGlassId, glassIdList));
        if (CollectionUtil.isEmpty(list)) {
                .eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT));
        log.info("直通片台的任务数量为：{}", count);
        if (count > 0) {
            return;
        }
        //todo:生成进进片大车任务

        HollowBigStorageCageDetails details = null;
        for (String glassId : glassIdList) {
            details = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
                    .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
                    .eq(HollowBigStorageCageDetails::getGlassId, glassId).last("limit 1"));
            log.info("获取调度任务：{}", details);
            if (details != null) {
                break;
            }
        }
        if (details == null) {
            return;
        }
        log.info("获取需要调度的单条任务：{}", details);
        //生成进进片大车任务
        hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
                .set(HollowBigStorageCageDetails::getState, Const.RAW_GLASS_STATE_OUT)
                .eq(HollowBigStorageCageDetails::getGlassId, details.getGlassId()));
        S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
        sendTask.setFrom7(details.getSlot());
        sendTask.setId7(details.getGlassId());
        s7SerializerZKDLPOne.write(sendTask);
        log.info("新笼子写入id与from{}", sendTask);
        updateSlotRemainBySlots(Arrays.asList(details.getSlot()));
    }


@@ -976,6 +1078,36 @@
        log.info("出片任务-无动作执行完成");
    }

    private List<HollowGlassQueueInfo> computeOutHollowQueue(List<HollowGlassQueueInfo> queueInfoList, HollowGlassOutRelationInfo hollowGlassOutRelationInfo) {
        if (CollectionUtil.isNotEmpty(queueInfoList)) {
            return new ArrayList<>();
        }
        //任务为强制，只直接返回原有的队列
        if (hollowGlassOutRelationInfo.getIsForce() == 1) {
            return queueInfoList;
        }
        log.info("领取任务：{}的队列：{}", hollowGlassOutRelationInfo, queueInfoList);
        // 按格子号分组
        Map<Integer, List<HollowGlassQueueInfo>> gridGroups = queueInfoList.stream()
                .collect(Collectors.groupingBy(HollowGlassQueueInfo::getSlot));
        List<HollowGlassQueueInfo> resultQueue = new ArrayList<>();

        for (List<HollowGlassQueueInfo> items : gridGroups.values()) {
            // 情况1：格子内只有一个数据且未配对 - 过滤掉
            if (items.size() == 1 && 0 == items.get(0).getSlot()) {
                continue;
            }

            // 情况2：格子内全部为未配对的数据 - 过滤掉
            boolean allUnpaired = items.stream().noneMatch(e -> e.getIsPair() == 1);
            if (allUnpaired) {
                continue;
            }
            // 否则保留这个格子内的所有数据
            resultQueue.addAll(items);
        }
        return resultQueue;
    }

    private <T extends HollowBigStorageCageBaseInfo> Boolean hollowOutGlassByIsPair(List<T> list,
                                                                                    int targetSlot, int isPair, int totalLayer, int isForce) throws Exception {
@@ -1012,6 +1144,13 @@
                    S7DataZKDLPOne s7DataZKDLPOne = new S7DataZKDLPOne();
                    s7DataZKDLPOne.setAlramSignal(16);
                    s7SerializerZKDLPOne.write(s7DataZKDLPOne);
                    ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
                    alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
                    alarmInfo.setAlarmModule(ALARM_MODULE);
                    alarmInfo.setAlarmType(ALARM_TYPE);
                    alarmInfo.setAlarmCode(ALARM_CODE_SLOT);
                    alarmInfo.setAlarmMessage("");
                    productAlarmInfoService.save(alarmInfo);
                    Assert.isFalse(storageCage == null, "任务调度没有多余格子，结束调度任务");
                }

@@ -1045,6 +1184,7 @@
        Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_OUT_CAR_SIZE);
//        Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
        Integer glassGap = hollowGlassRelationInfoService.getGlassGapByThickness(list.get(0).getThickness());
        log.info("中空生成一车任务：{}", list);
        for (T e : list) {
            if (templist.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
                break;
@@ -1097,6 +1237,12 @@
        for (T t : baseInfoList) {
            bigStorageCageTaskList.add(new BigStorageCageTask(t.getGlassId(), t.getSlot(), targetSlot, 0));
        }

        List<BigStorageCageTask> tasks = bigStorageCageTaskList.stream().filter(e -> e.getStartSlot() >= 500 && e.getStartSlot() < 900).collect(Collectors.toList());
        if (CollectionUtil.isNotEmpty(tasks)) {
            log.info("当前出片队列存在新笼子的玻璃小片，结束本次任务：{}", tasks);
            return false;
        }
        //清空任务表数据
        resetOutTask();
        log.info("生成出片任务数据{}", bigStorageCageTaskList);