#

Junjie

9 天以前 42af11ca3a84e13d1f55207b2770e2454a861983

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

@@ -348,7 +348,7 @@
        } else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
            //复位
            TrafficControlThread trafficControlThread = (TrafficControlThread) SlaveConnection.get(SlaveType.TrafficControl, 1);
            trafficControlThread.cancelTrafficControl(shuttleProtocol.getShuttleNo(), shuttleProtocol.getTaskNo());
            trafficControlThread.forceCancelTrafficControl(shuttleProtocol.getShuttleNo());

            shuttleThread.setSyncTaskNo(0);//工作号清空
            shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//任务状态-空闲
@@ -368,6 +368,10 @@
            //演示模式-关
            shuttleThread.enableDemo(false);
            return R.ok();
        } else if (shuttleTaskModeType == ShuttleTaskModeType.CLEAR_PATH) {
            //清除路径
            shuttleAction.clearPath(shuttleProtocol.getShuttleNo());
            return R.ok();
        } else {
            throw new CoolException("未知命令");
        }