From fcf0037bf2d689dae721132c785ce6f9dd80a8f7 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Mon, 27 Jul 2026 14:26:13 +0800
Subject: [PATCH] isextra truck X ticket fix

---
 .../DoWorkbench/WorkbenchFloorLanePanel.tsx   | 34 ++++++++++++++-----
 .../ReleasedDoPickOrderSelectModal.tsx        |  6 ++--
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/components/DoWorkbench/WorkbenchFloorLanePanel.tsx b/src/components/DoWorkbench/WorkbenchFloorLanePanel.tsx
index 9d74845..76b722b 100644
--- a/src/components/DoWorkbench/WorkbenchFloorLanePanel.tsx
+++ b/src/components/DoWorkbench/WorkbenchFloorLanePanel.tsx
@@ -40,6 +40,7 @@ interface Props {
 type LaneSlot4F = { truckDepartureTime: string; lane: LaneBtn };
 type TruckGroup4F = { truckLanceCode: string; slots: (LaneSlot4F & { sequenceIndex: number })[] };
 
+/** FP-MTMS Version Checklist | Functions Ref. No. 36 | v1.0.0 | 2026-07-27 */
 const WorkbenchFloorLanePanel: React.FC<Props> = ({
   onPickOrderAssigned,
   onSwitchToDetailTab,
@@ -689,11 +690,17 @@ const WorkbenchFloorLanePanel: React.FC<Props> = ({
                 group.lanes.map((lane, li) => {
                   const sid = (lane.storeId ?? "").trim();
                   const dep = (lane.truckDepartureTime ?? "").trim();
-                  const is4F = sid.replace(/\//g, "").toUpperCase() === "4F";
+                  const isTruckX =
+                    (lane.truckLanceCode ?? "").trim() === "車線-X" ||
+                    (lane.truckLanceCode ?? "").trim() === "Truck X";
+                  const floorKey = sid.replace(/\//g, "").toUpperCase();
+                  const is4F = floorKey === "4F";
                   const labelCore =
-                    is4F && lane.loadingSequence != null
-                      ? `${t("Loading sequence n", { n: lane.loadingSequence })} (${lane.unassigned}/${lane.total})`
-                      : `${dep ? `${dep} ` : ""}${lane.truckLanceCode} (${lane.unassigned}/${lane.total})`;
+                    isTruckX
+                      ? `${t("車線-X")}${sid ? ` · ${sid}` : ""} (${lane.unassigned}/${lane.total})`
+                      : is4F && lane.loadingSequence != null
+                        ? `${t("Loading sequence n", { n: lane.loadingSequence })} (${lane.unassigned}/${lane.total})`
+                        : `${dep ? `${dep} ` : ""}${lane.truckLanceCode} (${lane.unassigned}/${lane.total})`;
                   const handlerName = (lane.handlerName ?? "").trim();
                   const shopCode = (group.shopCode ?? "").trim();
                   const shopName = (group.shopName ?? "").trim();
@@ -702,20 +709,29 @@ const WorkbenchFloorLanePanel: React.FC<Props> = ({
                       ? `${shopCode} · ${shopName}`
                       : shopName || shopCode || t("Shop");
                   const laneSecondary = `${labelCore}${handlerName ? ` · ${handlerName}` : ""}`;
-                  const tileKey = `${shopCode}|${shopName}|${lane.truckLanceCode}|${dep}|${lane.loadingSequence ?? ""}|${li}`;
+                  const tileKey = `${shopCode}|${shopName}|${lane.truckLanceCode}|${dep}|${lane.loadingSequence ?? ""}|${sid}|${li}`;
                   return (
                     <Grid item xs={12} sm={6} md={4} lg={3} key={tileKey}>
                       <Button
                         fullWidth
                         variant="outlined"
-                        disabled={lane.unassigned === 0 || !sid}
+                        disabled={lane.unassigned === 0 || (!isTruckX && !sid)}
                         onClick={() => {
                           setModalReleaseTypeFilter("isExtra");
                           setModalFilterRequiredDeliveryDate(selectedDeliveryDateYmd);
                           setModalInitialShopSearch((group.shopName || group.shopCode || "").trim() || undefined);
-                          setSelectedStore(sid);
-                          setSelectedTruck(lane.truckLanceCode);
-                          setIsDefaultTruck(false);
+                          if (isTruckX) {
+                            // Truck X: DB storeId stays null; use display floor + default-truck list path.
+                            setSelectedStore("");
+                            setSelectedTruck("車線-X");
+                            setIsDefaultTruck(true);
+                            setModalTruckXFloor(floorKey || undefined);
+                          } else {
+                            setSelectedStore(sid);
+                            setSelectedTruck(lane.truckLanceCode);
+                            setIsDefaultTruck(false);
+                            setModalTruckXFloor(undefined);
+                          }
                           setDefaultDateScope("today");
                           setModalOpen(true);
                         }}
diff --git a/src/components/FinishedGoodSearch/ReleasedDoPickOrderSelectModal.tsx b/src/components/FinishedGoodSearch/ReleasedDoPickOrderSelectModal.tsx
index 53cad14..5f36509 100644
--- a/src/components/FinishedGoodSearch/ReleasedDoPickOrderSelectModal.tsx
+++ b/src/components/FinishedGoodSearch/ReleasedDoPickOrderSelectModal.tsx
@@ -80,6 +80,7 @@ interface Props {
   truckXFloor?: string;
 }
 
+/** FP-MTMS Version Checklist | Functions Ref. No. 36 | v1.0.0 | 2026-07-27 */
 const ReleasedDoPickOrderSelectModal: React.FC<Props> = ({
   open,
   onClose,
@@ -112,10 +113,11 @@ const ReleasedDoPickOrderSelectModal: React.FC<Props> = ({
       const loadTodayFn = listBridge?.loadToday ?? fetchReleasedDoPickOrdersForSelectionToday;
 
       const floorArg = truckXFloor?.trim() || undefined;
+      const shopArg = shopSearch.trim() || undefined;
       if (isDefaultTruck) {
         if (defaultDateScopeProp === "today") {
           data = await loadTodayFn(
-            undefined,
+            shopArg,
             undefined,
             "車線-X",
             defaultTruckRequiredDeliveryDate?.trim() || undefined,
@@ -124,7 +126,7 @@ const ReleasedDoPickOrderSelectModal: React.FC<Props> = ({
           );
         } else {
           data = await loadReleased(
-            undefined,
+            shopArg,
             undefined,
             "車線-X",
             releaseTypeFilter?.trim() || undefined,