#

Junjie

2025-05-24 7f76ee82f932af805ed8cc5f12d9a9c02da00077

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

@@ -385,12 +385,42 @@
        return crnControl(command)?R.ok():R.error();
    }

    @ManagerAuth(memo = "解锁小车")
    @PostMapping("/lock")
    public R lock(CrnOperatorParam param){
        RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
        rgvThread.setPakMk(true);
        return R.ok();
    @ManagerAuth(memo = "恢复联机任务")
    @PostMapping("/operator/taskRe")
    public R taskRe(CrnOperatorParam param){
        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){
        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 = "暂停")