feat: 統一進貨單 UI、修復庫存異動紀錄與廠商詳情顯示報錯

app/Modules/Procurement/Contracts/ProcurementServiceInterface.php

@@ -56,4 +56,27 @@ interface ProcurementServiceInterface
      * @return Collection
      */
     public function searchVendors(string $query): Collection;
+
+    /**
+     * 取得所有待進貨的採購單列表（不需搜尋條件）。
+     * 用於進貨單頁面直接顯示可選擇的採購單。
+     * 
+     * @return Collection
+     */
+    public function getPendingPurchaseOrders(): Collection;
+
+    /**
+     * 取得所有廠商列表。
+     * 
+     * @return Collection
+     */
+    public function getAllVendors(): Collection;
+    
+    /**
+     * Get vendors by multiple IDs.
+     * 
+     * @param array $ids
+     * @return Collection
+     */
+    public function getVendorsByIds(array $ids): Collection;
 }

app/Modules/Procurement/Controllers/PurchaseOrderController.php

@@ -420,7 +420,7 @@ class PurchaseOrderController extends Controller
             'order_date' => 'required|date', // 新增驗證
             'expected_delivery_date' => 'nullable|date',
             'remark' => 'nullable|string',
-            'status' => 'required|string|in:draft,pending,processing,shipping,confirming,completed,cancelled,partial',
+            'status' => 'required|string|in:draft,pending,approved,partial,completed,closed,cancelled',
             'invoice_number' => ['nullable', 'string', 'max:11', 'regex:/^[A-Z]{2}-\d{8}$/'],
             'invoice_date' => 'nullable|date',
             'invoice_amount' => 'nullable|numeric|min:0',

app/Modules/Procurement/Controllers/VendorController.php

@@ -95,14 +95,15 @@ class VendorController extends Controller
             if (!$product) return null;
             
             return (object) [
-                'id' => (string) $pivot->id,
-                'productId' => (string) $product->id,
-                'productName' => $product->name,
-                'unit' => $product->baseUnit?->name ?? 'N/A',
-                'baseUnit' => $product->baseUnit?->name,
-                'largeUnit' => $product->largeUnit?->name,
-                'conversionRate' => (float) $product->conversion_rate,
-                'lastPrice' => (float) $pivot->last_price,
+                'id' => (string) $product->id, // Frontend expects product ID here as p.id
+                'name' => $product->name,
+                'baseUnit' => $product->baseUnit ? (object)['name' => $product->baseUnit->name] : null,
+                'largeUnit' => $product->largeUnit ? (object)['name' => $product->largeUnit->name] : null,
+                'conversion_rate' => (float) $product->conversion_rate,
+                'purchase_unit' => $product->purchaseUnit?->name,
+                'pivot' => (object) [
+                    'last_price' => (float) $pivot->last_price,
+                ],
             ];
         })->filter()->values();
 
@@ -119,7 +120,7 @@ class VendorController extends Controller
             'email' => $vendor->email,
             'address' => $vendor->address,
             'remark' => $vendor->remark,
-            'supplyProducts' => $supplyProducts,
+            'products' => $supplyProducts, // Changed from supplyProducts to products
         ];
 
         return Inertia::render('Vendor/Show', [

app/Modules/Procurement/Services/ProcurementService.php

@@ -62,7 +62,7 @@ class ProcurementService implements ProcurementServiceInterface
     public function searchPendingPurchaseOrders(string $query): Collection
     {
         return PurchaseOrder::with(['vendor', 'items'])
-            ->whereIn('status', ['processing', 'shipping', 'partial'])
+            ->whereIn('status', ['approved', 'partial'])
             ->where(function($q) use ($query) {
                 $q->where('code', 'like', "%{$query}%")
                   ->orWhereHas('vendor', function($vq) use ($query) {
@@ -80,4 +80,23 @@ class ProcurementService implements ProcurementServiceInterface
             ->limit(20)
             ->get(['id', 'name', 'code']);
     }
+
+    public function getPendingPurchaseOrders(): Collection
+    {
+        return PurchaseOrder::with(['vendor', 'items'])
+            ->whereIn('status', ['approved', 'partial'])
+            ->orderBy('created_at', 'desc')
+            ->limit(50)
+            ->get();
+    }
+
+    public function getAllVendors(): Collection
+    {
+        return \App\Modules\Procurement\Models\Vendor::orderBy('name')->get(['id', 'name', 'code']);
+    }
+
+    public function getVendorsByIds(array $ids): Collection
+    {
+        return \App\Modules\Procurement\Models\Vendor::whereIn('id', $ids)->get(['id', 'name', 'code']);
+    }
 }