From 29cb77a9fa6a7f3803b2ad6b72615c976d2c62ab Mon Sep 17 00:00:00 2001 From: "CANCERYS\\kw093" Date: Wed, 26 Nov 2025 13:00:59 +0800 Subject: [PATCH] update --- src/components/JoSearch/JoCreateFormModal.tsx | 13 +++++++ src/components/Qc/QcStockInModal.tsx | 37 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/src/components/JoSearch/JoCreateFormModal.tsx b/src/components/JoSearch/JoCreateFormModal.tsx index fe2cae6..6fa107a 100644 --- a/src/components/JoSearch/JoCreateFormModal.tsx +++ b/src/components/JoSearch/JoCreateFormModal.tsx @@ -163,6 +163,19 @@ const JoCreateFormModal: React.FC = ({ type="number" /> + + value > 0 + })} + label={t("Job Type")} + fullWidth + error={Boolean(errors.reqQty)} + variant="outlined" + type="number" + /> + = ({ // const [viewOnly, setViewOnly] = useState(false); // Select Printer + const getDefaultPrinter = useMemo(() => { + if (typeof window === 'undefined' || printerCombo.length === 0) { + return printerCombo[0]; + } + + const savedPrinterId = localStorage.getItem('qcStockInModal_selectedPrinterId'); + if (savedPrinterId) { + const savedId = Number(savedPrinterId); + const foundPrinter = printerCombo.find(p => p.id === savedId); + if (foundPrinter) { + return foundPrinter; + } + } + + return printerCombo[0]; + }, [printerCombo]); const [selectedPrinter, setSelectedPrinter] = useState(printerCombo[0]); const [printQty, setPrintQty] = useState(1); const [tabIndex, setTabIndex] = useState(0); @@ -457,6 +473,24 @@ const QcStockInModal: React.FC = ({ [closeHandler], ); // Print handler + useEffect(() => { + if (printerCombo.length > 0) { + const savedPrinterId = typeof window !== 'undefined' + ? localStorage.getItem('qcStockInModal_selectedPrinterId') + : null; + + if (savedPrinterId) { + const savedId = Number(savedPrinterId); + const foundPrinter = printerCombo.find(p => p.id === savedId); + if (foundPrinter) { + setSelectedPrinter(foundPrinter); + return; + } + } + + setSelectedPrinter(printerCombo[0]); + } + }, [printerCombo]); const [isPrinting, setIsPrinting] = useState(false) const handlePrint = useCallback(async () => { // console.log("Print putaway documents"); @@ -487,6 +521,9 @@ const QcStockInModal: React.FC = ({ if (response) { console.log(response) } + if (typeof window !== 'undefined' && selectedPrinter) { + localStorage.setItem('qcStockInModal_selectedPrinterId', String(selectedPrinter.id)); + } } finally { setIsPrinting(() => false) }