#

Junjie

2025-01-14 900f7032f7e701efd4741c2bcabeaad969e5fd3f

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

@@ -286,9 +286,7 @@
            assignCommand.setLocNo(param.getDistLocNo());
        }

        for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
            if (param.getShuttleNo().equals(shuttleSlave.getId())) {
                ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleSlave.getId());
        ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, param.getShuttleNo());
                if (shuttleThread == null) {
                    throw new CoolException("四向穿梭车不在线");
                }
@@ -298,7 +296,7 @@
                }

                ShuttleTaskModeType shuttleTaskModeType = ShuttleTaskModeType.get(param.getShuttleTaskMode().intValue());
                assignCommand.setShuttleNo(shuttleSlave.getId()); // 四向穿梭车编号
        assignCommand.setShuttleNo(param.getShuttleNo()); // 四向穿梭车编号
                assignCommand.setTaskMode(shuttleTaskModeType.id);
                assignCommand.setTaskNo(commonService.getWorkNo(99));//获取任务号
                assignCommand.setAuto(false);//手动模式
@@ -355,15 +353,20 @@
                    //移动到目标库位(生成移动任务)
                    shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(3), param.getDistLocNo(), param.getShuttleNo());
                    return R.ok();
        } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_DEMO_OPEN) {
            //演示模式-开
            shuttleThread.enableDemo(true);
            return R.ok();
        } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_DEMO_CLOSE) {
            //演示模式-关
            shuttleThread.enableDemo(false);
            return R.ok();
                } else {
                    throw new CoolException("未知命令");
                }

                shuttleAction.assignWork(shuttleProtocol.getShuttleNo(), assignCommand);
                return R.ok();
            }
        }
        return R.error();
    }

    @PostMapping("/detl/update")