lsh
2026-04-21 b60ecc7f25ed10848faaf050f071168a85b9e1f0
Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master
2个文件已修改
4 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/ConsoleController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -199,6 +199,7 @@
            vo.setOffset(Double.valueOf(crnProtocol.getBay()));
            vo.setBay(crnProtocol.getBay()); // 当前列
            vo.setTaskNo(crnProtocol.getTaskNo());
            vo.setLaserValue(crnProtocol.getLaserValue());
            /**
             * 堆垛机状态判断
             */
src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -22,6 +22,9 @@
    // 当前列
    private Integer bay;
    // 镭射值
    private Integer laserValue;
    private CrnStatusType crnStatus;
    public String getCrnStatus(){