浏览代码

update

master
CANCERYS\kw093 2 周前
父节点
当前提交
232403c800
共有 3 个文件被更改,包括 22 次插入34 次删除
  1. +1
    -1
      src/components/PickOrderSearch/QcSelect.tsx
  2. +20
    -32
      src/components/Qc/QcStockInModal.tsx
  3. +1
    -1
      src/components/SearchResults/TempInputGridForMockUp.tsx

+ 1
- 1
src/components/PickOrderSearch/QcSelect.tsx 查看文件

@@ -26,7 +26,7 @@ interface SingleAutocompleteProps extends CommonProps {
type Props = SingleAutocompleteProps; type Props = SingleAutocompleteProps;


const QcSelect: React.FC<Props> = ({ allQcs, value, error, onQcSelect }) => { const QcSelect: React.FC<Props> = ({ allQcs, value, error, onQcSelect }) => {
const { t } = useTranslation("home");
const { t } = useTranslation("common");
const filteredQc = useMemo(() => { const filteredQc = useMemo(() => {
// do filtering here if any // do filtering here if any
return allQcs; return allQcs;


+ 20
- 32
src/components/Qc/QcStockInModal.tsx 查看文件

@@ -88,23 +88,18 @@ const QcStockInModal: React.FC<Props> = ({
// const [skipQc, setSkipQc] = useState<Boolean>(false); // const [skipQc, setSkipQc] = useState<Boolean>(false);
// const [viewOnly, setViewOnly] = useState(false); // const [viewOnly, setViewOnly] = useState(false);


// Select Printer
const printerStorageKey = useMemo(
() => `qcStockInModal_selectedPrinterId_${session?.id ?? "guest"}`,
[session?.id],
);
const getDefaultPrinter = useMemo(() => { 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]);
if (!printerCombo.length) return undefined;
if (typeof window === "undefined") return printerCombo[0];

const savedId = sessionStorage.getItem(printerStorageKey);
const matched = savedId ? printerCombo.find(p => p.id === Number(savedId)) : undefined;
return matched ?? printerCombo[0];
}, [printerCombo, printerStorageKey]);
const [selectedPrinter, setSelectedPrinter] = useState(printerCombo[0]); const [selectedPrinter, setSelectedPrinter] = useState(printerCombo[0]);
const [printQty, setPrintQty] = useState(1); const [printQty, setPrintQty] = useState(1);
const [tabIndex, setTabIndex] = useState(0); const [tabIndex, setTabIndex] = useState(0);
@@ -474,23 +469,16 @@ const QcStockInModal: React.FC<Props> = ({
); );
// Print handler // Print handler
useEffect(() => { 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;
}
}
if (!printerCombo.length) return;
if (typeof window === "undefined") {
setSelectedPrinter(printerCombo[0]); setSelectedPrinter(printerCombo[0]);
return;
} }
}, [printerCombo]);

const savedId = sessionStorage.getItem(printerStorageKey);
const matched = savedId ? printerCombo.find(p => p.id === Number(savedId)) : undefined;
setSelectedPrinter(matched ?? printerCombo[0]);
}, [printerCombo, printerStorageKey]);
const [isPrinting, setIsPrinting] = useState(false) const [isPrinting, setIsPrinting] = useState(false)
const handlePrint = useCallback(async () => { const handlePrint = useCallback(async () => {
// console.log("Print putaway documents"); // console.log("Print putaway documents");
@@ -522,7 +510,7 @@ const QcStockInModal: React.FC<Props> = ({
console.log(response) console.log(response)
} }
if (typeof window !== 'undefined' && selectedPrinter) { if (typeof window !== 'undefined' && selectedPrinter) {
localStorage.setItem('qcStockInModal_selectedPrinterId', String(selectedPrinter.id));
sessionStorage.setItem(printerStorageKey, String(selectedPrinter.id));
} }
} finally { } finally {
setIsPrinting(() => false) setIsPrinting(() => false)


+ 1
- 1
src/components/SearchResults/TempInputGridForMockUp.tsx 查看文件

@@ -439,7 +439,7 @@ function TempInputGridForMockUp({ stockInLine }: Props) {
); );
} }
const NoRowsOverlay: React.FC = () => { const NoRowsOverlay: React.FC = () => {
const { t } = useTranslation("home");
const { t } = useTranslation("common");
return ( return (
<Box <Box
display="flex" display="flex"


正在加载...
取消
保存