diff --git a/app/Http/Controllers/AssetController.php b/app/Http/Controllers/AssetController.php
new file mode 100644
index 0000000..73174d7
--- /dev/null
+++ b/app/Http/Controllers/AssetController.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Asset;
+use App\Models\AssetCategory;
+use App\Models\AssetClass;
+use App\Models\AssetLocation;
+use App\Models\AssetStatus;
+use App\Models\AssetUser;
+use App\Models\Department;
+use App\Models\PersonInCharge;
+use App\Models\Unit;
+use App\Models\Warranty;
+use App\Services\Asset\AssetService;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class AssetController extends Controller
+{
+    public function __construct(private readonly AssetService $assets)
+    {
+    }
+
+    public function index(): View
+    {
+        $assets = Asset::with(['status', 'class', 'category', 'unit', 'department', 'personInCharge', 'user', 'location', 'warranty'])
+            ->orderBy('created_at', 'desc')
+            ->get();
+
+        return view('assets.index', [
+            'assets' => $assets,
+            'statuses' => AssetStatus::orderBy('name')->get(),
+            'classes' => AssetClass::orderBy('name')->get(),
+            'categories' => AssetCategory::orderBy('name')->get(),
+            'units' => Unit::orderBy('name')->get(),
+            'departments' => Department::orderBy('name')->get(),
+            'peopleInCharge' => PersonInCharge::orderBy('name')->get(),
+            'users' => AssetUser::orderBy('name')->get(),
+            'locations' => AssetLocation::orderBy('name')->get(),
+            'warranties' => Warranty::orderBy('duration_months')->get(),
+        ]);
+    }
+
+    public function store(Request $request): RedirectResponse
+    {
+        $data = $this->validateRequest($request);
+        $asset = $this->assets->create($data);
+
+        return back()->with('success', "Aset {$asset->code} berhasil ditambahkan.");
+    }
+
+    public function update(Request $request, Asset $asset): RedirectResponse
+    {
+        $data = $this->validateRequest($request, $asset->id);
+        $this->assets->update($asset, $data);
+
+        return back()->with('success', "Aset {$asset->code} berhasil diperbarui.");
+    }
+
+    public function history(Asset $asset): View
+    {
+        $asset->load('histories');
+
+        return view('assets.history', compact('asset'));
+    }
+
+    private function validateRequest(Request $request, ?string $assetId = null): array
+    {
+        return $request->validate([
+            'name' => ['required', 'string', 'max:255'],
+            'serial_number' => ['nullable', 'string', 'max:255'],
+            'description' => ['nullable', 'string'],
+            'asset_status_id' => ['nullable', 'uuid', 'exists:asset_statuses,id'],
+            'asset_class_id' => ['nullable', 'uuid', 'exists:asset_classes,id'],
+            'asset_category_id' => ['nullable', 'uuid', 'exists:asset_categories,id'],
+            'unit_id' => ['nullable', 'uuid', 'exists:units,id'],
+            'department_id' => ['nullable', 'uuid', 'exists:departments,id'],
+            'person_in_charge_id' => ['nullable', 'uuid', 'exists:people_in_charge,id'],
+            'asset_user_id' => ['nullable', 'uuid', 'exists:asset_users,id'],
+            'asset_location_id' => ['nullable', 'uuid', 'exists:asset_locations,id'],
+            'warranty_id' => ['nullable', 'uuid', 'exists:warranties,id'],
+            'purchase_date' => ['nullable', 'date'],
+            'warranty_end' => ['nullable', 'date'],
+            'cost' => ['nullable', 'numeric', 'min:0'],
+            'metadata' => ['nullable', 'array'],
+        ]);
+    }
+}
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
new file mode 100644
index 0000000..b0fdba5
--- /dev/null
+++ b/app/Models/Asset.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Asset extends Model
+{
+    use HasFactory, HasUuids;
+
+    protected $fillable = [
+        'code',
+        'name',
+        'serial_number',
+        'description',
+        'asset_status_id',
+        'asset_class_id',
+        'asset_category_id',
+        'unit_id',
+        'department_id',
+        'person_in_charge_id',
+        'asset_user_id',
+        'asset_location_id',
+        'warranty_id',
+        'purchase_date',
+        'warranty_end',
+        'cost',
+        'qr_token',
+        'qr_path',
+        'metadata',
+    ];
+
+    protected $casts = [
+        'purchase_date' => 'date',
+        'warranty_end' => 'date',
+        'metadata' => 'array',
+    ];
+
+    public function status()
+    {
+        return $this->belongsTo(AssetStatus::class, 'asset_status_id');
+    }
+
+    public function class()
+    {
+        return $this->belongsTo(AssetClass::class, 'asset_class_id');
+    }
+
+    public function category()
+    {
+        return $this->belongsTo(AssetCategory::class, 'asset_category_id');
+    }
+
+    public function unit()
+    {
+        return $this->belongsTo(Unit::class);
+    }
+
+    public function department()
+    {
+        return $this->belongsTo(Department::class);
+    }
+
+    public function personInCharge()
+    {
+        return $this->belongsTo(PersonInCharge::class);
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(AssetUser::class, 'asset_user_id');
+    }
+
+    public function location()
+    {
+        return $this->belongsTo(AssetLocation::class, 'asset_location_id');
+    }
+
+    public function warranty()
+    {
+        return $this->belongsTo(Warranty::class);
+    }
+
+    public function histories()
+    {
+        return $this->hasMany(AssetHistory::class);
+    }
+}
diff --git a/app/Models/AssetHistory.php b/app/Models/AssetHistory.php
new file mode 100644
index 0000000..b5871b5
--- /dev/null
+++ b/app/Models/AssetHistory.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class AssetHistory extends Model
+{
+    use HasFactory, HasUuids;
+
+    protected $fillable = [
+        'asset_id',
+        'action',
+        'description',
+        'changed_by',
+        'payload',
+    ];
+
+    protected $casts = [
+        'payload' => 'array',
+    ];
+
+    public function asset()
+    {
+        return $this->belongsTo(Asset::class);
+    }
+}
diff --git a/app/Models/PersonInCharge.php b/app/Models/PersonInCharge.php
index 39924e3..16df19f 100644
--- a/app/Models/PersonInCharge.php
+++ b/app/Models/PersonInCharge.php
@@ -10,6 +10,8 @@ class PersonInCharge extends Model
 {
     use HasFactory, HasUuids;
 
+    protected $table = 'person_in_charges';
+
     protected $fillable = [
         'name',
         'email',
diff --git a/app/Services/Asset/AssetService.php b/app/Services/Asset/AssetService.php
new file mode 100644
index 0000000..b79fb4b
--- /dev/null
+++ b/app/Services/Asset/AssetService.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Services\Asset;
+
+use App\Models\Asset;
+use App\Models\AssetHistory;
+use App\Services\System\SystemSettingService;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+class AssetService
+{
+    public function __construct(private readonly SystemSettingService $settings)
+    {
+    }
+
+    /**
+     * Buat aset baru dengan kode otomatis berdasarkan setting.
+     */
+    public function create(array $data): Asset
+    {
+        return DB::transaction(function () use ($data) {
+            $data['code'] = $this->generateCode();
+            $data['qr_token'] = $data['qr_token'] ?? Str::uuid()->toString();
+
+            // Hitung warranty_end jika ada warranty dan purchase_date
+            if (!empty($data['purchase_date']) && empty($data['warranty_end'])) {
+                $days = (int) $this->settings->get('asset.warranty_reminder_days', 0);
+                if ($days > 0) {
+                    $data['warranty_end'] = now()->parse($data['purchase_date'])->addDays($days);
+                }
+            }
+
+            $asset = Asset::create($data);
+
+            $this->logHistory($asset, 'created', 'Aset dibuat', $data);
+
+            return $asset;
+        });
+    }
+
+    /**
+     * Perbarui aset dan catat riwayat.
+     */
+    public function update(Asset $asset, array $data): Asset
+    {
+        return DB::transaction(function () use ($asset, $data) {
+            $asset->update($data);
+            $this->logHistory($asset, 'updated', 'Aset diperbarui', $data);
+
+            return $asset;
+        });
+    }
+
+    private function generateCode(): string
+    {
+        $prefix = $this->settings->get('asset.code_prefix', 'AST');
+        $last = Asset::where('code', 'like', $prefix.'-%')
+            ->orderByDesc('code')
+            ->value('code');
+
+        $nextNumber = 1;
+        if ($last && preg_match('/\d+$/', $last, $m)) {
+            $nextNumber = ((int) $m[0]) + 1;
+        }
+
+        return sprintf('%s-%05d', $prefix, $nextNumber);
+    }
+
+    private function logHistory(Asset $asset, string $action, string $description, array $payload = []): void
+    {
+        AssetHistory::create([
+            'asset_id' => $asset->id,
+            'action' => $action,
+            'description' => $description,
+            'changed_by' => auth()->id(),
+            'payload' => $payload,
+        ]);
+    }
+}
diff --git a/database/migrations/2025_12_03_000000_create_master_tables.php b/database/migrations/2025_12_03_000000_create_master_tables.php
index e30567d..a16c400 100644
--- a/database/migrations/2025_12_03_000000_create_master_tables.php
+++ b/database/migrations/2025_12_03_000000_create_master_tables.php
@@ -84,10 +84,46 @@ return new class extends Migration
             $table->string('notes')->nullable();
             $table->timestamps();
         });
+
+        Schema::create('assets', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->string('code')->unique();
+            $table->string('name');
+            $table->string('serial_number')->nullable();
+            $table->text('description')->nullable();
+            $table->foreignUuid('asset_status_id')->nullable()->constrained('asset_statuses')->nullOnDelete();
+            $table->foreignUuid('asset_class_id')->nullable()->constrained('asset_classes')->nullOnDelete();
+            $table->foreignUuid('asset_category_id')->nullable()->constrained('asset_categories')->nullOnDelete();
+            $table->foreignUuid('unit_id')->nullable()->constrained('units')->nullOnDelete();
+            $table->foreignUuid('department_id')->nullable()->constrained('departments')->nullOnDelete();
+            $table->foreignUuid('person_in_charge_id')->nullable()->constrained('person_in_charges')->nullOnDelete();
+            $table->foreignUuid('asset_user_id')->nullable()->constrained('asset_users')->nullOnDelete();
+            $table->foreignUuid('asset_location_id')->nullable()->constrained('asset_locations')->nullOnDelete();
+            $table->foreignUuid('warranty_id')->nullable()->constrained('warranties')->nullOnDelete();
+            $table->date('purchase_date')->nullable();
+            $table->date('warranty_end')->nullable();
+            $table->decimal('cost', 15, 2)->nullable();
+            $table->string('qr_token')->unique();
+            $table->string('qr_path')->nullable();
+            $table->json('metadata')->nullable();
+            $table->timestamps();
+        });
+
+        Schema::create('asset_histories', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->foreignUuid('asset_id')->constrained('assets')->cascadeOnDelete();
+            $table->string('action');
+            $table->text('description')->nullable();
+            $table->uuid('changed_by')->nullable();
+            $table->json('payload')->nullable();
+            $table->timestamps();
+        });
     }
 
     public function down(): void
     {
+        Schema::dropIfExists('asset_histories');
+        Schema::dropIfExists('assets');
         Schema::dropIfExists('warranties');
         Schema::dropIfExists('asset_locations');
         Schema::dropIfExists('asset_categories');
diff --git a/resources/views/assets/history.blade.php b/resources/views/assets/history.blade.php
new file mode 100644
index 0000000..82fbba5
--- /dev/null
+++ b/resources/views/assets/history.blade.php
@@ -0,0 +1,45 @@
+@extends('layouts.master')
+
+@section('content')
+    <div class="d-flex align-items-center justify-content-between mb-3 page-header-breadcrumb flex-wrap gap-2">
+        <div>
+            <h1 class="page-title fw-medium fs-20 mb-0">Riwayat Aset {{ $asset->code }}</h1>
+            <p class="text-muted mb-0">{{ $asset->name }}</p>
+        </div>
+        <a href="{{ route('assets.index') }}" class="btn btn-outline-secondary btn-wave">Kembali</a>
+    </div>
+
+    <div class="card custom-card">
+        <div class="card-header">
+            <div class="card-title mb-0">Riwayat Perubahan</div>
+        </div>
+        <div class="card-body">
+            <div class="table-responsive">
+                <table class="table table-bordered align-middle text-nowrap">
+                    <thead class="table-light">
+                        <tr>
+                            <th>Waktu</th>
+                            <th>Aksi</th>
+                            <th>Deskripsi</th>
+                            <th>Payload</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @forelse($asset->histories()->latest()->get() as $history)
+                            <tr>
+                                <td>{{ $history->created_at->format('d/m/Y H:i') }}</td>
+                                <td>{{ $history->action }}</td>
+                                <td>{{ $history->description }}</td>
+                                <td><pre class="mb-0 small">{{ json_encode($history->payload, JSON_PRETTY_PRINT) }}</pre></td>
+                            </tr>
+                        @empty
+                            <tr>
+                                <td colspan="4" class="text-center text-muted">Belum ada riwayat.</td>
+                            </tr>
+                        @endforelse
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/assets/index.blade.php b/resources/views/assets/index.blade.php
new file mode 100644
index 0000000..631ee82
--- /dev/null
+++ b/resources/views/assets/index.blade.php
@@ -0,0 +1,154 @@
+@extends('layouts.master')
+
+@section('content')
+    <div class="d-flex align-items-center justify-content-between mb-3 page-header-breadcrumb flex-wrap gap-2">
+        <div>
+            <h1 class="page-title fw-medium fs-20 mb-0">Data Aset</h1>
+            <p class="text-muted mb-0">Kelola aset, QR token, dan metadata terkait.</p>
+        </div>
+        <button class="btn btn-primary btn-wave" data-bs-toggle="modal" data-bs-target="#createAssetModal">
+            <i class="ri-add-line me-1"></i>Tambah Aset
+        </button>
+    </div>
+
+    <div class="card custom-card">
+        <div class="card-header">
+            <div class="card-title mb-0">Daftar Aset</div>
+        </div>
+        <div class="card-body">
+            @if(session('success'))
+                <div class="alert alert-success alert-dismissible" role="alert">
+                    {{ session('success') }}
+                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+                </div>
+            @endif
+
+            @if($errors->any())
+                <div class="alert alert-danger">
+                    <ul class="mb-0">
+                        @foreach($errors->all() as $error)
+                            <li>{{ $error }}</li>
+                        @endforeach
+                    </ul>
+                </div>
+            @endif
+
+            <div class="table-responsive">
+                <table class="table table-bordered align-middle text-nowrap">
+                    <thead class="table-light">
+                        <tr>
+                            <th>Kode</th>
+                            <th>Nama</th>
+                            <th>Status</th>
+                            <th>Kategori</th>
+                            <th>Lokasi</th>
+                            <th>QR Token</th>
+                            <th class="text-center" style="width: 10%;">Aksi</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @forelse($assets as $asset)
+                            <tr>
+                                <td class="fw-semibold">{{ $asset->code }}</td>
+                                <td>{{ $asset->name }}</td>
+                                <td><span class="badge bg-primary-transparent text-primary">{{ $asset->status?->name ?: '-' }}</span></td>
+                                <td>{{ $asset->category?->name ?: '-' }}</td>
+                                <td>{{ $asset->location?->name ?: '-' }}</td>
+                                <td><code>{{ $asset->qr_token }}</code></td>
+                                <td class="text-center">
+                                    <div class="btn-list">
+                                        <button class="btn btn-sm btn-outline-primary"
+                                            data-bs-toggle="modal" data-bs-target="#editAssetModal"
+                                            data-id="{{ $asset->id }}"
+                                            data-payload='@json($asset->toArray())'>
+                                            Edit
+                                        </button>
+                                        <a href="{{ route('assets.history', $asset) }}" class="btn btn-sm btn-outline-secondary">History</a>
+                                    </div>
+                                </td>
+                            </tr>
+                        @empty
+                            <tr>
+                                <td colspan="7" class="text-center text-muted">Belum ada aset.</td>
+                            </tr>
+                        @endforelse
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    {{-- Modal create --}}
+    <div class="modal fade" id="createAssetModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-xl modal-dialog-centered">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Tambah Aset</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <form action="{{ route('assets.store') }}" method="POST">
+                    @csrf
+                    <div class="modal-body">
+                        @include('assets.partials.form')
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Batal</button>
+                        <button type="submit" class="btn btn-primary">Simpan</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    {{-- Modal edit --}}
+    <div class="modal fade" id="editAssetModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-xl modal-dialog-centered">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Edit Aset</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <form id="editAssetForm" method="POST">
+                    @csrf
+                    @method('PUT')
+                    <div class="modal-body">
+                        @include('assets.partials.form')
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Batal</button>
+                        <button type="submit" class="btn btn-primary">Update</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('scripts')
+<script>
+    const editAssetModal = document.getElementById('editAssetModal');
+    if (editAssetModal) {
+        editAssetModal.addEventListener('show.bs.modal', function (event) {
+            const button = event.relatedTarget;
+            const form = document.getElementById('editAssetForm');
+            const payload = JSON.parse(button.getAttribute('data-payload') || '{}');
+
+            form.action = "{{ url('assets') }}/" + button.getAttribute('data-id');
+
+            const simpleFields = [
+                'name','serial_number','description','asset_status_id','asset_class_id','asset_category_id',
+                'unit_id','department_id','person_in_charge_id','asset_user_id','asset_location_id',
+                'warranty_id','purchase_date','warranty_end','cost'
+            ];
+
+            simpleFields.forEach((field) => {
+                const el = form.querySelector(`[name="${field}"]`);
+                if (!el) return;
+                el.value = payload[field] ?? '';
+            });
+
+            // metadata not editable via modal here (bisa ditambah kemudian)
+        });
+    }
+</script>
+@endsection
diff --git a/resources/views/assets/partials/form.blade.php b/resources/views/assets/partials/form.blade.php
new file mode 100644
index 0000000..bf70bd6
--- /dev/null
+++ b/resources/views/assets/partials/form.blade.php
@@ -0,0 +1,112 @@
+<div class="row g-3">
+    <div class="col-md-6">
+        <label class="form-label">Nama Aset</label>
+        <input type="text" name="name" class="form-control" required placeholder="mis: Laptop Dell XPS">
+    </div>
+    <div class="col-md-6">
+        <label class="form-label">Serial Number</label>
+        <input type="text" name="serial_number" class="form-control" placeholder="SN/IMEI">
+    </div>
+
+    <div class="col-md-4">
+        <label class="form-label">Status</label>
+        <select name="asset_status_id" class="form-select">
+            <option value="">-- Pilih --</option>
+            @foreach($statuses as $item)
+                <option value="{{ $item->id }}">{{ $item->name }}</option>
+            @endforeach
+        </select>
+    </div>
+    <div class="col-md-4">
+        <label class="form-label">Kelas</label>
+        <select name="asset_class_id" class="form-select">
+            <option value="">-- Pilih --</option>
+            @foreach($classes as $item)
+                <option value="{{ $item->id }}">{{ $item->name }}</option>
+            @endforeach
+        </select>
+    </div>
+    <div class="col-md-4">
+        <label class="form-label">Kategori</label>
+        <select name="asset_category_id" class="form-select">
+            <option value="">-- Pilih --</option>
+            @foreach($categories as $item)
+                <option value="{{ $item->id }}">{{ $item->name }}</option>
+            @endforeach
+        </select>
+    </div>
+
+    <div class="col-md-4">
+        <label class="form-label">Unit</label>
+        <select name="unit_id" class="form-select">
+            <option value="">-- Pilih --</option>
+            @foreach($units as $item)
+                <option value="{{ $item->id }}">{{ $item->symbol }} - {{ $item->name }}</option>
+            @endforeach
+        </select>
+    </div>
+    <div class="col-md-4">
+        <label class="form-label">Departemen</label>
+        <select name="department_id" class="form-select">
+            <option value="">-- Pilih --</option>
+            @foreach($departments as $item)
+                <option value="{{ $item->id }}">{{ $item->name }}</option>
+            @endforeach
+        </select>
+    </div>
+    <div class="col-md-4">
+        <label class="form-label">Penanggung Jawab</label>
+        <select name="person_in_charge_id" class="form-select">
+            <option value="">-- Pilih --</option>
+            @foreach($peopleInCharge as $item)
+                <option value="{{ $item->id }}">{{ $item->name }}</option>
+            @endforeach
+        </select>
+    </div>
+
+    <div class="col-md-4">
+        <label class="form-label">Pengguna Aset</label>
+        <select name="asset_user_id" class="form-select">
+            <option value="">-- Pilih --</option>
+            @foreach($users as $item)
+                <option value="{{ $item->id }}">{{ $item->name }}</option>
+            @endforeach
+        </select>
+    </div>
+    <div class="col-md-4">
+        <label class="form-label">Lokasi</label>
+        <select name="asset_location_id" class="form-select">
+            <option value="">-- Pilih --</option>
+            @foreach($locations as $item)
+                <option value="{{ $item->id }}">{{ $item->name }}</option>
+            @endforeach
+        </select>
+    </div>
+    <div class="col-md-4">
+        <label class="form-label">Garansi</label>
+        <select name="warranty_id" class="form-select">
+            <option value="">-- Pilih --</option>
+            @foreach($warranties as $item)
+                <option value="{{ $item->id }}">{{ $item->name }} ({{ $item->duration_months }} bln)</option>
+            @endforeach
+        </select>
+    </div>
+
+    <div class="col-md-4">
+        <label class="form-label">Tanggal Pembelian</label>
+        <input type="date" name="purchase_date" class="form-control">
+    </div>
+    <div class="col-md-4">
+        <label class="form-label">Akhir Garansi</label>
+        <input type="date" name="warranty_end" class="form-control">
+    </div>
+    <div class="col-md-4">
+        <label class="form-label">Biaya (Rp)</label>
+        <input type="number" step="0.01" name="cost" class="form-control" placeholder="0.00">
+    </div>
+
+    <div class="col-md-12">
+        <label class="form-label">Deskripsi</label>
+        <textarea name="description" class="form-control" rows="3" placeholder="Keterangan singkat aset"></textarea>
+    </div>
+</div>
diff --git a/resources/views/layouts/components/main-sidebar.blade.php b/resources/views/layouts/components/main-sidebar.blade.php
index d9ac843..18b5f8c 100644
--- a/resources/views/layouts/components/main-sidebar.blade.php
+++ b/resources/views/layouts/components/main-sidebar.blade.php
@@ -109,6 +109,7 @@
                         <li class="slide"><a href="{{ route('asset-categories.index') }}" class="side-menu__item {{ request()->routeIs('asset-categories.index') ? 'active' : '' }}">Kategori Aset</a></li>
                         <li class="slide"><a href="{{ route('asset-locations.index') }}" class="side-menu__item {{ request()->routeIs('asset-locations.index') ? 'active' : '' }}">Lokasi Aset</a></li>
                         <li class="slide"><a href="{{ route('warranties.index') }}" class="side-menu__item {{ request()->routeIs('warranties.index') ? 'active' : '' }}">Masa Garansi</a></li>
+                        <li class="slide"><a href="{{ route('assets.index') }}" class="side-menu__item {{ request()->routeIs('assets.*') ? 'active' : '' }}">Data Aset</a></li>
                     </ul>
                 </li>
 
diff --git a/routes/web.php b/routes/web.php
index 9f4ed7a..cfa90bc 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -16,6 +16,7 @@ use App\Http\Controllers\Master\AssetUserController;
 use App\Http\Controllers\Master\AssetCategoryController;
 use App\Http\Controllers\Master\AssetLocationController;
 use App\Http\Controllers\Master\WarrantyController;
+use App\Http\Controllers\AssetController;
 use App\Http\Controllers\Controller;
 
 Route::get('/', function () {
@@ -45,3 +46,5 @@ Route::resource('asset-users', AssetUserController::class)->only(['index', 'stor
 Route::resource('asset-categories', AssetCategoryController::class)->only(['index', 'store', 'update', 'destroy']);
 Route::resource('asset-locations', AssetLocationController::class)->only(['index', 'store', 'update', 'destroy']);
 Route::resource('warranties', WarrantyController::class)->only(['index', 'store', 'update', 'destroy']);
+Route::get('assets/{asset}/history', [AssetController::class, 'history'])->name('assets.history');
+Route::resource('assets', AssetController::class)->only(['index', 'store', 'update']);
diff --git a/tests/Feature/AssetTest.php b/tests/Feature/AssetTest.php
new file mode 100644
index 0000000..8319990
--- /dev/null
+++ b/tests/Feature/AssetTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\AssetStatus;
+use App\Services\Asset\AssetService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AssetTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_create_asset_respects_code_prefix_from_setting(): void
+    {
+        config(['system.asset.code_prefix' => 'ASTX']);
+        $status = AssetStatus::create(['name' => 'Aktif', 'code' => 'ACTIVE']);
+
+        $asset = app(AssetService::class)->create([
+            'name' => 'Laptop Uji',
+            'asset_status_id' => $status->id,
+        ]);
+
+        $this->assertStringStartsWith('ASTX-', $asset->code);
+    }
+}