diff --git a/src/components/DoSearch/DoSearchWrapper.tsx b/src/components/DoSearch/DoSearchWrapper.tsx
index 93934b7..fd3855e 100644
--- a/src/components/DoSearch/DoSearchWrapper.tsx
+++ b/src/components/DoSearch/DoSearchWrapper.tsx
@@ -8,8 +8,8 @@ interface SubComponents {
 }
 
 const DoSearchWrapper: React.FC & SubComponents = async () => {
-  const [dos] = await Promise.all([fetchDoList()]);
-  return <DoSearch dos={dos} />;
+ // const [dos] = await Promise.all([fetchDoList()]);
+  return <DoSearch />;
 };
 
 DoSearchWrapper.Loading = GeneralLoading;
diff --git a/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx b/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx
index bb5670b..5c774db 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx
@@ -184,7 +184,7 @@ const GoodPickExecutionRecord: React.FC<Props> = ({ filterArgs, printerCombo, a4
         console.error("error: ", error)
       }
     }
-  }, [t]);
+  }, [t, a4Printer]);
 
   const handleDNandLabel = useCallback(async (recordId: number) => {
     if (!a4Printer || !labelPrinter) {
@@ -281,7 +281,7 @@ const GoodPickExecutionRecord: React.FC<Props> = ({ filterArgs, printerCombo, a4
         console.error("error: ", error)
       }
     }
-  }, [t]);
+  }, [t, a4Printer, labelPrinter]);
 
   const handleLabel = useCallback(async (recordId: number) => {
     const askNumofCarton = await Swal.fire({
@@ -340,7 +340,7 @@ const GoodPickExecutionRecord: React.FC<Props> = ({ filterArgs, printerCombo, a4
         console.error("error: ", error)
       }
     }
-  }, [t]);
+  }, [t, labelPrinter]);
 
   //  修改：使用新的 API 获取已完成的 DO Pick Orders
   const fetchCompletedDoPickOrdersData = useCallback(async (searchParams?: CompletedDoPickOrderSearchParams) => {
diff --git a/src/i18n/zh/pickOrder.json b/src/i18n/zh/pickOrder.json
index 65a0a14..51558a0 100644
--- a/src/i18n/zh/pickOrder.json
+++ b/src/i18n/zh/pickOrder.json
@@ -207,6 +207,8 @@
         "Delivery Note Code": "送貨單編號",
         "A4 Printer": "A4 打印機",
         "Label Printer": "標籤打印機",
+        "Please select a printer first": "請先選擇打印機",
+
         "Lot No": "批號",
         "Expiry Date": "到期日",
         "Location": "位置",