style: 修正盤點與盤調畫面 Table Padding 並統一 UI 規範

2026-01-28 18:04:45 +08:00
parent 852370cfe0
commit e5edad4fd0
24 changed files with 3648 additions and 102 deletions
--- a/app/Modules/Inventory/Controllers/TransferOrderController.php
+++ b/app/Modules/Inventory/Controllers/TransferOrderController.php
@@ -3,135 +3,171 @@
 namespace App\Modules\Inventory\Controllers;

 use App\Http\Controllers\Controller;
-
-use App\Modules\Inventory\Models\Inventory;
+use App\Modules\Inventory\Models\InventoryTransferOrder;
 use App\Modules\Inventory\Models\Warehouse;
+use App\Modules\Inventory\Services\TransferService;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Validation\ValidationException;
+use Inertia\Inertia;

 class TransferOrderController extends Controller
 {
-    /**
-     * 儲存撥補單（建立調撥單並執行庫存轉移）
-     */
+    protected $transferService;
+
+    public function __construct(TransferService $transferService)
+    {
+        $this->transferService = $transferService;
+    }
+
+    public function index(Request $request)
+    {
+        $query = InventoryTransferOrder::query()
+             ->with(['fromWarehouse', 'toWarehouse', 'createdBy', 'postedBy']);
+
+        // 篩選：若有選定倉庫，則顯示該倉庫作為來源或目的地的調撥單
+        if ($request->filled('warehouse_id')) {
+             $query->where(function ($q) use ($request) {
+                $q->where('from_warehouse_id', $request->warehouse_id)
+                  ->orWhere('to_warehouse_id', $request->warehouse_id);
+            });
+        }
+
+        $orders = $query->orderByDesc('created_at')
+            ->paginate(15)
+            ->through(function ($order) {
+                return [
+                    'id' => (string) $order->id,
+                    'doc_no' => $order->doc_no,
+                    'from_warehouse_name' => $order->fromWarehouse->name,
+                    'to_warehouse_name' => $order->toWarehouse->name,
+                    'status' => $order->status,
+                    'created_at' => $order->created_at->format('Y-m-d H:i'),
+                    'posted_at' => $order->posted_at ? $order->posted_at->format('Y-m-d H:i') : '-',
+                    'created_by' => $order->createdBy?->name,
+                ];
+            });
+
+        return Inertia::render('Inventory/Transfer/Index', [
+            'orders' => $orders,
+            'warehouses' => Warehouse::all()->map(fn($w) => ['id' => (string)$w->id, 'name' => $w->name]),
+            'filters' => $request->only(['warehouse_id']),
+        ]);
+    }
+
    public function store(Request $request)
    {
        $validated = $request->validate([
-            'sourceWarehouseId' => 'required|exists:warehouses,id',
-            'targetWarehouseId' => 'required|exists:warehouses,id|different:sourceWarehouseId',
-            'productId' => 'required|exists:products,id',
-            'quantity' => 'required|numeric|min:0.01',
-            'transferDate' => 'required|date',
-            'status' => 'required|in:待處理,處理中,已完成,已取消', // 目前僅支援立即完成或單純記錄
-            'notes' => 'nullable|string',
-            'batchNumber' => 'nullable|string', // 暫時接收，雖然 DB 可能沒存
+            'from_warehouse_id' => 'required|exists:warehouses,id',
+            'to_warehouse_id' => 'required|exists:warehouses,id|different:from_warehouse_id',
+            'remarks' => 'nullable|string',
        ]);

-        return DB::transaction(function () use ($validated) {
-            // 1. 檢查來源倉庫庫存 (精確匹配產品與批號)
-            $sourceInventory = Inventory::where('warehouse_id', $validated['sourceWarehouseId'])
-                ->where('product_id', $validated['productId'])
-                ->where('batch_number', $validated['batchNumber'])
-                ->first();
+        $order = $this->transferService->createOrder(
+            $validated['from_warehouse_id'],
+            $validated['to_warehouse_id'],
+            $validated['remarks'] ?? null,
+            auth()->id()
+        );

-            if (!$sourceInventory || $sourceInventory->quantity < $validated['quantity']) {
-                throw ValidationException::withMessages([
-                    'quantity' => ['來源倉庫指定批號庫存不足'],
-                ]);
+        return redirect()->route('inventory.transfer.show', [$order->id])
+            ->with('success', '已建立調撥單');
+    }
+
+    public function show(InventoryTransferOrder $order)
+    {
+        $order->load(['items.product.baseUnit', 'fromWarehouse', 'toWarehouse', 'createdBy', 'postedBy']);
+
+        $orderData = [
+            'id' => (string) $order->id,
+            'doc_no' => $order->doc_no,
+            'from_warehouse_id' => (string) $order->from_warehouse_id,
+            'from_warehouse_name' => $order->fromWarehouse->name,
+            'to_warehouse_id' => (string) $order->to_warehouse_id,
+            'to_warehouse_name' => $order->toWarehouse->name,
+            'status' => $order->status,
+            'remarks' => $order->remarks,
+            'created_at' => $order->created_at->format('Y-m-d H:i'),
+            'created_by' => $order->createdBy?->name,
+            'items' => $order->items->map(function ($item) {
+                return [
+                    'id' => (string) $item->id,
+                    'product_id' => (string) $item->product_id,
+                    'product_name' => $item->product->name,
+                    'product_code' => $item->product->code,
+                    'batch_number' => $item->batch_number,
+                    'unit' => $item->product->baseUnit?->name,
+                    'quantity' => (float) $item->quantity,
+                    'notes' => $item->notes,
+                ];
+            }),
+        ];
+
+        return Inertia::render('Inventory/Transfer/Show', [
+            'order' => $orderData,
+        ]);
+    }
+
+    public function update(Request $request, InventoryTransferOrder $order)
+    {
+        if ($order->status !== 'draft') {
+            return redirect()->back()->with('error', '只能修改草稿狀態的單據');
+        }
+
+        if ($request->input('action') === 'post') {
+            try {
+                $this->transferService->post($order, auth()->id());
+                return redirect()->route('inventory.transfer.index')
+                    ->with('success', '調撥單已過帳完成');
+            } catch (\Exception $e) {
+                 return redirect()->back()->withErrors(['items' => $e->getMessage()]);
            }
+        }

-            // 2. 獲取或建立目標倉庫庫存 (精確匹配產品與批號，並繼承效期與品質狀態)
-            $targetInventory = Inventory::firstOrCreate(
-                [
-                    'warehouse_id' => $validated['targetWarehouseId'],
-                    'product_id' => $validated['productId'],
-                    'batch_number' => $validated['batchNumber'],
-                ],
-                [
-                    'quantity' => 0,
-                    'unit_cost' => $sourceInventory->unit_cost, // 繼承成本
-                    'total_value' => 0,
-                    'expiry_date' => $sourceInventory->expiry_date,
-                    'quality_status' => $sourceInventory->quality_status,
-                    'origin_country' => $sourceInventory->origin_country,
-                ]
-            );
+        $validated = $request->validate([
+            'items' => 'array',
+            'items.*.product_id' => 'required|exists:products,id',
+            'items.*.quantity' => 'required|numeric|min:0.01',
+            'items.*.batch_number' => 'nullable|string',
+            'items.*.notes' => 'nullable|string',
+        ]);

-            $sourceWarehouse = Warehouse::find($validated['sourceWarehouseId']);
-            $targetWarehouse = Warehouse::find($validated['targetWarehouseId']);
+        if ($request->has('items')) {
+            $this->transferService->updateItems($order, $validated['items']);
+        }

-            // 3. 執行庫存轉移 (扣除來源)
-            $oldSourceQty = $sourceInventory->quantity;
-            $newSourceQty = $oldSourceQty - $validated['quantity'];
-            
-            // 設定活動紀錄原因
-            $sourceInventory->activityLogReason = "撥補出庫 至 {$targetWarehouse->name}";
-            $sourceInventory->quantity = $newSourceQty;
-            $sourceInventory->total_value = $sourceInventory->quantity * $sourceInventory->unit_cost; // 更新總值
-            $sourceInventory->save();
+        $order->update($request->only(['remarks']));

-            // 記錄來源異動
-            $sourceInventory->transactions()->create([
-                'type' => '撥補出庫',
-                'quantity' => -$validated['quantity'],
-                'unit_cost' => $sourceInventory->unit_cost, // 記錄
-                'balance_before' => $oldSourceQty,
-                'balance_after' => $newSourceQty,
-                'reason' => "撥補至 {$targetWarehouse->name}" . ($validated['notes'] ? " ({$validated['notes']})" : ""),
-                'actual_time' => $validated['transferDate'],
-                'user_id' => auth()->id(),
-            ]);
+        return redirect()->back()->with('success', '儲存成功');
+    }

-            // 4. 執行庫存轉移 (增加目標)
-            $oldTargetQty = $targetInventory->quantity;
-            $newTargetQty = $oldTargetQty + $validated['quantity'];
+    public function destroy(InventoryTransferOrder $order)
+    {
+        if ($order->status !== 'draft') {
+            return redirect()->back()->with('error', '只能刪除草稿狀態的單據');
+        }
+        $order->items()->delete();
+        $order->delete();

-            // 設定活動紀錄原因
-            $targetInventory->activityLogReason = "撥補入庫 來自 {$sourceWarehouse->name}";
-            // 確保目標庫存也有成本 (如果是繼承來的)
-            if ($targetInventory->unit_cost == 0 && $sourceInventory->unit_cost > 0) {
-                 $targetInventory->unit_cost = $sourceInventory->unit_cost;
-            }
-            $targetInventory->quantity = $newTargetQty;
-            $targetInventory->total_value = $targetInventory->quantity * $targetInventory->unit_cost; // 更新總值
-            $targetInventory->save();
-
-            // 記錄目標異動
-            $targetInventory->transactions()->create([
-                'type' => '撥補入庫',
-                'quantity' => $validated['quantity'],
-                'unit_cost' => $targetInventory->unit_cost, // 記錄
-                'balance_before' => $oldTargetQty,
-                'balance_after' => $newTargetQty,
-                'reason' => "來自 {$sourceWarehouse->name} 的撥補" . ($validated['notes'] ? " ({$validated['notes']})" : ""),
-                'actual_time' => $validated['transferDate'],
-                'user_id' => auth()->id(),
-            ]);
-
-            // TODO: 未來若有獨立的 TransferOrder 模型，可在此建立紀錄
-
-            return redirect()->back()->with('success', '撥補單已建立且庫存已轉移');
-        });
+        return redirect()->route('inventory.transfer.index')
+            ->with('success', '調撥單已刪除');
    }

    /**
-     * 獲取特定倉庫的庫存列表 (API)
+     * 獲取特定倉庫的庫存列表 (API) - 保留給前端選擇商品用
     */
    public function getWarehouseInventories(Warehouse $warehouse)
    {
        $inventories = $warehouse->inventories()
            ->with(['product.baseUnit', 'product.category'])
-            ->where('quantity', '>', 0) // 只回傳有庫存的
+            ->where('quantity', '>', 0) 
            ->get()
            ->map(function ($inv) {
                return [
                    'product_id' => (string) $inv->product_id,
                    'product_name' => $inv->product->name,
+                    'product_code' => $inv->product->code, // Added code
                    'batch_number' => $inv->batch_number,
                    'quantity' => (float) $inv->quantity,
-                    'unit_cost' => (float) $inv->unit_cost, // 新增
-                    'total_value' => (float) $inv->total_value, // 新增
+                    'unit_cost' => (float) $inv->unit_cost,
                    'unit_name' => $inv->product->baseUnit?->name ?? '個',
                    'expiry_date' => $inv->expiry_date ? $inv->expiry_date->format('Y-m-d') : null,
                ];