From 2dd14fd1b4e3086925295b995c7a8e1835447fe7 Mon Sep 17 00:00:00 2001
From: sky121113 <sky121113@gmail.com>
Date: Fri, 26 Jun 2026 17:42:21 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=20=E5=8F=96=E8=B2=A8=E7=A2=BC=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=94=B9=E4=BB=A5=E5=95=86=E5=93=81=E7=82=BA=E4=B8=BB?=
 =?UTF-8?q?=E3=80=81=E7=B6=81=E5=95=86=E5=93=81=E7=A2=BC=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E9=A1=AF=E7=A4=BA=E7=A9=BA=E8=B2=A8=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. pickupCodes 查詢補 product eager load，避免 N+1。
2. 列表商品欄改依綁定型態顯示：綁商品碼直接顯示商品名且不顯示貨道；綁貨道碼（舊）維持反查商品名並保留貨道號。
3. 桌面表格標題「商品 / 貨道」改為「商品」，手機卡片同步調整。
---
 .../Controllers/Admin/SalesController.php     |  2 +-
 .../pickup-codes/partials/tab-list.blade.php  | 43 +++++++++++++------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/Admin/SalesController.php b/app/Http/Controllers/Admin/SalesController.php
index becc8e2..01f8f24 100644
--- a/app/Http/Controllers/Admin/SalesController.php
+++ b/app/Http/Controllers/Admin/SalesController.php
@@ -376,7 +376,7 @@ class SalesController extends Controller
         // 1. 取貨碼列表 (list)
         if (!$isAjax || $tab === 'list') {
             // 僅顯示目前帳號可存取機台的取貨碼（機台授權以 machine_user 為準，whereHas 會套用 Machine 的 machine_access 全域 scope）
-            $query = PickupCode::with(['machine.slots.product', 'creator', 'order'])
+            $query = PickupCode::with(['machine.slots.product', 'product', 'creator', 'order'])
                 ->whereHas('machine')
                 ->latest();
 
diff --git a/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php b/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php
index 1eb5373..cc35db6 100644
--- a/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php
+++ b/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php
@@ -80,7 +80,7 @@
                 </th>
                 <th
                     class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800">
-                    {{ __('Product / Slot') }}
+                    {{ __('Product') }}
                 </th>
                 <th
                     class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800">
@@ -125,15 +125,25 @@
                 </td>
                 <td class="px-6 py-6">
                     @php
-                    $slot = $code->machine?->slots->where('slot_no', $code->slot_no)->first();
-                    $productName = $slot ? ($slot->product?->name ?? __('Empty')) : __('Empty');
+                    // 綁商品碼（新）：直接取 product 名稱，不顯示貨道。
+                    // 綁貨道碼（舊，向後相容）：由貨道反查商品，並保留貨道資訊。
+                    if ($code->product_id) {
+                        $productName = $code->product?->name ?? __('Empty');
+                        $slotLabel = null;
+                    } else {
+                        $slot = $code->machine?->slots->where('slot_no', $code->slot_no)->first();
+                        $productName = $slot ? ($slot->product?->name ?? __('Empty')) : __('Empty');
+                        $slotLabel = $code->slot_no;
+                    }
                     @endphp
                     <div class="text-sm font-black text-cyan-600 dark:text-cyan-400 mb-0.5">{{
                         $productName
                         }}</div>
+                    @if($slotLabel)
                     <div class="text-xs font-bold text-slate-400 uppercase tracking-widest">{{
                         __('Slot')
-                        }}: {{ $code->slot_no }}</div>
+                        }}: {{ $slotLabel }}</div>
+                    @endif
                 </td>
                 <td class="px-6 py-6 whitespace-nowrap">
                     <div class="text-sm font-black text-slate-600 dark:text-slate-300">
@@ -281,19 +291,24 @@
         <div
             class="grid grid-cols-2 gap-y-4 mb-6 border-y border-slate-100 dark:border-slate-800/50 py-4">
             <div>
+                @php
+                if ($code->product_id) {
+                    $prodMobile = $code->product?->name ?? __('Empty');
+                    $slotMobileLabel = null;
+                } else {
+                    $slotMobile = $code->machine?->slots->where('slot_no', $code->slot_no)->first();
+                    $prodMobile = $slotMobile ? ($slotMobile->product?->name ?? __('Empty')) : __('Empty');
+                    $slotMobileLabel = $code->slot_no;
+                }
+                @endphp
                 <p
                     class="text-[10px] font-black text-slate-400 dark:text-slate-500 uppercase tracking-widest mb-1">
-                    {{ __('Slot') }}</p>
+                    {{ __('Product') }}</p>
                 <p class="text-sm font-bold text-slate-700 dark:text-slate-300">
-                    {{ $code->slot_no }}
-                    @php
-                    $slotMobile = $code->machine?->slots->where('slot_no',
-                    $code->slot_no)->first();
-                    $prodMobile = $slotMobile ? ($slotMobile->product?->name ?? __('Empty')) :
-                    __('Empty');
-                    @endphp
-                    <span class="ml-1 text-cyan-600 dark:text-cyan-400">({{ $prodMobile
-                        }})</span>
+                    <span class="text-cyan-600 dark:text-cyan-400">{{ $prodMobile }}</span>
+                    @if($slotMobileLabel)
+                    <span class="ml-1 text-[10px] text-slate-400">{{ __('Slot') }}: {{ $slotMobileLabel }}</span>
+                    @endif
                 </p>
             </div>
             <div>