diff --git a/src/core/navigation/adminNavigation.test.ts b/src/core/navigation/adminNavigation.test.ts
index ec14da23..e8eeda8e 100644
--- a/src/core/navigation/adminNavigation.test.ts
+++ b/src/core/navigation/adminNavigation.test.ts
@@ -48,6 +48,7 @@ describe('adminNavigation', () => {
     expect(adminNavigation.find((item) => item.key === 'overseas-inventory')?.children?.map((item) => item.title)).toEqual([
       '尾程订单',
       '入库单',
+      '废弃单',
       '库位管理',
       '排车列表',
       '出库单',
@@ -334,3 +335,5 @@ describe('adminNavigation', () => {
     expect(getFirstNavigationLeaf(nodes)?.path).toBe('/tracking')
   })
 })
+
+
diff --git a/src/core/navigation/adminNavigation.ts b/src/core/navigation/adminNavigation.ts
index 91e825cd..0bc1b7f4 100644
--- a/src/core/navigation/adminNavigation.ts
+++ b/src/core/navigation/adminNavigation.ts
@@ -114,6 +114,7 @@ export const adminNavigation: AdminNavigationNode[] = [
     children: [
       { key: 'last-mile-orders', title: '尾程订单', icon: ClipboardList, path: '/overseas-warehouse/last-mile-orders', permission: 'platform:overseas-warehouse:last-mile-order:list' },
       { key: 'fba-inbound-order', title: '入库单', icon: ClipboardList, path: '/overseas-warehouse/inbound-orders', permission: 'platform:overseas-warehouse:inbound-order:list' },
+      { key: 'fba-cargo-discard', title: '废弃单', icon: ClipboardList, path: '/overseas-warehouse/cargo-discards', permission: 'platform:overseas-warehouse:discard:list' },
       { key: 'overseas-locations', title: '库位管理', icon: WarehouseIcon, path: '/overseas-warehouse/locations', permission: 'platform:overseas-warehouse:location:list' },
       { key: 'fba-dispatch', title: '排车列表', icon: Truck, path: '/overseas-warehouse/dispatches', permission: 'platform:overseas-warehouse:dispatch:list' },
       { key: 'fba-outbound', title: '出库单', icon: ClipboardList, path: '/overseas-warehouse/outbounds', permission: 'platform:overseas-warehouse:outbound:list' },
diff --git a/src/modules/overseas-warehouse/api/cargoDiscards.ts b/src/modules/overseas-warehouse/api/cargoDiscards.ts
new file mode 100644
index 00000000..1883512d
--- /dev/null
+++ b/src/modules/overseas-warehouse/api/cargoDiscards.ts
@@ -0,0 +1,26 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrders'
+
+export interface CargoDiscardQuery { page: number; size: number; customerId?: string; discardNo?: string; inboundCode?: string; overseasWarehouseId?: string; status?: string }
+export interface CargoDiscardSummary { id: string; customerId?: string | null; discardNo: string; inboundCodes?: string | null; overseasWarehouseId?: string | null; overseasWarehouseName?: string | null; totalPackages?: number | null; totalFee?: number | string | null; currency?: string | null; status?: string | null; createdBy?: string | null; createdAt?: string | null; reviewedAt?: string | null }
+export interface CargoDiscardItem { id: string; orderId?: string | null; inboundCode?: string | null; skuCode?: string | null; productName?: string | null; availablePackagesSnapshot?: number | null; discardPackages?: number | null }
+export interface CargoDiscardDetail { summary: CargoDiscardSummary; feePerPackage?: number | string | null; remark?: string | null; reviewedBy?: string | null; reviewRemark?: string | null; items: CargoDiscardItem[]; histories: { fromStatus?: string | null; toStatus?: string | null; operatorId?: string | null; remark?: string | null; createdAt?: string | null }[] }
+export interface CargoDiscardCandidate { orderId?: string | null; sourceType: string; returnCartonId?: string | null; cartonMark?: string | null; inboundCode?: string | null; inboundOrderNo?: string | null; overseasWarehouseId?: string | null; overseasWarehouseName?: string | null; availablePackages?: number; skus: { skuCode: string; productName?: string | null; availablePackages?: number }[] }
+
+export async function listCargoDiscards(query: CargoDiscardQuery) {
+  const response = await http.get<ApiEnvelope<OverseasPagePayload<CargoDiscardSummary>>, ApiEnvelope<OverseasPagePayload<CargoDiscardSummary>>>('/platform/v1/last-leg/cargo-discards', { params: query, headers: query.customerId ? { 'X-Customer-Id': query.customerId } : undefined })
+  return normalizeOverseasPage(unwrapApiResponse(response))
+}
+export async function getCargoDiscard(discardNo: string, customerId?: string) {
+  const response = await http.get<ApiEnvelope<CargoDiscardDetail>, ApiEnvelope<CargoDiscardDetail>>(`/platform/v1/last-leg/cargo-discards/${encodeURIComponent(discardNo)}`, { params: customerId ? { customerId } : undefined })
+  return unwrapApiResponse(response)
+}
+export async function reviewCargoDiscard(discardNo: string, decision: 'APPROVE' | 'REJECT', remark?: string, customerId?: string) {
+  const response = await http.post<ApiEnvelope<CargoDiscardDetail>, ApiEnvelope<CargoDiscardDetail>>(`/platform/v1/last-leg/cargo-discards/${encodeURIComponent(discardNo)}/review`, { decision, remark }, { params: customerId ? { customerId } : undefined })
+  return unwrapApiResponse(response)
+}
+export async function completeCargoDiscard(discardNo: string, customerId?: string) {
+  const response = await http.post<ApiEnvelope<CargoDiscardDetail>, ApiEnvelope<CargoDiscardDetail>>(`/platform/v1/last-leg/cargo-discards/${encodeURIComponent(discardNo)}/complete`, undefined, { params: customerId ? { customerId } : undefined })
+  return unwrapApiResponse(response)
+}
+
diff --git a/src/modules/overseas-warehouse/api/relabelOrders.ts b/src/modules/overseas-warehouse/api/relabelOrders.ts
index 33942dc3..0b7b24ab 100644
--- a/src/modules/overseas-warehouse/api/relabelOrders.ts
+++ b/src/modules/overseas-warehouse/api/relabelOrders.ts
@@ -98,7 +98,7 @@ export interface RelabelItemDto {
   relabelFileUrl?: string | null
   shipmentNo?: string | null
   trackingCode?: string | null
-  remark?: string | null
+  remark?: string
   cartonMark?: string | null
   fbaCartonMark?: string | null
   destinationWarehouseId?: string | null
@@ -109,7 +109,7 @@ export interface RelabelHistoryDto {
   fromStatus?: string | null
   toStatus?: string | null
   operatorId?: string | null
-  remark?: string | null
+  remark?: string
   createdAt?: string | null
 }
 
@@ -137,16 +137,24 @@ export interface ReturnPackingPlanBox {
 
 export interface ReturnPackingPlanPayload {
   returnNos: string[]
-  mode: 'CUSTOMER_INSTRUCTION' | 'WAREHOUSE_RECOMMENDATION'
+  mode: 'BOX' | 'SKU' | 'CUSTOMER_INSTRUCTION' | 'WAREHOUSE_RECOMMENDATION'
   boxes: ReturnPackingPlanBox[]
   remark?: string
   idempotencyKey: string
+  sourceCartonMarks?: string[]
 }
 
-export interface ReturnPackingPlanDto extends ReturnPackingPlanPayload {
+export interface ReturnPackingPlanDto extends Omit<ReturnPackingPlanPayload, 'remark'> {
   planNo: string
+  customerId?: string
+  overseasWarehouseId?: string
   status: string
+  boxes: ReturnPackingPlanBox[]
+  remark?: string | null
+  createdAt?: string | null
   pushedAt?: string | null
+  completedAt?: string | null
+  resultCartons?: import('./returnInventory').ReturnCartonDetail[]
 }
 
 export async function createReturnPackingPlan(payload: ReturnPackingPlanPayload) {
@@ -156,6 +164,21 @@ export async function createReturnPackingPlan(payload: ReturnPackingPlanPayload)
   return unwrapApiResponse(response) as ReturnPackingPlanDto
 }
 
+export interface ReturnPackingPlanQuery { page: number; size: number; status?: string; planNo?: string; customerId?: string; overseasWarehouseId?: string; skuCode?: string }
+export async function listReturnPackingPlans(query: ReturnPackingPlanQuery) {
+  const response = await http.get<ApiEnvelope<OverseasPagePayload<ReturnPackingPlanDto>>, ApiEnvelope<OverseasPagePayload<ReturnPackingPlanDto>>>('/platform/v1/last-leg/return-packing-plans', { params: query })
+  return normalizeOverseasPage(unwrapApiResponse(response))
+}
+export async function reviewReturnPackingPlan(planNo: string) {
+  const response = await http.post<ApiEnvelope<ReturnPackingPlanDto>, ApiEnvelope<ReturnPackingPlanDto>>(`/platform/v1/last-leg/return-packing-plans/${encodeURIComponent(planNo)}/review`)
+  return unwrapApiResponse(response) as ReturnPackingPlanDto
+}
+
+export async function cancelReturnPackingPlan(planNo: string) {
+  const response = await http.post<ApiEnvelope<ReturnPackingPlanDto>, ApiEnvelope<ReturnPackingPlanDto>>(`/platform/v1/last-leg/return-packing-plans/${encodeURIComponent(planNo)}/cancel`)
+  return unwrapApiResponse(response) as ReturnPackingPlanDto
+}
+
 export async function listRelabelOrders(query: RelabelOrderQuery) {
   const response = await http.get<ApiEnvelope<OverseasPagePayload<RelabelSummaryDto>>, ApiEnvelope<OverseasPagePayload<RelabelSummaryDto>>>(
     '/platform/v1/last-leg/relabel-applications', { params: query },
diff --git a/src/modules/overseas-warehouse/api/returnInventory.ts b/src/modules/overseas-warehouse/api/returnInventory.ts
index da468685..ffcdeb35 100644
--- a/src/modules/overseas-warehouse/api/returnInventory.ts
+++ b/src/modules/overseas-warehouse/api/returnInventory.ts
@@ -2,14 +2,17 @@ import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 
 import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrders'
 
-export interface ReturnStockRow { customerId: string; overseasWarehouseId: string; skuCode: string; productNameZh?: string; totalQuantity: number; availableQuantity: number; cartonQuantity: number; updatedAt: string }
-export interface ReturnCartonRow { customerId: string; overseasWarehouseId: string; cartonMark: string; sourceReturnNo?: string; sourceBatchNo?: string; status: string; fbaCartonMark?: string; destinationWarehouseCode?: string; destinationWarehouseName?: string; relabelNo?: string; relabelStatus?: string; skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; createdAt: string }
-export interface ReturnCartonDetail extends ReturnCartonRow { customerId: string; items: Array<{ skuCode: string; productNameZh?: string; quantity: number }> }
+export interface ReturnStockRow { customerId: string; overseasWarehouseId: string; skuCode: string; productNameZh?: string; totalQuantity: number; availableQuantity: number; looseAvailableQuantity?: number; cartonQuantity: number; updatedAt: string }
+export interface ReturnCartonRow { customerId: string; overseasWarehouseId: string; cartonMark: string; sourceReturnNo?: string; sourceUnitType?: 'PALLET' | 'BOX' | 'PARCEL' | string; sourceBatchNo?: string; status: string; fbaCartonMark?: string; destinationWarehouseCode?: string; destinationWarehouseName?: string; relabelNo?: string; relabelStatus?: string; skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; createdAt: string }
+export interface ReturnCartonMergeHistory { planNo?: string; sourceCartonMark: string; targetCartonMark: string; returnNo: string; skuCode: string; quantity: number; createdAt: string }
+export interface ReturnCartonDetail extends ReturnCartonRow { customerId: string; items: Array<{ skuCode: string; productNameZh?: string; quantity: number; availableQuantity?: number }>; mergeHistory?: ReturnCartonMergeHistory[] }
 export interface ReturnCartonLabel extends ReturnCartonDetail { printableHtml: string }
+export interface ReturnPackingSource { cartonMark: string; sourceReturnNo?: string; sourceUnitType?: string; items: ReturnCartonDetail['items'] }
 export interface ReturnInventoryMovement { customerId: string; overseasWarehouseId: string; skuCode: string; productNameZh?: string; movementType: 'RECEIPT' | 'MERGE' | 'OUTBOUND'; referenceNo: string; totalDelta: number; availableDelta: number; occurredAt: string }
 export interface ReturnInventoryQuery { page: number; size: number; customerId?: string; overseasWarehouseId?: string; skuCode?: string; cartonMark?: string; returnNo?: string; status?: string }
 
 export async function listReturnStock(params: ReturnInventoryQuery) { const response = await http.get<ApiEnvelope<OverseasPagePayload<ReturnStockRow>>, ApiEnvelope<OverseasPagePayload<ReturnStockRow>>>('/platform/v1/last-leg/return-inventory', { params }); return normalizeOverseasPage(unwrapApiResponse(response)) }
+export async function listReturnPackingSources(params: ReturnInventoryQuery) { const response = await http.get<ApiEnvelope<OverseasPagePayload<ReturnPackingSource>>, ApiEnvelope<OverseasPagePayload<ReturnPackingSource>>>('/platform/v1/last-leg/return-inventory/packing-sources', { params }); return normalizeOverseasPage(unwrapApiResponse(response)) }
 export async function listReturnCartons(params: ReturnInventoryQuery) { const response = await http.get<ApiEnvelope<OverseasPagePayload<ReturnCartonRow>>, ApiEnvelope<OverseasPagePayload<ReturnCartonRow>>>('/platform/v1/last-leg/return-inventory/cartons', { params }); return normalizeOverseasPage(unwrapApiResponse(response)) }
 export async function listReturnInventoryMovements(params: ReturnInventoryQuery) { const response = await http.get<ApiEnvelope<OverseasPagePayload<ReturnInventoryMovement>>, ApiEnvelope<OverseasPagePayload<ReturnInventoryMovement>>>('/platform/v1/last-leg/return-inventory/movements', { params }); return normalizeOverseasPage(unwrapApiResponse(response)) }
 export async function getReturnCarton(cartonMark: string) { const response = await http.get<ApiEnvelope<ReturnCartonDetail>, ApiEnvelope<ReturnCartonDetail>>(`/platform/v1/last-leg/return-inventory/cartons/${encodeURIComponent(cartonMark)}`); return unwrapApiResponse(response) }
diff --git a/src/modules/overseas-warehouse/pages/CargoDiscardsView.vue b/src/modules/overseas-warehouse/pages/CargoDiscardsView.vue
new file mode 100644
index 00000000..fbe8d43c
--- /dev/null
+++ b/src/modules/overseas-warehouse/pages/CargoDiscardsView.vue
@@ -0,0 +1,32 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { onMounted, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AdminPage from '@/shared/components/AdminPage.vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import ListPageLayout from '@/shared/components/ListPageLayout.vue'
+import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
+import StatusBadge from '@/shared/components/StatusBadge.vue'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import { getApiErrorDetails } from '@/shared/api/http'
+import { listCargoDiscards, getCargoDiscard, reviewCargoDiscard, type CargoDiscardDetail, type CargoDiscardSummary } from '../api/cargoDiscards'
+import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
+import { overseasWarehousePermissions as permission } from '../permissions'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+const access = useAccessPreviewStore(); const rows = ref<CargoDiscardSummary[]>([]); const customers = ref<PlatformTenantResource[]>([]); const page = ref(1); const pageSize = ref(10); const total = ref(0); const loading = ref(false); const detailOpen = ref(false); const detail = ref<CargoDiscardDetail | null>(null); const filters = ref<QueryModel>({ customerId: '', discardNo: '', inboundCode: '', status: '' })
+const fields: QueryField[] = [{ key: 'customerId', type: 'select', label: '客户', placeholder: '请选择客户', options: [] }, { key: 'discardNo', type: 'input', label: '废弃单号', placeholder: '废弃单号', width: 220 }, { key: 'inboundCode', type: 'input', label: '入仓码', placeholder: '请输入入仓码', width: 180 }, { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', options: [{ label: '待审核', value: 'PENDING_REVIEW' }, { label: '已审核', value: 'APPROVED' }, { label: 'PDA处理中', value: 'PDA_COMPLETED' }, { label: '已完成', value: 'COMPLETED' }, { label: '已驳回', value: 'REJECTED' }, { label: '已取消', value: 'CANCELLED' }] }]
+const columns: DataTableColumn[] = [{ key: 'actions', label: '操作', width: 140, fixed: 'left', slotName: 'actions' }, { key: 'discardNo', label: '废弃单号', minWidth: 180 }, { key: 'inboundCodes', label: '入仓码', minWidth: 180 }, { key: 'overseasWarehouseName', label: '仓库', minWidth: 140 }, { key: 'totalPackages', label: '总箱数', width: 90 }, { key: 'totalFee', label: '废弃费用', width: 120, formatter: (row: CargoDiscardSummary) => `${row.currency || 'USD'} ${row.totalFee ?? 0}` }, { key: 'createdBy', label: '申请人', width: 110 }, { key: 'createdAt', label: '创建时间', minWidth: 170 }, { key: 'status', label: '状态', width: 150, slotName: 'status' }]
+const statusLabels: Record<string, string> = { PENDING_REVIEW: '待审核', APPROVED: '已审核，待 PDA', PDA_COMPLETED: 'PDA 已完成，待客户确认', COMPLETED: '客户已确认', REJECTED: '已驳回', CANCELLED: '已取消' }
+function text(key: string) { return String(filters.value[key] || '').trim() || undefined }
+async function load(model: QueryModel = filters.value) { Object.assign(filters.value, model); loading.value = true; try { const result = await listCargoDiscards({ page: page.value, size: pageSize.value, customerId: text('customerId'), discardNo: text('discardNo'), inboundCode: text('inboundCode'), status: text('status') }); rows.value = result.records; total.value = result.total } catch (e) { ElMessage.error(getApiErrorDetails(e, '废弃单列表加载失败').message) } finally { loading.value = false } }
+async function openDetail(row: CargoDiscardSummary) { try { detail.value = await getCargoDiscard(row.discardNo, row.customerId || undefined); detailOpen.value = true } catch (e) { ElMessage.error(getApiErrorDetails(e, '废弃单详情加载失败').message) } }
+async function audit(row: CargoDiscardSummary) { try { await ElMessageBox.confirm('审核通过后将推送 PDA 执行废弃，确认继续？', '审核确认', { confirmButtonText: '通过并推送 PDA', cancelButtonText: '取消' }); await reviewCargoDiscard(row.discardNo, 'APPROVE', undefined, row.customerId || undefined); ElMessage.success('已审核通过并推送 PDA'); await load() } catch (e) { if (e !== 'cancel') ElMessage.error(getApiErrorDetails(e, '审核失败').message) } }
+onMounted(async () => { try { const result = await listPlatformTenants({ page: 1, size: 200, status: 'ACTIVE' }); customers.value = result.records; const field = fields[0]; if (field.type === 'select') field.options = [{ label: '全部客户', value: '' }, ...customers.value.map(item => ({ label: item.tenantName, value: String(item.id) }))]; await load() } catch (e) { ElMessage.error(getApiErrorDetails(e, '客户列表加载失败').message) } })
+</script>
+<template>
+<AdminPage class="admin-density"><ListPageLayout aria-label="废弃单列表"><section><DataTable appearance="integrated" :stripe="false" :data="rows" :columns="columns" :loading="loading" :total="total" v-model:page="page" v-model:page-size="pageSize" preference-key="overseas-cargo-discards" row-key="id" empty-text="暂无废弃单" @update:page="load()" @update:page-size="page = 1; load()"><template #toolbar-start><h1>废弃单</h1></template><template #filters><QueryToolbar ariaLabel="废弃单筛选" v-model="filters" :fields="fields" :loading="loading" preference-key="overseas-cargo-discards-query" @search="page = 1; load($event)" @reset="page = 1; load($event)" /></template><template #actions="{ row }"><el-button size="small" @click="openDetail(row as CargoDiscardSummary)">详情</el-button><el-button v-if="access.can(permission.discardApprove) && (row as CargoDiscardSummary).status === 'PENDING_REVIEW'" size="small" type="primary" @click="audit(row as CargoDiscardSummary)">审核并推送 PDA</el-button></template><template #status="{ row }"><StatusBadge :status="statusLabels[String((row as CargoDiscardSummary).status)] || String((row as CargoDiscardSummary).status)" /></template><template #pagination-left>共 {{ total }} 条废弃单</template></DataTable></section></ListPageLayout></AdminPage>
+<AppDialog v-model="detailOpen" title="废弃单详情" :show-confirm="false" cancel-text="关闭" width="min(920px, calc(100vw - 28px))"><template v-if="detail"><el-descriptions :column="3" border><el-descriptions-item label="废弃单号">{{ detail.summary.discardNo }}</el-descriptions-item><el-descriptions-item label="状态">{{ statusLabels[String(detail.summary.status)] }}</el-descriptions-item><el-descriptions-item label="仓库">{{ detail.summary.overseasWarehouseName || '—' }}</el-descriptions-item><el-descriptions-item label="入仓码" :span="2">{{ detail.summary.inboundCodes || '—' }}</el-descriptions-item><el-descriptions-item label="备注">{{ detail.remark || '—' }}</el-descriptions-item></el-descriptions><h3>废弃明细</h3><el-table :data="detail.items" border><el-table-column prop="inboundCode" label="入仓码"/><el-table-column prop="skuCode" label="SKU"/><el-table-column prop="productName" label="品名"/><el-table-column prop="discardPackages" label="申请箱数" width="100"/></el-table><h3>状态流转</h3><el-timeline><el-timeline-item v-for="(item, index) in detail.histories" :key="index" :timestamp="item.createdAt || ''">{{ statusLabels[item.toStatus || ''] || item.toStatus }} {{ item.remark ? `— ${item.remark}` : '' }}</el-timeline-item></el-timeline></template></AppDialog>
+</template>
+
+
+
diff --git a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.test.ts b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.test.ts
index e8b266ba..28851d13 100644
--- a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.test.ts
+++ b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.test.ts
@@ -4,7 +4,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import ElementPlus from 'element-plus'
 import DataTable from '@/shared/components/DataTable.vue'
 import { UI_PREFERENCE_SCOPE, preferenceStorageKey } from '@/shared/utils/uiLayoutPreference'
-import { getReturnCarton, listReturnCartons, listReturnInventoryMovements, listReturnStock } from '../api/returnInventory'
+import { getReturnCarton, listReturnCartons, listReturnInventoryMovements, listReturnStock, listReturnPackingSources } from '../api/returnInventory'
+import { listReturnPackingPlans } from '../api/relabelOrders'
 import ReturnInventoryManagementView from './ReturnInventoryManagementView.vue'
 
 vi.mock('@/modules/iam', () => ({
@@ -14,6 +15,11 @@ vi.mock('@/modules/iam', () => ({
 vi.mock('../api/returnInventory', () => ({
   listReturnStock: vi.fn(), listReturnCartons: vi.fn(), listReturnInventoryMovements: vi.fn(),
   getReturnCarton: vi.fn(), getReturnCartonLabel: vi.fn(),
+  listReturnPackingSources: vi.fn(),
+}))
+vi.mock('../api/relabelOrders', () => ({
+  listReturnPackingPlans: vi.fn(), createReturnPackingPlan: vi.fn(),
+  reviewReturnPackingPlan: vi.fn(), cancelReturnPackingPlan: vi.fn(),
 }))
 const wrappers: VueWrapper[] = []
 const stock = { customerId: 'customer-1', overseasWarehouseId: 'warehouse-1', skuCode: 'SKU-TEST', totalQuantity: 8, availableQuantity: 6, cartonQuantity: 1, updatedAt: '2026-09-30' }
@@ -34,6 +40,11 @@ beforeEach(() => {
   vi.mocked(listReturnCartons).mockResolvedValue({ records: [carton], page: 1, size: 20, total: 1, pages: 1 })
   vi.mocked(listReturnInventoryMovements).mockResolvedValue({ records: [{ ...stock, movementType: 'MERGE', referenceNo: 'MERGE-1', totalDelta: -2, availableDelta: -2, occurredAt: '2026-09-30' }], page: 1, size: 20, total: 1, pages: 1 })
   vi.mocked(getReturnCarton).mockResolvedValue({ ...carton, items: [{ skuCode: 'SKU-TEST', quantity: 8 }] })
+  vi.mocked(listReturnPackingPlans).mockImplementation(async query => ({
+    records: query.status ? [] : [{ planNo: 'PLAN-NEW', returnNos: ['RETURN-1'], mode: 'SKU', boxes: [], status: 'PENDING_REVIEW', idempotencyKey: 'plan-key' }],
+    page: query.page, size: query.size, total: query.status ? 0 : 45, pages: 3,
+  }))
+  vi.mocked(listReturnPackingSources).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
 })
 afterEach(() => {
   wrappers.splice(0).forEach(wrapper => wrapper.unmount())
@@ -41,6 +52,127 @@ afterEach(() => {
 })
 
 describe('ReturnInventoryManagementView shared list', () => {
+  it('finds boxes by contained SKU while retaining mixed-box contents and selected cartons', async () => {
+    vi.mocked(listReturnPackingSources).mockResolvedValue({records:[
+      {cartonMark:'BOX-A',sourceUnitType:'BOX',items:[{skuCode:'SKU-APPLE',quantity:2},{skuCode:'SKU-OTHER',quantity:3}]},
+      {cartonMark:'BOX-B',sourceUnitType:'BOX',items:[{skuCode:'SKU-BANANA',quantity:4}]},
+    ],page:1,size:200,total:2,pages:1})
+    const wrapper=await mountView('inventory')
+    await wrapper.findAll('button').find(button=>button.text().includes('创建合箱计划'))!.trigger('click');await flushPromises()
+    const form=wrapper.findAllComponents({name:'ElForm'}).find(form=>form.classes().includes('packing-form'))!
+    const customer=form.getComponent({name:'ElSelect'})
+    customer.vm.$emit('update:modelValue','customer-1');customer.vm.$emit('change','customer-1');await flushPromises()
+    const input=form.get('input[placeholder="按箱内 SKU 查找，多个 SKU 请用英文逗号分隔"]')
+    await input.setValue('APPLE')
+    expect(form.text()).toContain('BOX-A');expect(form.text()).toContain('SKU-OTHER');expect(form.text()).not.toContain('BOX-B')
+    const selection=form.getComponent({name:'ElCheckboxGroup'})
+    selection.vm.$emit('update:modelValue',['BOX-A']);await flushPromises()
+    await input.setValue('APPLE, BANANA')
+    expect(form.text()).toContain('BOX-A');expect(form.text()).toContain('BOX-B')
+    await input.setValue('NO-MATCH')
+    expect(form.text()).toContain('没有包含该 SKU 的可用箱子')
+    await input.setValue('')
+    expect(form.getComponent({name:'ElCheckboxGroup'}).props('modelValue')).toContain('BOX-A')
+  })
+  it('queries packing plan numbers through server pagination and clears the filter', async () => {
+    const wrapper = await mountView('inventory')
+    const tabs = wrapper.getComponent({ name: 'ElTabs' })
+    tabs.vm.$emit('update:modelValue', 'plans'); tabs.vm.$emit('tab-change', 'plans')
+    await flushPromises()
+    const selects = wrapper.findAllComponents({ name: 'ElSelect' }).filter(select => ['全部客户','全部海外仓'].includes(select.props('placeholder')))
+    expect(selects.map(select => select.props('placeholder'))).toEqual(['全部客户','全部海外仓'])
+    expect(wrapper.find('input[placeholder="SKU"]').exists()).toBe(true)
+    await wrapper.get('input[placeholder="合箱计划号"]').setValue(' PLAN-NEW ')
+    await wrapper.get('.query-panel button').trigger('click'); await flushPromises()
+    expect(listReturnPackingPlans).toHaveBeenLastCalledWith({page:1,size:20,planNo:'PLAN-NEW'})
+    wrapper.getComponent(DataTable).vm.$emit('update:page', 2); await flushPromises()
+    expect(listReturnPackingPlans).toHaveBeenLastCalledWith({page:2,size:20,planNo:'PLAN-NEW'})
+    await wrapper.get('input[placeholder="合箱计划号"]').setValue('')
+    await wrapper.get('.query-panel button').trigger('click'); await flushPromises()
+    expect(listReturnPackingPlans).toHaveBeenLastCalledWith({page:1,size:20})
+    selects[0]!.vm.$emit('update:modelValue','customer-1')
+    selects[1]!.vm.$emit('update:modelValue','warehouse-1')
+    await wrapper.get('input[placeholder="SKU"]').setValue(' SKU-TEST ')
+    await wrapper.get('.query-panel button').trigger('click'); await flushPromises()
+    expect(listReturnPackingPlans).toHaveBeenLastCalledWith({page:1,size:20,customerId:'customer-1',overseasWarehouseId:'warehouse-1',skuCode:'SKU-TEST'})
+  })
+  it('shows source carton, return ownership and moved quantities in carton merge history', async () => {
+    vi.mocked(getReturnCarton).mockResolvedValue({ ...carton, items: [{ skuCode: 'SKU-TEST', quantity: 8 }], mergeHistory: [{planNo:'PLAN-MERGED',sourceCartonMark:'SOURCE-BOX',targetCartonMark:carton.cartonMark,returnNo:'RETURN-SOURCE',skuCode:'SKU-TEST',quantity:2,createdAt:'2026-10-08T14:00:00'}] })
+    const wrapper = await mountView('cartons')
+    await wrapper.findAll('button').find(button => button.text() === '详情')!.trigger('click')
+    await flushPromises()
+    expect(document.body.textContent).toContain('合箱明细')
+    expect(document.body.textContent).toContain('SOURCE-BOX')
+    expect(document.body.textContent).toContain('RETURN-SOURCE')
+    expect(document.body.textContent).toContain('PLAN-MERGED')
+    expect(document.body.textContent).toContain('合入')
+  })
+
+  it('shows pending plans without applying the carton AVAILABLE status on tab changes and pagination', async () => {
+    const wrapper = await mountView('inventory')
+    const tabs = wrapper.getComponent({ name: 'ElTabs' })
+    tabs.vm.$emit('update:modelValue', 'plans')
+    tabs.vm.$emit('tab-change', 'plans')
+    await flushPromises()
+    expect(listReturnPackingPlans).toHaveBeenLastCalledWith({ page: 1, size: 20 })
+    expect(wrapper.text()).toContain('PLAN-NEW')
+    wrapper.getComponent(DataTable).vm.$emit('update:page', 2)
+    await flushPromises()
+    expect(listReturnPackingPlans).toHaveBeenLastCalledWith({ page: 2, size: 20 })
+    tabs.vm.$emit('update:modelValue', 'stock')
+    tabs.vm.$emit('tab-change', 'stock')
+    await flushPromises()
+    expect(listReturnStock).toHaveBeenLastCalledWith(expect.objectContaining({ status: 'AVAILABLE' }))
+  })
+
+  it('loads packing sources in pages without per-carton or stock requests and excludes reserved parcel quantities', async () => {
+    const wrapper = await mountView('inventory')
+    vi.mocked(listReturnPackingSources)
+      .mockResolvedValueOnce({ records: [{ cartonMark: 'PARCEL-1', sourceReturnNo: 'RETURN-1', sourceUnitType: 'PARCEL', items: [{ skuCode: 'PACK-SKU', quantity: 9, availableQuantity: 2 }] }], page: 1, size: 200, total: 2, pages: 2 })
+      .mockResolvedValueOnce({ records: [{ cartonMark: 'BOX-2', sourceReturnNo: 'RETURN-2', sourceUnitType: 'BOX', items: [{ skuCode: 'PACK-SKU', quantity: 100, availableQuantity: 100 }] }], page: 2, size: 200, total: 2, pages: 2 })
+    await wrapper.findAll('button').find(button => button.text().includes('创建合箱计划'))!.trigger('click')
+    await flushPromises()
+    const dialog = wrapper.findAllComponents({ name: 'ElForm' }).find(form => form.classes().includes('packing-form'))!
+    const selects = dialog.findAllComponents({ name: 'ElSelect' })
+    selects[0].vm.$emit('update:modelValue', 'customer-1')
+    selects[0].vm.$emit('change', 'customer-1')
+    await flushPromises()
+    expect(listReturnPackingSources).toHaveBeenCalledTimes(2)
+    expect(listReturnPackingSources).toHaveBeenLastCalledWith({ page: 2, size: 200, customerId: 'customer-1', overseasWarehouseId: 'warehouse-1' })
+    expect(getReturnCarton).not.toHaveBeenCalled()
+    expect(listReturnCartons).not.toHaveBeenCalled()
+    expect(listReturnStock).toHaveBeenCalledTimes(1)
+    const modes = dialog.findComponent({ name: 'ElRadioGroup' })
+    modes.vm.$emit('update:modelValue', 'SKU')
+    modes.vm.$emit('change', 'SKU')
+    await flushPromises()
+    expect(dialog.get('.packing-sku-row').text()).toContain('PACK-SKU')
+    expect(dialog.get('.packing-sku-row').text()).toContain('可用 2')
+  })
+
+  it('stops old pagination and ignores its result after the customer changes', async () => {
+    const wrapper = await mountView('inventory')
+    let resolveOld!: (value: Awaited<ReturnType<typeof listReturnPackingSources>>) => void
+    vi.mocked(listReturnPackingSources)
+      .mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve }))
+      .mockResolvedValueOnce({ records: [{ cartonMark: 'NEW-BOX', sourceUnitType: 'BOX', items: [] }], page: 1, size: 200, total: 1, pages: 1 })
+    await wrapper.findAll('button').find(button => button.text().includes('创建合箱计划'))!.trigger('click')
+    await flushPromises()
+    const dialog = wrapper.findAllComponents({ name: 'ElForm' }).find(form => form.classes().includes('packing-form'))!
+    const select = dialog.getComponent({ name: 'ElSelect' })
+    select.vm.$emit('update:modelValue', 'customer-1')
+    select.vm.$emit('change', 'customer-1')
+    await flushPromises()
+    select.vm.$emit('update:modelValue', 'customer-2')
+    select.vm.$emit('change', 'customer-2')
+    await flushPromises()
+    resolveOld({ records: [{ cartonMark: 'OLD-BOX', sourceUnitType: 'BOX', items: [] }], page: 1, size: 200, total: 400, pages: 2 })
+    await flushPromises()
+    expect(listReturnPackingSources).toHaveBeenCalledTimes(2)
+    expect(dialog.text()).toContain('NEW-BOX')
+    expect(dialog.text()).not.toContain('OLD-BOX')
+  })
+
   it('keeps query submission and server pagination when using the shared table', async () => {
     const wrapper = await mountView('inventory')
     expect(wrapper.get('h1').text()).toBe('退货库存管理')
diff --git a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue
index 3fbc91ab..5f185eac 100644
--- a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue
+++ b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue
@@ -1,117 +1,1083 @@
 <script setup lang="ts">
-import '@/styles/adminDensity.css'
-import { computed, onMounted, reactive, ref } from 'vue'
-import { Search } from '@lucide/vue'
-import { ElMessage } from 'element-plus'
-import { useRouter } from 'vue-router'
-import { listPlatformTenants, listSharedReceivingOverseasWarehouseOptions, type PlatformTenantResource } from '@/modules/iam'
-import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
-import AdminPage from '@/shared/components/AdminPage.vue'
-import AppDialog from '@/shared/components/AppDialog.vue'
-import { getReturnCarton, getReturnCartonLabel, listReturnCartons, listReturnInventoryMovements, listReturnStock, type ReturnCartonDetail, type ReturnCartonRow, type ReturnInventoryMovement, type ReturnStockRow } from '../api/returnInventory'
-const props = defineProps<{ mode: 'inventory' | 'cartons' }>()
-const router = useRouter()
-const loading = ref(false), total = ref(0), detailOpen = ref(false)
-const stockRows = ref<ReturnStockRow[]>([]), cartonRows = ref<ReturnCartonRow[]>([]), detail = ref<ReturnCartonDetail>()
-const inventoryTab = ref<'stock' | 'movements'>('stock')
-const movementRows = ref<ReturnInventoryMovement[]>([])
-const customers = ref<PlatformTenantResource[]>([])
-const warehouses = ref<Array<{ id: string; warehouseName: string }>>([])
-const optionsLoading = ref(false)
-const query = reactive({ page: 1, size: 20, customerId: '', overseasWarehouseId: '', skuCode: '', cartonMark: '', returnNo: '', status: 'AVAILABLE' })
-function params() { return { ...query, customerId: query.customerId || undefined, overseasWarehouseId: query.overseasWarehouseId || undefined, skuCode: query.skuCode || undefined, cartonMark: query.cartonMark || undefined, returnNo: query.returnNo || undefined, status: query.status || undefined } }
-async function load() { loading.value = true; try { if (props.mode === 'inventory') { if (inventoryTab.value === 'stock') { const page = await listReturnStock(params()); stockRows.value = page.records; total.value = page.total } else { const page = await listReturnInventoryMovements(params()); movementRows.value = page.records; total.value = page.total } } else { const page = await listReturnCartons(params()); cartonRows.value = page.records; total.value = page.total } } finally { loading.value = false } }
-function search() { query.page = 1; void load() }
-function changeInventoryTab() { query.page = 1; void load() }
-const customerOptions = computed(() => customers.value.filter((item) => item.status === 'ACTIVE').map((item) => ({ label: item.tenantName, value: String(item.id) })))
-const warehouseOptions = computed(() => warehouses.value.map((item) => ({ label: item.warehouseName, value: String(item.id) })))
-function customerName(customerId?: string) { return customers.value.find((item) => String(item.id) === String(customerId))?.tenantName || '客户名称待补充' }
-function warehouseName(warehouseId?: string) { return warehouses.value.find((item) => String(item.id) === String(warehouseId))?.warehouseName || '海外仓名称待补充' }
-function statusLabel(status?: string) { return status === 'AVAILABLE' ? '可用' : status === 'MERGED' ? '已合箱' : '—' }
+import "@/styles/adminDensity.css";
+import { computed, onMounted, reactive, ref, watch } from "vue";
+import dayjs from "dayjs";
+import { Search, Plus } from "@lucide/vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import {
+  listPlatformTenants,
+  listSharedReceivingOverseasWarehouseOptions,
+  type PlatformTenantResource,
+} from "@/modules/iam";
+import DataTable, {
+  type DataTableColumn,
+} from "@/shared/components/DataTable.vue";
+import AdminPage from "@/shared/components/AdminPage.vue";
+import AppDialog from "@/shared/components/AppDialog.vue";
+import {
+  getReturnCarton,
+  getReturnCartonLabel,
+  listReturnCartons,
+  listReturnPackingSources,
+  listReturnInventoryMovements,
+  listReturnStock,
+  type ReturnCartonDetail,
+  type ReturnCartonRow,
+  type ReturnInventoryMovement,
+  type ReturnStockRow,
+  type ReturnPackingSource,
+} from "../api/returnInventory";
+import {
+  createReturnPackingPlan,
+  listReturnPackingPlans,
+  reviewReturnPackingPlan,
+  cancelReturnPackingPlan,
+  type ReturnPackingPlanDto,
+} from "../api/relabelOrders";
+const props = defineProps<{ mode: "inventory" | "cartons" }>();
+const loading = ref(false),
+  total = ref(0),
+  detailOpen = ref(false);
+const stockRows = ref<ReturnStockRow[]>([]),
+  cartonRows = ref<ReturnCartonRow[]>([]),
+  detail = ref<ReturnCartonDetail>();
+const inventoryTab = ref<"stock" | "movements" | "plans">("stock");
+const movementRows = ref<ReturnInventoryMovement[]>([]);
+const planRows = ref<ReturnPackingPlanDto[]>([]),
+  planTotal = ref(0),
+  planDetail = ref<ReturnPackingPlanDto>(),
+  planDetailOpen = ref(false);
+const customers = ref<PlatformTenantResource[]>([]);
+const warehouses = ref<Array<{ id: string; warehouseName: string }>>([]);
+const optionsLoading = ref(false),
+  packingDialogOpen = ref(false),
+  packingSaving = ref(false);
+const packingSkuRows = ref<Array<Pick<ReturnStockRow, 'skuCode' | 'availableQuantity'>>>([]),
+  packingReturnOptions = ref<
+    Array<{ returnNo: string; unitTypes: string[]; cartonCount: number }>
+  >([]);
+const packingBoxRows = ref<
+  Array<{
+    cartonMark: string;
+    returnNo: string;
+    unitType: string;
+    items: Array<{ skuCode: string; quantity: number }>;
+  }>
+>([]);
+const packingForm = reactive({
+  returnNos: [] as string[],
+  returnNosInput: "",
+  skuSearchInput: "",
+  customerId: "",
+  overseasWarehouseId: "",
+  mode: "BOX" as "BOX" | "SKU",
+  skuQuantities: {} as Record<string, number>,
+  sourceCartonMarks: [] as string[],
+  remark: "",
+});
+const visiblePackingBoxRows = computed(() => {
+  const values = packingForm.skuSearchInput.split(',').map(value => value.trim()).filter(Boolean);
+  if (!values.length) return packingBoxRows.value;
+  return packingBoxRows.value.filter(box => box.items.some(item => values.some(value => item.skuCode.includes(value))));
+});
+const visiblePackingSkuRows = computed(() => {
+  const values = packingForm.skuSearchInput
+    .split(",")
+    .map(item => item.trim())
+    .filter(Boolean);
+  if (!values.length) return packingSkuRows.value;
+  const wanted = new Set(values);
+  return packingSkuRows.value.filter(item => wanted.has(item.skuCode));
+});
+const query = reactive({
+  page: 1,
+  size: 20,
+  customerId: "",
+  overseasWarehouseId: "",
+  skuCode: "",
+  cartonMark: "",
+  returnNo: "",
+  status: "AVAILABLE",
+});
+const planNoQuery = ref("");
+function params() {
+  return {
+    ...query,
+    customerId: query.customerId || undefined,
+    overseasWarehouseId: query.overseasWarehouseId || undefined,
+    skuCode: query.skuCode || undefined,
+    cartonMark: query.cartonMark || undefined,
+    returnNo: query.returnNo || undefined,
+    status: query.status || undefined,
+  };
+}
+async function load() {
+  loading.value = true;
+  try {
+    if (props.mode === "inventory") {
+      if (inventoryTab.value === "stock") {
+        const page = await listReturnStock(params());
+        stockRows.value = page.records;
+        total.value = page.total;
+      } else if (inventoryTab.value === "movements") {
+        const page = await listReturnInventoryMovements(params());
+        movementRows.value = page.records;
+        total.value = page.total;
+      } else {
+        const page = await listReturnPackingPlans({
+          page: query.page,
+          size: query.size,
+          ...(planNoQuery.value.trim() ? { planNo: planNoQuery.value.trim() } : {}),
+          ...(query.customerId ? { customerId: query.customerId } : {}),
+          ...(query.overseasWarehouseId ? { overseasWarehouseId: query.overseasWarehouseId } : {}),
+          ...(query.skuCode.trim() ? { skuCode: query.skuCode.trim() } : {}),
+        });
+        planRows.value = page.records;
+        planTotal.value = page.total;
+        total.value = page.total;
+      }
+    } else {
+      const page = await listReturnCartons(params());
+      cartonRows.value = page.records;
+      total.value = page.total;
+    }
+  } finally {
+    loading.value = false;
+  }
+}
+function search() {
+  query.page = 1;
+  void load();
+}
+function changeInventoryTab() {
+  query.page = 1;
+  void load();
+}
+async function reviewPlan(plan: Record<string, unknown>) {
+  try {
+    await reviewReturnPackingPlan(String(plan.planNo));
+    ElMessage.success("合箱计划审核通过，已推送 PDA");
+    await load();
+  } catch (error) {
+    ElMessage.error(
+      error instanceof Error ? error.message : "合箱计划审核失败",
+    );
+  }
+}
+async function cancelPlan(plan: Record<string, unknown>) {
+  try {
+    await ElMessageBox.confirm('取消后释放本计划锁定的来源库存，是否继续？', '取消合箱计划', { type: 'warning' });
+    await cancelReturnPackingPlan(String(plan.planNo)); ElMessage.success('计划已取消，库存已释放'); await load();
+  } catch (error) { if (error !== 'cancel' && error !== 'close') ElMessage.error(error instanceof Error ? error.message : '取消失败'); }
+}
+function openPlanDetail(row: Record<string, unknown>) {
+  planDetail.value = planRows.value.find(plan => plan.planNo === row.planNo);
+  planDetailOpen.value = !!planDetail.value;
+}
+const planCartonItemRows = computed(() => (planDetail.value?.resultCartons || []).flatMap(carton =>
+  carton.items.map(item => ({ ...carton, skuCode: item.skuCode, quantity: item.quantity })),
+));
+const plannedItemRows = computed(() => (planDetail.value?.boxes || []).flatMap((box, index) =>
+  (box.items || []).map(item => ({ boxNo: index + 1, skuCode: item.skuCode, quantity: item.quantity })),
+));
+const customerOptions = computed(() =>
+  customers.value
+    .filter((item) => item.status === "ACTIVE")
+    .map((item) => ({ label: item.tenantName, value: String(item.id) })),
+);
+const warehouseOptions = computed(() =>
+  warehouses.value.map((item) => ({
+    label: item.warehouseName,
+    value: String(item.id),
+  })),
+);
+function customerName(customerId?: string) {
+  return (
+    customers.value.find((item) => String(item.id) === String(customerId))
+      ?.tenantName || "客户名称待补充"
+  );
+}
+function warehouseName(warehouseId?: string) {
+  return (
+    warehouses.value.find((item) => String(item.id) === String(warehouseId))
+      ?.warehouseName || "海外仓名称待补充"
+  );
+}
+function statusLabel(status?: string) {
+  return status === "AVAILABLE" ? "可用" : status === "MERGED" ? "已合箱" : "—";
+}
 async function loadOptions() {
-  optionsLoading.value = true
+  optionsLoading.value = true;
   try {
     const [customerResult, warehouseResult] = await Promise.allSettled([
-      listPlatformTenants({ page: 1, size: 200, status: 'ACTIVE' }),
+      listPlatformTenants({ page: 1, size: 200, status: "ACTIVE" }),
       listSharedReceivingOverseasWarehouseOptions(),
-    ])
-    if (customerResult.status === 'fulfilled') customers.value = customerResult.value.records
-    else customers.value = []
-    if (warehouseResult.status === 'fulfilled') warehouses.value = warehouseResult.value
-    else warehouses.value = []
-    if (customerResult.status === 'rejected' || warehouseResult.status === 'rejected') {
-      const failed = customerResult.status === 'rejected' ? '客户' : '海外仓'
-      ElMessage.warning(`${failed}筛选数据加载失败，请检查服务或数据库迁移`)
+    ]);
+    if (customerResult.status === "fulfilled")
+      customers.value = customerResult.value.records;
+    else customers.value = [];
+    if (warehouseResult.status === "fulfilled")
+      warehouses.value = warehouseResult.value;
+    else warehouses.value = [];
+    if (
+      customerResult.status === "rejected" ||
+      warehouseResult.status === "rejected"
+    ) {
+      const failed = customerResult.status === "rejected" ? "客户" : "海外仓";
+      ElMessage.warning(`${failed}筛选数据加载失败，请检查服务或数据库迁移`);
     }
   } catch (error) {
-    ElMessage.warning(error instanceof Error ? `筛选名称加载失败：${error.message}` : '筛选名称加载失败')
-  } finally { optionsLoading.value = false }
+    ElMessage.warning(
+      error instanceof Error
+        ? `筛选名称加载失败：${error.message}`
+        : "筛选名称加载失败",
+    );
+  } finally {
+    optionsLoading.value = false;
+  }
 }
-async function openCarton(mark: string) { try { detail.value = await getReturnCarton(mark); detailOpen.value = true } catch (e) { ElMessage.error(e instanceof Error ? e.message : '箱号详情加载失败') } }
-async function printLabel(mark: string) { try { const label = await getReturnCartonLabel(mark); const popup = window.open('', '_blank'); if (!popup) return ElMessage.warning('请允许浏览器打开打印窗口'); popup.opener = null; popup.document.open(); popup.document.write(label.printableHtml); popup.document.close(); popup.focus(); popup.print() } catch (e) { ElMessage.error(e instanceof Error ? e.message : '箱唛加载失败') } }
-function openPackingPlan() { void router.push({ name: 'overseas-last-mile-orders', query: { tab: 'return-packing' } }) }
-onMounted(() => { void load(); void loadOptions() })
+async function openCarton(mark: string) {
+  try {
+    detail.value = await getReturnCarton(mark);
+    detailOpen.value = true;
+  } catch (e) {
+    ElMessage.error(e instanceof Error ? e.message : "箱号详情加载失败");
+  }
+}
+async function printLabel(mark: string) {
+  try {
+    const label = await getReturnCartonLabel(mark);
+    const popup = window.open("", "_blank");
+    if (!popup) return ElMessage.warning("请允许浏览器打开打印窗口");
+    popup.opener = null;
+    popup.document.open();
+    popup.document.write(label.printableHtml);
+    popup.document.close();
+    popup.focus();
+    popup.print();
+  } catch (e) {
+    ElMessage.error(e instanceof Error ? e.message : "箱唛加载失败");
+  }
+}
+function openPackingPlan() {
+  packingForm.customerId = query.customerId;
+  packingForm.overseasWarehouseId = query.overseasWarehouseId || warehouses.value[0]?.id || "";
+  packingForm.returnNos = [];
+  packingForm.returnNosInput = "";
+  packingForm.skuSearchInput = "";
+  packingForm.mode = "BOX";
+  packingForm.skuQuantities = {};
+  packingForm.remark = "";
+  packingDialogOpen.value = true;
+  void loadPackingSources();
+}
+const packingSources = ref<ReturnPackingSource[]>([]);
+const packingSourceLoading = ref(false);
+let packingLoadSequence = 0;
+async function loadPackingSources() {
+  const sequence = ++packingLoadSequence;
+  packingSkuRows.value = []; packingBoxRows.value = []; packingSources.value = [];
+  packingReturnOptions.value = []; packingForm.returnNos = []; packingForm.returnNosInput = ""; packingForm.skuSearchInput = ""; packingForm.skuQuantities = {}; packingForm.sourceCartonMarks = [];
+  if (!packingForm.customerId || !packingForm.overseasWarehouseId) { packingSourceLoading.value = false; return; }
+  packingSourceLoading.value = true;
+  try {
+    const customerId = packingForm.customerId;
+    const overseasWarehouseId = packingForm.overseasWarehouseId;
+    const sources: ReturnPackingSource[] = [];
+    for (let page = 1; ; page++) {
+      const response = await listReturnPackingSources({ page, size: 200, customerId, overseasWarehouseId });
+      if (sequence !== packingLoadSequence) return;
+      sources.push(...response.records);
+      if (!response.records.length || sources.length >= response.total) break;
+    }
+    if (sequence !== packingLoadSequence) return;
+    packingSources.value = sources;
+    updatePackingScope();
+  } catch (error) {
+    if (sequence === packingLoadSequence) ElMessage.error(error instanceof Error ? error.message : '客户退货库存加载失败，请重试');
+  } finally { if (sequence === packingLoadSequence) packingSourceLoading.value = false; }
+}
+function sourceReturnNos(source: ReturnPackingSource) { return (source.sourceReturnNo || '').split(',').filter(Boolean); }
+function updatePackingScope() {
+  const sources = packingSources.value.filter(row => packingForm.mode === 'SKU' ? row.sourceUnitType === 'PARCEL' : row.sourceUnitType !== 'PARCEL');
+  const options = new Map<string, { returnNo: string; unitTypes: string[]; cartonCount: number }>();
+  for (const source of sources) for (const returnNo of sourceReturnNos(source)) {
+    const option = options.get(returnNo) || { returnNo, unitTypes: [], cartonCount: 0 };
+    if (!option.unitTypes.includes(source.sourceUnitType || 'BOX')) option.unitTypes.push(source.sourceUnitType || 'BOX');
+    option.cartonCount++; options.set(returnNo, option);
+  }
+  packingReturnOptions.value = [...options.values()];
+  const scoped = sources.filter(row => !packingForm.returnNos.length || sourceReturnNos(row).every(no => packingForm.returnNos.includes(no)));
+  packingBoxRows.value = scoped.filter(row => row.sourceUnitType !== 'PARCEL').map(row => ({ cartonMark: row.cartonMark, returnNo: row.sourceReturnNo || '', unitType: row.sourceUnitType || 'BOX', items: row.items }));
+  const quantities = new Map<string, number>();
+  for (const source of scoped.filter(row => row.sourceUnitType === 'PARCEL')) for (const item of source.items)
+    quantities.set(item.skuCode, (quantities.get(item.skuCode) || 0) + Number(item.availableQuantity ?? item.quantity));
+  packingSkuRows.value = [...quantities].filter(([, quantity]) => quantity > 0).map(([skuCode, quantity]) => ({
+    skuCode, availableQuantity: quantity,
+  }));
+}
+function togglePackingSku(sku: string, checked: boolean) {
+  if (checked) packingForm.skuQuantities[sku] = 1;
+  else delete packingForm.skuQuantities[sku];
+}
+function changePackingMode() {
+  packingForm.skuQuantities = {};
+  packingForm.sourceCartonMarks = [];
+  packingForm.returnNos = [];
+  packingForm.returnNosInput = "";
+  packingForm.skuSearchInput = "";
+  updatePackingScope();
+}
+async function submitPackingPlan() {
+  const selectedBoxes = packingSources.value.filter(row => packingForm.sourceCartonMarks.includes(row.cartonMark));
+  const selectedSources = packingForm.mode === 'BOX' ? selectedBoxes : packingSources.value.filter(row => row.sourceUnitType === 'PARCEL' && (!packingForm.returnNos.length || sourceReturnNos(row).every(no => packingForm.returnNos.includes(no))));
+  const returnNos = [...new Set(selectedSources.flatMap(sourceReturnNos))];
+  const items = Object.entries(packingForm.skuQuantities)
+    .filter(([, quantity]) => Number(quantity) > 0)
+    .map(([skuCode, quantity]) => ({ skuCode, quantity: Number(quantity) }));
+  const boxes = [{ items }];
+  if (
+    !packingForm.customerId || !packingForm.overseasWarehouseId ||
+    !returnNos.length ||
+    packingSourceLoading.value ||
+    (packingForm.mode === 'BOX' && !selectedBoxes.length) ||
+    (packingForm.mode === "SKU" && !items.length)
+  ) {
+    ElMessage.warning(
+      packingForm.mode === "SKU"
+        ? "请选择客户、SKU 和合箱数量"
+        : "请选择客户及来源箱唛",
+    );
+    return;
+  }
+  packingSaving.value = true;
+  try {
+    await createReturnPackingPlan({
+      returnNos,
+      mode: packingForm.mode,
+      boxes,
+      sourceCartonMarks: packingForm.mode === 'BOX' ? packingForm.sourceCartonMarks : [],
+      remark: packingForm.remark.trim() || undefined,
+      idempotencyKey:
+        globalThis.crypto?.randomUUID?.() || `return-packing-${Date.now()}`,
+    });
+    ElMessage.success("合箱计划已创建，待审核后由 PDA 填写箱规并作业");
+    packingDialogOpen.value = false; inventoryTab.value = "plans"; query.page = 1; await load();
+  } catch (error) {
+    ElMessage.error(
+      error instanceof Error ? error.message : "合箱计划创建失败",
+    );
+  } finally {
+    packingSaving.value = false;
+  }
+}
+watch(() => packingForm.returnNosInput, (value) => {
+  packingForm.returnNos = [...new Set(value.split(",").map(item => item.trim()).filter(Boolean))];
+});
+watch(() => packingForm.returnNos, () => { packingForm.sourceCartonMarks = []; packingForm.skuQuantities = {}; updatePackingScope(); }, { deep: true });
+onMounted(() => {
+  void load();
+  void loadOptions();
+});
 const stockColumns: DataTableColumn[] = [
-  { key: 'stock-0', label: '客户', minWidth: 180, slotName: 'stock-0' },
-  { key: 'stock-1', label: '海外仓', minWidth: 180, slotName: 'stock-1' },
-  { key: 'skuCode', label: 'SKU', prop: 'skuCode', minWidth: 170 },
-  { key: 'productNameZh', label: '中文品名', prop: 'productNameZh', minWidth: 180 },
-  { key: 'totalQuantity', label: '总库存', prop: 'totalQuantity', align: 'right' },
-  { key: 'availableQuantity', label: '可用库存', prop: 'availableQuantity', align: 'right' },
-  { key: 'updatedAt', label: '更新时间', prop: 'updatedAt', minWidth: 180 },
-]
+  { key: "stock-0", label: "客户", minWidth: 180, slotName: "stock-0" },
+  { key: "stock-1", label: "海外仓", minWidth: 180, slotName: "stock-1" },
+  { key: "skuCode", label: "SKU", prop: "skuCode", minWidth: 170 },
+  {
+    key: "productNameZh",
+    label: "中文品名",
+    prop: "productNameZh",
+    minWidth: 180,
+  },
+  {
+    key: "totalQuantity",
+    label: "总库存",
+    prop: "totalQuantity",
+    align: "right",
+  },
+  {
+    key: "availableQuantity",
+    label: "可用库存",
+    prop: "availableQuantity",
+    align: "right",
+  },
+  { key: "updatedAt", label: "更新时间", prop: "updatedAt", minWidth: 180 },
+];
 const movementColumns: DataTableColumn[] = [
-  { key: 'movement-0', label: '客户', minWidth: 180, slotName: 'movement-0' },
-  { key: 'movement-1', label: '海外仓', minWidth: 180, slotName: 'movement-1' },
-  { key: 'skuCode', label: 'SKU', prop: 'skuCode', minWidth: 170 },
-  { key: 'productNameZh', label: '中文品名', prop: 'productNameZh', minWidth: 180 },
-  { key: 'movement-4', label: '业务类型', minWidth: 120, slotName: 'movement-4' },
-  { key: 'referenceNo', label: '关联单号/箱号', prop: 'referenceNo', minWidth: 220 },
-  { key: 'totalDelta', label: '总库存变动', prop: 'totalDelta', align: 'right' },
-  { key: 'availableDelta', label: '可用库存变动', prop: 'availableDelta', align: 'right' },
-  { key: 'occurredAt', label: '发生时间', prop: 'occurredAt', minWidth: 180 },
-]
+  { key: "movement-0", label: "客户", minWidth: 180, slotName: "movement-0" },
+  { key: "movement-1", label: "海外仓", minWidth: 180, slotName: "movement-1" },
+  { key: "skuCode", label: "SKU", prop: "skuCode", minWidth: 170 },
+  {
+    key: "productNameZh",
+    label: "中文品名",
+    prop: "productNameZh",
+    minWidth: 180,
+  },
+  {
+    key: "movement-4",
+    label: "业务类型",
+    minWidth: 120,
+    slotName: "movement-4",
+  },
+  {
+    key: "referenceNo",
+    label: "关联单号/箱号",
+    prop: "referenceNo",
+    minWidth: 220,
+  },
+  {
+    key: "totalDelta",
+    label: "总库存变动",
+    prop: "totalDelta",
+    align: "right",
+  },
+  {
+    key: "availableDelta",
+    label: "可用库存变动",
+    prop: "availableDelta",
+    align: "right",
+  },
+  { key: "occurredAt", label: "发生时间", prop: "occurredAt", minWidth: 180 },
+];
 const cartonColumns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 140, fixed: 'left', slotName: 'carton-0' },
-  { key: 'cartonMark', label: '箱号', prop: 'cartonMark', minWidth: 220 },
-  { key: 'carton-2', label: '客户', minWidth: 180, slotName: 'carton-2' },
-  { key: 'carton-3', label: '海外仓', minWidth: 180, slotName: 'carton-3' },
-  { key: 'sourceReturnNo', label: '来源退货单', prop: 'sourceReturnNo', minWidth: 220 },
-  { key: 'fbaCartonMark', label: 'FBA箱唛', prop: 'fbaCartonMark', minWidth: 180 },
-  { key: 'carton-6', label: '目的仓', minWidth: 180, slotName: 'carton-6' },
-  { key: 'relabelNo', label: '换标单号', prop: 'relabelNo', minWidth: 200 },
-  { key: 'carton-8', label: '换标状态', width: 110, slotName: 'carton-8' },
-  { key: 'carton-9', label: '状态', width: 100, slotName: 'carton-9' },
-  { key: 'skuTypes', label: 'SKU种类', prop: 'skuTypes', align: 'right' },
-  { key: 'totalQuantity', label: '总件数', prop: 'totalQuantity', align: 'right' },
-  { key: 'carton-12', label: '箱规', minWidth: 190, slotName: 'carton-12' },
-  { key: 'weight', label: '重量(kg)', prop: 'weight', align: 'right' },
-  { key: 'createdAt', label: '创建时间', prop: 'createdAt', minWidth: 180 },
-]
-const tableRows = computed(() => props.mode === 'cartons' ? cartonRows.value : inventoryTab.value === 'stock' ? stockRows.value : movementRows.value)
-const tableColumns = computed(() => props.mode === 'cartons' ? cartonColumns : inventoryTab.value === 'stock' ? stockColumns : movementColumns)
+  {
+    key: "actions",
+    label: "操作",
+    width: 140,
+    fixed: "left",
+    slotName: "carton-0",
+  },
+  { key: "cartonMark", label: "箱号", prop: "cartonMark", minWidth: 220 },
+  { key: "carton-2", label: "客户", minWidth: 180, slotName: "carton-2" },
+  { key: "carton-3", label: "海外仓", minWidth: 180, slotName: "carton-3" },
+  {
+    key: "sourceReturnNo",
+    label: "来源退货单",
+    prop: "sourceReturnNo",
+    minWidth: 220,
+  },
+  {
+    key: "fbaCartonMark",
+    label: "FBA箱唛",
+    prop: "fbaCartonMark",
+    minWidth: 180,
+  },
+  { key: "carton-6", label: "目的仓", minWidth: 180, slotName: "carton-6" },
+  { key: "relabelNo", label: "换标单号", prop: "relabelNo", minWidth: 200 },
+  { key: "carton-8", label: "换标状态", width: 110, slotName: "carton-8" },
+  { key: "carton-9", label: "状态", width: 100, slotName: "carton-9" },
+  { key: "skuTypes", label: "SKU种类", prop: "skuTypes", align: "right" },
+  {
+    key: "totalQuantity",
+    label: "总件数",
+    prop: "totalQuantity",
+    align: "right",
+  },
+  { key: "carton-12", label: "箱规", minWidth: 190, slotName: "carton-12" },
+  { key: "weight", label: "重量(kg)", prop: "weight", align: "right" },
+  { key: "createdAt", label: "创建时间", prop: "createdAt", minWidth: 180 },
+];
+const planColumns: DataTableColumn[] = [
+  {
+    key: "plan-actions",
+    label: "操作",
+    width: 160,
+    fixed: "left",
+    slotName: "plan-actions",
+  },
+  { key: "planNo", label: "计划号", prop: "planNo", minWidth: 230 },
+  { key: "customerId", label: "客户", prop: "customerId", minWidth: 180, slotName: "plan-customer" },
+  {
+    key: "returnNos",
+    label: "来源退货单",
+    minWidth: 260,
+    slotName: "plan-return-nos",
+  },
+  { key: "mode", label: "合箱方式", minWidth: 110, slotName: "plan-mode" },
+  { key: "status", label: "状态", minWidth: 110, slotName: "plan-status" },
+  { key: "createdAt", label: "创建时间", prop: "createdAt", minWidth: 180, slotName: "plan-created-at" },
+];
+function formatPlanCreatedAt(value: unknown) {
+  if (typeof value !== 'string' || !value.trim()) return '—';
+  const date = dayjs(value);
+  return date.isValid() ? date.format('YYYY-MM-DD HH:mm:ss') : '—';
+}
+const tableRows = computed(() =>
+  props.mode === "cartons"
+    ? cartonRows.value
+    : inventoryTab.value === "stock"
+      ? stockRows.value
+      : inventoryTab.value === "movements"
+        ? movementRows.value
+        : planRows.value,
+);
+const tableColumns = computed(() =>
+  props.mode === "cartons"
+    ? cartonColumns
+    : inventoryTab.value === "stock"
+      ? stockColumns
+      : inventoryTab.value === "movements"
+        ? movementColumns
+        : planColumns,
+);
 </script>
 
-<template><AdminPage as="div" class="business-page return-inventory-page admin-density">
-
-
-  <DataTable appearance="integrated" :stripe="false" column-settings-mode="show" v-model:page="query.page" v-model:page-size="query.size" :data="tableRows" :columns="tableColumns" :loading="loading" :total="total" :page-sizes="[20, 50, 100]" :preference-key="`overseas-return-${mode === 'inventory' ? inventoryTab : 'cartons'}`" @update:page="load" @update:page-size="query.page = 1; load()">
-    <template #toolbar-start><h1>{{ mode === 'inventory' ? '退货库存管理' : '退货箱号管理' }}</h1></template>
-    <template #toolbar-actions><el-button v-if="mode==='inventory'" type="warning" @click="openPackingPlan">创建合箱计划</el-button></template>
-    <template #filters><el-tabs class="density-element-tabs" v-if="mode==='inventory'" v-model="inventoryTab" @tab-change="changeInventoryTab"><el-tab-pane name="stock" ><template #label><span class="density-tab-icon" aria-hidden="true">🏷️</span><span>退货库存</span></template></el-tab-pane><el-tab-pane name="movements" ><template #label><span class="density-tab-icon" aria-hidden="true">📝</span><span>退货进销存明细</span></template></el-tab-pane></el-tabs><section class="query-toolbar query-panel"><el-select v-model="query.customerId" clearable filterable placeholder="全部客户" :loading="optionsLoading"><el-option v-for="item in customerOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select><el-select v-model="query.overseasWarehouseId" clearable filterable placeholder="全部海外仓" :loading="optionsLoading"><el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select><el-input v-model="query.skuCode" clearable placeholder="SKU" @keyup.enter="search" /><el-input v-if="mode==='cartons'" v-model="query.cartonMark" clearable placeholder="箱号/箱唛" @keyup.enter="search" /><el-input v-if="mode==='cartons'" v-model="query.returnNo" clearable placeholder="退货单号" @keyup.enter="search" /><el-select v-if="mode==='cartons'" v-model="query.status" clearable placeholder="箱状态"><el-option label="可用" value="AVAILABLE" /><el-option label="已合箱" value="MERGED" /></el-select><el-button type="primary" @click="search"><Search :size="16" />查询</el-button></section></template>
-    <template #stock-0="{ row }">{{ customerName(row.customerId) }}</template>
-    <template #stock-1="{ row }">{{ warehouseName(row.overseasWarehouseId) }}</template>
-    <template #movement-0="{ row }">{{ customerName(row.customerId) }}</template>
-    <template #movement-1="{ row }">{{ warehouseName(row.overseasWarehouseId) }}</template>
-    <template #movement-4="{ row }">{{ row.movementType === 'RECEIPT' ? '退货签收' : row.movementType === 'MERGE' ? '退货合箱' : '退货出库' }}</template>
-    <template #carton-0="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" @click="openCarton(row.cartonMark)">详情</el-button><el-button class="density-action" data-tone="neutral" @click="printLabel(row.cartonMark)">箱唛</el-button></div></template>
-    <template #carton-2="{ row }">{{ customerName(row.customerId) }}</template>
-    <template #carton-3="{ row }">{{ warehouseName(row.overseasWarehouseId) }}</template>
-    <template #carton-6="{ row }">{{ row.destinationWarehouseCode || row.destinationWarehouseName || '—' }}</template>
-    <template #carton-8="{ row }">{{ row.relabelStatus === 'COMPLETED' ? '已完成' : row.relabelStatus === 'BOUND' ? '已绑定' : row.relabelStatus || '未绑定' }}</template>
-    <template #carton-9="{ row }">{{ statusLabel(row.status) }}</template>
-    <template #carton-12="{ row }">{{ row.length ? `${row.length}×${row.width}×${row.height} cm` : '—' }}</template>
-  </DataTable>
-  <AppDialog class="admin-density-dialog" v-model="detailOpen" title="退货箱号详情" width="min(1080px, calc(100vw - 56px))" :show-footer="false"><template v-if="detail"><el-descriptions class="density-descriptions" :column="2" border><el-descriptions-item label="箱号">{{detail.cartonMark}}</el-descriptions-item><el-descriptions-item label="客户">{{customerName(detail.customerId)}}</el-descriptions-item><el-descriptions-item label="海外仓">{{warehouseName(detail.overseasWarehouseId)}}</el-descriptions-item><el-descriptions-item label="来源退货单">{{detail.sourceReturnNo||'—'}}</el-descriptions-item><el-descriptions-item label="FBA箱唛">{{detail.fbaCartonMark||'—'}}</el-descriptions-item><el-descriptions-item label="目的仓">{{detail.destinationWarehouseCode||detail.destinationWarehouseName||'—'}}</el-descriptions-item><el-descriptions-item label="换标单号">{{detail.relabelNo||'—'}}</el-descriptions-item><el-descriptions-item label="换标状态">{{detail.relabelStatus === 'COMPLETED' ? '已完成' : detail.relabelStatus === 'BOUND' ? '已绑定' : detail.relabelStatus || '未绑定'}}</el-descriptions-item><el-descriptions-item label="状态">{{statusLabel(detail.status)}}</el-descriptions-item><el-descriptions-item label="箱规">{{detail.length?`${detail.length}×${detail.width}×${detail.height} cm`:'—'}}</el-descriptions-item><el-descriptions-item label="重量">{{detail.weight?`${detail.weight} kg`:'—'}}</el-descriptions-item></el-descriptions><el-table :data="detail.items" class="detail-items"><el-table-column prop="skuCode" label="SKU" /><el-table-column prop="productNameZh" label="中文品名" /><el-table-column prop="quantity" label="数量" align="right" /></el-table></template></AppDialog>
-</AdminPage></template>
-<style scoped>.return-inventory-page{display:grid;gap:var(--admin-space-5)}.query-panel{display:flex;gap:var(--admin-space-4);flex-wrap:wrap;padding:var(--admin-space-5)}.query-panel .el-input,.query-panel .el-select{width:180px}.table-panel{padding:var(--admin-space-5)}.el-pagination{justify-content:flex-end;margin-top:var(--admin-space-5)}.detail-items{margin-top:var(--admin-space-5)}</style>
+<template>
+  <AdminPage as="div" class="business-page return-inventory-page admin-density">
+    <DataTable
+      appearance="integrated"
+      :stripe="false"
+      column-settings-mode="show"
+      v-model:page="query.page"
+      v-model:page-size="query.size"
+      :data="tableRows"
+      :columns="tableColumns"
+      :loading="loading"
+      :total="total"
+      :page-sizes="[20, 50, 100]"
+      :preference-key="`overseas-return-${mode === 'inventory' ? inventoryTab : 'cartons'}`"
+      @update:page="load"
+      @update:page-size="
+        query.page = 1;
+        load();
+      "
+    >
+      <template #toolbar-start
+        ><h1>
+          {{ mode === "inventory" ? "退货库存管理" : "退货箱号管理" }}
+        </h1></template
+      >
+      <template #toolbar-actions
+        ><el-button
+          v-if="mode === 'inventory'"
+          type="warning"
+          @click="openPackingPlan"
+          ><Plus :size="15" />创建合箱计划</el-button
+        ></template
+      >
+      <template #filters
+        ><el-tabs
+          class="density-element-tabs"
+          v-if="mode === 'inventory'"
+          v-model="inventoryTab"
+          @tab-change="changeInventoryTab"
+          ><el-tab-pane name="stock"
+            ><template #label
+              ><span class="density-tab-icon" aria-hidden="true">🏷️</span
+              ><span>退货库存</span></template
+            ></el-tab-pane
+          ><el-tab-pane name="movements"
+            ><template #label
+              ><span class="density-tab-icon" aria-hidden="true">📝</span
+              ><span>退货进销存明细</span></template
+            ></el-tab-pane
+          ><el-tab-pane name="plans"
+            ><template #label
+              ><span class="density-tab-icon" aria-hidden="true">📦</span
+              ><span>合箱计划</span></template
+            ></el-tab-pane
+          ></el-tabs
+        >
+        <section class="query-toolbar query-panel">
+          <el-input v-if="mode === 'inventory' && inventoryTab === 'plans'" v-model="planNoQuery" clearable placeholder="合箱计划号" @keyup.enter="search" />
+          <el-select
+            v-model="query.customerId"
+            clearable
+            filterable
+            placeholder="全部客户"
+            :loading="optionsLoading"
+            ><el-option
+              v-for="item in customerOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value" /></el-select
+          ><el-select
+            v-model="query.overseasWarehouseId"
+            clearable
+            filterable
+            placeholder="全部海外仓"
+            :loading="optionsLoading"
+            ><el-option
+              v-for="item in warehouseOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value" /></el-select
+          ><el-input
+            v-model="query.skuCode"
+            clearable
+            placeholder="SKU"
+            @keyup.enter="search"
+          /><el-input
+            v-if="mode === 'cartons'"
+            v-model="query.cartonMark"
+            clearable
+            placeholder="箱号/箱唛"
+            @keyup.enter="search"
+          /><el-input
+            v-if="mode === 'cartons'"
+            v-model="query.returnNo"
+            clearable
+            placeholder="退货单号"
+            @keyup.enter="search"
+          /><el-select
+            v-if="mode === 'cartons'"
+            v-model="query.status"
+            clearable
+            placeholder="箱状态"
+            ><el-option label="可用" value="AVAILABLE" /><el-option
+              label="已合箱"
+              value="MERGED" /></el-select
+          ><el-button type="primary" @click="search"
+            ><Search :size="16" />查询</el-button
+          >
+        </section></template
+      >
+      <template #stock-0="{ row }">{{ customerName(row.customerId) }}</template>
+      <template #stock-1="{ row }">{{
+        warehouseName(row.overseasWarehouseId)
+      }}</template>
+      <template #movement-0="{ row }">{{
+        customerName(row.customerId)
+      }}</template>
+      <template #movement-1="{ row }">{{
+        warehouseName(row.overseasWarehouseId)
+      }}</template>
+      <template #movement-4="{ row }">{{
+        row.movementType === "RECEIPT"
+          ? "退货签收"
+          : row.movementType === "MERGE"
+            ? "退货合箱"
+            : "退货出库"
+      }}</template>
+      <template #plan-customer="{ row }">{{ customerName(row.customerId) }}</template>
+      <template #plan-return-nos="{ row }">{{
+        row.returnNos?.join("、") || "—"
+      }}</template
+      ><template #plan-mode="{ row }">{{
+        row.mode === "SKU"
+          ? "按 SKU 合箱"
+          : row.mode === "BOX"
+            ? "按箱合箱"
+            : row.mode
+      }}</template
+      ><template #plan-status="{ row }">{{
+        row.status === "PENDING_REVIEW"
+          ? "待审核"
+          : row.status === "READY"
+            ? "待 PDA 作业"
+            : row.status === "COMPLETED"
+              ? "已完成"
+              : row.status === "CANCELLED" ? "已取消" : row.status
+      }}</template
+      ><template #plan-created-at="{ row }">{{ formatPlanCreatedAt(row.createdAt) }}</template
+      ><template #plan-actions="{ row }"
+        ><div class="row-actions density-actions admin-text-actions">
+          <el-button
+            class="density-action"
+            data-tone="neutral"
+            @click="openPlanDetail(row)"
+            >详情</el-button
+          ><el-button
+            v-if="row.status === 'PENDING_REVIEW'"
+            class="density-action"
+            data-tone="warning"
+            @click="reviewPlan(row)"
+            >审核</el-button><el-button v-if="['PENDING_REVIEW','READY'].includes(row.status)" class="density-action" data-tone="danger" @click="cancelPlan(row)">取消</el-button>
+        </div></template
+      ><template #carton-0="{ row }"
+        ><div class="row-actions density-actions admin-text-actions">
+          <el-button
+            class="density-action"
+            data-tone="neutral"
+            @click="openCarton(row.cartonMark)"
+            >详情</el-button
+          ><el-button
+            class="density-action"
+            data-tone="neutral"
+            @click="printLabel(row.cartonMark)"
+            >箱唛</el-button
+          >
+        </div></template
+      >
+      <template #carton-2="{ row }">{{
+        customerName(row.customerId)
+      }}</template>
+      <template #carton-3="{ row }">{{
+        warehouseName(row.overseasWarehouseId)
+      }}</template>
+      <template #carton-6="{ row }">{{
+        row.destinationWarehouseCode || row.destinationWarehouseName || "—"
+      }}</template>
+      <template #carton-8="{ row }">{{
+        row.relabelStatus === "COMPLETED"
+          ? "已完成"
+          : row.relabelStatus === "BOUND"
+            ? "已绑定"
+            : row.relabelStatus || "未绑定"
+      }}</template>
+      <template #carton-9="{ row }">{{ statusLabel(row.status) }}</template>
+      <template #carton-12="{ row }">{{
+        row.length ? `${row.length}×${row.width}×${row.height} cm` : "—"
+      }}</template>
+    </DataTable>
+    <AppDialog
+      class="packing-dialog"
+      v-model="packingDialogOpen"
+      title="创建退货合箱计划"
+      width="min(1380px, calc(100vw - 32px))"
+      confirm-text="提交审核"
+      :confirm-loading="packingSaving"
+      @confirm="submitPackingPlan"
+      ><el-form v-loading="packingSourceLoading" label-position="top" class="packing-form"
+        ><el-form-item label="客户"
+          ><el-select
+            v-model="packingForm.customerId"
+            filterable
+            placeholder="请选择客户"
+            style="width: 100%"
+            @change="loadPackingSources"
+            ><el-option
+              v-for="item in customerOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value" /></el-select></el-form-item
+        ><el-form-item label="海外仓"><el-select v-model="packingForm.overseasWarehouseId" style="width:100%" @change="loadPackingSources"><el-option v-for="warehouse in warehouseOptions" :key="warehouse.value" :label="warehouse.label" :value="warehouse.value" /></el-select></el-form-item><el-form-item label="合箱方式"
+          ><el-radio-group v-model="packingForm.mode" class="packing-mode" @change="changePackingMode"
+            ><el-radio-button label="BOX">按箱合箱</el-radio-button
+            ><el-radio-button label="SKU"
+              >按 SKU 合箱</el-radio-button
+            ></el-radio-group
+          ></el-form-item
+        ><el-form-item label="来源退货单筛选（可选，后台自动追溯）"
+          ><el-input
+            v-model="packingForm.returnNosInput"
+            clearable
+            placeholder="默认加载该客户全部可用库存；多个退货单号请用英文逗号分隔"
+            style="width: 100%"
+          ><template #suffix><span v-if="packingForm.returnNos.length" class="return-nos-count">已识别 {{ packingForm.returnNos.length }} 个</span></template></el-input></el-form-item
+        ><el-form-item v-if="packingForm.mode === 'SKU'" label="合箱 SKU"
+          ><div class="packing-sku-list-wrap">
+            <el-input
+              v-model="packingForm.skuSearchInput"
+              clearable
+              placeholder="请输入 SKU，多个 SKU 请用英文逗号分隔"
+              class="packing-sku-search"
+            ><template #suffix><span v-if="packingForm.skuSearchInput.trim()" class="return-nos-count">按 SKU 筛选</span></template></el-input>
+            <div class="packing-sku-list">
+            <div class="packing-sku-list-head"><span>选择 / SKU</span><span>可用数量</span><span>合箱数量</span></div>
+            <div
+              v-for="item in visiblePackingSkuRows"
+              :key="item.skuCode"
+              class="packing-sku-row"
+            >
+              <el-checkbox
+                :model-value="
+                  packingForm.skuQuantities[item.skuCode] !== undefined
+                "
+                @change="togglePackingSku(item.skuCode, Boolean($event))"
+                >{{ item.skuCode }}</el-checkbox
+              ><span>可用 {{ item.availableQuantity }}</span
+              ><el-input-number
+                v-if="packingForm.skuQuantities[item.skuCode] !== undefined"
+                v-model="packingForm.skuQuantities[item.skuCode]"
+                :min="1"
+                :max="item.availableQuantity"
+                :controls="false"
+                placeholder="数量"
+              />
+            </div>
+            <el-empty
+              v-if="!visiblePackingSkuRows.length"
+              :description="packingForm.skuSearchInput.trim() || packingForm.returnNos.length ? '没有符合查询条件的可用 SKU' : '该客户暂无包裹签收的单 SKU 库存'"
+            /></div></div></el-form-item
+        ><el-form-item v-if="packingForm.mode === 'BOX'" label="箱维度明细"
+          ><div class="packing-sku-list-wrap">
+            <el-input v-model="packingForm.skuSearchInput" clearable placeholder="按箱内 SKU 查找，多个 SKU 请用英文逗号分隔" class="packing-sku-search" />
+            <div class="packing-box-list">
+            <div class="packing-box-list-head"><span>选择</span><span>箱唛</span><span>来源退货单</span><span>类型</span><span>SKU 明细</span></div>
+            <div v-for="box in visiblePackingBoxRows" :key="box.cartonMark" class="packing-box-list-row">
+              <el-checkbox-group v-model="packingForm.sourceCartonMarks"><el-checkbox :value="box.cartonMark" :aria-label="`选择箱唛 ${box.cartonMark}`"><span /></el-checkbox></el-checkbox-group>
+              <strong>{{ box.cartonMark }}</strong><span>{{ box.returnNo || '—' }}</span><span>{{ box.unitType === 'PALLET' ? '托盘载体' : '箱子' }}</span><span class="packing-box-items"><span v-for="item in box.items" :key="item.skuCode">{{ item.skuCode }} × {{ item.quantity }}</span></span>
+            </div>
+            <el-empty v-if="!visiblePackingBoxRows.length" :description="packingForm.skuSearchInput.trim() ? '没有包含该 SKU 的可用箱子' : '所选客户暂无箱维度库存'" />
+          </div></div></el-form-item
+        ><el-alert
+          type="info"
+          :closable="false"
+          title="散 SKU 创建新箱，箱规由 PDA 填写；按箱合并由 PDA 扫描已有目标箱。提交即锁定来源库存，取消计划可释放。" /><el-form-item
+          label="合箱备注（可选）"
+          ><el-input
+            v-model="packingForm.remark"
+            type="textarea"
+            :rows="4"
+            maxlength="1000"
+            show-word-limit
+            resize="vertical"
+            placeholder="请输入合箱说明，最多 1000 字" /></el-form-item></el-form
+    ></AppDialog>
+    <AppDialog
+      class="admin-density-dialog"
+      v-model="planDetailOpen"
+      title="合箱计划详情"
+      width="min(1400px, calc(100vw - 56px))"
+      :show-footer="false"
+      ><template v-if="planDetail"
+        ><el-descriptions :column="2" border
+          ><el-descriptions-item label="计划号">{{
+            planDetail.planNo
+          }}</el-descriptions-item
+          ><el-descriptions-item label="客户">{{
+            customerName(planDetail.customerId)
+          }}</el-descriptions-item
+          ><el-descriptions-item label="合箱方式">{{
+            planDetail.mode === "SKU" ? "按 SKU 合箱" : "按箱合箱"
+          }}</el-descriptions-item
+          ><el-descriptions-item label="状态">{{
+            planDetail.status === 'COMPLETED' ? '已完成' : planDetail.status === 'READY' ? '待 PDA 作业' : planDetail.status === 'CANCELLED' ? '已取消' : '待审核'
+          }}</el-descriptions-item
+          ><el-descriptions-item label="来源退货单" :span="2">{{
+            planDetail.returnNos?.join("、") || "—"
+          }}</el-descriptions-item
+          ><el-descriptions-item label="备注" :span="2">{{
+            planDetail.remark || "—"
+          }}</el-descriptions-item></el-descriptions
+        ><el-table v-if="planDetail.resultCartons?.length" :data="planCartonItemRows" class="detail-items">
+          <el-table-column prop="cartonMark" label="实际箱唛" min-width="250" />
+          <el-table-column prop="skuCode" label="SKU" min-width="300" />
+          <el-table-column prop="quantity" label="数量" width="90" align="right" />
+          <el-table-column prop="locationCode" label="库位" min-width="100" />
+          <el-table-column prop="palletCode" label="载体托盘" min-width="120" />
+          <el-table-column label="合箱完成时间" min-width="170"><template #default>{{ planDetail.completedAt ? dayjs(planDetail.completedAt).format('YYYY-MM-DD HH:mm:ss') : '—' }}</template></el-table-column>
+          <el-table-column label="操作" width="100"><template #default="{ row }"><el-button class="density-action" data-tone="neutral" @click="printLabel(row.cartonMark)">打印箱唛</el-button></template></el-table-column>
+        </el-table>
+        <el-table v-else :data="plannedItemRows" class="detail-items" empty-text="待 PDA 填写箱子明细">
+          <el-table-column prop="boxNo" label="箱序号" width="90" />
+          <el-table-column prop="skuCode" label="SKU" min-width="300" />
+          <el-table-column prop="quantity" label="数量" width="90" align="right" />
+        </el-table></template
+      ></AppDialog
+    ><AppDialog
+      class="admin-density-dialog"
+      v-model="detailOpen"
+      title="退货箱号详情"
+      width="min(1080px, calc(100vw - 56px))"
+      :show-footer="false"
+      ><template v-if="detail"
+        ><el-descriptions class="density-descriptions" :column="2" border
+          ><el-descriptions-item label="箱号">{{
+            detail.cartonMark
+          }}</el-descriptions-item
+          ><el-descriptions-item label="客户">{{
+            customerName(detail.customerId)
+          }}</el-descriptions-item
+          ><el-descriptions-item label="海外仓">{{
+            warehouseName(detail.overseasWarehouseId)
+          }}</el-descriptions-item
+          ><el-descriptions-item label="来源退货单">{{
+            detail.sourceReturnNo || "—"
+          }}</el-descriptions-item
+          ><el-descriptions-item label="FBA箱唛">{{
+            detail.fbaCartonMark || "—"
+          }}</el-descriptions-item
+          ><el-descriptions-item label="目的仓">{{
+            detail.destinationWarehouseCode ||
+            detail.destinationWarehouseName ||
+            "—"
+          }}</el-descriptions-item
+          ><el-descriptions-item label="换标单号">{{
+            detail.relabelNo || "—"
+          }}</el-descriptions-item
+          ><el-descriptions-item label="换标状态">{{
+            detail.relabelStatus === "COMPLETED"
+              ? "已完成"
+              : detail.relabelStatus === "BOUND"
+                ? "已绑定"
+                : detail.relabelStatus || "未绑定"
+          }}</el-descriptions-item
+          ><el-descriptions-item label="状态">{{
+            statusLabel(detail.status)
+          }}</el-descriptions-item
+          ><el-descriptions-item label="箱规">{{
+            detail.length
+              ? `${detail.length}×${detail.width}×${detail.height} cm`
+              : "—"
+          }}</el-descriptions-item
+          ><el-descriptions-item label="重量">{{
+            detail.weight ? `${detail.weight} kg` : "—"
+          }}</el-descriptions-item></el-descriptions
+        ><el-table :data="detail.items" class="detail-items"
+          ><el-table-column prop="skuCode" label="SKU" /><el-table-column
+            prop="productNameZh"
+            label="中文品名" /><el-table-column
+            prop="quantity"
+            label="数量"
+            align="right" /></el-table>
+        <h3>合箱明细</h3>
+        <el-table :data="detail.mergeHistory || []" class="detail-items" empty-text="暂无合箱记录">
+          <el-table-column prop="createdAt" label="合箱时间" min-width="170" />
+          <el-table-column label="合箱计划" min-width="210"><template #default="{ row }">{{ row.planNo && row.planNo !== 'null' ? row.planNo : '现场合箱 / 历史未关联' }}</template></el-table-column>
+          <el-table-column label="流向" width="80"><template #default="{ row }">{{ row.targetCartonMark === detail.cartonMark ? '合入' : '合出' }}</template></el-table-column>
+          <el-table-column prop="sourceCartonMark" label="来源箱唛" min-width="220" />
+          <el-table-column prop="targetCartonMark" label="目标箱唛" min-width="220" />
+          <el-table-column prop="returnNo" label="来源退货单" min-width="240" />
+          <el-table-column prop="skuCode" label="SKU" min-width="170" />
+          <el-table-column prop="quantity" label="本次合箱数量" width="110" align="right" />
+        </el-table>
+        </template
+    ></AppDialog>
+  </AdminPage>
+</template>
+<style scoped>
+.return-inventory-page {
+  display: grid;
+  gap: var(--admin-space-5);
+}
+.query-panel {
+  display: flex;
+  gap: var(--admin-space-4);
+  flex-wrap: wrap;
+  padding: var(--admin-space-5);
+}
+.query-panel .el-input,
+.query-panel .el-select {
+  width: 180px;
+}
+.table-panel {
+  padding: var(--admin-space-5);
+}
+.el-pagination {
+  justify-content: flex-end;
+  margin-top: var(--admin-space-5);
+}
+.detail-items {
+  margin-top: var(--admin-space-5);
+}
+.packing-form {
+  padding: 2px 4px;
+}
+.packing-form :deep(.el-form-item) {
+  margin-bottom: 14px;
+}
+.packing-mode {
+  display: flex;
+  width: 100%;
+}
+.packing-mode :deep(.el-radio-button) {
+  flex: 1;
+}
+.packing-mode :deep(.el-radio-button__inner) {
+  width: 100%;
+  padding: 9px 14px;
+}
+.packing-sku-list-wrap { width: 100%; }
+.packing-sku-search { margin-bottom: 8px; }
+.packing-sku-list {
+  display: grid;
+  gap: 0;
+  width: 100%;
+  max-height: 260px;
+  overflow: auto;
+  border: 1px solid var(--cc-border);
+  border-radius: 6px;
+}
+.packing-sku-list-head,
+.packing-sku-row {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) 90px 92px;
+  align-items: center;
+  gap: 8px;
+  min-height: 42px;
+  padding: 7px 10px;
+  border-bottom: 1px solid var(--cc-border);
+}
+.packing-sku-list-head { position: sticky; top: 0; z-index: 1; background: var(--cc-surface-subtle, #f8fafc); color: var(--cc-muted); font-size: 12px; }
+.packing-sku-row:last-of-type { border-bottom: 0; }
+.packing-sku-row > span {
+  color: var(--cc-muted);
+  font-size: 12px;
+  white-space: nowrap;
+}
+.packing-sku-row :deep(.el-input-number) {
+  width: 68px;
+}
+.packing-sku-row :deep(.el-input-number .el-input__wrapper) {
+  padding: 0 7px;
+}
+.packing-sku-row :deep(.el-input__inner) {
+  font-size: 12px;
+  text-align: center;
+}
+.packing-box-list {
+  display: grid;
+  gap: 0;
+  width: 100%;
+  max-height: 260px;
+  overflow: auto;
+  border: 1px solid var(--cc-border);
+  border-radius: 6px;
+}
+.packing-box-list-head,
+.packing-box-list-row {
+  display: grid;
+  grid-template-columns: 72px minmax(180px, 1.15fr) minmax(150px, 1fr) 90px minmax(220px, 2fr);
+  align-items: center;
+  gap: 8px;
+  padding: 8px 10px;
+}
+.packing-box-list-row > strong,
+.packing-box-list-row > span { overflow-wrap: anywhere; }
+.packing-box-list-head {
+  position: sticky;
+  top: 0;
+  z-index: 1;
+  color: var(--cc-muted);
+  font-size: 12px;
+  background: var(--cc-surface-subtle, #f8fafc);
+  border-bottom: 1px solid var(--cc-border);
+}
+.packing-box-list-row {
+  min-height: 42px;
+  border-bottom: 1px solid var(--cc-border);
+}
+.packing-box-list-row:last-of-type {
+  border-bottom: 0;
+}
+.packing-box-list-row > span,
+.packing-box-items {
+  color: var(--cc-muted);
+  font-size: 12px;
+}
+.packing-box-items {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+}
+.return-nos-count { color: var(--cc-muted); font-size: 12px; white-space: nowrap; }
+.packing-form :deep(.el-alert) {
+  margin-top: 2px;
+  padding: 8px 12px;
+}
+.packing-form :deep(.el-alert__title) {
+  font-size: 12px;
+}
+@media (max-width: 700px) {
+  .packing-box-list { overflow-x: auto; }
+  .packing-box-list-head,
+  .packing-box-list-row { min-width: 760px; }
+}
+:deep(.packing-dialog.el-dialog) {
+  resize: both;
+  overflow: auto;
+  min-width: 720px;
+  min-height: 520px;
+  max-width: calc(100vw - 24px);
+  max-height: calc(100vh - 24px);
+}
+:deep(.packing-dialog .el-dialog__body) {
+  min-width: 0;
+}
+.packing-form :deep(.el-textarea__inner) {
+  width: 100%;
+  line-height: 1.6;
+}
+</style>
diff --git a/src/modules/overseas-warehouse/permissions.ts b/src/modules/overseas-warehouse/permissions.ts
index e73a8a7c..71aa23d0 100644
--- a/src/modules/overseas-warehouse/permissions.ts
+++ b/src/modules/overseas-warehouse/permissions.ts
@@ -8,6 +8,8 @@ export const overseasWarehousePermissions = {
   inboundOrderEdit: 'platform:overseas-warehouse:inbound-order:edit',
   inboundOrderAppointment: 'platform:overseas-warehouse:inbound-order:fba-appointment',
   inboundOrderSmartDispatch: 'platform:overseas-warehouse:inbound-order:smart-dispatch',
+  discardList: 'platform:overseas-warehouse:discard:list',
+  discardApprove: 'platform:overseas-warehouse:discard:approve',
   dispatchList: 'platform:overseas-warehouse:dispatch:list',
   dispatchEdit: 'platform:overseas-warehouse:dispatch:edit',
   dispatchCancel: 'platform:overseas-warehouse:dispatch:cancel',
diff --git a/src/modules/overseas-warehouse/routes.ts b/src/modules/overseas-warehouse/routes.ts
index 4984a511..da1d29a5 100644
--- a/src/modules/overseas-warehouse/routes.ts
+++ b/src/modules/overseas-warehouse/routes.ts
@@ -20,6 +20,12 @@ export const overseasWarehouseRoutes = [
     component: () => import('./pages/InboundOrdersView.vue'),
     meta: { showPageHeading: false, title: '入库单', description: '管理海外合作仓入库、预约与排车衔接', permission: permission.inboundOrderList },
   },
+  {
+    path: 'overseas-warehouse/cargo-discards',
+    name: 'overseas-cargo-discards',
+    component: () => import('./pages/CargoDiscardsView.vue'),
+    meta: { showPageHeading: false, title: '废弃单', description: '审核货物废弃申请并跟进 PDA 废弃与客户确认', permission: permission.discardList },
+  },
   {
     path: 'overseas-warehouse/inbound-orders/:orderId',
     name: 'overseas-inbound-order-detail',