生產工單BOM以及批號完善

app/Http/Controllers/InventoryController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use App\Models\WarehouseProductSafetyStock;
 
 class InventoryController extends Controller
 {
@@ -19,49 +20,82 @@ class InventoryController extends Controller
         // 1. 準備 availableProducts
         $availableProducts = $allProducts->map(function ($product) {
             return [
-                'id' => (string) $product->id, // Frontend expects string
+                'id' => (string) $product->id,
                 'name' => $product->name,
-                'type' => $product->category?->name ?? '其他', // 暫時用 Category Name 當 Type
+                'type' => $product->category?->name ?? '其他',
             ];
         });
 
-        // 2. 準備 inventories (模擬批號)
-        // 2. 準備 inventories
-        // 資料庫結構為 (warehouse_id, product_id) 唯一，故為扁平列表
-        $inventories = $warehouse->inventories->map(function ($inv) {
-            return [
-                'id' => (string) $inv->id,
-                'warehouseId' => (string) $inv->warehouse_id,
-                'productId' => (string) $inv->product_id,
-                'productName' => $inv->product?->name ?? '未知商品',
-                'productCode' => $inv->product?->code ?? 'N/A',
-                'unit' => $inv->product?->baseUnit?->name ?? '個',
-                'quantity' => (float) $inv->quantity,
-                'safetyStock' => $inv->safety_stock !== null ? (float) $inv->safety_stock : null,
-                'status' => '正常', // 前端會根據 quantity 與 safetyStock 重算，但後端亦可提供基礎狀態
-                'batchNumber' => $inv->batch_number ?? 'BATCH-' . $inv->id, // 優先使用 DB 批號，若無則 fallback
-                'expiryDate' => $inv->expiry_date ? $inv->expiry_date->format('Y-m-d') : null,
-                'lastInboundDate' => $inv->lastIncomingTransaction ? ($inv->lastIncomingTransaction->actual_time ? $inv->lastIncomingTransaction->actual_time->format('Y-m-d') : $inv->lastIncomingTransaction->created_at->format('Y-m-d')) : null,
-                'lastOutboundDate' => $inv->lastOutgoingTransaction ? ($inv->lastOutgoingTransaction->actual_time ? $inv->lastOutgoingTransaction->actual_time->format('Y-m-d') : $inv->lastOutgoingTransaction->created_at->format('Y-m-d')) : null,
-            ];
-        });
+        // 2. 從新表格讀取安全庫存設定 (商品-倉庫層級)
+        $safetyStockMap = WarehouseProductSafetyStock::where('warehouse_id', $warehouse->id)
+            ->pluck('safety_stock', 'product_id')
+            ->mapWithKeys(fn($val, $key) => [(string)$key => (float)$val]);
+
+        // 3. 準備 inventories (批號分組)
+        $items = $warehouse->inventories()
+            ->with(['product.baseUnit', 'lastIncomingTransaction', 'lastOutgoingTransaction'])
+            ->get();
+
+        $inventories = $items->groupBy('product_id')->map(function ($batchItems) use ($safetyStockMap) {
+            $firstItem = $batchItems->first();
+            $product = $firstItem->product;
+            $totalQuantity = $batchItems->sum('quantity');
+            // 從獨立表格讀取安全庫存
+            $safetyStock = $safetyStockMap[(string)$firstItem->product_id] ?? null;
+
+            // 計算狀態
+            $status = '正常';
+            if (!is_null($safetyStock)) {
+                if ($totalQuantity < $safetyStock) {
+                    $status = '低於';
+                }
+            }
 
-        // 3. 準備 safetyStockSettings
-        $safetyStockSettings = $warehouse->inventories->filter(function($inv) {
-            return !is_null($inv->safety_stock);
-        })->map(function ($inv) {
             return [
-                'id' => 'ss-' . $inv->id,
-                'warehouseId' => (string) $inv->warehouse_id,
-                'productId' => (string) $inv->product_id,
-                'productName' => $inv->product?->name ?? '未知商品',
-                'productType' => $inv->product?->category?->name ?? '其他',
-                'safetyStock' => (float) $inv->safety_stock,
-                'createdAt' => $inv->created_at->toIso8601String(),
-                'updatedAt' => $inv->updated_at->toIso8601String(),
+                'productId' => (string) $firstItem->product_id,
+                'productName' => $product?->name ?? '未知商品',
+                'productCode' => $product?->code ?? 'N/A',
+                'baseUnit' => $product?->baseUnit?->name ?? '個',
+                'totalQuantity' => (float) $totalQuantity,
+                'safetyStock' => $safetyStock,
+                'status' => $status,
+                'batches' => $batchItems->map(function ($inv) {
+                    return [
+                        'id' => (string) $inv->id,
+                        'warehouseId' => (string) $inv->warehouse_id,
+                        'productId' => (string) $inv->product_id,
+                        'productName' => $inv->product?->name ?? '未知商品',
+                        'productCode' => $inv->product?->code ?? 'N/A',
+                        'unit' => $inv->product?->baseUnit?->name ?? '個',
+                        'quantity' => (float) $inv->quantity,
+                        'safetyStock' => null, // 批號層級不再有安全庫存
+                        'status' => '正常',
+                        'batchNumber' => $inv->batch_number ?? 'BATCH-' . $inv->id,
+                        'expiryDate' => $inv->expiry_date ? $inv->expiry_date->format('Y-m-d') : null,
+                        'lastInboundDate' => $inv->lastIncomingTransaction ? ($inv->lastIncomingTransaction->actual_time ? $inv->lastIncomingTransaction->actual_time->format('Y-m-d') : $inv->lastIncomingTransaction->created_at->format('Y-m-d')) : null,
+                        'lastOutboundDate' => $inv->lastOutgoingTransaction ? ($inv->lastOutgoingTransaction->actual_time ? $inv->lastOutgoingTransaction->actual_time->format('Y-m-d') : $inv->lastOutgoingTransaction->created_at->format('Y-m-d')) : null,
+                    ];
+                })->values(),
             ];
         })->values();
 
+        // 4. 準備 safetyStockSettings (從新表格讀取)
+        $safetyStockSettings = WarehouseProductSafetyStock::where('warehouse_id', $warehouse->id)
+            ->with(['product.category'])
+            ->get()
+            ->map(function ($setting) {
+                return [
+                    'id' => (string) $setting->id,
+                    'warehouseId' => (string) $setting->warehouse_id,
+                    'productId' => (string) $setting->product_id,
+                    'productName' => $setting->product?->name ?? '未知商品',
+                    'productType' => $setting->product?->category?->name ?? '其他',
+                    'safetyStock' => (float) $setting->safety_stock,
+                    'createdAt' => $setting->created_at->toIso8601String(),
+                    'updatedAt' => $setting->updated_at->toIso8601String(),
+                ];
+            });
+
         return \Inertia\Inertia::render('Warehouse/Inventory', [
             'warehouse' => $warehouse,
             'inventories' => $inventories,
@@ -73,10 +107,14 @@ class InventoryController extends Controller
     public function create(\App\Models\Warehouse $warehouse)
     {
         // 取得所有商品供前端選單使用
-        $products = \App\Models\Product::with(['baseUnit', 'largeUnit'])->select('id', 'name', 'base_unit_id', 'large_unit_id', 'conversion_rate')->get()->map(function ($product) {
+        $products = \App\Models\Product::with(['baseUnit', 'largeUnit'])
+            ->select('id', 'name', 'code', 'base_unit_id', 'large_unit_id', 'conversion_rate')
+            ->get()
+            ->map(function ($product) {
             return [
                 'id' => (string) $product->id,
                 'name' => $product->name,
+                'code' => $product->code,
                 'baseUnit' => $product->baseUnit?->name ?? '個',
                 'largeUnit' => $product->largeUnit?->name, // 可能為 null
                 'conversionRate' => (float) $product->conversion_rate,
@@ -98,45 +136,55 @@ class InventoryController extends Controller
             'items' => 'required|array|min:1',
             'items.*.productId' => 'required|exists:products,id',
             'items.*.quantity' => 'required|numeric|min:0.01',
-            'items.*.batchNumber' => 'nullable|string',
+            'items.*.batchMode' => 'required|in:existing,new',
+            'items.*.inventoryId' => 'required_if:items.*.batchMode,existing|nullable|exists:inventories,id',
+            'items.*.originCountry' => 'required_if:items.*.batchMode,new|nullable|string|max:2',
             'items.*.expiryDate' => 'nullable|date',
         ]);
 
         return \Illuminate\Support\Facades\DB::transaction(function () use ($validated, $warehouse) {
             foreach ($validated['items'] as $item) {
-                $batchNumber = $item['batchNumber'] ?? null;
-                // 如果未提供批號，且系統設定需要批號，則自動產生 (這裡先保留彈性，若無則為 null 或預設)
-                if (empty($batchNumber)) {
-                    // 嘗試自動產生：需要 product_code, country, date
+                $inventory = null;
+
+                if ($item['batchMode'] === 'existing') {
+                    // 模式 A：選擇現有批號 (包含已刪除的也要能找回來累加)
+                    $inventory = \App\Models\Inventory::withTrashed()->findOrFail($item['inventoryId']);
+                    if ($inventory->trashed()) {
+                        $inventory->restore();
+                    }
+                } else {
+                    // 模式 B：建立新批號
+                    $originCountry = $item['originCountry'] ?? 'TW';
                     $product = \App\Models\Product::find($item['productId']);
-                    if ($product) {
-                        $batchNumber = \App\Models\Inventory::generateBatchNumber(
-                            $product->code ?? 'UNK', 
-                            'TW', // 預設來源
-                            $validated['inboundDate']
-                        );
+                    
+                    $batchNumber = \App\Models\Inventory::generateBatchNumber(
+                        $product->code ?? 'UNK',
+                        $originCountry,
+                        $validated['inboundDate']
+                    );
+
+                    // 同樣要檢查此批號是否已經存在 (即使模式是 new, 但可能撞到同一天同產地手動建立的)
+                    $inventory = $warehouse->inventories()->withTrashed()->firstOrNew(
+                        [
+                            'product_id' => $item['productId'],
+                            'batch_number' => $batchNumber
+                        ],
+                        [
+                            'quantity' => 0,
+                            'arrival_date' => $validated['inboundDate'],
+                            'expiry_date' => $item['expiryDate'] ?? null,
+                            'origin_country' => $originCountry,
+                        ]
+                    );
+
+                    if ($inventory->trashed()) {
+                        $inventory->restore();
                     }
                 }
 
-                // 取得或建立庫存紀錄 (加入批號判斷)
-                $inventory = $warehouse->inventories()->firstOrNew(
-                    [
-                        'product_id' => $item['productId'],
-                        'batch_number' => $batchNumber
-                    ],
-                    [
-                        'quantity' => 0, 
-                        'safety_stock' => null,
-                        'arrival_date' => $validated['inboundDate'],
-                        'expiry_date' => $item['expiryDate'] ?? null,
-                        'origin_country' => 'TW', // 預設
-                    ]
-                );
-
                 $currentQty = $inventory->quantity;
                 $newQty = $currentQty + $item['quantity'];
 
-                // 更新庫存並儲存 (新紀錄: Created, 舊紀錄: Updated)
                 $inventory->quantity = $newQty;
                 $inventory->save();
 
@@ -157,7 +205,46 @@ class InventoryController extends Controller
         });
     }
 
-    public function edit(\App\Models\Warehouse $warehouse, $inventoryId)
+    /**
+     * API: 取得商品在特定倉庫的所有批號，並回傳當前日期/產地下的一個流水號
+     */
+    public function getBatches(\App\Models\Warehouse $warehouse, $productId, \Illuminate\Http\Request $request)
+    {
+        $originCountry = $request->query('originCountry', 'TW');
+        $arrivalDate = $request->query('arrivalDate', now()->format('Y-m-d'));
+
+        $batches = \App\Models\Inventory::where('warehouse_id', $warehouse->id)
+            ->where('product_id', $productId)
+            ->get()
+            ->map(function ($inventory) {
+                return [
+                    'inventoryId' => (string) $inventory->id,
+                    'batchNumber' => $inventory->batch_number,
+                    'originCountry' => $inventory->origin_country,
+                    'expiryDate' => $inventory->expiry_date ? $inventory->expiry_date->format('Y-m-d') : null,
+                    'quantity' => (float) $inventory->quantity,
+                ];
+            });
+
+        // 計算下一個流水號
+        $product = \App\Models\Product::find($productId);
+        $nextSequence = '01';
+        if ($product) {
+            $batchNumber = \App\Models\Inventory::generateBatchNumber(
+                $product->code ?? 'UNK',
+                $originCountry,
+                $arrivalDate
+            );
+            $nextSequence = substr($batchNumber, -2);
+        }
+
+        return response()->json([
+            'batches' => $batches,
+            'nextSequence' => $nextSequence
+        ]);
+    }
+
+    public function edit(\Illuminate\Http\Request $request, \App\Models\Warehouse $warehouse, $inventoryId)
     {
         // 取得庫存紀錄，包含商品資訊與異動紀錄 (含經手人)
         // 這裡如果是 Mock 的 ID (mock-inv-1)，需要特殊處理
@@ -176,8 +263,8 @@ class InventoryController extends Controller
             'productId' => (string) $inventory->product_id,
             'productName' => $inventory->product?->name ?? '未知商品',
             'quantity' => (float) $inventory->quantity,
-            'batchNumber' => 'BATCH-' . $inventory->id, // Mock
-            'expiryDate' => '2099-12-31', // Mock
+            'batchNumber' => $inventory->batch_number ?? '-',
+            'expiryDate' => $inventory->expiry_date ?? null,
             'lastInboundDate' => $inventory->updated_at->format('Y-m-d'),
             'lastOutboundDate' => null,
         ];
@@ -234,19 +321,21 @@ class InventoryController extends Controller
         ]);
 
         return \Illuminate\Support\Facades\DB::transaction(function () use ($validated, $inventory) {
-            $currentQty = $inventory->quantity;
-            $newQty = $validated['quantity'];
+            $currentQty = (float) $inventory->quantity;
+            $newQty = (float) $validated['quantity'];
             
-            // 判斷操作模式
-            if (isset($validated['operation'])) {
-                $changeQty = 0;
+            // 判斷是否來自調整彈窗 (包含 operation 參數)
+            $isAdjustment = isset($validated['operation']);
+            $changeQty = 0;
+
+            if ($isAdjustment) {
                 switch ($validated['operation']) {
                     case 'add':
-                        $changeQty = $validated['quantity'];
+                        $changeQty = (float) $validated['quantity'];
                         $newQty = $currentQty + $changeQty;
                         break;
                     case 'subtract':
-                        $changeQty = -$validated['quantity'];
+                        $changeQty = -(float) $validated['quantity'];
                         $newQty = $currentQty + $changeQty;
                         break;
                     case 'set':
@@ -262,8 +351,9 @@ class InventoryController extends Controller
             $inventory->update(['quantity' => $newQty]);
 
             // 異動類型映射
-            $type = $validated['type'] ?? 'adjustment';
+            $type = $validated['type'] ?? ($isAdjustment ? 'manual_adjustment' : 'adjustment');
             $typeMapping = [
+                'manual_adjustment' => '手動調整庫存',
                 'adjustment' => '盤點調整',
                 'purchase_in' => '採購進貨',
                 'sales_out' => '銷售出庫',
@@ -274,22 +364,26 @@ class InventoryController extends Controller
             ];
             $chineseType = $typeMapping[$type] ?? $type;
             
-            // 如果是編輯頁面來的，可能沒有 type，預設為 "盤點調整" 或 "手動編輯"
-            if (!isset($validated['type'])) {
+            // 如果是編輯頁面來的，且沒傳 type，設為手動編輯
+            if (!$isAdjustment && !isset($validated['type'])) {
                 $chineseType = '手動編輯';
             }
 
+            // 整理原因
+            $reason = $validated['reason'] ?? ($isAdjustment ? '手動庫存調整' : '編輯頁面更新');
+            if (isset($validated['notes'])) {
+                $reason .= ' - ' . $validated['notes'];
+            }
+
             // 寫入異動紀錄
-            // 如果數量沒變，是否要寫紀錄？通常編輯頁面按儲存可能只改了其他欄位(如果有)
-            // 但因為我們目前只存 quantity，如果 quantity 沒變，可以不寫異動，或者寫一筆 0 的異動代表更新屬性
             if (abs($changeQty) > 0.0001) {
                 $inventory->transactions()->create([
                     'type' => $chineseType,
                     'quantity' => $changeQty,
                     'balance_before' => $currentQty,
                     'balance_after' => $newQty,
-                    'reason' => ($validated['reason'] ?? '編輯頁面更新') . ($validated['notes'] ?? ''),
-                    'actual_time' => now(), // 手動調整設定為當下
+                    'reason' => $reason,
+                    'actual_time' => now(), 
                     'user_id' => auth()->id(),
                 ]);
             }
@@ -303,8 +397,13 @@ class InventoryController extends Controller
     {
          $inventory = \App\Models\Inventory::findOrFail($inventoryId);
          
-         // 歸零異動
+         // 庫存 > 0 不允許刪除 (哪怕是軟刪除)
          if ($inventory->quantity > 0) {
+             return redirect()->back()->with('error', '庫存數量大於 0，無法刪除。請先進行出庫或調整。');
+         }
+         
+         // 歸零異動 (因為已經限制為 0 才能刪，這段邏輯可以簡化，但為了保險起見，若有微小殘值仍可記錄歸零)
+         if (abs($inventory->quantity) > 0.0001) {
              $inventory->transactions()->create([
                     'type' => '手動編輯',
                     'quantity' => -$inventory->quantity,
@@ -322,33 +421,117 @@ class InventoryController extends Controller
                 ->with('success', '庫存品項已刪除');
     }
 
-    public function history(\App\Models\Warehouse $warehouse, $inventoryId)
+    public function history(Request $request, \App\Models\Warehouse $warehouse)
     {
-        $inventory = \App\Models\Inventory::with(['product', 'transactions' => function($query) {
-            $query->orderBy('actual_time', 'desc')->orderBy('id', 'desc');
-        }, 'transactions.user'])->findOrFail($inventoryId);
+        $inventoryId = $request->query('inventoryId');
+        $productId = $request->query('productId');
 
-        $transactions = $inventory->transactions->map(function ($tx) {
-            return [
-                'id' => (string) $tx->id,
-                'type' => $tx->type,
-                'quantity' => (float) $tx->quantity,
-                'balanceAfter' => (float) $tx->balance_after,
-                'reason' => $tx->reason,
-                'userName' => $tx->user ? $tx->user->name : '系統',
-                'actualTime' => $tx->actual_time ? $tx->actual_time->format('Y-m-d H:i') : $tx->created_at->format('Y-m-d H:i'),
-            ];
-        });
+        if ($productId) {
+            // 商品層級查詢
+            $inventories = \App\Models\Inventory::where('warehouse_id', $warehouse->id)
+                ->where('product_id', $productId)
+                ->with(['product', 'transactions' => function($query) {
+                    $query->orderBy('actual_time', 'desc')->orderBy('id', 'desc');
+                }, 'transactions.user'])
+                ->get();
 
-        return \Inertia\Inertia::render('Warehouse/InventoryHistory', [
-            'warehouse' => $warehouse,
-            'inventory' => [
-                'id' => (string) $inventory->id,
-                'productName' => $inventory->product?->name ?? '未知商品',
-                'productCode' => $inventory->product?->code ?? 'N/A',
-                'quantity' => (float) $inventory->quantity,
-            ],
-            'transactions' => $transactions
-        ]);
+            if ($inventories->isEmpty()) {
+                return redirect()->back()->with('error', '找不到該商品的庫存紀錄');
+            }
+
+            $firstInventory = $inventories->first();
+            $productName = $firstInventory->product?->name ?? '未知商品';
+            $productCode = $firstInventory->product?->code ?? 'N/A';
+            $currentTotalQuantity = $inventories->sum('quantity');
+
+            // 合併所有批號的交易紀錄
+            $allTransactions = collect();
+            foreach ($inventories as $inv) {
+                foreach ($inv->transactions as $tx) {
+                    $allTransactions->push([
+                        'raw_tx' => $tx,
+                        'batchNumber' => $inv->batch_number ?? '-',
+                        'sort_time' => $tx->actual_time ?? $tx->created_at,
+                    ]);
+                }
+            }
+
+            // 依時間倒序排序 (最新的在前面)
+            $sortedTransactions = $allTransactions->sort(function ($a, $b) {
+                // 先比時間 (Desc)
+                if ($a['sort_time'] != $b['sort_time']) {
+                    return $a['sort_time'] > $b['sort_time'] ? -1 : 1;
+                }
+                // 再比 ID (Desc)
+                return $a['raw_tx']->id > $b['raw_tx']->id ? -1 : 1;
+            });
+
+            // 回推計算結餘
+            $runningBalance = $currentTotalQuantity;
+            $transactions = $sortedTransactions->map(function ($item) use (&$runningBalance) {
+                $tx = $item['raw_tx'];
+                
+                // 本次異動後的結餘 = 當前推算的結餘
+                $balanceAfter = $runningBalance;
+                
+                // 推算前一次的結餘 (減去本次的異動量：如果是入庫+10，前一次就是-10)
+                $runningBalance = $runningBalance - $tx->quantity;
+
+                return [
+                    'id' => (string) $tx->id,
+                    'type' => $tx->type,
+                    'quantity' => (float) $tx->quantity,
+                    'balanceAfter' => (float) $balanceAfter, // 使用即時計算的商品總結餘
+                    'reason' => $tx->reason,
+                    'userName' => $tx->user ? $tx->user->name : '系統',
+                    'actualTime' => $tx->actual_time ? $tx->actual_time->format('Y-m-d H:i') : $tx->created_at->format('Y-m-d H:i'),
+                    'batchNumber' => $item['batchNumber'],
+                ];
+            })->values();
+
+            return \Inertia\Inertia::render('Warehouse/InventoryHistory', [
+                'warehouse' => $warehouse,
+                'inventory' => [
+                    'id' => 'product-' . $productId,
+                    'productName' => $productName,
+                    'productCode' => $productCode,
+                    'quantity' => (float) $currentTotalQuantity,
+                ],
+                'transactions' => $transactions
+            ]);
+        }
+
+        if ($inventoryId) {
+            // 單一批號查詢
+            $inventory = \App\Models\Inventory::with(['product', 'transactions' => function($query) {
+                $query->orderBy('actual_time', 'desc')->orderBy('id', 'desc');
+            }, 'transactions.user'])->findOrFail($inventoryId);
+
+            $transactions = $inventory->transactions->map(function ($tx) {
+                return [
+                    'id' => (string) $tx->id,
+                    'type' => $tx->type,
+                    'quantity' => (float) $tx->quantity,
+                    'balanceAfter' => (float) $tx->balance_after,
+                    'reason' => $tx->reason,
+                    'userName' => $tx->user ? $tx->user->name : '系統',
+                    'actualTime' => $tx->actual_time ? $tx->actual_time->format('Y-m-d H:i') : $tx->created_at->format('Y-m-d H:i'),
+                ];
+            });
+
+            return \Inertia\Inertia::render('Warehouse/InventoryHistory', [
+                'warehouse' => $warehouse,
+                'inventory' => [
+                    'id' => (string) $inventory->id,
+                    'productName' => $inventory->product?->name ?? '未知商品',
+                    'productCode' => $inventory->product?->code ?? 'N/A',
+                    'batchNumber' => $inventory->batch_number ?? '-',
+                    'quantity' => (float) $inventory->quantity,
+                ],
+                'transactions' => $transactions
+            ]);
+        }
+
+        return redirect()->back()->with('error', '未提供查詢參數');
     }
 }