| @@ -36,7 +36,7 @@ const ItemsSearch: React.FC<Props> = ({ items }) => { | |||||
| { label: t("Name"), paramName: "name", type: "text" }, | { label: t("Name"), paramName: "name", type: "text" }, | ||||
| ]; | ]; | ||||
| return searchCriteria; | return searchCriteria; | ||||
| }, [t, items]); | |||||
| }, [t]); | |||||
| const onDetailClick = useCallback( | const onDetailClick = useCallback( | ||||
| (item: ItemsResult) => { | (item: ItemsResult) => { | ||||
| @@ -70,7 +70,7 @@ const ItemsSearch: React.FC<Props> = ({ items }) => { | |||||
| onClick: onDeleteClick, | onClick: onDeleteClick, | ||||
| }, | }, | ||||
| ], | ], | ||||
| [filteredItems], | |||||
| [onDeleteClick, onDetailClick, t], | |||||
| ); | ); | ||||
| const refetchData = useCallback( | const refetchData = useCallback( | ||||
| @@ -102,12 +102,17 @@ const ItemsSearch: React.FC<Props> = ({ items }) => { | |||||
| throw error; // Rethrow the error for further handling | throw error; // Rethrow the error for further handling | ||||
| } | } | ||||
| }, | }, | ||||
| [axiosInstance, pagingController.pageNum, pagingController.pageSize], | |||||
| [pagingController.pageNum, pagingController.pageSize], | |||||
| ); | ); | ||||
| useEffect(() => { | useEffect(() => { | ||||
| refetchData(filterObj); | refetchData(filterObj); | ||||
| }, [filterObj, pagingController.pageNum, pagingController.pageSize]); | |||||
| }, [ | |||||
| filterObj, | |||||
| pagingController.pageNum, | |||||
| pagingController.pageSize, | |||||
| refetchData, | |||||
| ]); | |||||
| const onReset = useCallback(() => { | const onReset = useCallback(() => { | ||||
| setFilteredItems(items); | setFilteredItems(items); | ||||
| @@ -52,7 +52,7 @@ const NavigationContent: React.FC = () => { | |||||
| { | { | ||||
| icon: <RequestQuote />, | icon: <RequestQuote />, | ||||
| label: "Pick Order", | label: "Pick Order", | ||||
| path: "/pickorder", | |||||
| path: "/pickOrder", | |||||
| }, | }, | ||||
| // { | // { | ||||
| // icon: <RequestQuote />, | // icon: <RequestQuote />, | ||||
| @@ -1,12 +1,7 @@ | |||||
| "use client"; | "use client"; | ||||
| import { | import { | ||||
| Box, | |||||
| Button, | Button, | ||||
| ButtonProps, | |||||
| Card, | |||||
| CardContent, | |||||
| CardHeader, | |||||
| CircularProgress, | CircularProgress, | ||||
| Grid, | Grid, | ||||
| Stack, | Stack, | ||||
| @@ -678,6 +673,8 @@ const PickOrderDetail: React.FC<Props> = ({ consoCode, qc }) => { | |||||
| changeRow, | changeRow, | ||||
| addRow, | addRow, | ||||
| getLotDetail, | getLotDetail, | ||||
| scanner, | |||||
| setIsUploading, | |||||
| ]); | ]); | ||||
| const mannuallyAddRow = useCallback(() => { | const mannuallyAddRow = useCallback(() => { | ||||
| @@ -685,7 +682,7 @@ const PickOrderDetail: React.FC<Props> = ({ consoCode, qc }) => { | |||||
| addRow(qrcode); | addRow(qrcode); | ||||
| // scanner.resetScan(); | // scanner.resetScan(); | ||||
| }); | }); | ||||
| }, [addRow, homemade_Qrcode]); | |||||
| }, [addRow, getLotDetail, homemade_Qrcode.stockInLineId]); | |||||
| const validation = useCallback( | const validation = useCallback( | ||||
| ( | ( | ||||
| @@ -754,7 +751,7 @@ const PickOrderDetail: React.FC<Props> = ({ consoCode, qc }) => { | |||||
| // not completed | // not completed | ||||
| triggerRefetch(); | triggerRefetch(); | ||||
| } | } | ||||
| }, [consoCode, triggerRefetch, completeConsoPickOrder]); | |||||
| }, [consoCode, triggerRefetch]); | |||||
| return ( | return ( | ||||
| <> | <> | ||||
| @@ -86,7 +86,7 @@ const QcForm: React.FC<Props> = ({ | |||||
| console.log("bug la"); | console.log("bug la"); | ||||
| } | } | ||||
| }, | }, | ||||
| [updateStockOutLine], | |||||
| [closeHandler, qcDefaultValues], | |||||
| ); | ); | ||||
| return ( | return ( | ||||
| <> | <> | ||||
| @@ -111,7 +111,7 @@ const ConsolidatedPickOrders: React.FC<Props> = ({ filterArgs }) => { | |||||
| console.log(pickOrder); | console.log(pickOrder); | ||||
| const status = pickOrder.status; | const status = pickOrder.status; | ||||
| if (pickOrderStatusMap[status] >= 3) { | if (pickOrderStatusMap[status] >= 3) { | ||||
| router.push(`/pickorder/detail?consoCode=${pickOrder.consoCode}`); | |||||
| router.push(`/pickOrder/detail?consoCode=${pickOrder.consoCode}`); | |||||
| } else { | } else { | ||||
| openDetailModal(pickOrder.consoCode); | openDetailModal(pickOrder.consoCode); | ||||
| } | } | ||||
| @@ -135,7 +135,7 @@ const ConsolidatedPickOrders: React.FC<Props> = ({ filterArgs }) => { | |||||
| label: t("status"), | label: t("status"), | ||||
| }, | }, | ||||
| ], | ], | ||||
| [], | |||||
| [onDetailClick, t], | |||||
| ); | ); | ||||
| const [pagingController, setPagingController] = useState( | const [pagingController, setPagingController] = useState( | ||||
| defaultPagingController, | defaultPagingController, | ||||
| @@ -215,7 +215,7 @@ const ConsolidatedPickOrders: React.FC<Props> = ({ filterArgs }) => { | |||||
| console.log(newValue); | console.log(newValue); | ||||
| formProps.setValue("assignTo", newValue.id); | formProps.setValue("assignTo", newValue.id); | ||||
| }, | }, | ||||
| [], | |||||
| [formProps], | |||||
| ); | ); | ||||
| const onSubmit = useCallback<SubmitHandler<ReleasePickOrderInputs>>( | const onSubmit = useCallback<SubmitHandler<ReleasePickOrderInputs>>( | ||||
| @@ -226,7 +226,7 @@ const ConsolidatedPickOrders: React.FC<Props> = ({ filterArgs }) => { | |||||
| console.log(res); | console.log(res); | ||||
| if (res.consoCode.length > 0) { | if (res.consoCode.length > 0) { | ||||
| console.log(res); | console.log(res); | ||||
| router.push(`/pickorder/detail?consoCode=${res.consoCode}`); | |||||
| router.push(`/pickOrder/detail?consoCode=${res.consoCode}`); | |||||
| } else { | } else { | ||||
| console.log(res); | console.log(res); | ||||
| } | } | ||||
| @@ -234,7 +234,7 @@ const ConsolidatedPickOrders: React.FC<Props> = ({ filterArgs }) => { | |||||
| console.log(error); | console.log(error); | ||||
| } | } | ||||
| }, | }, | ||||
| [releasePickOrder], | |||||
| [router], | |||||
| ); | ); | ||||
| const onSubmitError = useCallback<SubmitErrorHandler<ReleasePickOrderInputs>>( | const onSubmitError = useCallback<SubmitErrorHandler<ReleasePickOrderInputs>>( | ||||
| (errors) => {}, | (errors) => {}, | ||||
| @@ -250,7 +250,7 @@ const ConsolidatedPickOrders: React.FC<Props> = ({ filterArgs }) => { | |||||
| fetchConso(consoCode); | fetchConso(consoCode); | ||||
| formProps.setValue("consoCode", consoCode); | formProps.setValue("consoCode", consoCode); | ||||
| } | } | ||||
| }, [consoCode]); | |||||
| }, [consoCode, fetchConso, formProps]); | |||||
| return ( | return ( | ||||
| <> | <> | ||||