穿梭车方向问题

Junjie

2023-06-07 db7e5e8995363db9278544224ddf608b089b6be9

穿梭车方向问题

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

@@ -640,13 +640,13 @@
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());

                StaProtocol staProtocol = devpThread.getStation().get(rackInStn.getStaNo());
                StaProtocol staProtocol105 = devpThread.getStation().get(105);
                staProtocol105.setWorkNo((short) 752);
                staProtocol105.setStaNo((short) 100);

                StaProtocol staProtocol106 = devpThread.getStation().get(106);
                staProtocol106.setWorkNo((short) 753);
                staProtocol106.setStaNo((short) 100);
//                StaProtocol staProtocol105 = devpThread.getStation().get(105);
//                staProtocol105.setWorkNo((short) 752);
//                staProtocol105.setStaNo((short) 100);
//
//                StaProtocol staProtocol106 = devpThread.getStation().get(106);
//                staProtocol106.setWorkNo((short) 753);
//                staProtocol106.setStaNo((short) 100);

                if (staProtocol == null) {
                    continue;

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

@@ -5,10 +5,10 @@
 */
public enum ShuttleRunDirection {

    TOP((short)1, "货物方向+"),
    BOTTOM((short)2, "货物方向-"),
    LEFT((short)4, "过道方向+"),
    RIGHT((short)3, "过道方向-"),
    TOP((short)2, "货物方向+"),
    BOTTOM((short)1, "货物方向-"),
    LEFT((short)3, "过道方向-"),
    RIGHT((short)4, "过道方向+"),
    ;

    public Short id;

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

@@ -12,8 +12,8 @@
    MOVE_TOP(7, "前移"),
    MOVE_BOTTOM(8, "后移"),
    RESET(9, "状态复位"),
    SEARCH_LEFT(10, "正方向(左)寻库位"),
    SEARCH_RIGHT(11, "负方向(右)寻库位"),
    SEARCH_LEFT(10, "正方向(右)寻库位"),
    SEARCH_RIGHT(11, "负方向(左)寻库位"),
    SEARCH_TOP(12, "负方向(前)寻库位"),
    SEARCH_BOTTOM(13, "负方向(后)寻库位"),
    MOVE_LOC_NO(14, "移动到目标库位"),

 src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java

@@ -54,7 +54,7 @@
    private String sourceLocNo;

    /**
     * 目标库位
     * 目标库位f
     */
    private String locNo;


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

@@ -210,7 +210,7 @@

                //将四向穿梭车状态保存至数据库
                BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
                BasShuttle basShuttle = shuttleService.selectById(shuttleProtocol.getShuttleNo());
                BasShuttle basShuttle = shuttleService.selectById(slave.getId());
                if (basShuttle == null) {
                    basShuttle = new BasShuttle();
                    //四向穿梭车号
@@ -467,10 +467,16 @@
                    commands.add(getPalletCommand(assignCommand.getTaskMode() == 3 ? (short) 1 : (short) 2));
                    break;
                case 5://强制左移
                    commands.add(getForceMoveCommand((short) 2));
                    break;
                case 6://强制右移
                    commands.add(getForceMoveCommand((short) 1));
                    break;
                case 7://强制上移
                    commands.add(getForceMoveCommand((short) 3));
                    break;
                case 8://强制下移
                    commands.add(getForceMoveCommand((short) (assignCommand.getTaskMode() - 4)));
                    commands.add(getForceMoveCommand((short) 4));
                    break;
                case 9://状态复位
                    ShuttleCommand reset = getResetCommand();

 src/main/webapp/views/shuttle.html

@@ -138,8 +138,8 @@
                                            <button class="item" onclick="shuttleOperator(7)">后移</button>
                                            <button class="item" onclick="shuttleOperator(8)">前移</button>
                                            <button class="item" onclick="shuttleOperator(9)">复位</button>
                                            <button class="item" onclick="shuttleOperator(10)">正方向(左)寻库位</button>
                                            <button class="item" onclick="shuttleOperator(11)">负方向(右)寻库位</button>
                                            <button class="item" onclick="shuttleOperator(10)">正方向(右)寻库位</button>
                                            <button class="item" onclick="shuttleOperator(11)">负方向(左)寻库位</button>
                                            <button class="item" onclick="shuttleOperator(12)">正方向(前)寻库位</button>
                                            <button class="item" onclick="shuttleOperator(13)">负方向(后)寻库位</button>
                                            <button class="item" onclick="shuttleOperator(15)">充电开关</button>