优化

src/modules/overseas-business/api/platformOverseasBusiness.ts

@@ -1,4 +1,5 @@
 import type { PlatformProcurement } from '../procurementTypes'
+import type { TruckOperation } from '../truckWorkflow'
 import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 
 import type {
@@ -32,15 +33,15 @@ interface LooseboardDetailPayload {
 function normalizePage<TPayload, TResult>(payload: PagePayload<TPayload>, normalize: (value: TPayload) => TResult): OverseasBusinessPage<TResult> {
   return { records: (payload.records || []).map(normalize), page: Number(payload.page), size: Number(payload.size), total: Number(payload.total), pages: Number(payload.pages) }
 }
-function procurementInteger(value: unknown): number {
-  if ((typeof value !== 'number' && typeof value !== 'string') || !/^\d+$/.test(String(value)) || !Number.isSafeInteger(Number(value))) throw new Error('采购数据中的数量或版本无效，请刷新后重试')
+function procurementInteger(value: unknown, business = '采购'): number {
+  if ((typeof value !== 'number' && typeof value !== 'string') || !/^\d+$/.test(String(value)) || !Number.isSafeInteger(Number(value))) throw new Error(`${business}数据中的数量或版本无效，请刷新后重试`)
   return Number(value)
 }
 function procurementSummary(value: ProcurementSummaryPayload): OverseasPurchaseSummary {
   return { ...value, version: procurementInteger(value.version), purchaseQuantity: procurementInteger(value.purchaseQuantity), id: String(value.id), purchaseWarehouseId: value.purchaseWarehouseId == null ? null : String(value.purchaseWarehouseId), budgetUnitPrice: value.budgetUnitPrice == null ? null : String(value.budgetUnitPrice) }
 }
 function truckSummary(value: TruckSummaryPayload): LocalTransportOrder {
-  return { ...value, id: String(value.id), totalWeightKg: String(value.totalWeightKg), totalVolumeCbm: String(value.totalVolumeCbm), budgetAmount: value.budgetAmount == null ? null : String(value.budgetAmount) }
+  return { ...value, id: String(value.id), customerId: String(value.customerId), version: procurementInteger(value.version, '卡车'), palletCount: procurementInteger(value.palletCount, '卡车'), packageCount: procurementInteger(value.packageCount, '卡车'), receivedPalletCount: procurementInteger(value.receivedPalletCount, '卡车'), allocatedPalletCount: procurementInteger(value.allocatedPalletCount, '卡车'), totalWeightKg: String(value.totalWeightKg), totalVolumeCbm: String(value.totalVolumeCbm), budgetAmount: value.budgetAmount == null ? null : String(value.budgetAmount) }
 }
 function truckDetail(value: TruckDetailPayload): LocalTransportDetail {
   return { ...truckSummary(value.summary), originAddress: value.originAddress || null, destinationAddress: value.destinationAddress || null, remark: value.remark || null, createdBy: value.createdBy || null, pallets: (value.pallets || []).map((item) => ({ ...item, id: String(item.id), warehousePalletId: item.warehousePalletId == null ? null : String(item.warehousePalletId) })), histories: value.histories || [] }
@@ -130,6 +131,14 @@ export async function updateUsTruckOrder(orderNo: string, customerId: string, pa
   const response = await http.patch<ApiEnvelope<TruckDetailPayload>, ApiEnvelope<TruckDetailPayload>>(`${truckBasePath}/${encodeURIComponent(orderNo)}`, payload, { params: { customerId } })
   return truckDetail(unwrapApiResponse(response))
 }
+/** 正向履约使用具名命令，通用状态接口仅用于取消。 */
+export async function executeUsTruckCommand(orderNo: string, customerId: string, operation: TruckOperation) {
+  const path = `${truckBasePath}/${encodeURIComponent(orderNo)}/${operation.command === 'cancel' ? 'status' : operation.command}`
+  const response = operation.command === 'cancel'
+    ? await http.patch<ApiEnvelope<TruckDetailPayload>, ApiEnvelope<TruckDetailPayload>>(path, operation.payload, { params: { customerId } })
+    : await http.post<ApiEnvelope<TruckDetailPayload>, ApiEnvelope<TruckDetailPayload>>(path, operation.payload, { params: { customerId } })
+  return truckDetail(unwrapApiResponse(response))
+}
 export async function listLocalLooseboardOrders(query: LocalLooseboardQuery = {}) {
   const response = await http.get<ApiEnvelope<PagePayload<LooseboardSummaryPayload>>, ApiEnvelope<PagePayload<LooseboardSummaryPayload>>>(looseboardBasePath, { params: { ...query, customerId: query.customerId || undefined, orderNo: query.orderNo?.trim() || undefined, routeKeyword: query.routeKeyword?.trim() || undefined, status: query.status || undefined } })
   return normalizePage(unwrapApiResponse(response), looseboardSummary)