充电任务

Junjie

2023-08-02 e4a672a1ff1d8d881fe3071edb69080c2edaa96c

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

@@ -69,28 +69,17 @@
            }
            vo.setTaskNo(liftProtocol.getTaskNo());  //  任务号
            vo.setProtocolStatus(liftProtocol.getProtocolStatusType().id);
            vo.setLiftLock(liftProtocol.getLiftLock());
            vo.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback());
            vo.setReady(liftProtocol.getReady());
            vo.setRunning(liftProtocol.getRunning());
            vo.setMode(liftProtocol.getMode());
            vo.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
            vo.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
            vo.setReverseFeedback(liftProtocol.getReverseFeedback());
            vo.setMotorOverload(liftProtocol.getMotorOverload());
            vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
            vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
            vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
            vo.setPlatPositionDeviationAlarm(liftProtocol.getPlatPositionDeviationAlarm());
            vo.setPlatTorqueDeviationAlarm(liftProtocol.getPlatTorqueDeviationAlarm());
            vo.setPlatShuttleCheck(liftProtocol.getPlatShuttleCheck());
            vo.setNotReady(liftProtocol.getNotReady());
            vo.setServoError1(liftProtocol.getServoError1());
            vo.setServoError2(liftProtocol.getServoError2());
            vo.setServoError3(liftProtocol.getServoError3());
            vo.setServoError4(liftProtocol.getServoError4());
            vo.setLiftActualSpeed(liftProtocol.getLiftActualSpeed());
            vo.setPakMk(liftProtocol.getPakMk());
            vo.setModel(liftProtocol.getModel());
            vo.setBusy(liftProtocol.getBusy());
            vo.setHasTray(liftProtocol.getHasTray());
            vo.setHasCar(liftProtocol.getHasCar());
            vo.setDeviceError(liftProtocol.getDeviceError());
            vo.setFrontOverrun(liftProtocol.getFrontOverrun());
            vo.setBackOverrun(liftProtocol.getBackOverrun());
            vo.setLeftOverrun(liftProtocol.getLeftOverrun());
            vo.setRightOverrun(liftProtocol.getRightOverrun());
            vo.setOverHeight(liftProtocol.getOverHeight());
            vo.setOverWeight(liftProtocol.getOverWeight());
        }
        return R.ok().add(list);
    }
@@ -116,13 +105,10 @@

            vo.setWorkNo(liftProtocol.getTaskNo().intValue());//任务号
            vo.setPakMk(liftProtocol.getPakMk()?"Y" : "N");    // 作业标记
            vo.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
            vo.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
            vo.setReverseFeedback(liftProtocol.getReverseFeedback());
            vo.setMotorOverload(liftProtocol.getMotorOverload());
            vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
            vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
            vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
            vo.setLev(liftProtocol.getLev());
            vo.setTaskAddress(liftProtocol.getTaskAddress());
            vo.setDistAddress(liftProtocol.getDistAddress());
            vo.setCompleteTaskNo(liftProtocol.getCompleteTaskNo());
            vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
        }
        return R.ok().add(list);
@@ -276,8 +262,8 @@
        }
        LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
        LiftAssignCommand assignCommand = redisCommand.getAssignCommand();
        List<LiftCommand> commands = assignCommand.getCommands();
        LiftCommand command = commands.get(commandStep);
        List<NyLiftCommand> commands = assignCommand.getCommands();
        NyLiftCommand command = commands.get(commandStep);
        command.setComplete(complete != 0);
        redisUtil.set("lift_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
        return R.ok();