優化門市叫貨流程：實作庫存預扣機制、鎖定自動產生的調撥單明細、修復自動販賣機貨道數量連動 Bug 及狀態同步問題

app/Modules/Inventory/Controllers/StoreRequisitionController.php

@@ -165,7 +165,10 @@ class StoreRequisitionController extends Controller
      */
     public function show($id)
     {
-        $requisition = StoreRequisition::with(['items.product.baseUnit'])->findOrFail($id);
+        $requisition = StoreRequisition::with([
+            'items.product.baseUnit',
+            'transferOrder.items' // 載入產生的調撥單明細與批號
+        ])->findOrFail($id);
 
         // 水和倉庫
         $warehouses = Warehouse::select('id', 'name', 'type')->get();
@@ -198,8 +201,69 @@ class StoreRequisitionController extends Controller
             ->get()
             ->keyBy('product_id');
 
-        $requisition->items->transform(function ($item) use ($inventories) {
+        // 取得供貨倉庫的可用庫存
+        $supplyInventories = collect();
+        $supplyBatchesMap = collect();
+        if ($requisition->supply_warehouse_id) {
+            $supplyInventories = Inventory::where('warehouse_id', $requisition->supply_warehouse_id)
+                ->whereIn('product_id', $productIds)
+                ->select('product_id')
+                ->selectRaw('SUM(quantity) as total_qty')
+                ->selectRaw('SUM(reserved_quantity) as total_reserved')
+                ->groupBy('product_id')
+                ->get()
+                ->keyBy('product_id');
+
+            // 取得各商品的批號庫存
+            $batches = Inventory::where('warehouse_id', $requisition->supply_warehouse_id)
+                ->whereIn('product_id', $productIds)
+                ->whereRaw('(quantity - reserved_quantity) > 0') // 僅撈出還有可用庫存的批號
+                ->select('id', 'product_id', 'batch_number', 'expiry_date', 'location as position')
+                ->selectRaw('quantity - reserved_quantity as available_qty')
+                ->get();
+            
+            $supplyBatchesMap = $batches->groupBy('product_id');
+        }
+
+        // 把調撥單明細 (核准的批號與數量) 整理成 map, key 為 product_id
+        $approvedBatchesMap = collect();
+        if ($requisition->transferOrder) {
+            $approvedBatchesMap = $requisition->transferOrder->items->groupBy('product_id');
+        }
+
+        $requisition->items->transform(function ($item) use ($inventories, $supplyInventories, $supplyBatchesMap, $approvedBatchesMap) {
             $item->current_stock = $inventories->get($item->product_id)?->total_qty ?? 0;
+            
+            if ($supplyInventories->has($item->product_id)) {
+                $stock = $supplyInventories->get($item->product_id);
+                $item->supply_stock = max(0, $stock->total_qty - $stock->total_reserved);
+                
+                // 附加該商品的批號可用庫存
+                $batches = $supplyBatchesMap->get($item->product_id) ?? collect();
+                $item->supply_batches = $batches->map(function ($batch) {
+                    return [
+                        'inventory_id' => $batch->id,
+                        'batch_number' => $batch->batch_number,
+                        'position' => $batch->position,
+                        'available_qty' => $batch->available_qty,
+                        'expiry_date' => $batch->expiry_date ? $batch->expiry_date->format('Y-m-d') : null,
+                    ];
+                })->values()->toArray();
+            } else {
+                $item->supply_stock = null;
+                $item->supply_batches = [];
+            }
+            
+            // 附加已核准的批號資訊
+            $approvedBatches = $approvedBatchesMap->get($item->product_id) ?? collect();
+            $item->approved_batches = $approvedBatches->map(function ($transferItem) {
+                // 如果是沒有批號管控的商品，batch_number 可能為 null
+                return [
+                    'batch_number' => $transferItem->batch_number,
+                    'qty' => $transferItem->quantity,
+                ];
+            })->values()->toArray();
+
             return $item;
         });
 
@@ -306,6 +370,10 @@ class StoreRequisitionController extends Controller
             'items' => 'required|array',
             'items.*.id' => 'required|exists:store_requisition_items,id',
             'items.*.approved_qty' => 'required|numeric|min:0',
+            'items.*.batches' => 'nullable|array',
+            'items.*.batches.*.inventory_id' => 'nullable|integer',
+            'items.*.batches.*.batch_number' => 'nullable|string',
+            'items.*.batches.*.qty' => 'required_with:items.*.batches|numeric|min:0.01',
         ]);
 
         if (empty($requisition->supply_warehouse_id)) {

app/Modules/Inventory/Controllers/TransferOrderController.php

@@ -215,6 +215,9 @@ class TransferOrderController extends Controller
         // 2. 先更新資料 (如果請求中包含 items，則先執行儲存)
         $itemsChanged = false;
         if ($request->has('items')) {
+            if ($order->storeRequisition()->exists()) {
+                return redirect()->back()->with('error', '由叫貨單自動產生的調撥單無法修改明細');
+            }
             $validated = $request->validate([
                 'items' => 'array',
                 'items.*.product_id' => 'required|exists:products,id',
@@ -263,6 +266,17 @@ class TransferOrderController extends Controller
             return redirect()->back()->with('error', '只能刪除草稿狀態的單據');
         }
 
+        // 刪除前必須先釋放預留庫存
+        foreach ($order->items as $item) {
+            $inv = Inventory::where('warehouse_id', $order->from_warehouse_id)
+                ->where('product_id', $item->product_id)
+                ->where('batch_number', $item->batch_number)
+                ->first();
+            if ($inv) {
+                $inv->releaseReservedQuantity($item->quantity);
+            }
+        }
+
         $order->items()->delete();
         $order->delete();