优化

api/pda-loading.js

@@ -160,12 +160,11 @@ export async function submitContainerPickingBatch(task, actions, { warehouseId,
 }
 
 export function listLoadingOrders({ page = 1, size = 50, keyword = '' } = {}) {
-  const query = [`mainStatus=LOADING`, `page=${page}`, `size=${size}`]
-  if (session.tenantId) query.push(`tenantId=${encodeURIComponent(session.tenantId)}`)
+  const query = []
   if (keyword) query.push(`keyword=${encodeURIComponent(keyword)}`)
-  return request({ url: `/orders?${query.join('&')}`, method: 'GET' }).then((data) => ({
-    ...data,
-    records: (data && data.records ? data.records : []).map(normalizePdaOrder)
+  const suffix = query.length ? `?${query.join('&')}` : ''
+  return request({ url: `/first-leg/pda-loading/tasks/pending${suffix}`, method: 'GET' }).then((data) => ({
+    page, size, records: (Array.isArray(data) ? data : data?.records || []).map(normalizePdaOrder)
   }))
 }
 
@@ -176,12 +175,11 @@ export function normalizePdaOrder(row = {}) {
     inboundId: row.inboundId ?? row.inbound?.id ?? null,
     inboundVersion: row.inboundVersion ?? row.inbound?.version ?? null,
     tenantId: row.tenantId ?? row.accountId ?? row.inbound?.tenantId ?? null,
-    tenantId: row.tenantId ?? row.accountId ?? row.inbound?.tenantId ?? null,
     pickingVersion: row.pickingVersion ?? row.loading?.pickingVersion ?? null,
     taskId: row.taskId ?? row.pdaTaskId ?? row.loadingTaskId ?? row.loading?.taskId ?? null,
     containerNo: row.containerNo ?? row.container?.containerNo ?? row.loadingPlan?.containerNo ?? row.loading?.containerNo ?? '',
     warehouseId: row.warehouseId ?? row.warehouse?.id ?? row.loadingPlan?.warehouseId ?? null,
-    displayNo: row.orderNo ?? row.inboundCode ?? row.order?.orderNo ?? row.id
+    displayNo: row.orderNo ?? row.inboundCode ?? row.order?.orderNo ?? `任务 ${row.taskId ?? row.id}`
   }
 }