This commit is contained in:
Dwi Swandhana
2026-04-23 13:55:32 +07:00
parent 1b41f3e6ee
commit 1a1d58e60a
6 changed files with 74 additions and 23 deletions
+23
View File
@@ -329,10 +329,30 @@ class GudangPos extends Component
$jenisNames = $products->getCollection()->pluck('jenis')->filter()->values()->all();
$stockMap = $service->getStockBaseByJenisMany($jenisNames);
$latestExpiredMap = [];
if (count($jenisNames) > 0) {
$expiredRows = SIMBHPReport::query()
->select('jenis', DB::raw('MAX(masa_expired) as latest_expired'))
->whereIn('jenis', $jenisNames)
->whereNotNull('masa_expired')
->whereNotNull('pemasukan')
->where('pemasukan', '>', 0)
->groupBy('jenis')
->get();
foreach ($expiredRows as $row) {
$jenisNama = (string) ($row->jenis ?? '');
$expired = (string) ($row->latest_expired ?? '');
if ($jenisNama !== '' && $expired !== '') {
$latestExpiredMap[$jenisNama] = Carbon::parse($expired)->format('d-m-Y');
}
}
}
$selectedJenis = null;
$selectedStockDisplay = null;
$selectedSetting = null;
$selectedLatestExpired = null;
$kode = $service->sanitizeKode($this->selectedKode);
if ($kode !== '') {
$selectedJenis = $service->getJenisByKode($kode);
@@ -345,6 +365,7 @@ class GudangPos extends Component
(string) ($selectedJenis->satuan_kecil ?? ''),
(int) ($selectedJenis->konversi_kecil ?? 1),
);
$selectedLatestExpired = $latestExpiredMap[(string) $selectedJenis->jenis] ?? null;
}
}
@@ -352,9 +373,11 @@ class GudangPos extends Component
'users' => $users,
'products' => $products,
'stockMap' => $stockMap,
'latestExpiredMap' => $latestExpiredMap,
'selectedJenis' => $selectedJenis,
'selectedStockDisplay' => $selectedStockDisplay,
'selectedSetting' => $selectedSetting,
'selectedLatestExpired' => $selectedLatestExpired,
]);
}
}