#

Junjie

5 天以前 6daf900a09adcca981f620744bf89851654d88e0

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

@@ -35,6 +35,7 @@
import com.zy.core.model.param.ShuttleMoveLocParam;
import com.zy.core.model.protocol.ShuttleProtocol;
import com.zy.core.thread.ShuttleThread;
import com.zy.core.thread.TrafficControlThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -346,6 +347,9 @@
            assignCommand.setCommands(commands);
        } else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
            //复位
            TrafficControlThread trafficControlThread = (TrafficControlThread) SlaveConnection.get(SlaveType.TrafficControl, 1);
            trafficControlThread.forceCancelTrafficControl(shuttleProtocol.getShuttleNo());

            shuttleThread.setSyncTaskNo(0);//工作号清空
            shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//任务状态-空闲
            shuttleThread.setPakMk(true);//作业标记复位
@@ -364,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("未知命令");
        }