提升机配置文件更新

Junjie

2023-03-30 4b79d529958435a201762a8813a521ae8932b506

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

@@ -73,7 +73,7 @@
            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())) {
@@ -164,9 +164,6 @@
                vo.setShuttleNo(shuttleSlave.getId());
                BasShuttle basShuttle = basShuttleService.selectById(shuttleSlave.getId());
                if (!Cools.isEmpty(basShuttle)) {
                    vo.setRow(basShuttle.getRow());
                    vo.setBay(basShuttle.getBay());
                    vo.setLev(basShuttle.getLev());
                    vo.setWorkNo(basShuttle.getWrkNo());
                    vo.setPakMk(basShuttle.getPakMk());
                }
@@ -195,23 +192,6 @@
                // 穿梭车异常 -----------

                // 穿梭车提示信息 ----------------------

                // 任务信息 ----------------
                vo.setPakInTask(shuttleProtocol.isPakInTask());
                vo.setPakOutTask(shuttleProtocol.isPakOutTask());
                vo.setPakMoveTask(shuttleProtocol.isPakMoveTask());
                vo.setGoHpTask(shuttleProtocol.isGoHpTask());
                vo.setGoOHpTask(shuttleProtocol.isGoOHpTask());
                vo.setGoHpAvoid(shuttleProtocol.isGoHpAvoid());
                vo.setGoOHpAvoid(shuttleProtocol.isGoOHpAvoid());
                vo.setPakInEmpty(shuttleProtocol.isPakInEmpty());
                vo.setPakInFinish(shuttleProtocol.isPakInFinish());
                vo.setPakOutEmpty(shuttleProtocol.isPakOutEmpty());
                vo.setPakOutFinish(shuttleProtocol.isPakOutFinish());
                vo.setGoHpAvoidFinish(shuttleProtocol.isGoHpAvoidFinish());
                vo.setGoOHpAvoidFinish(shuttleProtocol.isGoOHpAvoidFinish());
                vo.setGoHpAvoidErr(shuttleProtocol.isGoHpAvoidErr());
                vo.setGoOHpAvoidErr(shuttleProtocol.isGoOHpAvoidErr());

                // 状态信息 -------------

@@ -245,9 +225,6 @@
        } else {
            throw new CoolException("命令下发失败");
        }
        basShuttle.setRow(vo.getRow());
        basShuttle.setBay(vo.getBay());
        basShuttle.setLev(vo.getLev());

        basShuttle.setPakMk(vo.getPakMk());
        basShuttle.setWrkNo(vo.getWorkNo());
@@ -289,7 +266,7 @@
                command.setShuttleNo(shuttleSlave.getId().shortValue()); // 四向穿梭车编号
                command.setTaskMode(shuttleTaskModeType.id.shortValue());
                command.setSourceLocNo(param.getSourceLocNo());
                command.setDistLocNo(param.getDistLocNo());
                command.setLocNo(param.getDistLocNo());
                command.setTaskNo((short) 9999);

                if (MessageQueue.offer(SlaveType.Shuttle, shuttleSlave.getId(), new Task(3, command))) {