Ver a proveniência

efficient improve V3

MergeProblem1
CANCERYS\kw093 há 1 dia
ascendente
cometimento
36c7216fbd
6 ficheiros alterados com 28 adições e 29 eliminações
  1. +2
    -2
      src/app/(main)/finishedGood/detail/page.tsx
  2. +1
    -1
      src/app/(main)/finishedGood/page.tsx
  3. +9
    -7
      src/components/FinishedGoodSearch/FinishedGoodSearch.tsx
  4. +4
    -11
      src/components/FinishedGoodSearch/FinishedGoodSearchWrapper.tsx
  5. +5
    -3
      src/components/Jodetail/FinishedGoodSearchWrapper.tsx
  6. +7
    -5
      src/components/Jodetail/JodetailSearch.tsx

+ 2
- 2
src/app/(main)/finishedGood/detail/page.tsx Ver ficheiro

@@ -1,4 +1,4 @@
import { PreloadPickOrder } from "@/app/api/pickOrder";
import { SearchParams } from "@/app/utils/fetchUtil";
import FinishedGoodSearchWrapper from "@/components/FinishedGoodSearch";
import { getServerI18n, I18nProvider } from "@/i18n";
@@ -14,7 +14,7 @@ type Props = {} & SearchParams;
const PickOrder: React.FC<Props> = async ({ searchParams }) => {
const { t } = await getServerI18n("pickOrder");

PreloadPickOrder();

return (
<>


+ 1
- 1
src/app/(main)/finishedGood/page.tsx Ver ficheiro

@@ -13,7 +13,7 @@ export const metadata: Metadata = {
const PickOrder: React.FC = async () => {
const { t } = await getServerI18n("pickOrder");

PreloadPickOrder();
//PreloadPickOrder();

return (
<>


+ 9
- 7
src/components/FinishedGoodSearch/FinishedGoodSearch.tsx Ver ficheiro

@@ -46,7 +46,7 @@ import { clientAuthFetch } from "@/app/utils/clientAuthFetch";
import { NEXT_PUBLIC_API_URL } from "@/config/api";

interface Props {
pickOrders: PickOrderResult[];
// pickOrders: PickOrderResult[];
printerCombo: PrinterCombo[];
}

@@ -56,7 +56,7 @@ type SearchQuery = Partial<

type SearchParamNames = keyof SearchQuery;

const PickOrderSearch: React.FC<Props> = ({ pickOrders, printerCombo }) => {
const PickOrderSearch: React.FC<Props> = ({ printerCombo }) => {
const { t } = useTranslation("pickOrder");
const { data: session } = useSession() as { data: SessionWithTokens | null };
const currentUserId = session?.id ? parseInt(session.id) : undefined;
@@ -64,7 +64,7 @@ const PickOrderSearch: React.FC<Props> = ({ pickOrders, printerCombo }) => {
const [isOpenCreateModal, setIsOpenCreateModal] = useState(false)
const [items, setItems] = useState<ItemCombo[]>([])
const [printButtonsEnabled, setPrintButtonsEnabled] = useState(false);
const [filteredPickOrders, setFilteredPickOrders] = useState(pickOrders);
//const [filteredPickOrders, setFilteredPickOrders] = useState(pickOrders);
const [filterArgs, setFilterArgs] = useState<Record<string, any>>({});
const [searchQuery, setSearchQuery] = useState<Record<string, any>>({});
const [tabIndex, setTabIndex] = useState(0);
@@ -511,7 +511,7 @@ const handleAssignByLane = useCallback(async (
window.removeEventListener('pickOrderCompletionStatus', handleCompletionStatusChange as EventListener);
};
}, []);
/*
const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
() => {
const baseCriteria: Criterion<SearchParamNames>[] = [
@@ -616,7 +616,8 @@ const handleAssignByLane = useCallback(async (
},
[pickOrders, t, tabIndex, items],
);

*/
/*
const fetchNewPagePickOrder = useCallback(
async (
pagingController: Record<string, number>,
@@ -635,11 +636,12 @@ const handleAssignByLane = useCallback(async (
},
[],
);

*/
/*
const onReset = useCallback(() => {
setFilteredPickOrders(pickOrders);
}, [pickOrders]);
*/
useEffect(() => {
if (!isOpenCreateModal) {
setTabIndex(1)


+ 4
- 11
src/components/FinishedGoodSearch/FinishedGoodSearchWrapper.tsx Ver ficheiro

@@ -1,4 +1,4 @@
import { fetchPickOrders } from "@/app/api/pickOrder";
import GeneralLoading from "../General/GeneralLoading";
import PickOrderSearch from "./FinishedGoodSearch";
import{fetchPrinterCombo} from "@/app/api/settings/printer";
@@ -7,19 +7,12 @@ interface SubComponents {
}

const FinishedGoodSearchWrapper: React.FC & SubComponents = async () => {
const [pickOrders, printerCombo] = await Promise.all([
fetchPickOrders({
code: undefined,
targetDateFrom: undefined,
targetDateTo: undefined,
type: undefined,
status: undefined,
itemName: undefined,
}),
const [printerCombo] = await Promise.all([

fetchPrinterCombo(),
]);

return <PickOrderSearch pickOrders={pickOrders} printerCombo={printerCombo} />;
return <PickOrderSearch printerCombo={printerCombo} />;
};

FinishedGoodSearchWrapper.Loading = GeneralLoading;


+ 5
- 3
src/components/Jodetail/FinishedGoodSearchWrapper.tsx Ver ficheiro

@@ -1,4 +1,4 @@
import { fetchPickOrders } from "@/app/api/pickOrder";
import { fetchPrinterCombo } from "@/app/api/settings/printer";
import GeneralLoading from "../General/GeneralLoading";
import JodetailSearch from "./JodetailSearch";
@@ -8,7 +8,8 @@ interface SubComponents {
}

const JodetailSearchWrapper: React.FC & SubComponents = async () => {
const [pickOrders, printerCombo] = await Promise.all([
const [printerCombo] = await Promise.all([
/*
fetchPickOrders({
code: undefined,
targetDateFrom: undefined,
@@ -19,11 +20,12 @@ const JodetailSearchWrapper: React.FC & SubComponents = async () => {
pageNum: 0,
pageSize: 50,
}),
*/
fetchPrinterCombo(),
]);
console.log("%c printerCombo:", "color:green", printerCombo);

return <JodetailSearch pickOrders={pickOrders} printerCombo={printerCombo} />;
return <JodetailSearch printerCombo={printerCombo} />;
};

JodetailSearchWrapper.Loading = GeneralLoading;


+ 7
- 5
src/components/Jodetail/JodetailSearch.tsx Ver ficheiro

@@ -39,7 +39,7 @@ import { PrinterCombo } from "@/app/api/settings/printer";
import JoPickOrderDetail from "./JoPickOrderDetail";
import MaterialPickStatusTable from "./MaterialPickStatusTable";
interface Props {
pickOrders: PickOrderResult[];
//pickOrders: PickOrderResult[];
printerCombo: PrinterCombo[];
}

@@ -49,7 +49,7 @@ type SearchQuery = Partial<

type SearchParamNames = keyof SearchQuery;

const JodetailSearch: React.FC<Props> = ({ pickOrders, printerCombo }) => {
const JodetailSearch: React.FC<Props> = ({ printerCombo }) => {
const { t } = useTranslation("jo");
const { data: session } = useSession() as { data: SessionWithTokens | null };
const currentUserId = session?.id ? parseInt(session.id) : undefined;
@@ -57,7 +57,7 @@ const JodetailSearch: React.FC<Props> = ({ pickOrders, printerCombo }) => {
const [isOpenCreateModal, setIsOpenCreateModal] = useState(false)
const [items, setItems] = useState<ItemCombo[]>([])
const [printButtonsEnabled, setPrintButtonsEnabled] = useState(false);
const [filteredPickOrders, setFilteredPickOrders] = useState(pickOrders);
//const [filteredPickOrders, setFilteredPickOrders] = useState(pickOrders);
const [filterArgs, setFilterArgs] = useState<Record<string, any>>({});
const [searchQuery, setSearchQuery] = useState<Record<string, any>>({});
const [tabIndex, setTabIndex] = useState(0);
@@ -275,7 +275,7 @@ const JodetailSearch: React.FC<Props> = ({ pickOrders, printerCombo }) => {
window.removeEventListener('pickOrderCompletionStatus', handleCompletionStatusChange as EventListener);
};
}, []);
/*
const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
() => {
const baseCriteria: Criterion<SearchParamNames>[] = [
@@ -380,9 +380,11 @@ const JodetailSearch: React.FC<Props> = ({ pickOrders, printerCombo }) => {
},
[pickOrders, t, tabIndex, items],
);
*/
const handleSwitchToRecordTab = useCallback(() => {
setTabIndex(1); // 切换到 CompleteJobOrderRecord 标签页(tabIndex 1)
}, []);
/*
const fetchNewPagePickOrder = useCallback(
async (
pagingController: Record<string, number>,
@@ -405,7 +407,7 @@ const JodetailSearch: React.FC<Props> = ({ pickOrders, printerCombo }) => {
const onReset = useCallback(() => {
setFilteredPickOrders(pickOrders);
}, [pickOrders]);
*/
useEffect(() => {
if (!isOpenCreateModal) {
setTabIndex(1)


Carregando…
Cancelar
Guardar