Merge branch 'master' of http://svn.2fi-solutions.com:8300/derek/FPSMS-frontend

src/components/DashboardPage/escalation/EscalationLogTable.tsx

@@ -65,7 +65,9 @@ const EscalationLogTable: React.FC<Props> = ({
   );
 
   const onRowClick = useCallback((item: EscalationResult) => {
-    router.push(`/po/edit?id=${item.poId}&selectedIds=${item.poId}&polId=${item.polId}&stockInLineId=${item.stockInLineId}`);
+    if (type == "dashboard") {
+      router.push(`/po/edit?id=${item.poId}&selectedIds=${item.poId}&polId=${item.polId}&stockInLineId=${item.stockInLineId}`);
+    }
   }, [router])
 
   // const handleKeyDown = useCallback(

src/components/PoDetail/QcStockInModal.tsx

@@ -19,7 +19,7 @@ import { Dispatch, SetStateAction, useCallback, useEffect, useMemo, useState } f
 import { FormProvider, SubmitErrorHandler, SubmitHandler, useForm } from "react-hook-form";
 import { StockInLineRow } from "./PoInputGrid";
 import { useTranslation } from "react-i18next";
-import StockInForm from "./StockInForm";
+import StockInForm from "../StockIn/StockInForm";
 import QcComponent from "./QcComponent";
 import PutAwayForm from "./PutAwayForm";
 import { GridRowModes, GridRowSelectionModel, useGridApiRef } from "@mui/x-data-grid";

src/components/PutAwayScan/PutAwayModal.tsx

@@ -30,7 +30,7 @@ import { useTranslation } from "react-i18next";
 import { useSearchParams } from "next/navigation";
 import { useQrCodeScannerContext } from "../QrCodeScannerProvider/QrCodeScannerProvider";
 import LoadingComponent from "../General/LoadingComponent";
-import StockInForm from "../PoDetail/StockInForm";
+import StockInForm from "../StockIn/StockInForm";
 import { arrayToDateString, INPUT_DATE_FORMAT } from "@/app/utils/formatUtil";
 import { QrCodeScanner } from "../QrCodeScannerProvider/QrCodeScannerProvider";
 import { msg } from "../Swal/CustomAlerts";

src/components/PoDetail/StockInForm.tsx → src/components/StockIn/StockInForm.tsx

@@ -28,8 +28,6 @@ import {
 } from "@mui/x-data-grid";
 import InputDataGrid from "../InputDataGrid";
 import { TableRow } from "../InputDataGrid/InputDataGrid";
-import TwoLineCell from "./TwoLineCell";
-import QcSelect from "./QcSelect";
 import { QcItemWithChecks } from "@/app/api/qc";
 import { GridEditInputCell } from "@mui/x-data-grid";
 import { StockInLine } from "@/app/api/stockIn";