#

Junjie

2023-08-30 c41fce4524aaf930da42d2b86a41f0ec8570c0a0

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

@@ -311,6 +311,18 @@
                    shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//任务状态-空闲
                    shuttleProtocol.setPakMk(true);//作业标记复位
                    return R.ok();
                } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CONTROL) {
                    //小车管制
                    NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), true);
                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
                    commands.add(suspendCommand);
                    assignCommand.setCommands(commands);
                } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CANCEL_CONTROL) {
                    //小车取消管制
                    NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), false);
                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
                    commands.add(suspendCommand);
                    assignCommand.setCommands(commands);
                } else {
                    throw new CoolException("未知命令");
                }
@@ -328,8 +340,9 @@
    @PostMapping("/detl/update")
    @ManagerAuth(memo = "修改数据")
    public R shuttleUpdate(@RequestParam Integer shuttleNo,
                        @RequestParam Integer workNo,
                        @RequestParam String pakMk){
                           @RequestParam Integer workNo,
                           @RequestParam String pakMk,
                           @RequestParam Integer token) {
        NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
        if (shuttleThread == null) {
            return R.error("plc已掉线");
@@ -344,6 +357,9 @@
        if (pakMk != null) {
            shuttleProtocol.setPakMk(pakMk.equals("Y"));
        }
        if (token != null) {
            shuttleProtocol.setToken(token);
        }
        return R.ok();
    }