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

app/Modules/Inventory/Services/StoreRequisitionService.php

@@ -118,17 +118,57 @@ class StoreRequisitionService
         }
 
         return DB::transaction(function () use ($requisition, $data, $userId) {
-            // 更新核准數量
+            // 處理前端傳來的明細與批號資料
+            $processedItems = []; // 暫存處理後的明細，用於轉入調撥單
+            
             if (isset($data['items'])) {
                 foreach ($data['items'] as $itemData) {
-                    StoreRequisitionItem::where('id', $itemData['id'])
+                    $reqItemId = $itemData['id'];
+                    $totalApprovedQty = 0;
+                    $batches = $itemData['batches'] ?? [];
+
+                    // 如果有批號，根據批號展開。若有多個無批號(null)的批次(例如來自不同貨道)，則將其數量加總
+                    if (!empty($batches)) {
+                        $batchGroups = [];
+                        foreach ($batches as $batch) {
+                            $qty = (float)($batch['qty'] ?? 0);
+                            $bNum = $batch['batch_number'] ?? null;
+                            if ($qty > 0) {
+                                $totalApprovedQty += $qty;
+                                $batchKey = $bNum ?? '';
+                                $batchGroups[$batchKey] = ($batchGroups[$batchKey] ?? 0) + $qty;
+                            }
+                        }
+                        
+                        foreach ($batchGroups as $bNumKey => $qty) {
+                            $processedItems[] = [
+                                'req_item_id' => $reqItemId,
+                                'batch_number' => $bNumKey === '' ? null : $bNumKey,
+                                'quantity' => $qty,
+                            ];
+                        }
+                    } else {
+                        // 無批號，傳統輸入
+                        $qty = (float)($itemData['approved_qty'] ?? 0);
+                        if ($qty > 0) {
+                            $totalApprovedQty += $qty;
+                            $processedItems[] = [
+                                'req_item_id' => $reqItemId,
+                                'batch_number' => null,
+                                'quantity' => $qty,
+                            ];
+                        }
+                    }
+
+                    // 更新叫貨單明細的核准數量總和
+                    StoreRequisitionItem::where('id', $reqItemId)
                         ->where('store_requisition_id', $requisition->id)
-                        ->update(['approved_qty' => $itemData['approved_qty']]);
+                        ->update(['approved_qty' => $totalApprovedQty]);
                 }
             }
 
             // 優先使用傳入的供貨倉庫，若無則從單據中取得
-            $supplyWarehouseId = $data['supply_warehouse_id'] ?? $requisition->supply_warehouse_id;
+            $supplyWarehouseId = $requisition->supply_warehouse_id;
 
             if (!$supplyWarehouseId) {
                 throw ValidationException::withMessages([
@@ -152,12 +192,17 @@ class StoreRequisitionService
             // 將核准的明細寫入調撥單
             $requisition->load('items');
             $transferItems = [];
-            foreach ($requisition->items as $item) {
-                $qty = $item->approved_qty ?? $item->requested_qty;
-                if ($qty > 0) {
+            
+            // 建立 req_item_id 對應 product_id 的 lookup
+            $reqItemMap = $requisition->items->keyBy('id');
+
+            foreach ($processedItems as $pItem) {
+                $reqItem = $reqItemMap->get($pItem['req_item_id']);
+                if ($reqItem) {
                     $transferItems[] = [
-                        'product_id' => $item->product_id,
-                        'quantity' => $qty,
+                        'product_id' => $reqItem->product_id,
+                        'batch_number' => $pItem['batch_number'],
+                        'quantity' => $pItem['quantity'],
                     ];
                 }
             }