#

tqs

2023-03-27 825accaa1ecde7c8b4a6852b92b8da615b624b6f

#

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

@@ -70,10 +70,10 @@
            vo.setBusyStatus(shuttleProtocol.getBusyStatusType().desc); //四向穿梭车状态
            vo.setStatus(shuttleProtocol.getProtocolStatusType().desc);//当前任务状态
            vo.setCurrentCode(shuttleProtocol.getCurrentCode());//当前二维码
            vo.setBatteryPower(shuttleProtocol.getBatteryPower$() + "%");//电池电量
            vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() + "°");//电池温度
            vo.setBatteryPower(shuttleProtocol.getBatteryPower$() == null ? "" : shuttleProtocol.getBatteryPower$() + "%");//电池电量
            vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() == null ? "" : shuttleProtocol.getBatteryTemp$() + "°");//电池温度
            if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
                vo.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//错误编号
//                vo.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//错误编号
            }
            vo.setPlcOutputStatusIO(shuttleProtocol.getPlcOutputStatusIO());//Plc输出状态IO
            if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
@@ -129,8 +129,8 @@
            vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//当前的电压值
            vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//当前的模拟量值
            vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//当前的行走伺服速度
            vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad() + "%");//当前的行走伺服负载率
            vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad() + "%");//当前的升降伺服负载率
            vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad() == null ? "" : shuttleProtocol.getCurrentMoveServoLoad() + "%");//当前的行走伺服负载率
            vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad() == null ? "" : shuttleProtocol.getCurrentLiftServoLoad() + "%");//当前的升降伺服负载率
            vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//当前的升降伺服速度
            vo.setPakMk(shuttleProtocol.getPakMk()?"Y" : "N");    // 作业标记
        }

 src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java

@@ -129,7 +129,7 @@

    public void setStatusErrorCode(Short statusErrorCode) {
        this.statusErrorCode = statusErrorCode;
        this.errorCodeType = ShuttleErrorCodeType.get(statusErrorCode);
        this.errorCodeType = ShuttleErrorCodeType.get(statusErrorCode.intValue());
    }

    public void setStatusErrorCode(ShuttleErrorCodeType type) {

 src/main/webapp/views/shuttle.html

@@ -583,7 +583,6 @@
                        initShuttleStateTable(table.length-shuttleStateTableBlankRows);
                        shuttleStateTableFullRows = table.length;
                    }
                    console.log(res.data);
                    for (let i=1;i<=table.length;i++){
                        // $("#mode-"+table[i-1].shuttleNo).html(table[i-1].statusVal===0?'联机':'脱机');
                        let tr = tableEl.find("tr").eq(i);