From 1e23efc100b63450ed1226fe6b9f5037d52a35ae Mon Sep 17 00:00:00 2001 From: tommy Date: Thu, 30 Apr 2026 16:39:34 +0800 Subject: [PATCH] update type --- src/app/api/shop/actions.ts | 10 +++++----- src/components/Shop/ShopDetail.tsx | 5 ++++- src/components/Shop/TruckLaneDetail.tsx | 5 ++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/app/api/shop/actions.ts b/src/app/api/shop/actions.ts index a927342..4585eef 100644 --- a/src/app/api/shop/actions.ts +++ b/src/app/api/shop/actions.ts @@ -25,7 +25,7 @@ export interface ShopAndTruck{ truckLanceCode: String; DepartureTime: String; LoadingSequence?: number | null; - districtReference: Number; + districtReference: string | null; Store_id: Number; remark?: String | null; truckId?: number; @@ -43,7 +43,7 @@ export interface Truck{ truckLanceCode: String; departureTime: String | number[]; loadingSequence: number; - districtReference: Number; + districtReference: string | null; storeId: Number | String; remark?: String | null; shopName?: String | null; @@ -55,7 +55,7 @@ export interface SaveTruckLane { truckLanceCode: string; departureTime: string; loadingSequence: number; - districtReference: number; + districtReference: string | null; storeId: string; remark?: string | null; } @@ -82,7 +82,7 @@ export interface SaveTruckRequest { shopName: string; shopCode: string; loadingSequence: number; - districtReference?: number | null; + districtReference?: string | null; remark?: string | null; } @@ -91,7 +91,7 @@ export interface CreateTruckWithoutShopRequest { truckLanceCode: string; departureTime: string; loadingSequence?: number; - districtReference?: number | null; + districtReference?: string | null; remark?: string | null; } diff --git a/src/components/Shop/ShopDetail.tsx b/src/components/Shop/ShopDetail.tsx index ea6d807..f475193 100644 --- a/src/components/Shop/ShopDetail.tsx +++ b/src/components/Shop/ShopDetail.tsx @@ -291,7 +291,10 @@ const ShopDetail: React.FC = () => { shopName: String(shopDetail!.name), shopCode: String(shopDetail!.code), loadingSequence: addLoadingSequence, - districtReference: Number(lane.districtReference) || 0, + districtReference: + lane.districtReference != null && String(lane.districtReference).trim() !== "" + ? String(lane.districtReference) + : null, remark: remarkValue, }); diff --git a/src/components/Shop/TruckLaneDetail.tsx b/src/components/Shop/TruckLaneDetail.tsx index 30fa394..5874f2a 100644 --- a/src/components/Shop/TruckLaneDetail.tsx +++ b/src/components/Shop/TruckLaneDetail.tsx @@ -301,7 +301,10 @@ const TruckLaneDetail: React.FC = () => { truckLanceCode: String(row.truckLanceCode || ""), departureTime: departureTimeStr, loadingSequence: Number(row.loadingSequence) || 0, - districtReference: Number(row.districtReference) || 0, + districtReference: + row.districtReference != null && String(row.districtReference).trim() !== "" + ? String(row.districtReference) + : null, storeId: storeIdStr, remark: remarkValue, });