From 6b583ffe157d6880a012cf3a53684d0af8be5771 Mon Sep 17 00:00:00 2001
From: "kelvin.yau" <kelvin.yau@2fi-solutions.com.hk>
Date: Fri, 14 Nov 2025 11:34:51 +0800
Subject: [PATCH] DoSearch optimization

---
 src/app/api/do/actions.tsx                    | 14 ++--------
 src/components/DoSearch/DoSearch.tsx          | 27 +++++--------------
 .../GoodPickExecutionForm.tsx                 |  4 +++
 3 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/app/api/do/actions.tsx b/src/app/api/do/actions.tsx
index f3be747..3c368d9 100644
--- a/src/app/api/do/actions.tsx
+++ b/src/app/api/do/actions.tsx
@@ -132,19 +132,9 @@ export interface getTicketReleaseTable {
   numberOfFGItems: number;
 }
 
-export const fetchTicketReleaseTable = cache(async (startDate?: string, endDate?: string) => {
-  const params = new URLSearchParams();
-  if (startDate) {
-    params.append('startDate', startDate);
-  }
-  if (endDate) {
-    params.append('endDate', endDate);
-  }
-  
-  const url = `${BASE_API_URL}/doPickOrder/ticket-release-table${params.toString() ? `?${params.toString()}` : ''}`;
-  
+export const fetchTicketReleaseTable = cache(async ()=> {
   return await serverFetchJson<getTicketReleaseTable[]>(
-    url,
+    `${BASE_API_URL}/doPickOrder/ticket-release-table`,
     {
       method: "GET",
     }
diff --git a/src/components/DoSearch/DoSearch.tsx b/src/components/DoSearch/DoSearch.tsx
index ef3274a..7136242 100644
--- a/src/components/DoSearch/DoSearch.tsx
+++ b/src/components/DoSearch/DoSearch.tsx
@@ -127,23 +127,6 @@ const DoSearch: React.FC<Props> = ({filterArgs, searchQuery, onDeliveryOrderSear
   }, [searchAllDos]);
 
 
-  //INITIALIZATION
-  useEffect(() => {
-    const loadItems = async () => {
-      try{
-        //const itemsData = await fetchDoSearch("","","","","","","");
-        //setSearchAllDos(itemsData);
-      }
-      catch (error){
-        console.error("Loading Error: ", error);
-        setSearchAllDos([]);
-      };
-    };
-    loadItems();
-    console.log("success");
-  },[]);
-
-
   const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
     () => [
       { label: t("Code"), paramName: "code", type: "text" },
@@ -180,10 +163,9 @@ const DoSearch: React.FC<Props> = ({filterArgs, searchQuery, onDeliveryOrderSear
 
   const onReset = useCallback(async () => {
     try {
-      //const data = await fetchDoSearch("", "", "", "", "","","");
-      //setSearchAllDos(data);
-      setHasSearched(false);
+      setSearchAllDos([]);
       setHasSearched(false);
+      setHasResults(false);
     } 
     catch (error) {
       console.error("Error: ", error);
@@ -348,6 +330,9 @@ const DoSearch: React.FC<Props> = ({filterArgs, searchQuery, onDeliveryOrderSear
       setHasResults(data.length > 0);
     } catch (error) {
       console.error("Error: ", error);
+      setSearchAllDos([]);
+      setHasSearched(true);
+      setHasResults(false);
     }
   }, []);
   const debouncedSearch = useCallback((query: SearchBoxInputs) => {
@@ -558,4 +543,4 @@ const NoRowsOverlay: React.FC = () => {
   );
 };
 
-export default DoSearch;
+export default DoSearch;
\ No newline at end of file
diff --git a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
index 55eed14..485e137 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
@@ -190,7 +190,11 @@ 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');
   }