From ebd39a09d4200d1c0f43bae2f5d33b6811b099ba Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Sat, 4 Jul 2026 21:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=9C=E8=B2=A8=20search=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/api/do/replenishmentTypes.ts           |  1 +
 src/components/DoSearch/DoReplenishmentTab.tsx | 14 ++++++++++----
 src/i18n/en/do.json                            |  1 +
 src/i18n/zh/do.json                            |  1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/api/do/replenishmentTypes.ts b/src/app/api/do/replenishmentTypes.ts
index a2a0222..28669db 100644
--- a/src/app/api/do/replenishmentTypes.ts
+++ b/src/app/api/do/replenishmentTypes.ts
@@ -29,6 +29,7 @@ export interface DoReplenishmentRecord {
   targetDoEstimatedArrivalDate?: string;
   pickOrderLineId?: number;
   deliveryOrderPickOrderId?: number;
+  relateTicketNo?: string;
   status: string;
   reason?: string;
   created?: string;
diff --git a/src/components/DoSearch/DoReplenishmentTab.tsx b/src/components/DoSearch/DoReplenishmentTab.tsx
index 123a8d7..f5ce0f7 100644
--- a/src/components/DoSearch/DoReplenishmentTab.tsx
+++ b/src/components/DoSearch/DoReplenishmentTab.tsx
@@ -113,6 +113,7 @@ export type ReplenishmentRecord = ReplenishmentDraftRow & {
   targetDoEstimatedArrivalDate?: string;
   pickOrderLineId?: number;
   actualPickQty?: number;
+  relateTicketNo?: string;
   status: ReplenishmentStatus;
   created: string;
 };
@@ -209,6 +210,7 @@ function mapApiRecord(record: DoReplenishmentRecord): ReplenishmentRecord {
       record.actualPickQty != null && Number.isFinite(Number(record.actualPickQty))
         ? Number(record.actualPickQty)
         : undefined,
+    relateTicketNo: record.relateTicketNo,
     status: record.status as ReplenishmentStatus,
     reason: record.reason,
     created: record.created ?? "",
@@ -515,7 +517,7 @@ const DoReplenishmentTab: React.FC = () => {
     try {
       const searchRes = await fetchDoSearch(
         suffix,
-        "",
+        shop,
         "completed",
         "",
         "",
@@ -1569,9 +1571,6 @@ const DoReplenishmentTab: React.FC = () => {
                           <TrackingInlineLine label={t("Replenish Qty")}>
                             {formatQtyWithUom(row.replenishQty, row.shortUom)}
                           </TrackingInlineLine>
-                          <TrackingInlineLine label={t("replenishmentActualPickQty")}>
-                            {formatQtyWithUom(row.actualPickQty, row.shortUom)}
-                          </TrackingInlineLine>
                           <TrackingInlineLine label={t("Remark")}>
                             {formatReplenishmentReason(row.reason, t)}
                           </TrackingInlineLine>
@@ -1590,6 +1589,13 @@ const DoReplenishmentTab: React.FC = () => {
                                 : "—"
                             }
                           />
+                          <TrackingFieldBlock
+                            label={t("replenishmentRelateTicketNo")}
+                            value={row.relateTicketNo ?? "—"}
+                          />
+                          <TrackingInlineLine label={t("replenishmentActualPickQty")}>
+                            {formatQtyWithUom(row.actualPickQty, row.shortUom)}
+                          </TrackingInlineLine>
                           <TrackingFieldBlock
                             label={t("replenishmentStatusLabel")}
                             value={t(row.status)}
diff --git a/src/i18n/en/do.json b/src/i18n/en/do.json
index ffc6025..b21c9bb 100644
--- a/src/i18n/en/do.json
+++ b/src/i18n/en/do.json
@@ -103,6 +103,7 @@
   "Replenish Qty": "Replenish Qty",
   "Replenish Qty short": "Replenish",
   "replenishmentActualPickQty": "Actual Picked Qty",
+  "replenishmentRelateTicketNo": "Related Ticket No.",
   "Replenish qty must be greater than zero": "Replenish qty must be greater than zero",
   "Replenishment": "Replenishment",
   "Delivery date is required": "Delivery date is required",
diff --git a/src/i18n/zh/do.json b/src/i18n/zh/do.json
index fe45e4b..e498ca3 100644
--- a/src/i18n/zh/do.json
+++ b/src/i18n/zh/do.json
@@ -48,6 +48,7 @@
   "Replenish Qty": "補貨數量",
   "Replenish Qty short": "補貨",
   "replenishmentActualPickQty": "實際提料數量",
+  "replenishmentRelateTicketNo": "關聯提票號碼",
   "Replenish qty must be greater than zero": "補貨數量必須大於零",
   "Replenishment": "補貨",
   "Delivery date is required": "請選擇送貨日期",