feat(商品): 調整商品代號顯示與會計報表樣式
This commit is contained in:
@@ -90,37 +90,58 @@ class AccountingReportController extends Controller
|
||||
{
|
||||
$dateStart = $request->input('date_start', Carbon::now()->toDateString());
|
||||
$dateEnd = $request->input('date_end', Carbon::now()->toDateString());
|
||||
$selectedIdsParam = $request->input('selected_ids');
|
||||
|
||||
$purchaseOrders = PurchaseOrder::with(['vendor'])
|
||||
->whereIn('status', ['received', 'completed'])
|
||||
->whereBetween('created_at', [$dateStart . ' 00:00:00', $dateEnd . ' 23:59:59'])
|
||||
->get();
|
||||
$purchaseOrdersQuery = PurchaseOrder::with(['vendor'])
|
||||
->whereIn('status', ['received', 'completed']);
|
||||
|
||||
$utilityFeesQuery = UtilityFee::query();
|
||||
|
||||
$utilityFees = UtilityFee::whereBetween('transaction_date', [$dateStart, $dateEnd])->get();
|
||||
if ($selectedIdsParam) {
|
||||
$ids = explode(',', $selectedIdsParam);
|
||||
$poIds = [];
|
||||
$ufIds = [];
|
||||
foreach ($ids as $id) {
|
||||
if (str_starts_with($id, 'PO-')) {
|
||||
$poIds[] = substr($id, 3);
|
||||
} elseif (str_starts_with($id, 'UF-')) {
|
||||
$ufIds[] = substr($id, 3);
|
||||
}
|
||||
}
|
||||
$purchaseOrders = $purchaseOrdersQuery->whereIn('id', $poIds)->get();
|
||||
$utilityFees = $utilityFeesQuery->whereIn('id', $ufIds)->get();
|
||||
} else {
|
||||
$purchaseOrders = $purchaseOrdersQuery
|
||||
->whereBetween('created_at', [$dateStart . ' 00:00:00', $dateEnd . ' 23:59:59'])
|
||||
->get();
|
||||
$utilityFees = $utilityFeesQuery
|
||||
->whereBetween('transaction_date', [$dateStart, $dateEnd])
|
||||
->get();
|
||||
}
|
||||
|
||||
$allRecords = collect();
|
||||
|
||||
foreach ($purchaseOrders as $po) {
|
||||
$allRecords->push([
|
||||
$po->created_at->toDateString(),
|
||||
Carbon::parse($po->created_at)->toDateString(),
|
||||
'採購單',
|
||||
'進貨支出',
|
||||
$po->vendor->name ?? '',
|
||||
$po->code,
|
||||
$po->invoice_number,
|
||||
$po->grand_total,
|
||||
(float)$po->grand_total,
|
||||
]);
|
||||
}
|
||||
|
||||
foreach ($utilityFees as $fee) {
|
||||
$allRecords->push([
|
||||
$fee->transaction_date,
|
||||
Carbon::parse($fee->transaction_date)->toDateString(),
|
||||
'公共事業費',
|
||||
$fee->category,
|
||||
$fee->description,
|
||||
'-',
|
||||
$fee->invoice_number,
|
||||
$fee->amount,
|
||||
(float)$fee->amount,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user