mama/star-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(inventory): 重構庫存盤點流程與優化操作日誌

Browse Source 
1. 重構盤點流程：實作自動狀態轉換（盤點中/盤點完成）、整合按鈕為「儲存盤點結果」、更名 UI 狀態標籤。
2. 優化操作日誌：
   - 實作全域 ID 轉名稱邏輯（倉庫、使用者）。
   - 合併單次操作的日誌記錄，避免重複產生。
   - 修復日誌產生過程中的 Collection 修改錯誤。
3. 修正 TypeScript lint 錯誤（Index, Show 頁面）。
This commit is contained in:
sky121113
2026-02-04 15:12:10 +08:00
parent f4f597e96d
commit 702af0a259
9 changed files with 291 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
app/Modules/Inventory/Services/CountService.php
View File

@@ -20,7 +20,8 @@ class CountService
return DB::transaction(function () use ($warehouseId, $remarks, $userId) {
$doc = InventoryCountDoc::create([
'warehouse_id' => $warehouseId,
'status' => 'draft',
'status' => 'counting',
'snapshot_date' => now(),
'remarks' => $remarks,
'created_by' => $userId,
]);
@@ -32,9 +33,9 @@ class CountService
/**
* 執行快照：鎖定當前庫存量
*/
public function snapshot(InventoryCountDoc $doc): void
public function snapshot(InventoryCountDoc $doc, bool $updateDoc = true): void
{
DB::transaction(function () use ($doc) {
DB::transaction(function () use ($doc, $updateDoc) {
// 清除舊的 items (如果有)
$doc->items()->delete();
@@ -62,10 +63,12 @@ class CountService
InventoryCountItem::insert($items);
}
$doc->update([
'status' => 'counting',
'snapshot_date' => now(),
]);
if ($updateDoc) {
$doc->update([
'status' => 'counting',
'snapshot_date' => now(),
]);
}
});
}
@@ -91,19 +94,111 @@ class CountService
public function updateCount(InventoryCountDoc $doc, array $itemsData): void
{
DB::transaction(function () use ($doc, $itemsData) {
$updatedItems = [];
$hasChanges = false;
$oldDocAttributes = [
'status' => $doc->status,
'completed_at' => $doc->completed_at ? $doc->completed_at->format('Y-m-d H:i:s') : null,
'completed_by' => $doc->completed_by,
];
foreach ($itemsData as $data) {
$item = $doc->items()->find($data['id']);
$item = $doc->items()->with('product')->find($data['id']);
if ($item) {
$countedQty = $data['counted_qty'];
$diff = is_numeric($countedQty) ? ($countedQty - $item->system_qty) : 0;
$oldQty = $item->counted_qty;
$newQty = $data['counted_qty'];
$oldNotes = $item->notes;
$newNotes = $data['notes'] ?? $item->notes;
$item->update([
'counted_qty' => $countedQty,
'diff_qty' => $diff,
'notes' => $data['notes'] ?? $item->notes,
]);
$isQtyChanged = $oldQty != $newQty;
$isNotesChanged = $oldNotes !== $newNotes;
if ($isQtyChanged || $isNotesChanged) {
$updatedItems[] = [
'product_name' => $item->product->name,
'old' => [
'counted_qty' => $oldQty,
'notes' => $oldNotes,
],
'new' => [
'counted_qty' => $newQty,
'notes' => $newNotes,
]
];
$countedQty = $data['counted_qty'];
$diff = is_numeric($countedQty) ? ($countedQty - $item->system_qty) : 0;
$item->update([
'counted_qty' => $countedQty,
'diff_qty' => $diff,
'notes' => $newNotes,
]);
$hasChanges = true;
}
}
}
// 檢查是否完成
$doc->refresh();
$isAllCounted = $doc->items()->whereNull('counted_qty')->count() === 0;
$newDocAttributesLog = [];
if ($isAllCounted) {
if ($doc->status !== 'completed') {
$doc->status = 'completed';
$doc->completed_at = now();
$doc->completed_by = auth()->id();
$doc->saveQuietly();
$doc->refresh(); // 獲取更新後的屬性 (如時間)
$newDocAttributesLog = [
'status' => 'completed',
'completed_at' => $doc->completed_at->format('Y-m-d H:i:s'),
'completed_by' => $doc->completed_by,
];
$hasChanges = true;
}
} else {
if ($doc->status === 'completed') {
$doc->status = 'counting';
$doc->completed_at = null;
$doc->completed_by = null;
$doc->saveQuietly();
$newDocAttributesLog = [
'status' => 'counting',
'completed_at' => null,
'completed_by' => null,
];
$hasChanges = true;
}
}
// 記錄操作日誌
if ($hasChanges) {
$properties = [
'items_diff' => [
'added' => [],
'removed' => [],
'updated' => $updatedItems,
],
];
// 如果有文件層級的屬性變更 (狀態)，併入 log
if (!empty($newDocAttributesLog)) {
$properties['attributes'] = $newDocAttributesLog;
$properties['old'] = array_intersect_key($oldDocAttributes, $newDocAttributesLog);
}
activity()
->performedOn($doc)
->causedBy(auth()->user())
->event('updated')
->withProperties($properties)
->log('updated');
}
});
}
}