diff --git a/src/app/api/pickOrder/actions.ts b/src/app/api/pickOrder/actions.ts
index 7e1ee51..a30a1b5 100644
--- a/src/app/api/pickOrder/actions.ts
+++ b/src/app/api/pickOrder/actions.ts
@@ -362,10 +362,9 @@ export interface CompletedDoPickOrderResponse {
 
 //  新增：搜索参数接口
 export interface CompletedDoPickOrderSearchParams {
-  pickOrderCode?: string;
+  targetDate?: string;
   shopName?: string;
-  deliveryNo?: string;
-  ticketNo?: string;
+  deliveryNoteCode?: string;
 }
 export interface PickExecutionIssue {
   id: number;
@@ -521,17 +520,14 @@ export const fetchCompletedDoPickOrders = async (
 ): Promise<CompletedDoPickOrderResponse[]> => {
   const params = new URLSearchParams();
   
-  if (searchParams?.pickOrderCode) {
-    params.append('pickOrderCode', searchParams.pickOrderCode);
+  if (searchParams?.deliveryNoteCode) {
+    params.append('deliveryNoteCode', searchParams.deliveryNoteCode);
   }
   if (searchParams?.shopName) {
     params.append('shopName', searchParams.shopName);
   }
-  if (searchParams?.deliveryNo) {
-    params.append('deliveryNo', searchParams.deliveryNo);
-  }
-  if (searchParams?.ticketNo) {
-    params.append('ticketNo', searchParams.ticketNo);
+  if (searchParams?.targetDate) {
+    params.append('targetDate', searchParams.targetDate);
   }
   
   const queryString = params.toString();
diff --git a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
index 068f094..55eed14 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
@@ -190,11 +190,7 @@ const validateForm = (): boolean => {
   }
   
   // 2. 检查 actualPickQty 不能超过可用数量或需求数量
-<<<<<<< Updated upstream
-  if (ap > Math.min( req)) {
-=======
   if (ap > Math.min(req)) {
->>>>>>> Stashed changes
     newErrors.actualPickQty = t('Qty is not allowed to be greater than required/available qty');
   }
   
diff --git a/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx b/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx
index 510546a..6d1d6d7 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx
@@ -342,9 +342,9 @@ const GoodPickExecutionRecord: React.FC<Props> = ({ filterArgs }) => {
     console.log("Search query:", query);
 
     const searchParams: CompletedDoPickOrderSearchParams = {
-      pickOrderCode: query.pickOrderCode || undefined,
+      targetDate: query.targetDate || undefined,
       shopName: query.shopName || undefined,
-      deliveryNo: query.deliveryNo || undefined,
+      deliveryNoteCode: query.deliveryNoteCode || undefined,
       //ticketNo: query.ticketNo || undefined,
     };
 
@@ -384,8 +384,8 @@ const GoodPickExecutionRecord: React.FC<Props> = ({ filterArgs }) => {
   //  搜索条件
   const searchCriteria: Criterion<any>[] = [
     {
-      label: t("Pick Order Code"),
-      paramName: "pickOrderCode",
+      label: t("Delivery Note Code"),
+      paramName: "deliveryNoteCode",
       type: "text",
     },
     {
@@ -394,9 +394,9 @@ const GoodPickExecutionRecord: React.FC<Props> = ({ filterArgs }) => {
       type: "text",
     },
     {
-      label: t("Delivery No"),
-      paramName: "deliveryNo",
-      type: "text",
+      label: t("Target Date"),
+      paramName: "targetDate",
+      type: "date",
     }
   ];