#

zjj

2025-04-08 3df03c486fde77ab36b9298a94bdbb0aa065a7e2

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java

@@ -79,10 +79,10 @@
        redisCommand.setAssignCommand(assignCommand);//命令
        //任务数据保存到redis
        if (redisUtil.set(DeviceRedisConstant.SHUTTLE_WORK_FLAG + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand, SerializerFeature.DisableCircularReferenceDetect))) {
            if (assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_IN.id
                    || assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_OUT.id
                    || assignCommand.getTaskMode() == ShuttleTaskModeType.MOVE_LOC_NO.id
                    || assignCommand.getTaskMode() == ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO.id) {
            if (assignCommand.getTaskMode() == ShuttleTaskModeType.SHUTTLE_MOVE.id
                    || assignCommand.getTaskMode() == ShuttleTaskModeType.TRANSPORT.id
                    || assignCommand.getTaskMode() == ShuttleTaskModeType.MOVE_PALLET_LIFT.id
                    || assignCommand.getTaskMode() == ShuttleTaskModeType.MOVE_PALLET_DOWN.id) {
                //下发行驶路径
                CommandResponse response = shuttleThread.movePath(assignCommand.getNodes(), assignCommand.getDeviceTaskNo());
                Boolean result = response.getResult();
@@ -270,7 +270,7 @@
        basShuttleOpt.setTaskNo(redisCommand.getTaskNo());
        basShuttleOpt.setShuttleNo(Integer.parseInt(device.getDeviceNo()));

        basShuttleOpt.setMode(ShuttleCommandModeType.get(command.getMode()).desc);
        basShuttleOpt.setMode(ShuttleTaskModeType.get(assignCommand.getTaskMode()).desc);
        basShuttleOpt.setSourceLocNo(assignCommand.getSourceLocNo());
        basShuttleOpt.setDistLocNo(assignCommand.getLocNo());
        basShuttleOpt.setCommand(JSON.toJSONString(command));
@@ -691,7 +691,7 @@
            response = shuttleThread.updateLocation(command);
        }

//        News.info("四向穿梭车命令下发，穿梭车号={}，任务数据={}", device.getDeviceNo(), JSON.toJSON(command));
        News.info("四向穿梭车命令下发，穿梭车号={}，任务数据={}", device.getDeviceNo(), JSON.toJSON(command));
        return response;
    }