diff --git a/src/app/api/pickOrder/actions.ts b/src/app/api/pickOrder/actions.ts index 8c35c9b..213ea1d 100644 --- a/src/app/api/pickOrder/actions.ts +++ b/src/app/api/pickOrder/actions.ts @@ -259,7 +259,7 @@ export interface FGPickOrderResponse { shopPoNo: string; numberOfCartons: number; DepartureTime: string; - truckNo: string; + truckLanceCode: string; storeId: string; qrCodeData: number; } @@ -291,7 +291,7 @@ export interface CompletedDoPickOrderResponse { ticketNo: string; shopPoNo: string; numberOfCartons: number; - truckNo: string; + truckLanceCode: string; storeId: string; completedDate: string; fgPickOrders: FGPickOrderResponse[]; diff --git a/src/components/FinishedGoodSearch/FGPickOrderCard.tsx b/src/components/FinishedGoodSearch/FGPickOrderCard.tsx index 2a97786..e2d3dc9 100644 --- a/src/components/FinishedGoodSearch/FGPickOrderCard.tsx +++ b/src/components/FinishedGoodSearch/FGPickOrderCard.tsx @@ -84,7 +84,7 @@ const FGPickOrderCard: React.FC = ({ fgOrder, onQrCodeClick }) => { label={t("Truck No.")} fullWidth disabled={true} - value={fgOrder.truckNo} + value={fgOrder.truckLanceCode} /> diff --git a/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx b/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx index eb59ec0..d07f1e9 100644 --- a/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx +++ b/src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx @@ -66,28 +66,6 @@ interface Props { filterArgs: Record; } -// ✅ 新增:已完成的 DO Pick Order 接口 -interface CompletedDoPickOrder { - id: number; - pickOrderId: number; - pickOrderCode: string; - pickOrderConsoCode: string; - pickOrderStatus: string; - deliveryOrderId: number; - deliveryNo: string; - deliveryDate: string; - shopId: number; - shopCode: string; - shopName: string; - shopAddress: string; - ticketNo: string; - shopPoNo: string; - numberOfCartons: number; - truckNo: string; - storeId: string; - completedDate: string; - fgPickOrders: FGPickOrderResponse[]; -} // ✅ 新增:Pick Order 数据接口 interface PickOrderData { @@ -107,18 +85,18 @@ const GoodPickExecutionRecord: React.FC = ({ filterArgs }) => { const currentUserId = session?.id ? parseInt(session.id) : undefined; // ✅ 新增:已完成 DO Pick Orders 状态 - const [completedDoPickOrders, setCompletedDoPickOrders] = useState([]); + const [completedDoPickOrders, setCompletedDoPickOrders] = useState([]); const [completedDoPickOrdersLoading, setCompletedDoPickOrdersLoading] = useState(false); // ✅ 新增:详情视图状态 - const [selectedDoPickOrder, setSelectedDoPickOrder] = useState(null); + const [selectedDoPickOrder, setSelectedDoPickOrder] = useState(null); const [showDetailView, setShowDetailView] = useState(false); const [detailLotData, setDetailLotData] = useState([]); // ✅ 新增:搜索状态 const [searchQuery, setSearchQuery] = useState>({}); - const [filteredDoPickOrders, setFilteredDoPickOrders] = useState([]); - + const [filteredDoPickOrders, setFilteredDoPickOrders] = useState([]); + // ✅ 新增:分页状态 const [paginationController, setPaginationController] = useState({ pageNum: 0, @@ -221,7 +199,7 @@ const GoodPickExecutionRecord: React.FC = ({ filterArgs }) => { } ]; - const handleDetailClick = useCallback(async (doPickOrder: CompletedDoPickOrder) => { + const handleDetailClick = useCallback(async (doPickOrder: CompletedDoPickOrderResponse) => { setSelectedDoPickOrder(doPickOrder); setShowDetailView(true); diff --git a/src/components/Jodetail/FGPickOrderCard.tsx b/src/components/Jodetail/FGPickOrderCard.tsx index 885942a..36156b3 100644 --- a/src/components/Jodetail/FGPickOrderCard.tsx +++ b/src/components/Jodetail/FGPickOrderCard.tsx @@ -98,7 +98,7 @@ const FGPickOrderCard: React.FC = ({ fgOrder, onQrCodeClick }) => { label={t("Truck No.")} fullWidth disabled={true} - value={fgOrder.truckNo} + value={fgOrder.truckLanceCode} />