提升机命令封装

Junjie

2023-05-11 2fdd53192ff992ef913b102dbff60542326a4cdd

提升机命令封装

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1207,44 +1207,22 @@
                //提升机当前楼层
                int liftLev = liftProtocol.getLev().intValue();
                if (liftLev != 1) {
                    //提升机不在1层
                    LiftCommand command1 = new LiftCommand();
                    command1.setLiftNo(liftProtocol.getLiftNo());//提升机号
                    command1.setTaskNo(liftProtocol.getTaskNo());//任务号
                    command1.setRun((short) 1);//升降
                    command1.setDistPosition((short) 1);//目标楼层1层
                    command1.setLiftLock(true);//锁定提升机

                    //提升机不在1层，获取到1层的提升机命令
                    LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), (short) 1);
                    commands.add(command1);//将命令添加进list
                }

                //输送线将货物运进来
                LiftCommand command2 = new LiftCommand();
                command2.setLiftNo(liftProtocol.getLiftNo());//提升机号
                command2.setTaskNo(liftProtocol.getTaskNo());//任务号
                command2.setRun((short) 6);//输送线运作
                command2.setLiftLock(true);//锁定提升机

                //输送线将货物运进来(正转)
                LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
                commands.add(command2);//将命令添加进list

                //提升机前往目标楼层
                LiftCommand command3 = new LiftCommand();
                command3.setLiftNo(liftProtocol.getLiftNo());//提升机号
                command3.setTaskNo(liftProtocol.getTaskNo());//任务号
                command3.setRun((short) 1);//升降
                command3.setDistPosition((short) wrkMastLocNoLey);//工作档目标楼层
                command3.setLiftLock(true);//锁定提升机

                //提升机前往目标楼层(工作档目标楼层)
                LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), (short) wrkMastLocNoLey);
                commands.add(command3);//将命令添加进list

                //提升机到达指定楼层，输送线将货物移出去
                //提升机到达指定楼层，输送线将货物移出去(反转)
                //输送线将货物移出去
                LiftCommand command4 = new LiftCommand();
                command4.setLiftNo(liftProtocol.getLiftNo());//提升机号
                command4.setTaskNo(liftProtocol.getTaskNo());//任务号
                command4.setRun((short) 3);//输送线运作
                command4.setLiftLock(true);//锁定提升机

                LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
                commands.add(command4);//将命令添加进list
            }else {
                liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//设置四向穿梭车号
@@ -1273,45 +1251,24 @@
                int liftLev = liftProtocol.getLev().intValue();
                if (liftLev != currentLocNoLey) {
                    //不同楼层
                    LiftCommand command1 = new LiftCommand();
                    command1.setLiftNo(liftProtocol.getLiftNo());//提升机号
                    command1.setTaskNo(liftProtocol.getTaskNo());//任务号
                    command1.setRun((short) 1);//升降
                    command1.setDistPosition((short) currentLocNoLey);//目标楼层(穿梭车所在楼层)
                    command1.setLiftLock(true);//锁定提升机

                    //获取目标楼层(穿梭车所在楼层)命令
                    LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), (short) currentLocNoLey);
                    commands.add(command1);//将命令添加进list
                }

                //输送线将四向穿梭车移动进来
                LiftCommand command2 = new LiftCommand();
                command2.setLiftNo(liftProtocol.getLiftNo());//提升机号
                command2.setTaskNo(liftProtocol.getTaskNo());//任务号
                command2.setRun((short) 6);//输送线运作
                command2.setLiftLock(true);//锁定提升机

                //输送线将四向穿梭车移动进来(正转)
                LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
                commands.add(command2);//将命令添加进list

                if (liftLev != currentLocNoLey) {
                    //提升机前往目标楼层
                    LiftCommand command3 = new LiftCommand();
                    command3.setLiftNo(liftProtocol.getLiftNo());//提升机号
                    command3.setTaskNo(liftProtocol.getTaskNo());//任务号
                    command3.setRun((short) 1);//升降
                    command3.setDistPosition((short) wrkMastLocNoLey);//工作档目标楼层
                    command3.setLiftLock(true);//锁定提升机

                    //提升机前往目标楼层(工作档目标楼层)
                    LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), (short) wrkMastLocNoLey);
                    commands.add(command3);//将命令添加进list
                }

                //提升机到达指定楼层，输送线将四向穿梭车移出去
                //输送线将四向穿梭车移动出去
                LiftCommand command4 = new LiftCommand();
                command4.setLiftNo(liftProtocol.getLiftNo());//提升机号
                command4.setTaskNo(liftProtocol.getTaskNo());//任务号
                command4.setRun((short) 3);//输送线运作
                command4.setLiftLock(true);//锁定提升机

                //输送线将四向穿梭车移动出去(反转)
                LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
                commands.add(command4);//将命令添加进list
            }

@@ -2273,42 +2230,23 @@
            int liftLev = liftProtocol.getLev().intValue();
            if (liftLev != currentLev) {
                //穿梭车和提升机处于不同楼层
                LiftCommand command1 = new LiftCommand();
                command1.setLiftNo(liftProtocol.getLiftNo());//提升机号
                command1.setTaskNo(liftProtocol.getTaskNo());//任务号
                command1.setRun((short) 1);//升降
                command1.setDistPosition(currentLev.shortValue());//目标楼层(穿梭车所在楼层)
                command1.setLiftLock(true);//锁定提升机
                //获取目标楼层(穿梭车所在楼层)命令
                LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), currentLev.shortValue());
                commands.add(command1);//将命令添加进list
            }

            //输送线将四向穿梭车移动进来
            LiftCommand command2 = new LiftCommand();
            command2.setLiftNo(liftProtocol.getLiftNo());//提升机号
            command2.setTaskNo(liftProtocol.getTaskNo());//任务号
            command2.setRun((short) 6);//输送线运作
            command2.setLiftLock(true);//锁定提升机

            //输送线将四向穿梭车移动进来(正转)
            LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
            commands.add(command2);//将命令添加进list

            //提升机前往目标楼层
            LiftCommand command3 = new LiftCommand();
            command3.setLiftNo(liftProtocol.getLiftNo());//提升机号
            command3.setTaskNo(liftProtocol.getTaskNo());//任务号
            command3.setRun((short) 1);//升降
            command3.setDistPosition(chargeLocNoLev.shortValue());//充电库位目标楼层
            command3.setLiftLock(true);//锁定提升机

            //获取充电库位目标楼层命令
            LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), chargeLocNoLev.shortValue());
            commands.add(command3);//将命令添加进list

            //提升机到达指定楼层，输送线将四向穿梭车移出去
            //输送线将四向穿梭车移动出去
            LiftCommand command4 = new LiftCommand();
            command4.setLiftNo(liftProtocol.getLiftNo());//提升机号
            command4.setTaskNo(liftProtocol.getTaskNo());//任务号
            command4.setRun((short) 3);//输送线运作
            command4.setLiftLock(true);//锁定提升机

            //输送线将四向穿梭车移动出去(反转)
            LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
            commands.add(command4);//将命令添加进list

            wrkCharge.setWrkSts(54L);//提升机搬运中

 src/main/java/com/zy/core/thread/LiftThread.java

@@ -417,7 +417,7 @@
    /**
     * 获取提升机解锁命令
     */
    private LiftCommand getUnlockCommand(Short liftNo) {
    public LiftCommand getUnlockCommand(Short liftNo) {
        LiftCommand command = new LiftCommand();
        command.setRun((short) 0);
        command.setLiftNo(liftNo);
@@ -428,7 +428,7 @@
    /**
     * 获取复位命令
     */
    private LiftCommand getResetCommand() {
    public LiftCommand getResetCommand() {
        LiftCommand command = new LiftCommand();
        command.setRun((short) 0);
        command.setLiftLock(false);
@@ -438,7 +438,7 @@
    /**
     * 获取提升机上升下降命令
     */
    private LiftCommand getLiftUpDownCommand(Short lev) {
    public LiftCommand getLiftUpDownCommand(Short lev) {
        LiftCommand command = new LiftCommand();
        command.setRun((short) 1);//升降
        command.setDistPosition(lev);
@@ -446,15 +446,40 @@
    }

    /**
     * 获取提升机上升下降命令
     */
    public LiftCommand getLiftUpDownCommand(Short liftNo, Short taskNo, Short lev) {
        LiftCommand command = new LiftCommand();
        command.setRun((short) 1);//升降
        command.setLiftNo(liftNo);//提升机号
        command.setTaskNo(taskNo);//任务号
        command.setDistPosition(lev);//目标楼层1层
        command.setLiftLock(true);//锁定提升机
        return command;
    }

    /**
     * 获取提升机转动命令，direction：1=》有货正转，2=》有货反转
     */
    private LiftCommand getLiftTurnCommand(Integer direction) {
    public LiftCommand getLiftTurnCommand(Integer direction) {
        LiftCommand command = new LiftCommand();
        command.setRun(direction == 1 ? (short) 6 : (short) 3);
        return command;
    }

    /**
     * 获取提升机转动命令，direction：1=》有货正转，2=》有货反转
     */
    public LiftCommand getLiftTurnCommand(Short liftNo, Short taskNo, Integer direction) {
        LiftCommand command = new LiftCommand();
        command.setRun(direction == 1 ? (short) 6 : (short) 3);
        command.setLiftNo(liftNo);//提升机号
        command.setTaskNo(taskNo);//任务号
        command.setLiftLock(true);//锁定提升机
        return command;
    }

    /**
     * 初始化提升机
     */
    private void initLift() {