server commit file

fyxc

2025-05-22 6994981f40f1573f54de1a1e402a7743073cf38e

server commit file

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

@@ -388,17 +388,39 @@
    @ManagerAuth(memo = "恢复联机任务")
    @PostMapping("/operator/taskRe")
    public R taskRe(CrnOperatorParam param){
        CrnCommand command = new CrnCommand();
        command.setTaskRe((short)1);
        return crnControl(command)?R.ok():R.error();
        CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, param.getCrnNo());
        if (crnThread == null) {
            return R.error("堆垛机不在线");
        }
        CrnProtocol crnProtocol = crnThread.getCrnProtocol();
        if (crnProtocol == null) {
            return R.error("堆垛机不在线");
        }

        if (MessageQueue.offer(SlaveType.Crn, param.getCrnNo(), new Task(4, null))) {
            return R.ok();
        } else {
            return R.error("命令下发失败");
        }
    }

    @ManagerAuth(memo = "清除联机任务")
    @PostMapping("/operator/taskClear")
    public R crnTaskClear(CrnOperatorParam param){
        CrnCommand command = new CrnCommand();
        command.setTaskClear((short)1);
        return crnControl(command)?R.ok():R.error();
        CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, param.getCrnNo());
        if (crnThread == null) {
            return R.error("堆垛机不在线");
        }
        CrnProtocol crnProtocol = crnThread.getCrnProtocol();
        if (crnProtocol == null) {
            return R.error("堆垛机不在线");
        }

        if (MessageQueue.offer(SlaveType.Crn, param.getCrnNo(), new Task(5, null))) {
            return R.ok();
        } else {
            return R.error("命令下发失败");
        }
    }

//    @ManagerAuth(memo = "暂停")

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

@@ -91,6 +91,12 @@
                        command.setDestinationPosZ((short)0);     // 目标库位层
                        write(command);
                        break;
                    case 4://恢复联机
                        writeResume();
                        break;
                    case 5://取消任务
                        writeCancel();
                        break;
                    default:
                        break;
                }
@@ -235,6 +241,22 @@
        }
    }

    private boolean writeResume() throws InterruptedException {
        OperateResult write = siemensNet.Write("DB100.22", (short) 1);
        if (write.IsSuccess) {
            return true;
        }
        return false;
    }

    private boolean writeCancel() throws InterruptedException {
        OperateResult write = siemensNet.Write("DB100.20", (short) 1);
        if (write.IsSuccess) {
            return true;
        }
        return false;
    }

    /**
     * 写入数据
     */