*

lsh

2025-04-24 7a7c50a1ecf82fe070cf4dd86b73ba7386b33da6

 src/main/java/com/zy/asrs/controller/CrnController.java

@@ -288,7 +288,11 @@
                    vo.setLocNo(wrkMast.getLocNo());    //  目标库位
                }
            } else {
                vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
                if (Cools.isEmpty(crnProtocol.modeType)){
                    vo.setDeviceStatus(CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
                } else {
                    vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
                }
            }
            vo.setXspeed(crnProtocol.getXSpeed());  //  走行速度（m/min)
            vo.setYspeed(crnProtocol.getYSpeed());  //  升降速度（m/min)
@@ -297,8 +301,11 @@
            vo.setYdistance(crnProtocol.getYDistance());  //  升降距离(Km)
            vo.setXduration(crnProtocol.getXDuration());    //  走行时长(H)
            vo.setYduration(crnProtocol.getYDuration());    //  升降时长(H)

            vo.setStatusType(crnProtocol.modeType.desc);   //  模式状态
            if (Cools.isEmpty(crnProtocol.modeType)){
                vo.setStatusType(CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
            } else {
                vo.setStatusType(crnProtocol.modeType.desc);   //  模式状态
            }
            vo.setWrkStatus(crnProtocol.getStatusType().id);     //  任务状态
            vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "有物" : "无物");  //  有物
            vo.setBay(crnProtocol.getBay());    //  列