#

Junjie

15 小时以前 114b4110c46d1976c53ca1373e45c63471e2c9ba

#

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

@@ -338,17 +338,13 @@
            //托盘下降
            List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleLiftCommand(assignCommand, shuttleThread, false);
            assignCommand.setCommands(commands);
        } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE) {
            //充电开关
            boolean charge = false;
            if (shuttleProtocol.getHasCharge()) {
                //已充电，关闭充电
                charge = false;
            }else {
                //开启充电
                charge = true;
            }
            List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, charge);
        } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE_ON) {
            //充电开
            List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, true);
            assignCommand.setCommands(commands);
        } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE_OFF) {
            //充电关
            List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, false);
            assignCommand.setCommands(commands);
        } else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
            //复位

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

@@ -1360,7 +1360,7 @@
            ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
            assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());//四向穿梭车号
            assignCommand.setTaskNo(wrkMast.getWrkNo());//任务号
            assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE.id);//出库模式
            assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE_ON.id);//充电开
            assignCommand.setSourceLocNo(shuttleProtocol.getCurrentLocNo());//源库位(小车当前位置)

            List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, true);
@@ -1401,7 +1401,7 @@
            ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
            assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());//四向穿梭车号
            assignCommand.setTaskNo(wrkMast.getWrkNo());//任务号
            assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE.id);//出库模式
            assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE_OFF.id);//充电关
            assignCommand.setSourceLocNo(shuttleProtocol.getCurrentLocNo());//源库位(小车当前位置)

            List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, false);

 src/main/java/com/zy/core/enums/ShuttleTaskModeType.java

@@ -8,7 +8,7 @@
    RESET(3, "状态复位"),
    MOVE_LOC_NO(4, "移动到目标库位"),
    MOVE_LOC_NO_TASK(5, "移动到目标库位(生成移动任务)"),
    CHARGE(6, "充电"),

    MOVE_LIFT(7, "移动到提升机"),
    AVOID(8, "避让任务"),
    TRANSPORT(9, "搬运任务"),
@@ -17,6 +17,8 @@
    SHUTTLE_DEMO_OPEN(12, "演示模式-开"),
    SHUTTLE_DEMO_CLOSE(13, "演示模式-关"),
    UPDATE_LOCATION(14, "更新坐标"),
    CHARGE_ON(15, "充电-开"),
    CHARGE_OFF(16, "充电-关"),
    ;

    public Integer id;

 src/main/webapp/views/shuttle.html

@@ -127,7 +127,8 @@
                                    <div class="button-group">
                                        <button class="item" onclick="shuttleOperator(1)">托盘顶升</button>
                                        <button class="item" onclick="shuttleOperator(2)">托盘下降</button>
                                        <button class="item" onclick="shuttleOperator(6)">充电开关</button>
                                        <button class="item" onclick="shuttleOperator(15)">充电开</button>
                                        <button class="item" onclick="shuttleOperator(16)">充电关</button>
                                        <button class="item" onclick="shuttleOperator(3)">复位</button>
                                        <button class="item" onclick="shuttleOperator(12)">演示模式-开</button>
                                        <button class="item" onclick="shuttleOperator(13)">演示模式-关</button>