優化採購單與進貨單操作紀錄:新增品項明細、ID 轉名稱解析、前端多數量 key 通用顯示
- 重構 PurchaseOrder@tapActivity:支援 vendor_id/warehouse_id/user_id 自動解析為名稱 - 修改 PurchaseOrderController@store:改用 saveQuietly + 手動日誌,建立時紀錄品項明細 - 修正 PurchaseOrderController update/destroy snapshot 跨模組取值為 null 的問題 - 修改 GoodsReceiptService@store:改用 saveQuietly + 手動日誌,建立時紀錄品項明細 - 修改 ActivityDetailDialog.tsx:支援 quantity/quantity_received/requested_qty 多 key 通用渲染 - 新增項目顯示金額與備註,更新項目增加金額與備註變更對比
This commit is contained in:
@@ -230,7 +230,8 @@ class PurchaseOrderController extends Controller
|
||||
$userId = $user->id;
|
||||
}
|
||||
|
||||
$order = PurchaseOrder::create([
|
||||
// 靜默建立以抑制自動日誌(後續手動發送含品項明細的日誌)
|
||||
$order = new PurchaseOrder([
|
||||
'code' => $code,
|
||||
'vendor_id' => $validated['vendor_id'],
|
||||
'warehouse_id' => $validated['warehouse_id'],
|
||||
@@ -246,6 +247,12 @@ class PurchaseOrderController extends Controller
|
||||
'invoice_date' => $validated['invoice_date'] ?? null,
|
||||
'invoice_amount' => $validated['invoice_amount'] ?? null,
|
||||
]);
|
||||
$order->saveQuietly();
|
||||
|
||||
// 建立品項並收集 items_diff
|
||||
$diff = ['added' => [], 'removed' => [], 'updated' => []];
|
||||
$productIds = collect($validated['items'])->pluck('productId')->unique()->toArray();
|
||||
$products = $this->inventoryService->getProductsByIds($productIds)->keyBy('id');
|
||||
|
||||
foreach ($validated['items'] as $item) {
|
||||
// 反算單價
|
||||
@@ -258,8 +265,43 @@ class PurchaseOrderController extends Controller
|
||||
'unit_price' => $unitPrice,
|
||||
'subtotal' => $item['subtotal'],
|
||||
]);
|
||||
|
||||
$product = $products->get($item['productId']);
|
||||
$diff['added'][] = [
|
||||
'product_name' => $product?->name ?? '未知商品',
|
||||
'new' => [
|
||||
'quantity' => (float)$item['quantity'],
|
||||
'subtotal' => (float)$item['subtotal'],
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
// 手動發送高品質日誌(包含品項明細)
|
||||
activity()
|
||||
->performedOn($order)
|
||||
->causedBy($userId)
|
||||
->event('created')
|
||||
->withProperties([
|
||||
'items_diff' => $diff,
|
||||
'attributes' => [
|
||||
'po_number' => $order->code,
|
||||
'vendor_id' => $order->vendor_id,
|
||||
'warehouse_id' => $order->warehouse_id,
|
||||
'user_id' => $order->user_id,
|
||||
'status' => $order->status,
|
||||
'order_date' => $order->order_date,
|
||||
'expected_delivery_date' => $order->expected_delivery_date,
|
||||
'total_amount' => $order->total_amount,
|
||||
'tax_amount' => $order->tax_amount,
|
||||
'grand_total' => $order->grand_total,
|
||||
'remark' => $order->remark,
|
||||
'invoice_number' => $order->invoice_number,
|
||||
'invoice_date' => $order->invoice_date,
|
||||
'invoice_amount' => $order->invoice_amount,
|
||||
]
|
||||
])
|
||||
->log('created');
|
||||
|
||||
DB::commit();
|
||||
} finally {
|
||||
$lock->release();
|
||||
@@ -619,8 +661,6 @@ class PurchaseOrderController extends Controller
|
||||
'snapshot' => [
|
||||
'po_number' => $order->code,
|
||||
'vendor_name' => $order->vendor?->name,
|
||||
'warehouse_name' => $order->warehouse?->name,
|
||||
'user_name' => $order->user?->name,
|
||||
]
|
||||
])
|
||||
->log('updated');
|
||||
@@ -673,8 +713,6 @@ class PurchaseOrderController extends Controller
|
||||
'snapshot' => [
|
||||
'po_number' => $order->code,
|
||||
'vendor_name' => $order->vendor?->name,
|
||||
'warehouse_name' => $order->warehouse?->name,
|
||||
'user_name' => $order->user?->name,
|
||||
]
|
||||
])
|
||||
->log('deleted');
|
||||
|
||||
Reference in New Issue
Block a user