#

Junjie

5 天以前 456273f11d75782e676d43763f0f0601ea5c37f8

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

@@ -298,7 +298,7 @@
        ShuttleTaskModeType shuttleTaskModeType = ShuttleTaskModeType.get(param.getShuttleTaskMode().intValue());
        assignCommand.setShuttleNo(param.getShuttleNo()); // 四向穿梭车编号
        assignCommand.setTaskMode(shuttleTaskModeType.id);
        assignCommand.setTaskNo(commonService.getWorkNo(99));//获取任务号
        assignCommand.setTaskNo(commonService.getWorkNo(WrkIoType.MANUAL.id));//获取任务号
        assignCommand.setAuto(false);//手动模式

        if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO) {
@@ -351,7 +351,7 @@
            return R.ok();
        } else if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO_TASK) {
            //移动到目标库位(生成移动任务)
            shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(3), param.getDistLocNo(), param.getShuttleNo());
            shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(WrkIoType.LOC_MOVE.id), param.getDistLocNo(), param.getShuttleNo());
            return R.ok();
        } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_DEMO_OPEN) {
            //演示模式-开
@@ -373,8 +373,7 @@
    @ManagerAuth(memo = "修改数据")
    public R shuttleUpdate(@RequestParam Integer shuttleNo,
                           @RequestParam Integer workNo,
                           @RequestParam String pakMk,
                           @RequestParam Integer token) {
                           @RequestParam String pakMk) {
        ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
        if (shuttleThread == null) {
            return R.error("plc已掉线");