diff --git a/src/app/(main)/finishedGood/detail/page.tsx b/src/app/(main)/finishedGood/detail/page.tsx index 058ad77..a456798 100644 --- a/src/app/(main)/finishedGood/detail/page.tsx +++ b/src/app/(main)/finishedGood/detail/page.tsx @@ -1,4 +1,4 @@ -import { PreloadPickOrder } from "@/app/api/pickOrder"; + import { SearchParams } from "@/app/utils/fetchUtil"; import FinishedGoodSearchWrapper from "@/components/FinishedGoodSearch"; import { getServerI18n, I18nProvider } from "@/i18n"; @@ -14,7 +14,7 @@ type Props = {} & SearchParams; const PickOrder: React.FC = async ({ searchParams }) => { const { t } = await getServerI18n("pickOrder"); - PreloadPickOrder(); + return ( <> diff --git a/src/app/(main)/finishedGood/page.tsx b/src/app/(main)/finishedGood/page.tsx index 843f02c..44ca00b 100644 --- a/src/app/(main)/finishedGood/page.tsx +++ b/src/app/(main)/finishedGood/page.tsx @@ -13,7 +13,7 @@ export const metadata: Metadata = { const PickOrder: React.FC = async () => { const { t } = await getServerI18n("pickOrder"); - PreloadPickOrder(); + //PreloadPickOrder(); return ( <> diff --git a/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx b/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx index 123175d..c09548f 100644 --- a/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx +++ b/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx @@ -46,7 +46,7 @@ import { clientAuthFetch } from "@/app/utils/clientAuthFetch"; import { NEXT_PUBLIC_API_URL } from "@/config/api"; interface Props { - pickOrders: PickOrderResult[]; + // pickOrders: PickOrderResult[]; printerCombo: PrinterCombo[]; } @@ -56,7 +56,7 @@ type SearchQuery = Partial< type SearchParamNames = keyof SearchQuery; -const PickOrderSearch: React.FC = ({ pickOrders, printerCombo }) => { +const PickOrderSearch: React.FC = ({ printerCombo }) => { const { t } = useTranslation("pickOrder"); const { data: session } = useSession() as { data: SessionWithTokens | null }; const currentUserId = session?.id ? parseInt(session.id) : undefined; @@ -64,7 +64,7 @@ const PickOrderSearch: React.FC = ({ pickOrders, printerCombo }) => { const [isOpenCreateModal, setIsOpenCreateModal] = useState(false) const [items, setItems] = useState([]) const [printButtonsEnabled, setPrintButtonsEnabled] = useState(false); - const [filteredPickOrders, setFilteredPickOrders] = useState(pickOrders); + //const [filteredPickOrders, setFilteredPickOrders] = useState(pickOrders); const [filterArgs, setFilterArgs] = useState>({}); const [searchQuery, setSearchQuery] = useState>({}); const [tabIndex, setTabIndex] = useState(0); @@ -511,7 +511,7 @@ const handleAssignByLane = useCallback(async ( window.removeEventListener('pickOrderCompletionStatus', handleCompletionStatusChange as EventListener); }; }, []); - +/* const searchCriteria: Criterion[] = useMemo( () => { const baseCriteria: Criterion[] = [ @@ -616,7 +616,8 @@ const handleAssignByLane = useCallback(async ( }, [pickOrders, t, tabIndex, items], ); - +*/ +/* const fetchNewPagePickOrder = useCallback( async ( pagingController: Record, @@ -635,11 +636,12 @@ const handleAssignByLane = useCallback(async ( }, [], ); - + */ +/* const onReset = useCallback(() => { setFilteredPickOrders(pickOrders); }, [pickOrders]); - +*/ useEffect(() => { if (!isOpenCreateModal) { setTabIndex(1) diff --git a/src/components/FinishedGoodSearch/FinishedGoodSearchWrapper.tsx b/src/components/FinishedGoodSearch/FinishedGoodSearchWrapper.tsx index 11657f4..c063c1b 100644 --- a/src/components/FinishedGoodSearch/FinishedGoodSearchWrapper.tsx +++ b/src/components/FinishedGoodSearch/FinishedGoodSearchWrapper.tsx @@ -1,4 +1,4 @@ -import { fetchPickOrders } from "@/app/api/pickOrder"; + import GeneralLoading from "../General/GeneralLoading"; import PickOrderSearch from "./FinishedGoodSearch"; import{fetchPrinterCombo} from "@/app/api/settings/printer"; @@ -7,19 +7,12 @@ interface SubComponents { } const FinishedGoodSearchWrapper: React.FC & SubComponents = async () => { - const [pickOrders, printerCombo] = await Promise.all([ - fetchPickOrders({ - code: undefined, - targetDateFrom: undefined, - targetDateTo: undefined, - type: undefined, - status: undefined, - itemName: undefined, - }), + const [printerCombo] = await Promise.all([ + fetchPrinterCombo(), ]); - return ; + return ; }; FinishedGoodSearchWrapper.Loading = GeneralLoading; diff --git a/src/components/Jodetail/FinishedGoodSearchWrapper.tsx b/src/components/Jodetail/FinishedGoodSearchWrapper.tsx index 48e2956..8784982 100644 --- a/src/components/Jodetail/FinishedGoodSearchWrapper.tsx +++ b/src/components/Jodetail/FinishedGoodSearchWrapper.tsx @@ -1,4 +1,4 @@ -import { fetchPickOrders } from "@/app/api/pickOrder"; + import { fetchPrinterCombo } from "@/app/api/settings/printer"; import GeneralLoading from "../General/GeneralLoading"; import JodetailSearch from "./JodetailSearch"; @@ -8,7 +8,8 @@ interface SubComponents { } const JodetailSearchWrapper: React.FC & SubComponents = async () => { - const [pickOrders, printerCombo] = await Promise.all([ + const [printerCombo] = await Promise.all([ + /* fetchPickOrders({ code: undefined, targetDateFrom: undefined, @@ -19,11 +20,12 @@ const JodetailSearchWrapper: React.FC & SubComponents = async () => { pageNum: 0, pageSize: 50, }), + */ fetchPrinterCombo(), ]); console.log("%c printerCombo:", "color:green", printerCombo); - return ; + return ; }; JodetailSearchWrapper.Loading = GeneralLoading; diff --git a/src/components/Jodetail/JodetailSearch.tsx b/src/components/Jodetail/JodetailSearch.tsx index 9698dbf..f6f04c4 100644 --- a/src/components/Jodetail/JodetailSearch.tsx +++ b/src/components/Jodetail/JodetailSearch.tsx @@ -39,7 +39,7 @@ import { PrinterCombo } from "@/app/api/settings/printer"; import JoPickOrderDetail from "./JoPickOrderDetail"; import MaterialPickStatusTable from "./MaterialPickStatusTable"; interface Props { - pickOrders: PickOrderResult[]; + //pickOrders: PickOrderResult[]; printerCombo: PrinterCombo[]; } @@ -49,7 +49,7 @@ type SearchQuery = Partial< type SearchParamNames = keyof SearchQuery; -const JodetailSearch: React.FC = ({ pickOrders, printerCombo }) => { +const JodetailSearch: React.FC = ({ printerCombo }) => { const { t } = useTranslation("jo"); const { data: session } = useSession() as { data: SessionWithTokens | null }; const currentUserId = session?.id ? parseInt(session.id) : undefined; @@ -57,7 +57,7 @@ const JodetailSearch: React.FC = ({ pickOrders, printerCombo }) => { const [isOpenCreateModal, setIsOpenCreateModal] = useState(false) const [items, setItems] = useState([]) const [printButtonsEnabled, setPrintButtonsEnabled] = useState(false); - const [filteredPickOrders, setFilteredPickOrders] = useState(pickOrders); + //const [filteredPickOrders, setFilteredPickOrders] = useState(pickOrders); const [filterArgs, setFilterArgs] = useState>({}); const [searchQuery, setSearchQuery] = useState>({}); const [tabIndex, setTabIndex] = useState(0); @@ -275,7 +275,7 @@ const JodetailSearch: React.FC = ({ pickOrders, printerCombo }) => { window.removeEventListener('pickOrderCompletionStatus', handleCompletionStatusChange as EventListener); }; }, []); - +/* const searchCriteria: Criterion[] = useMemo( () => { const baseCriteria: Criterion[] = [ @@ -380,9 +380,11 @@ const JodetailSearch: React.FC = ({ pickOrders, printerCombo }) => { }, [pickOrders, t, tabIndex, items], ); + */ const handleSwitchToRecordTab = useCallback(() => { setTabIndex(1); // 切换到 CompleteJobOrderRecord 标签页(tabIndex 1) }, []); +/* const fetchNewPagePickOrder = useCallback( async ( pagingController: Record, @@ -405,7 +407,7 @@ const JodetailSearch: React.FC = ({ pickOrders, printerCombo }) => { const onReset = useCallback(() => { setFilteredPickOrders(pickOrders); }, [pickOrders]); - +*/ useEffect(() => { if (!isOpenCreateModal) { setTabIndex(1)