S7通讯部署版本代码提交

ZengTao

2025-06-18 cfaa77861170237f07da3113c7d505c70bf371be

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java

@@ -127,6 +127,7 @@
        } else {
            s7DataSP = s7SerializerSPTwo.read(S7DataSP.class);
        }
        log.info("{}上片线，当前上片位信息：{}", deviceId, s7DataSP);
        Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
                .eq(Engineering::getState, Const.ENGINEERING_RUNNING).eq(Engineering::getStationCell, deviceId));
        if (null == engineering) {
@@ -135,11 +136,11 @@
        }
        //任务暂停
        S7DataSP task = new S7DataSP();
        if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
            s7SerializerSPOne.read(S7DataSP.class);
        } else {
            s7SerializerSPTwo.read(S7DataSP.class);
        }
//        if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
//            s7SerializerSPOne.read(S7DataSP.class);
//        } else {
//            s7SerializerSPTwo.read(S7DataSP.class);
//        }
//        LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
        ;
        if ("0".equals(s7DataSP.getInkageState().toString())) {
@@ -237,6 +238,7 @@
        } else {
            s7DataSP = s7SerializerSPTwo.read(S7DataSP.class);
        }
        log.info("{}上片线，当前上片位信息：{}", deviceId, s7DataSP);
//        LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
        if (s7DataSP.getTaskRunning().toString().equals(Const.ENGINEERING_NEW)) {
//        if (task.getTaskRunning().equals(Const.ENGINEERING_NEW)) {