小车从提升机移动出去增强管控

Junjie

2023-06-17 928bc386bea03b9d3157e6d66dcb7afc843e9964

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

@@ -65,6 +65,8 @@
            // 获取四向穿梭车信息
            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, basShuttle.getShuttleNo());
            if (shuttleThread == null) {
                vo.setStatus(ShuttleProtocolStatusType.OFFLINE.id);//设备离线
                vo.setBusyStatus(ShuttleProtocolStatusType.OFFLINE.desc);
                continue;
            }
            ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
@@ -73,7 +75,7 @@
            }
            vo.setTaskNo(shuttleProtocol.getTaskNo().intValue());  //  任务号
            vo.setBusyStatus(shuttleProtocol.getBusyStatusType().desc); //四向穿梭车状态
            vo.setStatus(shuttleProtocol.getProtocolStatusType().desc);//当前任务状态
            vo.setStatus(shuttleProtocol.getProtocolStatusType().id);//当前任务状态
            vo.setCurrentCode(shuttleProtocol.getCurrentCode());//当前二维码
            LocMast currentLocMast = locMastService.queryByQrCode(shuttleProtocol.getCurrentCode().toString());
            if (currentLocMast == null) {
@@ -113,7 +115,7 @@
            vo.setCurrentOrBeforeCode(shuttleProtocol.getCurrentOrBeforeCode());//当前或者之前读到的二维码值
            vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//读到的二维码X方向偏移量
            vo.setCodeOffsetY(shuttleProtocol.getCodeOffsetY());//读到的二维码Y方向偏移量
            vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage() * 0.1);//当前的电压值
            vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//当前的电压值
            vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//当前的模拟量值
            vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//当前的升降伺服速度
            vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//当前的行走伺服速度
@@ -142,6 +144,9 @@
            if (shuttleProtocol == null) {
                continue;
            }
            if (shuttleProtocol.getShuttleNo() == null) {
                continue;
            }

            vo.setWorkNo(shuttleProtocol.getTaskNo().intValue());//任务号
            if (shuttleProtocol.getTaskNo() > 0) {
@@ -163,6 +168,10 @@
            vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad() == null ? "" : shuttleProtocol.getCurrentLiftServoLoad() + "%");//当前的升降伺服负载率
            vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//当前的升降伺服速度
            vo.setPakMk(shuttleProtocol.getPakMk()?"Y" : "N");    // 作业标记
            vo.setLocNo(shuttleProtocol.getLocNo());//四向穿梭车当前库位号
            vo.setLev(shuttleProtocol.getLocNo() == null ? 0 : Utils.getLev(shuttleProtocol.getLocNo()));//四向穿梭车当前层高
            vo.setRunSpeed(basShuttle.getRunSpeed());//四向穿梭车运行速度(设置)
            vo.setChargeLine(basShuttle.getChargeLine());//充电阈值
        }
        return R.ok().add(list);
    }
@@ -265,6 +274,22 @@
        return R.ok();
    }

    @PostMapping("/runSpeed/{shuttleNo}")
    @ManagerAuth
    public R setRunSpeed(@PathVariable("shuttleNo") String shuttleNo, @RequestParam("runSpeed") Integer runSpeed, @RequestParam("chargeLine") Integer chargeLine) {

        BasShuttle basShuttle = basShuttleService.selectById(shuttleNo);
        if (basShuttle == null) {
            return R.error("四向穿梭车不存在");
        }
        basShuttle.setRunSpeed(runSpeed);
        basShuttle.setChargeLine(chargeLine);
        if (!basShuttleService.updateById(basShuttle)) {
            return R.error();
        }
        return R.ok();
    }

    /****************************************************************/
    /************************** 手动操作 ******************************/
    /****************************************************************/