浏览代码

update jo printer

master
kelvinsuen 1 个月前
父节点
当前提交
9de4dd601f
共有 2 个文件被更改,包括 11 次插入6 次删除
  1. +5
    -3
      src/components/JoSearch/JoSearch.tsx
  2. +6
    -3
      src/components/JoSearch/JoSearchWrapper.tsx

+ 5
- 3
src/components/JoSearch/JoSearch.tsx 查看文件

@@ -16,7 +16,7 @@ import { Button, Stack } from "@mui/material";
import { BomCombo } from "@/app/api/bom"; import { BomCombo } from "@/app/api/bom";
import JoCreateFormModal from "./JoCreateFormModal"; import JoCreateFormModal from "./JoCreateFormModal";
import AddIcon from '@mui/icons-material/Add'; import AddIcon from '@mui/icons-material/Add';
import QcStockInModal from "../PoDetail/QcStockInModal";
import QcStockInModal from "../Qc/QcStockInModal";
import { useSession } from "next-auth/react"; import { useSession } from "next-auth/react";
import { SessionWithTokens } from "@/config/authConfig"; import { SessionWithTokens } from "@/config/authConfig";
import { createStockInLine } from "@/app/api/stockIn/actions"; import { createStockInLine } from "@/app/api/stockIn/actions";
@@ -25,17 +25,19 @@ import dayjs from "dayjs";


import { fetchInventories } from "@/app/api/inventory/actions"; import { fetchInventories } from "@/app/api/inventory/actions";
import { InventoryResult } from "@/app/api/inventory"; import { InventoryResult } from "@/app/api/inventory";
import { PrinterCombo } from "@/app/api/settings/printer";


interface Props { interface Props {
defaultInputs: SearchJoResultRequest, defaultInputs: SearchJoResultRequest,
bomCombo: BomCombo[] bomCombo: BomCombo[]
printerCombo: PrinterCombo[];
} }


type SearchQuery = Partial<Omit<JobOrder, "id">>; type SearchQuery = Partial<Omit<JobOrder, "id">>;


type SearchParamNames = keyof SearchQuery; type SearchParamNames = keyof SearchQuery;


const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo }) => {
const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo, printerCombo }) => {
const { t } = useTranslation("jo"); const { t } = useTranslation("jo");
const router = useRouter() const router = useRouter()
const [filteredJos, setFilteredJos] = useState<JobOrder[]>([]); const [filteredJos, setFilteredJos] = useState<JobOrder[]>([]);
@@ -426,7 +428,7 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo }) => {
open={openModal} open={openModal}
onClose={closeNewModal} onClose={closeNewModal}
inputDetail={modalInfo} inputDetail={modalInfo}
printerCombo={[]}
printerCombo={printerCombo}
// skipQc={true} // skipQc={true}
/> />
</> </>


+ 6
- 3
src/components/JoSearch/JoSearchWrapper.tsx 查看文件

@@ -3,6 +3,7 @@ import GeneralLoading from "../General/GeneralLoading";
import JoSearch from "./JoSearch"; import JoSearch from "./JoSearch";
import { SearchJoResultRequest } from "@/app/api/jo/actions"; import { SearchJoResultRequest } from "@/app/api/jo/actions";
import { fetchBomCombo } from "@/app/api/bom"; import { fetchBomCombo } from "@/app/api/bom";
import { fetchPrinterCombo } from "@/app/api/settings/printer";


interface SubComponents { interface SubComponents {
Loading: typeof GeneralLoading; Loading: typeof GeneralLoading;
@@ -15,12 +16,14 @@ const JoSearchWrapper: React.FC & SubComponents = async () => {
} }


const [ const [
bomCombo
bomCombo,
printerCombo
] = await Promise.all([ ] = await Promise.all([
fetchBomCombo()
fetchBomCombo(),
fetchPrinterCombo()
]) ])
return <JoSearch defaultInputs={defaultInputs} bomCombo={bomCombo}/>
return <JoSearch defaultInputs={defaultInputs} bomCombo={bomCombo} printerCombo={printerCombo}/>
} }


JoSearchWrapper.Loading = GeneralLoading; JoSearchWrapper.Loading = GeneralLoading;


正在加载...
取消
保存