优化

2026-08-17 13:24:58 +08:00
parent c8bb1eecdf
commit 6bbbcb7750
6 changed files with 92 additions and 2 deletions
@@ -183,6 +183,9 @@ export function normalizePdaOrder(row = {}) {
 		taskId: row.taskId ?? row.pdaTaskId ?? row.loadingTaskId ?? row.loading?.taskId ?? null,
 		loadingPlanId: row.loadingPlanId ?? row.loading?.loadingPlanId ?? row.loadingPlan?.id ?? null,
 		containerBookingId: row.containerBookingId ?? row.loading?.containerBookingId ?? row.container?.id ?? null,
+		sourceType: row.sourceType ?? row.container?.sourceType ?? null,
+		recordStatus: row.recordStatus ?? row.container?.recordStatus ?? null,
+		mergedIntoContainerBookingId: row.mergedIntoContainerBookingId ?? row.container?.mergedIntoContainerBookingId ?? null,
 		cabinetNo: row.cabinetNo ?? row.loading?.cabinetNo ?? row.container?.cabinetNo ?? row.containerNo ?? '',
 		currentContainerNo: row.currentContainerNo ?? row.containerNo ?? row.container?.containerNo ?? row.loadingPlan?.containerNo ?? row.loading?.containerNo ?? null,
    warehouseId: row.warehouseId ?? row.warehouse?.id ?? row.loadingPlan?.warehouseId ?? null,
@@ -197,6 +200,9 @@ export function normalizePickingTask(task = {}) {
 		taskId: task.taskId ?? task.id ?? null,
 		loadingPlanId: task.loadingPlanId ?? task.loading?.loadingPlanId ?? null,
 		containerBookingId: task.containerBookingId ?? task.loading?.containerBookingId ?? null,
+		sourceType: task.sourceType ?? task.container?.sourceType ?? null,
+		recordStatus: task.recordStatus ?? task.container?.recordStatus ?? null,
+		mergedIntoContainerBookingId: task.mergedIntoContainerBookingId ?? task.container?.mergedIntoContainerBookingId ?? null,
 		cabinetNo: task.cabinetNo ?? task.loading?.cabinetNo ?? task.containerNo ?? '',
 		currentContainerNo: task.currentContainerNo ?? task.containerNo ?? null,
 		pickingVersion: task.pickingVersion ?? task.version ?? null,