1、fixbug:卧式理片笼出片异常 2、钢化版图显示

zhoushihao

2025-07-09 a3c4e24bf090430e1a0a207d44478ca61926248a

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java

@@ -87,32 +87,25 @@
    @Qualifier("s7SerializerMBTwo")
    private S7Serializer s7SerializerMBTwo;

    //    @Value("${mes.threshold}")

    private int threshold;
    //    @Value("${mes.cellLength}")

    private int cellLength;
    //    @Value("${mes.ratio}")

    private int ratio;

    //    @Value("${mes.min.one.firstLength}")
    private int minOneFirstLength;
    //
//    @Value("${mes.min.one.secondLength}")

    private int minOneSecondLength;
    //
//    @Value("${mes.min.two.firstLength}")

    private int minTwoFirstLength;
    //
//    @Value("${mes.min.two.secondLength}")

    private int minTwoSecondLength;
    //
//    @Value("${mes.max.firstLength}")

    private int maxTwoFirstLength;
    //
//    @Value("${mes.max.secondLength}")

    private int maxTwoSecondLength;
    //
//    @Value("${mes.maxThickness}")

    private int maxThickness;

    private String glassInIdOne = "";
@@ -124,16 +117,14 @@
    public void startOneOpcTask() throws Exception {
        S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
        S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
        S7DataWLExtra s7DataWLExtraTwo = s7SerializerWLTwo.read(S7DataWLExtra.class);
        log.info("一线卧理: {}", s7DataWLOne);
        //获取第二条线路的卧式理片笼状态
//        ReadWriteEntity twoInkageEntity = miloService.readFromOpcUa("WL2.WL2.deviceState");
        Boolean twoInkageEntity = s7DataWLTwo.getDeviceState();
//        Boolean twoInkageEntity = Boolean.FALSE;
        //默认只跑一台卧式理片,两条线路都可以走
        int cellFlag = 1;
        //如果两条线都启动则只能跑一条线
//        if (twoInkageEntity != null && !Boolean.parseBoolean(twoInkageEntity.getValue() + "")) {
        if (twoInkageEntity != null && !twoInkageEntity) {
        if (!twoInkageEntity && !Const.OUT_DISABLE.equals(s7DataWLExtraTwo.getD06SlotState())) {
            cellFlag = 2;
        }
        startOneOpcTaskChild(s7DataWLOne, 1, cellFlag);
@@ -143,18 +134,16 @@
    public void startTwoOpcTask() throws Exception {
        S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
        S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
        S7DataWLExtra s7DataWLExtraTwo = s7SerializerWLTwo.read(S7DataWLExtra.class);
        log.info("二线卧理: {}", s7DataWLTwo);
//        ReadWriteEntity oneInkageEntity = miloService.readFromOpcUa("WL1.WL1.deviceState");
        Boolean oneInkageEntity = s7DataWLOne.getDeviceState();
        int cellFlag = 1;
//        if (oneInkageEntity != null && !Boolean.parseBoolean(oneInkageEntity.getValue() + "")) {
        if (oneInkageEntity != null && !oneInkageEntity) {
        if (!oneInkageEntity  && !Const.OUT_DISABLE.equals(s7DataWLExtraTwo.getD06SlotState())) {
            cellFlag = 2;
        }
        startOneOpcTaskChild(s7DataWLTwo, 2, cellFlag);
    }

    //    private void startOneOpcTaskChild(String tableName, int device, int cellFlag) throws Exception {
    private void startOneOpcTaskChild(S7DataWL task, int device, int cellFlag) throws Exception {
        threshold = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_THRESHOLD);
        cellLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_CELL_LENGTH);
@@ -167,7 +156,6 @@
        maxTwoSecondLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_SECOND_LENGTH);
        maxThickness = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_THICKNESS);

//        EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(tableName);

        if (task == null) {
            log.info("任务表基础数据录入失败，请检查数据是否录入成功");
@@ -187,21 +175,19 @@
            //进片任务
            log.info("设备：{}状态：{}", device, request);
            log.info("进片任务：进片玻璃id为：{}", task.getGlassIdIn());
            intoTask(task, "", device);
            intoTask(task, device);
        } else if (request == 2 && taskRunning == 0) {
            //出片任务
            outTask(task, "", device, cellFlag);
            outTask(task, device, cellFlag);
        } else if (request == 3 && taskRunning == 0) {
            //直通任务
            log.info("设备：{}状态：{}", device, request);
            if (!outTask(task, "", device, cellFlag)) {
                intoTask(task, "", device);
            if (!outTask(task, device, cellFlag)) {
                intoTask(task, device);
            }
        } else if (request == 4) {
            log.info("设备：{}状态：{}", device, request);
            log.info("将启动子改为4");
//            task.setTaskRunning(Const.GLASS_CACHE_TYPE_RUNNING);
//            edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
            if (device == 2) {
                task.setTaskRunning(Const.GLASS_CACHE_TYPE_RUNNING);
                s7SerializerWLTwo.write(S7DataWL.builder().taskRunning(Const.GLASS_CACHE_TYPE_RUNNING).build());
@@ -217,22 +203,12 @@
            log.info("玻璃异常处理");
            damageTask(task, "", device);
        }
//    } catch(Exception e)
//
//    {
//        log.info("执行任务过程中发生异常，任务字{}，{}", task.getTaskState(), e.getMessage());
//        log.info("将启动字改为0");
//        task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
//        edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
//    }

    }


    @Scheduled(fixedDelay = 1000)
    public void edgOneOpcTask() throws Exception {
//        EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_ONE_TASK);
//        String glassId = task.getGlassId();
        S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
        String glassId = s7DataWLOne.getGlassId();
        log.info("1号线玻璃id{},历史id{}", glassId, glassIdOne);
@@ -244,12 +220,8 @@
    }

    @Scheduled(fixedDelay = 1000)
    public void edgTwoOpcTask() throws Exception {
//        EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_TWO_TASK);
//        String glassId = task.getGlassId();
    public void edgTwoOpcTask() {
        S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
//        S7DataMB s7DataMB = s7SerializerMBOne.read(S7DataMB.class);
//        log.info("磨边数据{}", s7DataMB);
        String glassId = s7DataWLTwo.getGlassId();
        log.info("2号线玻璃id{},历史id{}", glassId, glassIdTwo);
        if (StringUtils.isBlank(glassId) || glassId.equals(glassIdTwo)) {
@@ -259,7 +231,7 @@
        edgTaskChild(glassId, 2);
    }

    private void edgTaskChild(String glassId, int cell) throws Exception {
    private void edgTaskChild(String glassId, int cell) {
        ratio = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_RATIO);
        GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId).last("limit 1"));
        if (glassInfo == null) {
@@ -267,16 +239,6 @@
            return;
        }
        String toEndingId = glassInfo.getTemperingLayoutId() + "" + glassInfo.getTemperingFeedSequence();
//        List<ReadWriteEntity> list = new ArrayList<>();
////        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".mesControl", true));
//        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".glassId", Integer.parseInt(toEndingId)));
//        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".toEdingId", Integer.parseInt(toEndingId)));
//        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".width", (int) Math.max(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio)));
//        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".height", (int) Math.min(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio)));
//
//        miloService.writeToOpcUa(list);
//        miloService.writeToOpcWord(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".thickness", (int) glassInfo.getThickness() * ratio));

        S7DataMB s7DataMB = new S7DataMB();
        s7DataMB.setToEdingId(Integer.parseInt(toEndingId));
        s7DataMB.setGlassId(Integer.parseInt(toEndingId));
@@ -310,9 +272,9 @@
        }
    }

    private boolean intoTask(S7DataWL task, String tableName, int deviceId) {
    private boolean intoTask(S7DataWL task, int deviceId) {
        Date startDate = new Date();
        log.info("开始执行进片任务，任务信息为：{},表名为：{},设备id:{},开始时间：{}", task, tableName, deviceId, startDate);
        log.info("开始执行进片任务，任务信息为：{},设备id:{},开始时间：{}", task, deviceId, startDate);
        //获取玻璃的基本信息
        GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn()));
        if (null == glassInfo) {
@@ -342,7 +304,6 @@
            log.info("结束进片任务设备为{}，结束时间为：{}，共耗时：{}ms", deviceId, endDate, endDate.getTime() - startDate.getTime());
            return Boolean.FALSE;
        }
//        EdgStorageCage edgStorageCage = edgStorageCageService.selectNearestEmpty(task.getCurrentCell(), deviceId, Boolean.FALSE);
        EdgStorageCage edgStorageCage = edgStorageCageService.selectNearestEmpty(Integer.parseInt(task.getCurrentCell().toString()), deviceId, Boolean.FALSE);
        Assert.isTrue(null != edgStorageCage, "格子已满");
        log.info("4、将玻璃信息插入卧式理片笼,当前玻璃信息:{}", glassInfo);
@@ -354,9 +315,6 @@
        edgStorageCageDetailsService.save(details);

        //更新任务信息
//        task.setStartCell(edgStorageCage.getSlot());
//        task.setTaskRunning(Const.GLASS_CACHE_TYPE_IN);
//        edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
        task.setStartCell(edgStorageCage.getSlot());
        task.setTaskRunning(Const.GLASS_CACHE_TYPE_IN);
        if (deviceId == 1) {
@@ -382,44 +340,20 @@
        return Boolean.TRUE;
    }

    private boolean outTask(S7DataWL task, String tableName, int deviceId, int cellFlag) throws Exception {
    private boolean outTask(S7DataWL task, int deviceId, int cellFlag) {
        Date startDate = new Date();
        //获取对应的设备状态信息
//        ReadWriteEntity oneOutStateEntity = miloService.readFromOpcUa("WL1.WL1.slotState");
//        ReadWriteEntity twoOutStateEntity = miloService.readFromOpcUa("WL2.WL2.slotState");
//        ReadWriteEntity d06OutStateEntity = miloService.readFromOpcUa("WL2.WL2.d06SlotState");
        S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
        S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
        S7DataWLExtra s7DataWLExtraTwo = s7SerializerWLTwo.read(S7DataWLExtra.class);
        Integer oneOutStateEntity = s7DataWLOne.getSlotState();
        Integer twoOutStateEntity = s7DataWLTwo.getSlotState();
        Integer d06OutStateEntity = s7DataWLExtraTwo.getD06SlotState();
        Integer oneOutState = s7DataWLOne.getSlotState();
        Integer twoOutState = s7DataWLTwo.getSlotState();
        Integer d06OutState = s7DataWLExtraTwo.getD06SlotState();
        //状态有3中情况：0空闲 1忙碌 2禁用
        String oneOutState = Const.OUT_DISABLE;
        String twoOutState = Const.OUT_DISABLE;
        String d06OutState = Const.OUT_DISABLE;
//        if (null != oneOutStateEntity && null != oneOutStateEntity.getValue()) {
//            oneOutState = oneOutStateEntity.getValue().toString();
//        }
        if (null != oneOutStateEntity) {
            oneOutState = oneOutStateEntity.toString();
        }
//        if (null != twoOutStateEntity && null != twoOutStateEntity.getValue()) {
//            twoOutState = twoOutStateEntity.getValue().toString();
//        }
        if (null != twoOutStateEntity) {
            twoOutState = twoOutStateEntity.toString();
        }
        //两条线都为禁用则不出玻璃
        if (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState)) {
            log.info("A09、A10为{},{}非自动状态，无法出片", oneOutState, oneOutState);
            return Boolean.FALSE;
        }
//        if (null != d06OutStateEntity && null != d06OutStateEntity.getValue()) {
//            d06OutState = d06OutStateEntity.getValue().toString();
//        }
        if (null != d06OutStateEntity) {
            d06OutState = d06OutStateEntity.toString();
        }
        //获取d06片台状态
        // 1:一对一的情况下不需要判断d06状态
@@ -427,18 +361,14 @@
        // 3:二号线一对多的情况下，获取一号线磨边前片台C08的状态，C08非禁用时，一号线将按照D06片台状态觉得出片
        if (cellFlag == 2) {
            if (deviceId == 1) {
                twoOutState = Const.OUT_DISABLE.equals(twoOutState) ? Const.OUT_DISABLE : d06OutState;
                twoOutState = twoOutState & d06OutState;
            } else {
                oneOutState = Const.OUT_DISABLE.equals(oneOutState) ? Const.OUT_DISABLE : d06OutState;
            }
            if (Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) {
                log.info("A09、A10为{},{}非自动状态，无法出片", oneOutState, oneOutState);
                return Boolean.FALSE;
                oneOutState = oneOutState & d06OutState;
            }
        }

        log.info("开始执行出片/直通任务，任务信息为：{},表名为：{},设备id:{},开始时间：{},一号线状态：{}，二号线状态：{}",
                task, tableName, deviceId, startDate, oneOutState, twoOutState);
        log.info("开始执行出片/直通任务，任务信息为：{},设备id:{},开始时间：{},一号线状态：{}，二号线状态：{}",
                task, deviceId, startDate, oneOutState, twoOutState);
        //获取当前需要走那条线
        int cell = 0;
        if (cellFlag == 1) {
@@ -449,25 +379,21 @@
            } else if (Const.OUT_FREE.equals(oneOutState)) {
                cell = Const.ONE_OUT_TARGET_POSITION;
            } else {
                return Boolean.FALSE;
                cell = Const.TWO_OUT_TARGET_POSITION;
            }
        }
        if (Const.OUT_FREE.equals(oneOutState) && Const.OUT_FREE.equals(twoOutState)) {
            if (cellFlag == 2) {
                if (!outChildTask(task, tableName, deviceId, cell, startDate)) {
                    cell = cell == Const.ONE_OUT_TARGET_POSITION ? Const.TWO_OUT_TARGET_POSITION : Const.ONE_OUT_TARGET_POSITION;
                    return outChildTask(task, tableName, deviceId, cell, startDate);
                }
            } else {
                return outChildTask(task, tableName, deviceId, cell, startDate);
        if (cellFlag == 2) {
            if (!outChildTask(task, deviceId, cell, startDate)) {
                cell = cell == Const.ONE_OUT_TARGET_POSITION ? Const.TWO_OUT_TARGET_POSITION : Const.ONE_OUT_TARGET_POSITION;
                return outChildTask(task, deviceId, cell, startDate);
            }
        } else {
            return outChildTask(task, tableName, deviceId, cell, startDate);
            return outChildTask(task, deviceId, cell, startDate);
        }
        return Boolean.TRUE;
    }

    private boolean outChildTask(S7DataWL task, String tableName, int deviceId, int cell, Date startDate) {
    private boolean outChildTask(S7DataWL task, int deviceId, int cell, Date startDate) {
        EdgStorageCageDetails edgStorageCageDetails = null;

        //笼内是版图相差是否超过阈值
@@ -605,7 +531,6 @@
        task.setStartCell(edgStorageCageDetails.getSlot());
        task.setTaskRunning(taskType);
        task.setEndCell(cell);
//        edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
        if (deviceId == 1) {
            s7SerializerWLOne.write(
                    S7DataWL.builder()
@@ -652,10 +577,6 @@
        }
        Date startDate = new Date();
        log.info("开始执行完成任务后清除动作，任务信息为：{},表名为：{},开始时间：{}", task, tableName, startDate);
//        task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
//        task.setGlassIdOut("");
//        task.setStartCell(0);
//        task.setEndCell(0);
        EdgStorageDeviceTaskHistory taskHistory = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
                .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
                .eq(EdgStorageDeviceTaskHistory::getDeviceId, device)
@@ -673,12 +594,6 @@
            );
        }
        //最后更新任务，保证任务前的动作都做完

//        task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
//        task.setGlassIdOut("");
//        task.setStartCell(0);
//        task.setEndCell(0);
//        edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
        if (device == 1) {
            s7SerializerWLOne.write(
                    S7DataWL.builder()
@@ -738,12 +653,6 @@
                    .set(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_FAILURE)
            );
        }
        //最后更新任务，保证任务前的动作都做完
//        task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
//        task.setGlassIdOut("");
//        task.setStartCell(0);
//        task.setEndCell(0);
//        edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
        if (device == 1) {
            s7SerializerWLOne.write(
                    S7DataWL.builder()
@@ -777,7 +686,6 @@
     */
    public String queryAndChangeGlass(String glassId) {
        GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
//                .inSql(GlassInfo::getEngineerId, "select engineer_id from engineering where state = 1"));
        Assert.isFalse(null == glassInfo, "玻璃信息不存在");        //按照玻璃尺寸
        LambdaQueryWrapper<GlassInfo> queryWrapper = new LambdaQueryWrapper<GlassInfo>()
                .eq(GlassInfo::getWidth, glassInfo.getWidth())