diff --git a/app/Http/Controllers/KJPPController.php b/app/Http/Controllers/KJPPController.php
index 966c35c..99a0c2f 100644
--- a/app/Http/Controllers/KJPPController.php
+++ b/app/Http/Controllers/KJPPController.php
@@ -40,7 +40,15 @@ class KJPPController extends Controller
         $jenis_aset = JenisJaminan::all();
         $provinces = Province::all();
 
-        return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset', 'provinces'));
+        // Generate KJPP Number
+        $lastKjpp = KJPP::orderBy('code', 'desc')->first();
+        $nextNumber = $lastKjpp ? intval(substr($lastKjpp->code, 1, 6)) + 1 : 1;
+        $kjppNumber = 'K' . str_pad($nextNumber, 6, '0', STR_PAD_LEFT);
+
+        // Combine KJPP number with branch code
+        $fullKjppNumber = $kjppNumber;
+
+        return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset', 'provinces', 'fullKjppNumber'));
     }
 
     /**
diff --git a/resources/views/kjpp/create.blade.php b/resources/views/kjpp/create.blade.php
index e0c854d..c03ab45 100644
--- a/resources/views/kjpp/create.blade.php
+++ b/resources/views/kjpp/create.blade.php
@@ -32,7 +32,7 @@
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <input class="input  @error('code') border-danger  @enderror" type="text" name="code"
-                                value="{{ $kjpp->code ?? old('code') }}">
+                                value="{{ isset($kjpp->id) ? $kjpp->code : (empty($kjpp->id) ? $fullKjppNumber : old('code')) }}">
                             @error('code')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror