优化

2026-09-03 15:00:58 +08:00
parent a25b4ed0f7
commit 764b4cc2e6
8 changed files with 452 additions and 246 deletions
@@ -16,6 +16,9 @@ import type {
  ContainerSimulationCreateRequest,
  ContainerOceanBookingLinkRequest,
  SmartLoadingCandidate,
+  SmartLoadingCandidatePage,
+  SmartLoadingCandidateQuery,
+  SmartLoadingWorkbenchContainerPage,
  SmartLoadingItem,
  SmartLoadingPlan,
  BusinessDocument,
@@ -225,21 +228,58 @@ export async function completeContainerClearance(containerId: string, expectedVe
  return document(unwrapApiResponse(response))
 }

-export async function listSmartLoadingCandidates(bookingId: string, warehouseId: string) {
-  const response = await http.get<ApiEnvelope<SmartLoadingCandidate[]>, ApiEnvelope<SmartLoadingCandidate[]>>(`${smartLoadingPath}/inbound-candidates`, { params: { bookingId, warehouseId } })
-  return unwrapApiResponse(response).map((raw) => ({
-    ...raw, accountId: id(raw.accountId), inboundId: id(raw.inboundId),
-    orderId: id(raw.orderId), warehouseId: id(raw.warehouseId), destinationWarehouseId: optionalId(raw.destinationWarehouseId),
-    coLoadGroupId: optionalId(raw.coLoadGroupId),
-    memberCount: raw.memberCount == null ? null : numberValue(raw.memberCount),
-    groupTotalBoxes: raw.groupTotalBoxes == null ? null : numberValue(raw.groupTotalBoxes),
-    locked: raw.locked == null ? null : Boolean(raw.locked),
-    availablePackageCount: numberValue(raw.availablePackageCount),
-    unitGrossWeightKg: raw.unitGrossWeightKg == null ? null : numberValue(raw.unitGrossWeightKg),
-    unitNetWeightKg: raw.unitNetWeightKg == null ? null : numberValue(raw.unitNetWeightKg),
-    averageUnitVolumeCbm: raw.averageUnitVolumeCbm == null ? null : numberValue(raw.averageUnitVolumeCbm),
-    availableVolumeCbm: raw.availableVolumeCbm == null ? null : numberValue(raw.availableVolumeCbm),
-  }))
+function smartLoadingQueryParams(query: SmartLoadingCandidateQuery) {
+  const params = new URLSearchParams()
+  for (const channelGroupCode of query.channelGroupCodes) params.append('channelGroupCodes', channelGroupCode)
+  const optionalParams: Array<[string, string | number | undefined]> = [
+    ['warehouseId', query.warehouseId], ['customerId', query.customerId], ['inboundCode', query.inboundCode],
+    ['expectedArrivalStart', query.expectedArrivalStart], ['expectedArrivalEnd', query.expectedArrivalEnd],
+    ['orderStatus', query.orderStatus], ['page', query.page], ['size', query.size],
+  ]
+  for (const [key, value] of optionalParams) if (value !== undefined && value !== '') params.append(key, String(value))
+  return params
+}
+
+export async function listSmartLoadingCandidates(query: SmartLoadingCandidateQuery) {
+  const params = smartLoadingQueryParams(query)
+  const response = await http.get<ApiEnvelope<SmartLoadingCandidatePage>, ApiEnvelope<SmartLoadingCandidatePage>>(`${smartLoadingPath}/inbound-candidates`, { params })
+  const result = unwrapApiResponse(response)
+  return {
+    ...result,
+    page: numberValue(result.page, query.page), size: numberValue(result.size, query.size),
+    total: numberValue(result.total), pages: numberValue(result.pages),
+    records: result.records.map((raw) => ({
+      ...raw, accountId: id(raw.accountId), customerId: id(raw.customerId), inboundId: id(raw.inboundId),
+      orderId: id(raw.orderId), warehouseId: id(raw.warehouseId), destinationWarehouseId: optionalId(raw.destinationWarehouseId),
+      coLoadGroupId: optionalId(raw.coLoadGroupId),
+      memberCount: raw.memberCount == null ? null : numberValue(raw.memberCount),
+      groupTotalBoxes: raw.groupTotalBoxes == null ? null : numberValue(raw.groupTotalBoxes),
+      locked: raw.locked == null ? null : Boolean(raw.locked),
+      availablePackageCount: numberValue(raw.availablePackageCount),
+      unitGrossWeightKg: raw.unitGrossWeightKg == null ? null : numberValue(raw.unitGrossWeightKg),
+      unitNetWeightKg: raw.unitNetWeightKg == null ? null : numberValue(raw.unitNetWeightKg),
+      averageUnitVolumeCbm: raw.averageUnitVolumeCbm == null ? null : numberValue(raw.averageUnitVolumeCbm),
+      availableVolumeCbm: raw.availableVolumeCbm == null ? null : numberValue(raw.availableVolumeCbm),
+      groupMembers: raw.groupMembers.map((member) => ({
+        ...member, accountId: id(member.accountId), inboundId: id(member.inboundId), orderId: id(member.orderId),
+        availablePackageCount: numberValue(member.availablePackageCount),
+      })),
+    })),
+  }
+}
+
+export async function listSmartLoadingWorkbenchContainers(query: SmartLoadingCandidateQuery) {
+  const response = await http.get<ApiEnvelope<SmartLoadingWorkbenchContainerPage>, ApiEnvelope<SmartLoadingWorkbenchContainerPage>>(`${smartLoadingPath}/containers`, { params: smartLoadingQueryParams(query) })
+  const result = unwrapApiResponse(response)
+  return {
+    ...result,
+    page: numberValue(result.page, query.page), size: numberValue(result.size, query.size),
+    total: numberValue(result.total), pages: numberValue(result.pages),
+    records: result.records.map((raw) => ({
+      ...raw, bookingId: id(raw.bookingId), warehouseId: id(raw.warehouseId), planId: optionalId(raw.planId),
+      version: numberValue(raw.version),
+    })),
+  }
 }

 export async function getSmartLoadingPlanByBooking(bookingId: string) {