diff --git a/app/Http/Controllers/Qma/UnitTransferController.php b/app/Http/Controllers/Qma/UnitTransferController.php index b577eb5..766f6b9 100644 --- a/app/Http/Controllers/Qma/UnitTransferController.php +++ b/app/Http/Controllers/Qma/UnitTransferController.php @@ -129,6 +129,20 @@ class UnitTransferController extends Controller ->orderBy('code') ->get(); + // Cari lokasi awal jika vehicle_id disertakan + $selectedOriginLocation = null; + if ($selectedVehicleId) { + $selectedVeh = $heavyUnits->firstWhere('id', $selectedVehicleId); + if ($selectedVeh) { + $selectedOriginLocation = $selectedVeh->location ?: 'Site Kerinci'; + } + } + + // Daftar lokasi awal unik yang saat ini memiliki unit alat berat beserta jumlah unitnya + $originLocations = $heavyUnits->groupBy(fn($u) => $u->location ?: 'Site Kerinci') + ->map(fn($group) => $group->count()) + ->sortKeys(); + // 2. Daftar unit kendaraan kita untuk armada pengangkut (Truk, Flatbed, Lowbed, Towing, LV, dsb.) $transporterUnits = Vehicle::trackableUnits() ->orderBy('category') @@ -149,6 +163,8 @@ class UnitTransferController extends Controller return view('qma.unit_transfers_create', compact( 'heavyUnits', + 'originLocations', + 'selectedOriginLocation', 'transporterUnits', 'drivers', 'locationSuggestions', @@ -164,6 +180,7 @@ class UnitTransferController extends Controller { $validated = $request->validate([ 'vehicle_id' => ['required', 'integer', 'exists:vehicles,id'], + 'from_location' => ['nullable', 'string', 'max:255'], 'transfer_date' => ['required', 'date'], 'to_location' => ['required', 'string', 'max:255'], 'to_site_status' => ['required', 'in:inside_site,outside_site'], @@ -174,6 +191,7 @@ class UnitTransferController extends Controller 'transporter_driver_id' => ['nullable', 'integer', 'exists:employees,id'], 'transporter_driver_name' => ['nullable', 'string', 'max:255'], 'transporter_description' => ['nullable', 'string', 'max:2000'], + 'update_transporter_location' => ['nullable', 'boolean'], 'document_number' => ['required', 'string', 'max:255'], 'document_title' => ['required', 'string', 'max:255'], 'document_file' => ['nullable', 'file', 'mimes:pdf,jpg,jpeg,png', 'max:5120'], @@ -194,11 +212,13 @@ class UnitTransferController extends Controller $filePath = $request->file('document_file')->store('transfers/documents', 'public'); } - $transfer = DB::transaction(function () use ($validated, $filePath) { + $updateTransporter = $request->boolean('update_transporter_location', true); + + $transfer = DB::transaction(function () use ($validated, $filePath, $updateTransporter) { $vehicle = Vehicle::trackableUnits()->findOrFail($validated['vehicle_id']); // Lokasi dan status site awal sebelum dipindahkan - $fromLocation = $vehicle->location ?: 'Site Kerinci'; + $fromLocation = $vehicle->location ?: ($validated['from_location'] ?? 'Site Kerinci'); $fromSiteStatus = $vehicle->site_status ?: 'inside_site'; // Nama armada pengangkut @@ -278,6 +298,31 @@ class UnitTransferController extends Controller 'recorded_at' => Carbon::now(), ]); + // 4. Jika opsi perbarui posisi truk pengangkut aktif + if ($updateTransporter && !empty($validated['transporter_vehicle_id'])) { + $transporterVeh = Vehicle::find($validated['transporter_vehicle_id']); + if ($transporterVeh && $transporterVeh->id !== $vehicle->id) { + $transporterVeh->update([ + 'location' => $toLocation, + 'site_status' => $validated['to_site_status'], + 'location_updated_at' => Carbon::now(), + 'location_updated_by' => $reportedBy, + 'location_note' => "Armada Pengangkut BAST {$validated['document_number']} untuk {$vehicle->code} ke {$toLocation}", + ]); + + VehicleLocationHistory::create([ + 'vehicle_id' => $transporterVeh->id, + 'site_status' => $validated['to_site_status'], + 'location' => $toLocation, + 'note' => "Armada Pengangkut: Mengantar {$vehicle->code} ({$vehicle->brand_type}) via BAST {$validated['document_number']} ke {$toLocation}", + 'source' => 'transfer', + 'user_id' => auth()->id(), + 'user_name' => $reportedBy, + 'recorded_at' => Carbon::now(), + ]); + } + } + return $transfer; }); diff --git a/resources/views/qma/unit_transfers_create.blade.php b/resources/views/qma/unit_transfers_create.blade.php index a32b6e2..cc6ac94 100644 --- a/resources/views/qma/unit_transfers_create.blade.php +++ b/resources/views/qma/unit_transfers_create.blade.php @@ -19,7 +19,7 @@ Form Pemindahan Unit Alat Berat

- Lengkapi rincian pemindahan alat berat, armada pengangkut, dan data Berita Acara Serah Terima (BAST). + Pilih lokasi asal untuk memfilter unit yang tersedia, tentukan tujuan baru, armada truk pengangkut, dan terbitkan BAST.

@@ -49,7 +49,7 @@ @csrf - +
@@ -57,38 +57,73 @@
-

1. Data Alat Berat yang Dipindahkan

-

Pilih unit alat berat dan tentukan lokasi penempatan barunya.

+

1. Lokasi Awal & Unit Alat Berat yang Dipindahkan

+

Pilih titik lokasi awal untuk melihat alat berat yang siap dipindahkan dari lokasi tersebut.

- -
- - + + + @foreach($originLocations as $locName => $count) + + @endforeach + +
+

Memilih lokasi awal akan memfilter unit alat berat yang berada di titik tersebut.

+ + + +
+ + - @error('vehicle_id') -

{{ $message }}

- @enderror + @foreach($heavyUnits as $unit) + + @endforeach + + @error('vehicle_id') +

{{ $message }}

+ @enderror +
@@ -105,14 +140,14 @@

- Lokasi saat ini: + Titik Keberangkatan (Asal):
- +
@@ -130,29 +165,11 @@ @enderror
- -
- -
- - -
-
-
- - -
-
+
- + +
+
-
- - -
- -
- - -
@@ -250,6 +256,18 @@ @enderror
+ + +
+ + +
@@ -262,7 +280,16 @@

2. Armada & Supir Pengangkut (Transporter)

-

Alat berat diangkut menggunakan truk/mobil pengangkut dari unit internal atau unit rekanan.

+

Truk pengangkut dapat dipilih dari lokasi yang sama atau dimobilisasi dari pool/workshop lain.

+
+ + + + @@ -271,19 +298,21 @@
@@ -292,7 +321,7 @@
@@ -300,14 +329,27 @@ name="transporter_unit_name" id="transporter_unit_name" value="{{ old('transporter_unit_name') }}" - placeholder="Contoh: DT-05 Hino 500 / Truk Towing Rekanan" + placeholder="Contoh: DT-05 Hino 500 / Truk Towing Rekanan Luar" class="w-full pl-9 pr-3.5 py-2.5 text-xs rounded-xl border border-slate-200 focus:outline-none focus:ring-2 focus:ring-[#1b5e20]/20 focus:border-[#1b5e20] transition bg-white text-slate-800 font-semibold">
-

Otomatis terisi jika memilih mobil dari unit kita, atau isi manual jika memakai vendor luar.

+

Otomatis terisi jika memilih armada internal, atau ketik nama vendor/unit rekanan luar.

- + +
+ + +
+ +
@@ -337,12 +379,12 @@
@@ -438,6 +480,110 @@
@endsection diff --git a/tests/Feature/QmaUnitTransferTest.php b/tests/Feature/QmaUnitTransferTest.php index ac3cdf3..b5f9624 100644 --- a/tests/Feature/QmaUnitTransferTest.php +++ b/tests/Feature/QmaUnitTransferTest.php @@ -304,4 +304,43 @@ class QmaUnitTransferTest extends TestCase $response->assertSee('value="' . $this->heavyEquipment->id . '"', false); $response->assertSee('selected', false); } + + /** + * Jika opsi update_transporter_location dicentang, armada pengangkut juga diperbarui posisinya + * dan dicatat di riwayat mutasi lokasi. + */ + public function test_store_transfer_updates_transporter_truck_location_when_checked(): void + { + Storage::fake('public'); + + $payload = [ + 'vehicle_id' => $this->heavyEquipment->id, + 'from_location' => 'Main Dam', + 'transfer_date' => Carbon::now()->format('Y-m-d'), + 'to_location' => 'Adit 2 Intake', + 'to_site_status' => 'inside_site', + 'reported_by' => 'Staff QMA Logistik', + 'transporter_vehicle_id' => $this->transporterTruck->id, + 'transporter_unit_name' => 'DT-05', + 'update_transporter_location' => '1', + 'document_number' => '020/BAST-AB/QMA-KMH/X/2026', + 'document_title' => 'BAST Pemindahan Unit & Mobilisasi Truk', + ]; + + $response = $this->actingAs($this->qmaAdmin)->post(route('qma.unit_transfers.store'), $payload); + $response->assertSessionHas('success'); + + // Posisi truk pengangkut harus terupdate ke Adit 2 Intake + $freshTransporter = $this->transporterTruck->fresh(); + $this->assertEquals('Adit 2 Intake', $freshTransporter->location); + + // Riwayat lokasi truk pengangkut harus tercatat + $transporterHistory = VehicleLocationHistory::where('vehicle_id', $this->transporterTruck->id) + ->where('source', 'transfer') + ->first(); + + $this->assertNotNull($transporterHistory); + $this->assertEquals('Adit 2 Intake', $transporterHistory->location); + $this->assertStringContainsString('Mengantar EXCA-01', $transporterHistory->note); + } }