feat: 整合門市領料日誌、API 文件存取、修改庫存與併發編號問題、供應商商品內聯編輯及日誌 UI 優化

app/Modules/Inventory/Models/Category.php

@@ -29,12 +29,27 @@ class Category extends Model
 
     public function tapActivity(\Spatie\Activitylog\Contracts\Activity $activity, string $eventName)
     {
-        $properties = $activity->properties;
+        $properties = $activity->properties instanceof \Illuminate\Support\Collection 
+            ? $activity->properties->toArray() 
+            : $activity->properties;
         
         $snapshot = $properties['snapshot'] ?? [];
         $snapshot['name'] = $this->name;
         $properties['snapshot'] = $snapshot;
 
+        $resolver = function (&$data) {
+            if (empty($data) || !is_array($data)) return;
+            
+            foreach (['created_by', 'updated_by'] as $f) {
+                if (isset($data[$f]) && is_numeric($data[$f])) {
+                    $data[$f] = \App\Modules\Core\Models\User::find($data[$f])?->name;
+                }
+            }
+        };
+
+        if (isset($properties['attributes'])) $resolver($properties['attributes']);
+        if (isset($properties['old'])) $resolver($properties['old']);
+
         $activity->properties = $properties;
     }
 }

app/Modules/Inventory/Models/GoodsReceipt.php

@@ -40,6 +40,47 @@ class GoodsReceipt extends Model
             ->dontSubmitEmptyLogs();
     }
 
+    public function tapActivity(\Spatie\Activitylog\Contracts\Activity $activity, string $eventName)
+    {
+        $properties = $activity->properties instanceof \Illuminate\Support\Collection 
+            ? $activity->properties->toArray() 
+            : $activity->properties;
+
+        $snapshot = $properties['snapshot'] ?? [];
+        $snapshot['doc_no'] = $this->code;
+        $snapshot['warehouse_name'] = $this->warehouse?->name;
+        
+        if (!isset($snapshot['vendor_name']) && $this->vendor_id) {
+            $vendor = app(\App\Modules\Procurement\Contracts\ProcurementServiceInterface::class)
+                ->getVendorsByIds([$this->vendor_id])->first();
+            $snapshot['vendor_name'] = $vendor?->name;
+        }
+        $properties['snapshot'] = $snapshot;
+
+        $resolver = function (&$data) {
+            if (empty($data) || !is_array($data)) return;
+            
+            foreach (['user_id', 'created_by', 'updated_by'] as $f) {
+                if (isset($data[$f]) && is_numeric($data[$f])) {
+                    $data[$f] = app(\App\Modules\Core\Contracts\CoreServiceInterface::class)->getUser($data[$f])?->name;
+                }
+            }
+            if (isset($data['warehouse_id']) && is_numeric($data['warehouse_id'])) {
+                $data['warehouse_id'] = \App\Modules\Inventory\Models\Warehouse::find($data['warehouse_id'])?->name;
+            }
+            if (isset($data['vendor_id']) && is_numeric($data['vendor_id'])) {
+                $vendor = app(\App\Modules\Procurement\Contracts\ProcurementServiceInterface::class)
+                    ->getVendorsByIds([$data['vendor_id']])->first();
+                $data['vendor_id'] = $vendor?->name;
+            }
+        };
+
+        if (isset($properties['attributes'])) $resolver($properties['attributes']);
+        if (isset($properties['old'])) $resolver($properties['old']);
+
+        $activity->properties = $properties;
+    }
+
     public function items()
     {
         return $this->hasMany(GoodsReceiptItem::class);

app/Modules/Inventory/Models/Inventory.php

@@ -147,7 +147,7 @@ class Inventory extends Model
     {
         if ($amount <= 0) return;
         $this->reserved_quantity += $amount;
-        $this->save();
+        $this->saveQuietly();
     }
 
     /**
@@ -157,7 +157,7 @@ class Inventory extends Model
     {
         if ($amount <= 0) return;
         $this->reserved_quantity = max(0, $this->reserved_quantity - $amount);
-        $this->save();
+        $this->saveQuietly();
     }
 
     /**

app/Modules/Inventory/Models/InventoryTransferOrder.php

@@ -36,21 +36,23 @@ class InventoryTransferOrder extends Model
         if ($eventName === 'created') {
             $activity->description = 'created';
         } elseif ($eventName === 'updated') {
-            // 如果屬性中有 status 且變更為 completed，將描述改為 posted
             if (isset($properties['attributes']['status']) && $properties['attributes']['status'] === 'completed') {
                 $activity->description = 'posted';
-                $eventName = 'posted'; // 供後續快照邏輯判定
+                $eventName = 'posted'; 
             } else {
                 $activity->description = 'updated';
             }
         }
 
-        // 處理倉庫 ID 轉名稱
+        // 處理 ID 轉名稱 (核心：支援 attributes 與 old 的自動轉換)
         $idToNameFields = [
             'from_warehouse_id' => 'fromWarehouse',
             'to_warehouse_id' => 'toWarehouse',
+            'transit_warehouse_id' => 'transitWarehouse',
             'created_by' => 'createdBy',
             'posted_by' => 'postedBy',
+            'dispatched_by' => 'dispatchedBy',
+            'received_by' => 'receivedBy',
         ];
 
         foreach (['attributes', 'old'] as $part) {
@@ -58,14 +60,20 @@ class InventoryTransferOrder extends Model
                 foreach ($idToNameFields as $idField => $relation) {
                     if (isset($properties[$part][$idField])) {
                         $id = $properties[$part][$idField];
-                        $nameField = str_replace('_id', '_name', $idField);
+                        if (!$id) continue;
                         
+                        $nameField = str_replace('_id', '_name', $idField);
                         $name = null;
-                        if ($this->relationLoaded($relation) && $this->$relation && $this->$relation->id == $id) {
-                            $name = $this->$relation->name;
-                        } else {
-                            $model = $this->$relation()->getRelated()->find($id);
-                            $name = $model ? $model->name : "ID: $id";
+                        try {
+                            if ($this->relationLoaded($relation) && $this->$relation && $this->$relation->id == $id) {
+                                $name = $this->$relation->name;
+                            } else {
+                                $relatedModel = $this->$relation()->getRelated();
+                                $model = $relatedModel->find($id);
+                                $name = $model ? ($model->name ?? $model->display_name ?? "ID: $id") : "ID: $id";
+                            }
+                        } catch (\Exception $e) {
+                            $name = "ID: $id";
                         }
                         $properties[$part][$nameField] = $name;
                     }
@@ -73,7 +81,7 @@ class InventoryTransferOrder extends Model
             }
         }
 
-        // 基本單據資訊快照 (包含單號、來源、目的地)
+        // 基本單據資訊快照
         if (in_array($eventName, ['created', 'updated', 'posted', 'deleted'])) {
             $properties['snapshot'] = [
                 'doc_no' => $this->doc_no,
@@ -85,8 +93,6 @@ class InventoryTransferOrder extends Model
 
         // 移除輔助欄位與雜訊
         if (isset($properties['attributes'])) {
-            unset($properties['attributes']['from_warehouse_name']);
-            unset($properties['attributes']['to_warehouse_name']);
             unset($properties['attributes']['activityProperties']);
             unset($properties['attributes']['updated_at']);
         }
@@ -94,7 +100,7 @@ class InventoryTransferOrder extends Model
             unset($properties['old']['updated_at']);
         }
 
-        // 合併暫存屬性 (例如 items_diff)
+        // 合併暫存屬性 (重要：例如 items_diff)
         if (!empty($this->activityProperties)) {
             $properties = array_merge($properties, $this->activityProperties);
         }

app/Modules/Inventory/Models/StoreRequisition.php

@@ -41,6 +41,11 @@ class StoreRequisition extends Model
             ->dontSubmitEmptyLogs();
     }
 
+    /**
+     * @var array 暫存的活動紀錄屬性 (不會存入資料庫)
+     */
+    public $activityProperties = [];
+
     /**
      * 自定義日誌屬性，解析 ID 為名稱
      */
@@ -48,22 +53,90 @@ class StoreRequisition extends Model
     {
         $properties = $activity->properties->toArray();
 
+        // 處置日誌事件與狀態中文化
+        $statusMap = [
+            'draft' => '草稿',
+            'pending' => '待審核',
+            'approved' => '已核准',
+            'rejected' => '已駁回',
+            'completed' => '已完成',
+        ];
+
+        // 處理 ID 轉名稱
+        $idToNameFields = [
+            'store_warehouse_id' => 'storeWarehouse',
+            'supply_warehouse_id' => 'supplyWarehouse',
+            'created_by' => 'createdBy',
+            'approved_by' => 'approvedBy',
+            'transfer_order_id' => 'transferOrder',
+        ];
+
+        foreach (['attributes', 'old'] as $part) {
+            if (isset($properties[$part])) {
+                // 1. 解析狀態中文並替換原始 status 欄位
+                if (isset($properties[$part]['status'])) {
+                    $statusValue = $properties[$part]['status'];
+                    $properties[$part]['status'] = $statusMap[$statusValue] ?? $statusValue;
+                }
+
+                // 2. 解析關連名稱
+                foreach ($idToNameFields as $idField => $relation) {
+                    if (isset($properties[$part][$idField])) {
+                        $id = $properties[$part][$idField];
+                        if (!$id) continue;
+
+                        $nameField = str_replace('_id', '_name', $idField);
+                        if (str_contains($idField, '_by')) {
+                             $nameField = str_replace('_by', '_user_name', $idField);
+                        }
+                        
+                        $name = null;
+                        try {
+                            if ($this->relationLoaded($relation) && $this->$relation && $this->$relation->id == $id) {
+                                // 特別處理調撥單號
+                                $name = ($relation === 'transferOrder') ? $this->$relation->doc_no : $this->$relation->name;
+                            } else {
+                                $relatedModel = $this->$relation()->getRelated();
+                                $model = $relatedModel->find($id);
+                                if ($model) {
+                                    $name = ($relation === 'transferOrder') ? ($model->doc_no ?? "ID: $id") : ($model->name ?? "ID: $id");
+                                } else {
+                                    $name = "ID: $id";
+                                }
+                            }
+                        } catch (\Exception $e) {
+                            $name = "ID: $id";
+                        }
+                        $properties[$part][$nameField] = $name;
+                        // 移除原生的技術 ID 欄位，讓詳情更乾淨
+                        unset($properties[$part][$idField]);
+                    }
+                }
+            }
+        }
+
         // 基本單據資訊快照
         $properties['snapshot'] = [
             'doc_no' => $this->doc_no,
             'store_warehouse_name' => $this->storeWarehouse?->name,
             'supply_warehouse_name' => $this->supplyWarehouse?->name,
-            'status' => $this->status,
+            'status' => $statusMap[$this->status] ?? $this->status,
         ];
 
-        // 移除雜訊欄位
+        // 移除雜訊與重複欄位
         if (isset($properties['attributes'])) {
             unset($properties['attributes']['updated_at']);
+            unset($properties['attributes']['activityProperties']);
         }
         if (isset($properties['old'])) {
             unset($properties['old']['updated_at']);
         }
 
+        // 合併暫存屬性 (例如 items_diff)
+        if (!empty($this->activityProperties)) {
+            $properties = array_merge($properties, $this->activityProperties);
+        }
+
         $activity->properties = collect($properties);
     }
 

app/Modules/Inventory/Models/Unit.php

@@ -34,12 +34,27 @@ class Unit extends Model
 
     public function tapActivity(\Spatie\Activitylog\Contracts\Activity $activity, string $eventName)
     {
-        $properties = $activity->properties;
+        $properties = $activity->properties instanceof \Illuminate\Support\Collection 
+            ? $activity->properties->toArray() 
+            : $activity->properties;
         
         $snapshot = $properties['snapshot'] ?? [];
         $snapshot['name'] = $this->name;
         $properties['snapshot'] = $snapshot;
 
+        $resolver = function (&$data) {
+            if (empty($data) || !is_array($data)) return;
+            
+            foreach (['created_by', 'updated_by'] as $f) {
+                if (isset($data[$f]) && is_numeric($data[$f])) {
+                    $data[$f] = \App\Modules\Core\Models\User::find($data[$f])?->name;
+                }
+            }
+        };
+
+        if (isset($properties['attributes'])) $resolver($properties['attributes']);
+        if (isset($properties['old'])) $resolver($properties['old']);
+
         $activity->properties = $properties;
     }
 }

app/Modules/Inventory/Models/Warehouse.php

@@ -37,12 +37,31 @@ class Warehouse extends Model
 
     public function tapActivity(\Spatie\Activitylog\Contracts\Activity $activity, string $eventName)
     {
-        $properties = $activity->properties;
+        $properties = $activity->properties instanceof \Illuminate\Support\Collection 
+            ? $activity->properties->toArray() 
+            : $activity->properties;
         
         $snapshot = $properties['snapshot'] ?? [];
         $snapshot['name'] = $this->name;
         $properties['snapshot'] = $snapshot;
 
+        $resolver = function (&$data) {
+            if (empty($data) || !is_array($data)) return;
+            
+            foreach (['created_by', 'updated_by'] as $f) {
+                if (isset($data[$f]) && is_numeric($data[$f])) {
+                    $data[$f] = \App\Modules\Core\Models\User::find($data[$f])?->name;
+                }
+            }
+
+            if (isset($data['default_transit_warehouse_id']) && is_numeric($data['default_transit_warehouse_id'])) {
+                $data['default_transit_warehouse_id'] = self::find($data['default_transit_warehouse_id'])?->name;
+            }
+        };
+
+        if (isset($properties['attributes'])) $resolver($properties['attributes']);
+        if (isset($properties['old'])) $resolver($properties['old']);
+
         $activity->properties = $properties;
     }