Merge remote-tracking branch 'origin/master'

zhoushihao

2024-06-04 300c187d293847c17bf18cefdfba8eb442367a34

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java

@@ -92,7 +92,8 @@
        PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
        log.info("修改设备联动请求为{}：0离线；1联动", inKageWord);
        S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("InkageStatus").getAddress(), inKageWord);
        return "success";
        //读取plc的值
        return plcParameterObject.getPlcParameter("InkageStatus").getValue();
    }

}