优化

AGENTS.md

@@ -54,7 +54,7 @@
 | 客户资金账户与充值申请 | `src/modules/finance/views/FinanceAccountView.vue`、`api/account.ts` | 显示当前企业 CNY 实际、冻结、可用余额和不可变流水；充值只展示服务端启用的微信/支付宝静态收款码，客户上传 JPG/PNG 付款截图后进入待审核。客户范围只取登录态，无收款码时禁止提交，不模拟支付成功 |
 | 海外采购、美国本土卡与美本土散板 | `src/modules/cross-border/routes.ts`、`components/BusinessOrdersView.vue`、`api/businessOrders.ts` | 三个路由均为 `active`，客户范围只取 Token；Backend `lastleg-service/` 的 `procurement/`、`trucking/`、`looseboard/` 客户接口 |
 | 海外仓入库订单 | `src/modules/order-management/routes.ts`、`views/InboundOrdersView.vue`、`api/inboundPlans.ts` | `orders/inbound` 为只读列表/详情，权限 `merchant:warehouse:inbound:list`；不展示或提交内部 ID |
-| 海外仓贴标、仓储转运、货物废弃、退货换标 | `src/modules/overseas-warehouse/routes.ts`、`views/WarehouseServiceView.vue`、`api/warehouseServices.ts` | 四个路由均为 `active`；Backend `lastleg-service/` 的 `relabel/`、`transfer/`、`discard/`，请求统一经 `src/api/overseasHttp.ts` 与 `gateway-overseas/` |
+| 海外仓贴标、仓储转运、货物废弃、退货换标 | `src/modules/overseas-warehouse/routes.ts`、`views/WarehouseServiceView.vue`、`api/warehouseServices.ts` | 四个路由均为 `active`；贴标申请先从共享仓库主数据选择国外中转仓，并自动带出海外仓签收联系人和联系电话，再从当前客户已经完成入库且仍有可用库存的历史入仓单中单选。货物明细支持箱唛换标、SKU 换标和同箱组合换标：SKU 明细按来源库存箱聚合为一个箱唛任务，整箱只冻结一次，SKU 数量按件保存为子明细；PDA 扫我方箱唛定位任务，返回新 FBA 箱唛和 SKU 子明细，照片完工并复核通过后释放原库存，后续仍进入既有排车出库。客户页面不暴露托盘、库位和内部库存 ID；Backend `lastleg-service/` 的 `relabel/`、`relabel/pda/`、`transfer/`、`discard/`，请求统一经 `src/api/overseasHttp.ts` 与 `gateway-overseas/` |
 
 ## 租户、认证与数据安全
 

src/components.d.ts

@@ -23,6 +23,8 @@ declare module 'vue' {
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
@@ -34,6 +36,7 @@ declare module 'vue' {
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElOptionGroup: typeof import('element-plus/es')['ElOptionGroup']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']

src/modules/first-leg/views/businessIdentifiers.test.mjs

@@ -30,7 +30,6 @@ test('keeps overseas warehouse operations first and renders readable list values
   assert.match(overseas, /columns: \['操作', '贴标申请单号'/)
   assert.match(overseas, /columns: \['操作', '转运单号'/)
   assert.match(overseas, /columns: \['操作', '废弃申请单号'/)
-  assert.match(overseas, /columns: \['操作', '退货换标单号'/)
   assert.match(overseas, /function statusLabel\(value: string\)/)
   assert.match(overseas, /function deliveryMethodLabel\(value: string\)/)
   assert.match(overseas, /function formatDateTime\(value: string\)/)

src/modules/overseas-warehouse/api/returnInventory.ts

@@ -0,0 +1,59 @@
+import { overseasApiRequest } from '@/api/overseasHttp'
+import type { PageResult } from './warehouseServices'
+
+export interface ReturnInventoryItem {
+  overseasWarehouseId: string; cartonMark: string; sourceBatchNo?: string; status: string; skuCode: string
+  productNameZh?: string; quantity: number; cartonSkuTypes: number; cartonTotalQuantity: number; receivedAt: string
+}
+
+export interface ReturnInventorySummaryItem {
+  overseasWarehouseId: string; skuCode: string; productNameZh?: string
+  availableQuantity: number; cartonQuantity: number; updatedAt: string
+}
+
+export interface ReturnInventoryCartonItem { skuCode: string; productNameZh?: string; quantity: number }
+
+export interface ReturnInventoryCartonDetail {
+  cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; status: string
+  skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; receivedAt: string; items: ReturnInventoryCartonItem[]
+}
+
+export interface ReturnInventoryLabel {
+  cartonMark: string; overseasWarehouseId: string; customerId: string; sourceBatchNo?: string; sourceReturnNo?: string
+  totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; items: ReturnInventoryCartonItem[]; generatedAt: string; printableHtml: string
+}
+
+export function listReturnInventory(params: Record<string, unknown>) {
+  return overseasApiRequest<PageResult<ReturnInventoryItem>>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory', params })
+}
+
+export function listReturnInventorySummary(params: Record<string, unknown>) {
+  return overseasApiRequest<PageResult<ReturnInventorySummaryItem>>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory/summary', params })
+}
+
+export function getReturnInventoryCarton(cartonMark: string) {
+  return overseasApiRequest<ReturnInventoryCartonDetail>({ method: 'GET', url: `/merchant/v1/last-leg/return-inventory/cartons/${encodeURIComponent(cartonMark)}` })
+}
+
+export function getReturnInventoryLabel(cartonMark: string) {
+  return overseasApiRequest<ReturnInventoryLabel>({ method: 'GET', url: `/merchant/v1/last-leg/return-inventory/cartons/${encodeURIComponent(cartonMark)}/label` })
+}
+
+export interface ReturnPackingPreview {
+  orders: Array<{ returnNo: string; customerId: string; customerReferenceNo?: string; status: string }>
+  customerId?: string
+  skus: Array<{ skuCode: string; productNameZh?: string; availableQuantity: number }>
+}
+
+export function getReturnPackingPreview(returnNo?: string) {
+  return overseasApiRequest<ReturnPackingPreview>({ method: 'GET', url: '/pda/v1/last-leg/return-inventory/packing/orders', params: { returnNo: returnNo || undefined } })
+}
+
+export function mergeReturnInventory(payload: {
+  returnNos: string[]; items: Array<{ skuCode: string; quantity: number }>
+  length: number; width: number; height: number; weight: number; idempotencyKey: string
+}) {
+  return overseasApiRequest<{ cartonMark: string; skuCode: string; totalQuantity: number; label: ReturnInventoryLabel }>({
+    method: 'POST', url: '/pda/v1/last-leg/return-inventory/cartons/merge', data: payload,
+  })
+}

src/modules/overseas-warehouse/api/returnOrders.ts

@@ -0,0 +1,29 @@
+import { overseasApiRequest } from '@/api/overseasHttp'
+import type { PageResult } from './warehouseServices'
+
+export interface ReturnOrderSummary {
+  returnNo: string; overseasWarehouseId: string; customerReferenceNo?: string; status: string
+  skuTypes: number; expectedQuantity: number; receivedQuantity: number; createdAt: string
+}
+export interface ReturnOrderItem {
+  skuCode: string; productNameZh?: string; expectedQuantity: number; receivedQuantity: number
+}
+export interface ReturnReceipt {
+  receiptNo: string; receiptBatchNo: string; cartonMark?: string; trackingNo?: string; startedBy: 'RETURN_NO' | 'SKU'
+  receivedQuantity: number; operatorName?: string; signedAt: string
+}
+export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[] }
+export interface ReturnOrderCreate {
+  overseasWarehouseId: string; customerReferenceNo?: string; remark?: string; idempotencyKey: string
+  items: Array<{ skuCode: string; productNameZh?: string; expectedQuantity: number }>
+}
+
+export function listReturnOrders(params: Record<string, unknown>) {
+  return overseasApiRequest<PageResult<ReturnOrderSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/return-orders', params })
+}
+export function getReturnOrder(returnNo: string) {
+  return overseasApiRequest<ReturnOrderDetail>({ method: 'GET', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}` })
+}
+export function createReturnOrder(payload: ReturnOrderCreate) {
+  return overseasApiRequest<ReturnOrderDetail>({ method: 'POST', url: '/merchant/v1/last-leg/return-orders', data: payload })
+}

src/modules/overseas-warehouse/api/warehouseServices.ts

@@ -6,9 +6,13 @@ export interface TransferSummary { id: string; transferNo: string; inboundCode:
 export interface RelabelSummary { id: string; relabelNo: string; lastlegOrderId: string; lastlegOrderNo: string; customerOrderNo: string; overseasWarehouseId: string; status: string; itemCount: number; totalPackageCount: number; notifiedPackageCount: number; skuCodes: string; createdAt: string }
 export interface RelabelItemDetail {
   id: string; skuCode?: string; productNameZh: string; totalPackageCount: number; notifiedPackageCount: number
-  shipmentNo: string; trackingCode?: string; newSkuCode: string; labelRequirement?: string; remark?: string
+  shipmentNo: string; trackingCode?: string; newSkuCode?: string; labelRequirement?: string; remark?: string
   relabelFileId?: string; relabelFileName?: string; relabelFileUrl?: string
-  cartonMark: string; fbaCartonMark: string; destinationWarehouseId: string
+  cartonMark: string; fbaCartonMark?: string; destinationFbaWarehouseCode?: string
+  operationType: 'CARTON_LABEL' | 'SKU_LABEL' | 'CARTON_AND_SKU'
+  skuItems: Array<{ skuCode: string; newSkuCode: string; quantity: number; remark?: string }>
+  sourceInventoryBalanceId: string; sourceInventoryPositionId: string; sourceInboundOrderId: string
+  sourceInboundOrderNo?: string; sourceInboundCode?: string; sourceWarehouseId: string; sourceWarehouseCode?: string; sourceWarehouseName?: string
 }
 export interface RelabelDetail {
   application: RelabelSummary & { labelDeadline?: string; contactName?: string; contactPhone?: string; chargeAmount?: number; chargeCurrency?: string; walletStatus?: string; walletErrorMessage?: string }
@@ -18,6 +22,13 @@ export interface RelabelDetail {
 }
 export interface DiscardSummary { id: string; discardNo: string; inboundCodes: string; overseasWarehouseId: string; overseasWarehouseName: string; totalPackages: number; totalFee: number; currency: string; status: string; createdAt: string }
 export interface DiscardCandidate { orderId: string; inboundCode: string; inboundOrderNo: string; overseasWarehouseId: string; overseasWarehouseName: string; availablePackages: number; skus: Array<{ skuCode: string; productName: string; availablePackages: number }> }
+export interface RelabelInventoryCandidate {
+  inventoryBalanceId: string; inboundOrderId: string; inboundOrderNo?: string; inboundCode?: string
+  overseasWarehouseId: string; overseasWarehouseCode?: string; overseasWarehouseName?: string
+  destinationFbaWarehouseCode?: string; destinationFbaWarehouseName?: string; skuCode?: string; productNameZh?: string
+  availablePackages: number; version: number
+  positions: Array<{ positionId: string; palletNo?: string; batchNo?: string; warehouseLocationCode?: string; availablePackages: number }>
+}
 
 export interface TransferCreate {
   inboundCode: string; sourceLastlegOrderIds: string[]; operatingWarehouseId: string; fbaWarehouseCode: string
@@ -26,10 +37,10 @@ export interface TransferCreate {
   items: Array<{ skuCode: string; productNameZh: string; packageCount: number; shippingMark?: string }>
 }
 export interface RelabelCreate {
-  customerOrderNo: string; overseasWarehouseId?: string; labelDeadline: string; contactName: string; contactPhone: string; chargeAmount: number
+  customerOrderNo: string; operationWarehouseId: string; labelDeadline: string; contactName: string; contactPhone: string; chargeAmount: number
   remark?: string; idempotencyKey: string
-  items: Array<{ skuCode?: string; productNameZh: string; totalPackageCount: number; notifiedPackageCount: number; shipmentNo: string; trackingCode?: string; newSkuCode: string; labelRequirement?: string
+  items: Array<{ sourceInventoryBalanceId: string; sourceInventoryPositionId: string; sourceInboundOrderId: string; skuCode?: string; productNameZh: string; totalPackageCount: number; notifiedPackageCount: number; shipmentNo: string; trackingCode?: string; newSkuCode?: string; labelRequirement?: string
-    cartonMark: string; fbaCartonMark: string; destinationWarehouseId?: string; remark?: string }>
+    cartonMark: string; fbaCartonMark?: string; destinationFbaWarehouseCode?: string; operationType: 'CARTON_LABEL' | 'SKU_LABEL' | 'CARTON_AND_SKU'; skuItems?: Array<{ skuCode: string; newSkuCode: string; quantity: number; remark?: string }>; remark?: string }>
 }
 
 export function listLastlegOrders(inboundCode: string) {
@@ -50,6 +61,13 @@ export function listRelabels(params: Record<string, unknown>) {
 export function getRelabel(relabelNo: string) {
   return overseasApiRequest<RelabelDetail>({ method: 'GET', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}` })
 }
+
+export function listRelabelInventoryCandidates(operationWarehouseId: string, inboundCode?: string) {
+  return overseasApiRequest<RelabelInventoryCandidate[]>({
+    method: 'GET', url: '/merchant/v1/last-leg/relabel-applications/inventory-candidates',
+    params: { operationWarehouseId, inboundCode: inboundCode || undefined },
+  })
+}
 export function createRelabel(payload: RelabelCreate) {
   return overseasApiRequest<Record<string, unknown>>({ method: 'POST', url: '/merchant/v1/last-leg/relabel-applications', data: payload })
 }

src/modules/overseas-warehouse/routes.ts

@@ -1,4 +1,4 @@
-import { PackageX, RefreshCcw, Tags, Truck, Warehouse } from '@lucide/vue'
+import { Boxes, PackageX, RefreshCcw, Tags, Truck, Warehouse } from '@lucide/vue'
 import type { ClientModuleManifest } from '../types.ts'
 
 export const overseasWarehouseModule = {
@@ -25,9 +25,21 @@ export const overseasWarehouseModule = {
     },
     {
       path: 'overseas-warehouse/return-relabel', name: 'overseas-return-relabel',
-      component: () => import('./views/WarehouseServiceView.vue'), props: { service: 'relabel' }, release: 'active',
+      component: () => import('./views/ReturnOrdersView.vue'), release: 'active',
-      meta: { title: '退货换标', description: '查询并管理退货换标订单', permission: 'dashboard:view' },
+      meta: { title: '退货签收', description: '创建退货预报并查看仓库签收结果', permission: 'dashboard:view' },
       navigation: { key: 'overseas-return-relabel', icon: RefreshCcw },
     },
+    {
+      path: 'overseas-warehouse/return-inventory', name: 'overseas-return-inventory',
+      component: () => import('./views/ReturnInventoryView.vue'), release: 'active',
+      meta: { title: '退货库存', description: '按箱号和 SKU 查询海外仓退货实收库存', permission: 'merchant:overseas-warehouse:return-inventory:list' },
+      navigation: { key: 'overseas-return-inventory', icon: Boxes },
+    },
+    {
+      path: 'overseas-warehouse/return-cartons', name: 'overseas-return-cartons',
+      component: () => import('./views/ReturnInventoryView.vue'), props: { cartonOnly: true }, release: 'active',
+      meta: { title: '退货箱号管理', description: '查询合箱后的退货箱号和箱内库存', permission: 'merchant:overseas-warehouse:return-inventory:list' },
+      navigation: { key: 'overseas-return-cartons', icon: Boxes },
+    },
   ],
 } satisfies ClientModuleManifest

src/modules/overseas-warehouse/views/ReturnInventoryView.vue

@@ -0,0 +1,124 @@
+<script setup lang="ts">
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { Printer, Search } from '@lucide/vue'
+import {
+  getReturnInventoryCarton,
+  getReturnInventoryLabel,
+  listReturnInventory,
+  listReturnInventorySummary,
+  type ReturnInventoryCartonDetail,
+  type ReturnInventoryItem,
+  type ReturnInventorySummaryItem,
+} from '../api/returnInventory'
+
+const activeTab = ref<'summary' | 'cartons'>('summary')
+const props = defineProps<{ cartonOnly?: boolean }>()
+if (props.cartonOnly) activeTab.value = 'cartons'
+const loading = ref(false)
+const summaryRows = ref<ReturnInventorySummaryItem[]>([])
+const cartonRows = ref<ReturnInventoryItem[]>([])
+const total = ref(0)
+const showCartonDetail = ref(false)
+const cartonDetail = ref<ReturnInventoryCartonDetail>()
+const query = reactive({ page: 1, size: 20, overseasWarehouseId: '', skuCode: '', cartonMark: '', status: 'AVAILABLE', returnNo: '' })
+
+function params(includeCartonMark: boolean) {
+  return {
+    page: query.page,
+    size: query.size,
+    overseasWarehouseId: query.overseasWarehouseId || undefined,
+    skuCode: query.skuCode || undefined,
+    cartonMark: includeCartonMark ? query.cartonMark || undefined : undefined,
+    status: includeCartonMark ? query.status || undefined : undefined,
+    returnNo: includeCartonMark ? query.returnNo || undefined : undefined,
+  }
+}
+
+async function load() {
+  loading.value = true
+  try {
+    if (activeTab.value === 'summary') {
+      const page = await listReturnInventorySummary(params(false))
+      summaryRows.value = page.records
+      total.value = page.total
+      return
+    }
+    const page = await listReturnInventory(params(true))
+    cartonRows.value = page.records
+    total.value = page.total
+  } finally { loading.value = false }
+}
+
+function search() { query.page = 1; void load() }
+function changeTab() { query.page = 1; void load() }
+function openSkuCartons(skuCode: string) {
+  query.skuCode = skuCode
+  activeTab.value = 'cartons'
+  query.page = 1
+  void load()
+}
+
+async function openCarton(cartonMark: string) {
+  try {
+    cartonDetail.value = await getReturnInventoryCarton(cartonMark)
+    showCartonDetail.value = true
+  } catch (error) { ElMessage.error(error instanceof Error ? error.message : '箱内明细加载失败') }
+}
+
+async function printLabel(cartonMark: string) {
+  try {
+    const label = await getReturnInventoryLabel(cartonMark)
+    const printWindow = window.open('', '_blank')
+    if (!printWindow) { ElMessage.warning('浏览器阻止了打印窗口，请允许弹窗后重试'); return }
+    printWindow.opener = null
+    printWindow.document.open()
+    printWindow.document.write(label.printableHtml)
+    printWindow.document.close()
+    printWindow.focus()
+    printWindow.print()
+  } catch (error) { ElMessage.error(error instanceof Error ? error.message : '箱唛加载失败') }
+}
+
+onMounted(load)
+</script>
+
+<template>
+  <section class="return-inventory-page">
+    <div class="page-heading"><div><h2>{{ props.cartonOnly ? '退货箱号管理' : '退货库存管理' }}</h2><p>{{ props.cartonOnly ? '查询合箱完成后的退货箱号、箱规和箱内 SKU 明细。' : '库存数量以仓库 PDA 实收并上架的数量为准。' }}</p></div></div>
+    <el-tabs v-if="!props.cartonOnly" v-model="activeTab" @tab-change="changeTab"><el-tab-pane label="SKU 汇总库存" name="summary" /><el-tab-pane label="箱号明细" name="cartons" /></el-tabs>
+    <div class="filter-bar">
+      <el-input v-model="query.overseasWarehouseId" clearable placeholder="海外仓 ID" @keyup.enter="search" />
+      <el-input v-model="query.skuCode" clearable placeholder="SKU" @keyup.enter="search" />
+      <el-input v-if="activeTab === 'cartons'" v-model="query.cartonMark" clearable placeholder="箱号 / 箱唛" @keyup.enter="search" />
+      <el-input v-if="activeTab === 'cartons'" v-model="query.returnNo" clearable placeholder="退货单号" @keyup.enter="search" />
+      <el-select v-if="activeTab === '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>
+    </div>
+    <el-table v-if="activeTab === 'summary'" v-loading="loading" :data="summaryRows">
+      <el-table-column prop="overseasWarehouseId" label="海外仓" min-width="150" /><el-table-column prop="skuCode" label="SKU" min-width="180" />
+      <el-table-column prop="productNameZh" label="中文品名" min-width="190" show-overflow-tooltip /><el-table-column prop="availableQuantity" label="可用库存" min-width="120" align="right" />
+      <el-table-column prop="cartonQuantity" label="所在箱数" min-width="120" align="right" /><el-table-column prop="updatedAt" label="最近入库时间" min-width="180" />
+      <el-table-column label="操作" width="110" fixed="right"><template #default="{ row }"><el-button link type="primary" @click="openSkuCartons(row.skuCode)">查看箱号</el-button></template></el-table-column>
+    </el-table>
+    <el-table v-else v-loading="loading" :data="cartonRows">
+      <el-table-column prop="cartonMark" label="箱号" min-width="235"><template #default="{ row }"><el-button link type="primary" @click="openCarton(row.cartonMark)">{{ row.cartonMark }}</el-button></template></el-table-column>
+      <el-table-column prop="overseasWarehouseId" label="海外仓" min-width="130" /><el-table-column prop="skuCode" label="SKU" min-width="150" />
+      <el-table-column prop="productNameZh" label="中文品名" min-width="170" show-overflow-tooltip /><el-table-column prop="quantity" label="本箱 SKU 数量" min-width="135" align="right" />
+      <el-table-column prop="cartonSkuTypes" label="箱内 SKU 种类" min-width="130" align="right" /><el-table-column prop="cartonTotalQuantity" label="箱内总件数" min-width="115" align="right" />
+      <el-table-column prop="status" label="箱状态" min-width="100" /><el-table-column prop="sourceBatchNo" label="签收批次" min-width="190" /><el-table-column prop="receivedAt" label="签收时间" min-width="175" />
+      <el-table-column label="操作" width="150" fixed="right"><template #default="{ row }"><el-button link type="primary" @click="openCarton(row.cartonMark)">详情</el-button><el-button link type="primary" @click="printLabel(row.cartonMark)"><Printer :size="14" />箱唛</el-button></template></el-table-column>
+    </el-table>
+    <el-pagination v-model:current-page="query.page" v-model:page-size="query.size" :total="total" layout="total, prev, pager, next" @current-change="load" />
+    <el-drawer v-model="showCartonDetail" title="退货箱明细" size="680px"><template v-if="cartonDetail">
+      <el-descriptions :column="2" border><el-descriptions-item label="箱号">{{ cartonDetail.cartonMark }}</el-descriptions-item><el-descriptions-item label="海外仓">{{ cartonDetail.overseasWarehouseId }}</el-descriptions-item><el-descriptions-item label="来源退货单">{{ cartonDetail.sourceReturnNo || '—' }}</el-descriptions-item><el-descriptions-item label="签收批次">{{ cartonDetail.sourceBatchNo || '—' }}</el-descriptions-item><el-descriptions-item label="状态">{{ cartonDetail.status }}</el-descriptions-item><el-descriptions-item label="SKU 种类">{{ cartonDetail.skuTypes }}</el-descriptions-item><el-descriptions-item label="箱内总件数">{{ cartonDetail.totalQuantity }}</el-descriptions-item><el-descriptions-item label="箱规">{{ cartonDetail.length && cartonDetail.width && cartonDetail.height ? `${cartonDetail.length} × ${cartonDetail.width} × ${cartonDetail.height} cm` : '—' }}</el-descriptions-item><el-descriptions-item label="重量">{{ cartonDetail.weight ? `${cartonDetail.weight} kg` : '—' }}</el-descriptions-item></el-descriptions>
+      <div class="drawer-heading"><h3>箱内 SKU</h3><el-button type="primary" @click="printLabel(cartonDetail.cartonMark)"><Printer :size="16" />打印箱唛</el-button></div>
+      <el-table :data="cartonDetail.items" size="small"><el-table-column prop="skuCode" label="SKU" min-width="170" /><el-table-column prop="productNameZh" label="中文品名" min-width="180" /><el-table-column prop="quantity" label="数量" min-width="100" align="right" /></el-table>
+    </template></el-drawer>
+  </section>
+</template>
+
+<style scoped>
+.return-inventory-page { padding: 20px; } .page-heading { margin-bottom: 14px; } h2 { margin: 0; font-size: 22px; } p { margin: 6px 0 0; color: var(--el-text-color-secondary); } .filter-bar { display: grid; grid-template-columns: repeat(3, minmax(150px, 1fr)) auto; gap: 10px; margin-bottom: 14px; } .el-pagination { margin-top: 16px; justify-content: flex-end; } .drawer-heading { display: flex; align-items: center; justify-content: space-between; margin: 24px 0 12px; } .drawer-heading h3 { margin: 0; font-size: 16px; }
+@media (max-width: 760px) { .return-inventory-page { padding: 12px; } .filter-bar { grid-template-columns: 1fr 1fr; } }
+</style>

src/modules/overseas-warehouse/views/ReturnOrdersView.vue

@@ -0,0 +1,116 @@
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { Plus, Search } from '@lucide/vue'
+import { getMerchantWarehouses, type MerchantWarehouse } from '@/modules/first-leg/api/firstLeg'
+import { createReturnOrder, getReturnOrder, listReturnOrders, type ReturnOrderDetail, type ReturnOrderSummary } from '../api/returnOrders'
+
+const loading = ref(false)
+const creating = ref(false)
+const showCreate = ref(false)
+const showDetail = ref(false)
+const selected = ref<ReturnOrderDetail>()
+const rows = ref<ReturnOrderSummary[]>([])
+const total = ref(0)
+const operationWarehouses = ref<MerchantWarehouse[]>([])
+const operationWarehousesLoading = ref(false)
+const operationWarehousesError = ref('')
+const query = reactive({ page: 1, size: 20, returnNo: '', trackingNo: '', skuCode: '', status: '' })
+interface SkuDraft { id: number; skuCode: string; productNameZh: string; expectedQuantity: number }
+let skuSequence = 0
+function emptySku(): SkuDraft { return { id: ++skuSequence, skuCode: '', productNameZh: '', expectedQuantity: 1 } }
+const form = reactive({ overseasWarehouseId: '', customerReferenceNo: '', remark: '', items: [emptySku()] })
+function normalizedSku(value: string) { return value.trim().toUpperCase() }
+const duplicateSkuIds = computed(() => {
+  const grouped = new Map<string, number[]>()
+  for (const item of form.items) {
+    const skuCode = normalizedSku(item.skuCode)
+    if (skuCode) grouped.set(skuCode, [...(grouped.get(skuCode) ?? []), item.id])
+  }
+  return new Set([...grouped.values()].filter(ids => ids.length > 1).flat())
+})
+function resetForm() { Object.assign(form, { overseasWarehouseId: '', customerReferenceNo: '', remark: '', items: [emptySku()] }) }
+function warehouseLabel(warehouse: MerchantWarehouse) { return `${warehouse.warehouseName} · ${warehouse.warehouseCode}` }
+async function loadOperationWarehouses() {
+  operationWarehousesLoading.value = true
+  operationWarehousesError.value = ''
+  try {
+    const result = await getMerchantWarehouses({ warehouseType: 'OVERSEAS' })
+    operationWarehouses.value = result.records
+    if (!result.records.length) operationWarehousesError.value = '暂无可用的国外中转仓'
+  } catch (error) {
+    operationWarehouses.value = []
+    operationWarehousesError.value = error instanceof Error ? error.message : '国外中转仓加载失败'
+    ElMessage.error(operationWarehousesError.value)
+  } finally { operationWarehousesLoading.value = false }
+}
+function openCreate() {
+  resetForm()
+  showCreate.value = true
+  void loadOperationWarehouses()
+}
+function addItem() { form.items.push(emptySku()) }
+function removeItem(index: number) { if (form.items.length > 1) form.items.splice(index, 1) }
+async function load() {
+  loading.value = true
+  try { const response = await listReturnOrders({ ...query, returnNo: query.returnNo || undefined, trackingNo: query.trackingNo || undefined, skuCode: query.skuCode || undefined, status: query.status || undefined }); rows.value = response.records; total.value = response.total }
+  finally { loading.value = false }
+}
+async function openDetail(returnNo: string) { selected.value = await getReturnOrder(returnNo); showDetail.value = true }
+async function submit() {
+  const items = form.items.map(({ skuCode, productNameZh, expectedQuantity }) => ({ skuCode: skuCode.trim(), productNameZh: productNameZh.trim(), expectedQuantity }))
+  if (!form.overseasWarehouseId || items.some(item => !item.skuCode || item.expectedQuantity <= 0)) { ElMessage.warning('请填写操作仓、SKU 和预报数量'); return }
+  if (duplicateSkuIds.value.size) { ElMessage.warning('同一退货单不能重复填写相同 SKU'); return }
+  creating.value = true
+  try {
+    const detail = await createReturnOrder({ overseasWarehouseId: form.overseasWarehouseId, customerReferenceNo: form.customerReferenceNo || undefined, remark: form.remark || undefined, idempotencyKey: crypto.randomUUID(), items: items.map(item => ({ ...item, productNameZh: item.productNameZh || undefined })) })
+    ElMessage.success('退货预报已创建'); showCreate.value = false; resetForm(); await load(); await openDetail(detail.order.returnNo)
+  } finally { creating.value = false }
+}
+function statusType(status: string) { return status === 'COMPLETED' ? 'success' : status === 'PARTIALLY_RECEIVED' ? 'warning' : 'info' }
+onMounted(load)
+</script>
+
+<template>
+  <section class="return-orders-page">
+    <div class="page-heading"><div><h2>退货签收</h2><p>预报退货 SKU 和数量，仓库 PDA 实收后自动更新签收状态。</p></div><el-button type="primary" @click="openCreate"><Plus :size="16" />新建退货预报</el-button></div>
+    <div class="filter-bar">
+      <el-input v-model="query.returnNo" clearable placeholder="退货单号" @keyup.enter="query.page=1; load()" />
+      <el-input v-model="query.trackingNo" clearable placeholder="快递单号" @keyup.enter="query.page=1; load()" />
+      <el-input v-model="query.skuCode" clearable placeholder="SKU" @keyup.enter="query.page=1; load()" />
+      <el-select v-model="query.status" clearable placeholder="签收状态"><el-option label="待签收" value="PENDING_RECEIPT" /><el-option label="部分签收" value="PARTIALLY_RECEIVED" /><el-option label="已完成" value="COMPLETED" /></el-select>
+      <el-button @click="query.page=1; load()"><Search :size="16" />查询</el-button>
+    </div>
+    <el-table v-loading="loading" :data="rows" @row-click="row => openDetail(row.returnNo)">
+      <el-table-column prop="returnNo" label="退货单号" min-width="190" />
+      <el-table-column prop="customerReferenceNo" label="客户参考号" min-width="150" />
+      <el-table-column prop="overseasWarehouseId" label="操作仓" min-width="120" />
+      <el-table-column prop="skuTypes" label="SKU种类" width="100" />
+      <el-table-column prop="expectedQuantity" label="预报数量" width="110" />
+      <el-table-column prop="receivedQuantity" label="实收数量" width="110" />
+      <el-table-column label="状态" width="130"><template #default="{ row }"><el-tag :type="statusType(row.status)">{{ row.status }}</el-tag></template></el-table-column>
+      <el-table-column prop="createdAt" label="创建时间" min-width="170" />
+      <el-table-column label="操作" width="90" fixed="right"><template #default="{ row }"><el-button link type="primary" @click.stop="openDetail(row.returnNo)">详情</el-button></template></el-table-column>
+    </el-table>
+    <el-pagination v-model:current-page="query.page" v-model:page-size="query.size" :total="total" layout="total, prev, pager, next" @current-change="load" />
+
+    <el-dialog v-model="showCreate" title="新建退货预报" width="920px" destroy-on-close>
+      <el-form label-width="150px"><el-form-item label="海外操作仓（中转仓）" required><el-select v-model="form.overseasWarehouseId" filterable clearable :loading="operationWarehousesLoading" :disabled="Boolean(operationWarehousesError)" placeholder="请选择国外中转仓"><el-option v-for="warehouse in operationWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="String(warehouse.id)" /></el-select><div v-if="operationWarehousesError" class="warehouse-error">{{ operationWarehousesError }}</div></el-form-item><el-form-item label="客户参考号"><el-input v-model="form.customerReferenceNo" placeholder="可填写客户侧参考号" /></el-form-item><el-form-item label="备注"><el-input v-model="form.remark" type="textarea" placeholder="填写退货说明（选填）" /></el-form-item></el-form>
+      <div class="items-title"><span>SKU 预报明细</span><el-button text type="primary" @click="addItem"><Plus :size="15" />添加 SKU</el-button></div>
+      <div class="items-hint">客户只需填写预计退回的 SKU 和数量；快递单号由仓库签收时按实际包裹扫描绑定。</div>
+      <el-table :data="form.items" row-key="id" size="small">
+        <el-table-column label="SKU" min-width="200"><template #default="{ row }"><div><el-input v-model="row.skuCode" :class="{ 'duplicate-sku-input': duplicateSkuIds.has(row.id) }" placeholder="填写 SKU" @blur="row.skuCode = row.skuCode.trim()" /><div v-if="duplicateSkuIds.has(row.id)" class="duplicate-sku-error">该 SKU 已在明细中填写</div></div></template></el-table-column>
+        <el-table-column label="中文品名" min-width="260"><template #default="{ row }"><el-input v-model="row.productNameZh" placeholder="填写中文品名（选填）" /></template></el-table-column>
+        <el-table-column label="预报数量" width="160"><template #default="{ row }"><el-input-number v-model="row.expectedQuantity" :min="1" controls-position="right" placeholder="数量" /></template></el-table-column>
+        <el-table-column label="操作" width="80"><template #default="{ $index }"><el-button link type="danger" :disabled="form.items.length === 1" @click="removeItem($index)">删除</el-button></template></el-table-column>
+      </el-table>
+      <template #footer><el-button @click="showCreate=false">取消</el-button><el-button type="primary" :loading="creating" @click="submit">提交预报</el-button></template>
+    </el-dialog>
+    <el-drawer v-model="showDetail" title="退货签收详情" size="760px"><template v-if="selected"><el-descriptions :column="2" border><el-descriptions-item label="退货单号">{{ selected.order.returnNo }}</el-descriptions-item><el-descriptions-item label="状态"><el-tag :type="statusType(selected.order.status)">{{ selected.order.status }}</el-tag></el-descriptions-item><el-descriptions-item label="操作仓">{{ selected.order.overseasWarehouseId }}</el-descriptions-item><el-descriptions-item label="实收 / 预报">{{ selected.order.receivedQuantity }} / {{ selected.order.expectedQuantity }}</el-descriptions-item></el-descriptions><p v-if="selected.remark" class="remark">备注：{{ selected.remark }}</p><h3>预报与实收</h3><el-table :data="selected.items" size="small"><el-table-column prop="skuCode" label="SKU" /><el-table-column prop="productNameZh" label="中文品名" /><el-table-column prop="expectedQuantity" label="预报" /><el-table-column prop="receivedQuantity" label="实收" /></el-table><h3>签收批次</h3><el-table :data="selected.receipts" size="small"><el-table-column prop="receiptBatchNo" label="批次号" min-width="170" /><el-table-column prop="receiptNo" label="签收单号" min-width="170" /><el-table-column prop="cartonMark" label="箱号" min-width="190" /><el-table-column prop="trackingNo" label="快递单号"><template #default="{ row }">{{ row.trackingNo || '无快递单号' }}</template></el-table-column><el-table-column prop="startedBy" label="开始方式" /><el-table-column prop="receivedQuantity" label="实收" /><el-table-column prop="signedAt" label="签收时间" min-width="170" /></el-table></template></el-drawer>
+  </section>
+</template>
+
+<style scoped>
+.return-orders-page { padding: 20px; } .page-heading { display:flex; justify-content:space-between; align-items:flex-start; gap:16px; margin-bottom:18px; } h2 { margin:0; font-size:22px; } p { margin:6px 0 0; color:var(--el-text-color-secondary); } .filter-bar { display:grid; grid-template-columns:repeat(4,minmax(120px,1fr)) auto; gap:10px; margin-bottom:14px; } .items-title { display:flex; justify-content:space-between; align-items:center; margin:16px 0 4px; font-weight:600; } .items-hint { margin-bottom:10px; color:var(--el-text-color-secondary); font-size:12px; } .el-pagination { margin-top:16px; justify-content:flex-end; } h3 { margin:24px 0 10px; font-size:16px; } h4 { margin:16px 0 8px; font-size:14px; } .remark { white-space:pre-wrap; } .warehouse-error, .duplicate-sku-error { margin-top:6px; color:var(--el-color-danger); font-size:12px; } :deep(.duplicate-sku-input .el-input__wrapper) { box-shadow:0 0 0 1px var(--el-color-danger) inset; } :deep(.el-dialog .el-select) { width:100%; }
+@media (max-width: 760px) { .return-orders-page { padding:12px; } .page-heading { align-items:stretch; flex-direction:column; } .filter-bar { grid-template-columns:1fr 1fr; } }
+</style>

src/modules/overseas-warehouse/views/WarehouseServiceView.vue

@@ -4,21 +4,26 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeft, Download, Eye, Plus, Search, Trash2, Upload } from '@lucide/vue'
 import {
   createDiscard, createRelabel, createTransfer, getDiscard, getRelabel, getTransfer,
-  listDiscardCandidates, listDiscards, listLastlegOrders, listRelabels, listTransfers,
+  listDiscardCandidates, listDiscards, listLastlegOrders, listRelabelInventoryCandidates, listRelabels, listTransfers,
+  type RelabelInventoryCandidate,
+  type RelabelCreate,
   type RelabelDetail,
 } from '../api/warehouseServices'
+import { getMerchantWarehouses, type MerchantWarehouse } from '@/modules/first-leg/api/firstLeg'
 
 type ServiceType = 'labeling' | 'transfer' | 'disposal' | 'relabel'
 type PageMode = 'list' | 'create' | 'detail'
-interface CargoRow { id: number; sku: string; name: string; quantity: number; availableQuantity?: number; sourceOrderId?: string; fnsku: string; shipmentNo: string; newSkuCode: string; shippingMark: string; cartonMark: string; fbaCartonMark: string; destinationWarehouseId: string; remark: string }
+type LabelingMode = 'carton' | 'sku'
+interface CargoRow { id: number; sku: string; name: string; quantity: number; availableQuantity?: number; sourceOrderId?: string; sourceInventoryBalanceId?: string; sourceInventoryPositionId?: string; sourceInboundOrderId?: string; sourceInboundOrderNo?: string; sourceInboundCode?: string; sourceWarehouseName?: string; palletNo?: string; warehouseLocationCode?: string; fnsku: string; shipmentNo: string; newSkuCode: string; shippingMark: string; cartonMark: string; fbaCartonMark: string; destinationWarehouseId: string; remark: string }
+interface SkuRelabelRow { id: number; sourceRowId: number | null; cartonMark: string; originalSku: string; newSku: string; quantity: number; changeCarton: boolean; fbaCartonMark: string; destinationWarehouseId: string; remark: string }
 interface ServiceConfig { title: string; createTitle: string; numberLabel: string; emptyText: string; columns: string[] }
 
 const props = defineProps<{ service: ServiceType }>()
 const configs: Record<ServiceType, ServiceConfig> = {
-  labeling: { title: '贴标申请', createTitle: '新增贴标申请', numberLabel: '贴标申请单号', emptyText: '暂无贴标申请', columns: ['贴标申请单号', '客户单号', '目的海外仓', '贴标要求', 'SKU 数', '总箱数', '状态', '创建时间', '操作'] },
+  labeling: { title: '贴标申请', createTitle: '新增贴标申请', numberLabel: '贴标申请单号', emptyText: '暂无贴标申请', columns: ['操作', '贴标申请单号', '客户单号', '海外操作仓', '贴标要求', 'SKU 数', '总箱数', '状态', '创建时间'] },
-  transfer: { title: '仓储转运单', createTitle: '新增仓储转运单', numberLabel: '转运单号', emptyText: '暂无仓储转运订单', columns: ['转运单号', '进仓编号', '发货箱数', '操作仓', 'FBA 目的仓', '派送方式', '是否换标', '状态', '创建时间', '操作'] },
+  transfer: { title: '仓储转运单', createTitle: '新增仓储转运单', numberLabel: '转运单号', emptyText: '暂无仓储转运订单', columns: ['操作', '转运单号', '进仓编号', '发货箱数', '操作仓', 'FBA 目的仓', '派送方式', '是否换标', '状态', '创建时间'] },
-  disposal: { title: '货物废弃', createTitle: '新增货物废弃申请', numberLabel: '废弃申请单号', emptyText: '暂无货物废弃申请', columns: ['废弃申请单号', '进仓编号', '操作仓', 'SKU 汇总', '废弃数量', '预估费用', '状态', '创建时间', '操作'] },
+  disposal: { title: '货物废弃', createTitle: '新增货物废弃申请', numberLabel: '废弃申请单号', emptyText: '暂无货物废弃申请', columns: ['操作', '废弃申请单号', '进仓编号', '操作仓', 'SKU 汇总', '废弃数量', '预估费用', '状态', '创建时间'] },
-  relabel: { title: '退货换标', createTitle: '新建退货换标单', numberLabel: '退货换标单号', emptyText: '暂无退货换标订单', columns: ['退货换标单号', '来源 FBA 仓', '目的 FBA 仓', 'SKU 汇总', '退件总数', '是否换标', '换标状态', '尾程状态', '创建时间', '操作'] },
+  relabel: { title: '退货换标', createTitle: '新建退货换标单', numberLabel: '退货换标单号', emptyText: '暂无退货换标订单', columns: ['操作', '退货换标单号', '来源 FBA 仓', '目的 FBA 仓', 'SKU 汇总', '退件总数', '是否换标', '换标状态', '尾程状态', '创建时间'] },
 }
 const config = computed(() => configs[props.service])
 const statusOptions = computed(() => props.service === 'labeling'
@@ -30,28 +35,64 @@ const mode = ref<PageMode>('list')
 const filters = reactive({ number: '', inboundNo: '', warehouse: '', destination: '', status: '', start: '', end: '' })
 const form = reactive({ customerNo: '', inboundNo: '', sourceWarehouse: '', warehouse: '', destination: '', address: '', contact: '', phone: '', deliveryMethod: '', trackingNo: '', reason: '', requirement: '', relabel: false, remark: '', labelDeadline: '', estimatedArrivalAt: '', fbaShipmentNo: '', volumeCbm: 0.01, chargeAmount: 0 })
 const cargoRows = ref<CargoRow[]>([])
+const labelingMode = ref<LabelingMode>('carton')
+const skuRelabelRows = ref<SkuRelabelRow[]>([])
+const cartonMarkOptions = computed(() => cargoRows.value.map((item) => ({
+  value: item.id,
+  label: `${item.cartonMark || item.sku || '库存货物'}｜可用 ${item.availableQuantity || item.quantity} 箱`,
+})))
 const submittedRows = ref<Record<string, string>[]>([])
 const selectedDetail = ref<Record<string, string> | null>(null)
 const selectedRelabelDetail = ref<RelabelDetail | null>(null)
+const fbaWarehouses = ref<MerchantWarehouse[]>([])
+const operationWarehouses = ref<MerchantWarehouse[]>([])
+const fbaWarehousesLoading = ref(false)
+const fbaWarehousesError = ref('')
 const discardCandidates = ref<import('../api/warehouseServices').DiscardCandidate[]>([])
 const selectedDiscardOrderId = ref('')
 const discardCandidatesLoading = ref(false)
+const relabelCandidates = ref<RelabelInventoryCandidate[]>([])
+const selectedRelabelInboundOrderId = ref('')
+const relabelCandidatesLoading = ref(false)
+const relabelInboundOptions = computed(() => {
+  const grouped = new Map<string, { value: string; inboundOrderNo: string; inboundCode: string; availablePackages: number }>()
+  for (const candidate of relabelCandidates.value) {
+    const value = String(candidate.inboundOrderId)
+    const current = grouped.get(value)
+    if (current) current.availablePackages += candidate.availablePackages
+    else grouped.set(value, {
+      value,
+      inboundOrderNo: candidate.inboundOrderNo || '—',
+      inboundCode: candidate.inboundCode || '—',
+      availablePackages: candidate.availablePackages,
+    })
+  }
+  return [...grouped.values()]
+})
 const loading = ref(false)
 const saving = ref(false)
 const templateInput = ref<HTMLInputElement | null>(null)
 let cargoSequence = 0
+let skuRelabelSequence = 0
 
 watch(() => props.service, () => { mode.value = 'list'; resetFilters(); resetForm(); void load() })
+watch(labelingMode, (value) => { if (value === 'sku' && !skuRelabelRows.value.length) addSkuRelabelRow() })
 onMounted(() => { void load() })
 function resetFilters() { Object.assign(filters, { number: '', inboundNo: '', warehouse: '', destination: '', status: '', start: '', end: '' }) }
 function resetForm() {
   Object.assign(form, { customerNo: '', inboundNo: '', sourceWarehouse: '', warehouse: '', destination: '', address: '', contact: '', phone: '', deliveryMethod: '', trackingNo: '', reason: '', requirement: '', relabel: false, remark: '', labelDeadline: '', estimatedArrivalAt: '', fbaShipmentNo: '', volumeCbm: 0.01, chargeAmount: 0 })
   cargoRows.value = []
+  labelingMode.value = 'carton'
+  skuRelabelRows.value = []
   discardCandidates.value = []
   selectedDiscardOrderId.value = ''
+  relabelCandidates.value = []
+  selectedRelabelInboundOrderId.value = ''
 }
 async function openCreate() {
   resetForm(); mode.value = 'create'
+  if (props.service === 'labeling' || props.service === 'relabel' || props.service === 'transfer') void loadWarehouses()
+  if (props.service === 'labeling') return
   if (props.service !== 'disposal') { addCargoRow(); return }
   discardCandidatesLoading.value = true
   try { discardCandidates.value = await listDiscardCandidates() }
@@ -59,12 +100,78 @@ async function openCreate() {
   finally { discardCandidatesLoading.value = false }
 }
 function addCargoRow() { cargoRows.value.push({ id: ++cargoSequence, sku: '', name: '', quantity: 1, fnsku: '', shipmentNo: '', newSkuCode: '', shippingMark: '', cartonMark: '', fbaCartonMark: '', destinationWarehouseId: '', remark: '' }) }
-function removeCargoRow(id: number) { cargoRows.value = cargoRows.value.filter((row) => row.id !== id) }
+function addSkuRelabelRow() { skuRelabelRows.value.push({ id: ++skuRelabelSequence, sourceRowId: null, cartonMark: '', originalSku: '', newSku: '', quantity: 1, changeCarton: false, fbaCartonMark: '', destinationWarehouseId: '', remark: '' }) }
-function csvCell(value: string) { return `"${value.replaceAll('"', '""')}"` }
+function removeSkuRelabelRow(id: number) { skuRelabelRows.value = skuRelabelRows.value.filter((row) => row.id !== id) }
+function selectSkuSource(row: SkuRelabelRow) {
+  const source = cargoRows.value.find((item) => item.id === row.sourceRowId)
+  if (!source) return
+  row.cartonMark = source.cartonMark || ''
+  row.originalSku = row.originalSku || source.sku
+  row.destinationWarehouseId = row.destinationWarehouseId || source.destinationWarehouseId
+}
+function buildSkuRelabelItems(): RelabelCreate['items'] {
+  const groups = new Map<number, SkuRelabelRow[]>()
+  for (const row of skuRelabelRows.value) {
+    if (row.sourceRowId == null) throw new Error('请选择每条 SKU 明细对应的来源库存箱')
+    const rows = groups.get(row.sourceRowId) || []
+    rows.push(row)
+    groups.set(row.sourceRowId, rows)
+  }
+  return [...groups.entries()].map(([sourceRowId, rows]) => {
+    const source = cargoRows.value.find((item) => item.id === sourceRowId)
+    if (!source?.sourceInventoryBalanceId || !source.sourceInventoryPositionId || !source.sourceInboundOrderId) {
+      throw new Error('来源库存已变化，请重新选择有库存的历史入仓单')
+    }
+    const cartonMark = rows[0].cartonMark.trim()
+    if (!cartonMark || rows.some((row) => row.cartonMark.trim() !== cartonMark)) {
+      throw new Error('同一来源库存箱的 SKU 明细必须使用同一个我方箱唛')
+    }
+    const changeCarton = rows[0].changeCarton
+    if (rows.some((row) => row.changeCarton !== changeCarton)) {
+      throw new Error('同一我方箱唛的 SKU 明细必须统一是否同时更换箱唛')
+    }
+    const fbaCartonMark = rows[0].fbaCartonMark.trim()
+    const destinationWarehouseId = rows[0].destinationWarehouseId
+    if (changeCarton && (!fbaCartonMark || !destinationWarehouseId
+      || rows.some((row) => row.fbaCartonMark.trim() !== fbaCartonMark || row.destinationWarehouseId !== destinationWarehouseId))) {
+      throw new Error('同一我方箱唛的组合换标必须使用相同的新 FBA 箱唛和目的仓')
+    }
+    return {
+      sourceInventoryBalanceId: source.sourceInventoryBalanceId,
+      sourceInventoryPositionId: source.sourceInventoryPositionId,
+      sourceInboundOrderId: source.sourceInboundOrderId,
+      skuCode: source.sku || rows[0].originalSku,
+      productNameZh: source.name,
+      totalPackageCount: source.quantity,
+      notifiedPackageCount: source.quantity,
+      shipmentNo: source.shipmentNo || cartonMark,
+      trackingCode: form.trackingNo || undefined,
+      newSkuCode: rows[0].newSku,
+      labelRequirement: form.requirement || undefined,
+      cartonMark,
+      fbaCartonMark: changeCarton ? fbaCartonMark : undefined,
+      destinationFbaWarehouseCode: changeCarton ? destinationWarehouseId : undefined,
+      operationType: changeCarton ? 'CARTON_AND_SKU' as const : 'SKU_LABEL' as const,
+      skuItems: rows.map((row) => ({ skuCode: row.originalSku.trim(), newSkuCode: row.newSku.trim(), quantity: row.quantity, remark: row.remark || undefined })),
+      remark: undefined,
+    }
+  })
+}
+function addRelabelCargoRow() {
+  if (!selectedRelabelInboundOrderId.value) { ElMessage.warning('请先选择有库存的历史入仓单'); return }
+  ElMessage.info('货物明细已按所选入仓单的可用库存带出，请直接编辑现有明细')
+}
+function removeCargoRow(id: number) {
+  cargoRows.value = cargoRows.value.filter((row) => row.id !== id)
+}
+function clearRelabelRows() { cargoRows.value = []; selectedRelabelInboundOrderId.value = '' }
+function csvCell(value: string | number | undefined) { return `"${String(value ?? '').replaceAll('"', '""')}"` }
 function downloadRelabelTemplate() {
-  const header = ['商品SKU（选填）', '中文品名', 'FBA货件编号', '换标新SKU', '我方箱唛', 'FBA箱唛', '目的仓', '备注']
+  if (!cargoRows.value.length) { ElMessage.warning('请先选择有库存的历史入仓单'); return }
-  const example = ['', '示例商品', 'FBA-SHIPMENT-001', 'LX1000-NEW', 'LX1000箱唛', 'FBA-LX1000箱唛', 'ONT8', '']
+  const header = ['明细行标识', '本次箱数', '商品SKU', '中文品名', 'FBA货件编号', '换标新SKU', '我方箱唛', 'FBA箱唛', 'FBA目的仓', '备注']
-  const blob = new Blob([`\uFEFF${header.map(csvCell).join(',')}\r\n${example.map(csvCell).join(',')}\r\n`], { type: 'text/csv;charset=utf-8' })
+  const rows = cargoRows.value.map((item) => [item.id, item.quantity, item.sku, item.name, item.shipmentNo, item.newSkuCode,
+    item.cartonMark, item.fbaCartonMark, item.destinationWarehouseId, item.remark])
+  const blob = new Blob([`\uFEFF${[header, ...rows].map((row) => row.map(csvCell).join(',')).join('\r\n')}\r\n`], { type: 'text/csv;charset=utf-8' })
   const url = URL.createObjectURL(blob)
   const anchor = document.createElement('a')
   anchor.href = url; anchor.download = '贴标申请-关联面单模板.csv'; anchor.click(); URL.revokeObjectURL(url)
@@ -84,20 +191,37 @@ async function importRelabelTemplate(event: Event) {
   if (!file) return
   const lines = (await file.text()).replace(/^\uFEFF/, '').split(/\r?\n/).filter((line) => line.trim())
   if (lines.length < 2) { ElMessage.error('模板中没有可导入的明细'); return }
-  const headers = parseCsvLine(lines[0]); const required = ['中文品名', 'FBA货件编号', '换标新SKU', '我方箱唛', 'FBA箱唛']
+  const headers = parseCsvLine(lines[0])
-  const skuHeader = headers.includes('商品SKU（选填）') ? '商品SKU（选填）' : '商品SKU'
+  const required = ['明细行标识', '本次箱数', 'FBA货件编号', '换标新SKU', '我方箱唛', 'FBA箱唛', 'FBA目的仓']
-  if (!headers.includes(skuHeader)) { ElMessage.error('模板格式不正确，请重新下载模板填写'); return }
   if (required.some((name) => !headers.includes(name))) { ElMessage.error('模板格式不正确，请重新下载模板填写'); return }
-  const imported = lines.slice(1).map(parseCsvLine).map((values) => Object.fromEntries(headers.map((key, index) => [key, values[index] || '']))).filter((item) => required.some((key) => item[key]))
+  const imported = lines.slice(1).map(parseCsvLine)
-  if (!imported.length || imported.some((item) => required.some((key) => !item[key]))) { ElMessage.error('模板中的商品、货件、换标 SKU 和箱唛信息必须填写完整'); return }
+    .map((values) => Object.fromEntries(headers.map((key, index) => [key, values[index] || ''])))
-  if (new Set(imported.map((item) => item['我方箱唛'])).size !== imported.length) { ElMessage.error('模板中的我方箱唛不能重复'); return }
+    .filter((item) => item['明细行标识'])
-  cargoRows.value = imported.map((item) => ({
+  if (!imported.length || imported.some((item) => required.some((key) => !item[key]))) {
-    id: ++cargoSequence, sku: item[skuHeader], name: item['中文品名'], quantity: 1, fnsku: '',
+    ElMessage.error('模板中的明细行、箱数、货件、换标 SKU、箱唛和 FBA 目的仓必须填写完整'); return
-    shipmentNo: item['FBA货件编号'], newSkuCode: item['换标新SKU'], shippingMark: '',
+  }
-    cartonMark: item['我方箱唛'], fbaCartonMark: item['FBA箱唛'],
+  if (new Set(imported.map((item) => item['明细行标识'])).size !== imported.length) {
-    destinationWarehouseId: item['目的仓'] || '', remark: item['备注'] || '',
+    ElMessage.error('模板中的明细行标识不能重复'); return
-  }))
+  }
-  ElMessage.success(`已导入 ${cargoRows.value.length} 箱货物明细`)
+  const importedByRow = new Map(imported.map((item) => [item['明细行标识'], item]))
+  if (importedByRow.size !== cargoRows.value.length || cargoRows.value.some((row) => !importedByRow.has(String(row.id)))) {
+    ElMessage.error('模板明细与当前已选入仓单库存不一致，请重新下载模板'); return
+  }
+  for (const row of cargoRows.value) {
+    const item = importedByRow.get(String(row.id))!
+    const quantity = Number(item['本次箱数'])
+    if (!Number.isInteger(quantity) || quantity < 1 || quantity > Number(row.availableQuantity || 0)) {
+      ElMessage.error(`明细行 ${row.id} 的本次箱数不正确或超过可用库存`); return
+    }
+    row.quantity = quantity
+    row.shipmentNo = item['FBA货件编号']
+    row.newSkuCode = item['换标新SKU']
+    row.cartonMark = item['我方箱唛']
+    row.fbaCartonMark = item['FBA箱唛']
+    row.destinationWarehouseId = item['FBA目的仓']
+    row.remark = item['备注'] || ''
+  }
+  ElMessage.success(`已导入 ${imported.length} 条关联面单明细`)
 }
 function selectDiscardInbound(orderId: string) {
   const candidate = discardCandidates.value.find((item) => item.orderId === orderId)
@@ -112,10 +236,21 @@ function selectDiscardInbound(orderId: string) {
 }
 function dateTime(value: string, end = false) { return value ? `${value}T${end ? '23:59:59' : '00:00:00'}` : undefined }
 function row(values: Array<string | number | undefined | null>) { return Object.fromEntries(values.map((value, index) => [String(index), value == null || value === '' ? '—' : String(value)])) }
+function statusLabel(value: string) {
+  return statusOptions.value.find((option) => option.value === value)?.label || value
+}
+function deliveryMethodLabel(value: string) {
+  return ({ TRUCK: '卡车派送', EXPRESS: '快递派送', '卡车派送': '卡车派送', '快递派送': '快递派送' } as Record<string, string>)[value] || value
+}
+function formatDateTime(value: string) {
+  return value ? value.replace('T', ' ').slice(0, 19) : '—'
+}
 function warehouseDisplay(value?: string) {
   if (!value) return '—'
-  const labels: Record<string, string> = { ONT8: '美西海外仓-ONT8', ABE8: '美东海外仓-ABE8', MDW2: '美中海外仓-MDW2' }
+  return value.split(',').map((code) => {
-  return value.split(',').map((warehouse) => labels[warehouse] || warehouse).join('、')
+    const warehouse = [...operationWarehouses.value, ...fbaWarehouses.value].find((item) => String(item.id) === code || item.warehouseCode === code)
+    return warehouse ? warehouseLabel(warehouse) : code
+  }).join('、')
 }
 async function load() {
   loading.value = true
@@ -124,16 +259,16 @@ async function load() {
       const result = await listRelabels({ page: 1, size: 20, relabelNo: filters.number || undefined, overseasWarehouseId: filters.warehouse || undefined, status: filters.status || undefined, createdFrom: dateTime(filters.start), createdTo: dateTime(filters.end, true) })
       submittedRows.value = result.records.map((item) => {
         const destinationWarehouses = warehouseDisplay(item.overseasWarehouseId)
-        return row([item.relabelNo, item.customerOrderNo, destinationWarehouses, '—', item.itemCount, item.totalPackageCount, item.status, item.createdAt])
+        return row([item.relabelNo, item.customerOrderNo, destinationWarehouses, '—', item.itemCount, item.totalPackageCount, statusLabel(item.status), formatDateTime(item.createdAt)])
       })
     } else if (props.service === 'disposal') {
       const result = await listDiscards({ page: 1, size: 20, discardNo: filters.number || undefined, inboundCode: filters.inboundNo || undefined, overseasWarehouseId: filters.warehouse || undefined, status: filters.status || undefined, createdFrom: dateTime(filters.start), createdTo: dateTime(filters.end, true) })
-      submittedRows.value = result.records.map((item) => row([item.discardNo, item.inboundCodes, item.overseasWarehouseName || '—', '—', item.totalPackages, `${item.currency} ${item.totalFee}`, item.status, item.createdAt]))
+      submittedRows.value = result.records.map((item) => row([item.discardNo, item.inboundCodes, item.overseasWarehouseName || '—', '—', item.totalPackages, `${item.currency} ${item.totalFee}`, statusLabel(item.status), formatDateTime(item.createdAt)]))
     } else {
       const result = await listTransfers({ page: 1, size: 20, transferNo: filters.number || undefined, inboundCode: filters.inboundNo || undefined, operatingWarehouseId: filters.warehouse || undefined, fbaWarehouseCode: filters.destination || undefined, status: filters.status || undefined, needRelabel: props.service === 'relabel', createdFrom: dateTime(filters.start), createdTo: dateTime(filters.end, true) })
       submittedRows.value = result.records.map((item) => props.service === 'transfer'
-        ? row([item.transferNo, item.inboundCode, item.packageCount, '—', item.fbaWarehouseCode, item.deliveryMethod, item.needRelabel ? '是' : '否', item.status, item.createdAt])
+        ? row([item.transferNo, item.inboundCode, item.packageCount, '—', item.fbaWarehouseCode, deliveryMethodLabel(item.deliveryMethod), item.needRelabel ? '是' : '否', statusLabel(item.status), formatDateTime(item.createdAt)])
-        : row([item.transferNo, '—', item.fbaWarehouseCode, '—', item.packageCount, '是', item.relabelNo ? '已生成' : '待生成', item.status, item.createdAt]))
+        : row([item.transferNo, '—', item.fbaWarehouseCode, '—', item.packageCount, '是', item.relabelNo ? '已生成' : '待生成', statusLabel(item.status), formatDateTime(item.createdAt)]))
     }
   } catch (error) { ElMessage.error(error instanceof Error ? error.message : '列表加载失败') }
   finally { loading.value = false }
@@ -141,21 +276,25 @@ async function load() {
 function query() { void load() }
 async function submit() {
   const primaryWarehouse = props.service === 'relabel' ? form.sourceWarehouse : form.warehouse
+  const relabelRows = labelingMode.value === 'sku' ? skuRelabelRows.value : cargoRows.value
   const invalidCargo = props.service === 'disposal'
     ? !selectedDiscardOrderId.value || cargoRows.value.every((item) => item.quantity < 1)
       || cargoRows.value.some((item) => item.quantity < 0 || item.quantity > Number(item.availableQuantity || 0))
-    : cargoRows.value.length === 0 || cargoRows.value.some((item) => (props.service !== 'labeling' && !item.sku) || !item.name || item.quantity < 1)
+    : relabelRows.length === 0 || (props.service === 'labeling' && labelingMode.value === 'sku'
-  if ((!form.customerNo && !form.inboundNo) || (props.service !== 'labeling' && !primaryWarehouse) || invalidCargo) {
+      ? skuRelabelRows.value.some((item) => !item.sourceRowId || !item.cartonMark || !item.originalSku || !item.newSku || item.quantity < 1
+        || (item.changeCarton && (!item.fbaCartonMark || !item.destinationWarehouseId)))
+      : cargoRows.value.some((item) => (props.service !== 'labeling' && !item.sku) || !item.name || item.quantity < 1))
+  if ((props.service !== 'labeling' && !form.customerNo && !form.inboundNo) || (props.service !== 'disposal' && !primaryWarehouse) || invalidCargo) {
     ElMessage.warning('请填写必填信息和完整的货物明细'); return
   }
-  if (props.service === 'labeling' && (!form.labelDeadline || !form.contact || !form.phone || form.chargeAmount <= 0 || cargoRows.value.some((item) => !item.shipmentNo || !item.newSkuCode))) {
+  if (props.service === 'labeling' && (!form.labelDeadline || !form.contact || !form.phone || form.chargeAmount <= 0)) {
-    ElMessage.warning('请填写贴标截止时间、联系人、贴标费用以及货物的货件编号和新 SKU'); return
+    ElMessage.warning('请填写贴标截止时间、联系人和贴标费用'); return
   }
-  if (props.service === 'labeling' && cargoRows.value.some((item) => !item.cartonMark || !item.fbaCartonMark)) {
+  if (props.service === 'labeling' && labelingMode.value === 'carton' && cargoRows.value.some((item) => !item.shipmentNo || !item.newSkuCode || !item.cartonMark || !item.fbaCartonMark)) {
     ElMessage.warning('请上传关联面单，确保每箱的我方箱唛和 FBA 箱唛完整'); return
   }
-  if (props.service === 'labeling' && cargoRows.value.some((item) => !item.destinationWarehouseId && !form.warehouse)) {
+  if (props.service === 'labeling' && labelingMode.value === 'carton' && cargoRows.value.some((item) => !item.destinationWarehouseId || !item.sourceInventoryPositionId)) {
-    ElMessage.warning('请填写统一目的海外仓，或为每箱货物填写目的仓'); return
+    ElMessage.warning('请选择有库存的历史入仓单，并为每项填写 FBA 目的仓'); return
   }
   if (props.service === 'disposal' && !form.reason) {
     ElMessage.warning('请选择废弃原因'); return
@@ -168,7 +307,11 @@ async function submit() {
   try {
     const idempotencyKey = crypto.randomUUID()
     if (props.service === 'labeling') {
-      await createRelabel({ customerOrderNo: form.customerNo, overseasWarehouseId: form.warehouse || undefined, labelDeadline: form.labelDeadline, contactName: form.contact, contactPhone: form.phone, chargeAmount: form.chargeAmount, remark: form.remark || undefined, idempotencyKey, items: cargoRows.value.map((item) => ({ skuCode: item.sku, productNameZh: item.name, totalPackageCount: 1, notifiedPackageCount: 1, shipmentNo: item.shipmentNo, trackingCode: form.trackingNo || undefined, newSkuCode: item.newSkuCode, labelRequirement: form.requirement || undefined, cartonMark: item.cartonMark, fbaCartonMark: item.fbaCartonMark, destinationWarehouseId: item.destinationWarehouseId || undefined, remark: item.remark || undefined })) })
+      const sourceInboundOrders = [...new Set(cargoRows.value.map((item) => item.sourceInboundOrderNo || item.sourceInboundCode).filter((value): value is string => Boolean(value)))].join('、').slice(0, 128)
+      const items = labelingMode.value === 'carton'
+        ? cargoRows.value.map((item) => ({ sourceInventoryBalanceId: item.sourceInventoryBalanceId!, sourceInventoryPositionId: item.sourceInventoryPositionId!, sourceInboundOrderId: item.sourceInboundOrderId!, skuCode: item.sku, productNameZh: item.name, totalPackageCount: item.quantity, notifiedPackageCount: item.quantity, shipmentNo: item.shipmentNo, trackingCode: form.trackingNo || undefined, newSkuCode: item.newSkuCode, labelRequirement: form.requirement || undefined, cartonMark: item.cartonMark, fbaCartonMark: item.fbaCartonMark, destinationFbaWarehouseCode: item.destinationWarehouseId, operationType: 'CARTON_LABEL' as const, skuItems: [], remark: item.remark || undefined }))
+        : buildSkuRelabelItems()
+      await createRelabel({ customerOrderNo: sourceInboundOrders || '贴标申请', operationWarehouseId: form.warehouse, labelDeadline: form.labelDeadline, contactName: form.contact, contactPhone: form.phone, chargeAmount: form.chargeAmount, remark: form.remark || undefined, idempotencyKey, items })
     } else if (props.service === 'disposal') {
       const items = cargoRows.value.filter((item) => item.quantity > 0).map((item) => {
         if (!item.sourceOrderId || item.sourceOrderId !== selectedDiscardOrderId.value || item.quantity > Number(item.availableQuantity || 0)) {
@@ -195,6 +338,57 @@ async function openDetail(value: Record<string, string>) {
     mode.value = 'detail'
   } catch (error) { ElMessage.error(error instanceof Error ? error.message : '详情加载失败') }
 }
+async function loadWarehouses() {
+  fbaWarehousesLoading.value = true
+  fbaWarehousesError.value = ''
+  try {
+    const [fbaResult, operationResult] = await Promise.all([
+      getMerchantWarehouses({ warehouseType: 'FBA' }),
+      getMerchantWarehouses({ warehouseType: 'OVERSEAS' }),
+    ])
+    fbaWarehouses.value = fbaResult.records
+    operationWarehouses.value = operationResult.records
+  } catch (error) {
+    fbaWarehouses.value = []
+    fbaWarehousesError.value = error instanceof Error ? error.message : 'FBA 目的仓加载失败'
+    ElMessage.error(fbaWarehousesError.value)
+  } finally { fbaWarehousesLoading.value = false }
+}
+function warehouseLabel(value: MerchantWarehouse) { return `${value.warehouseName} · ${value.warehouseCode}` }
+async function selectOperationWarehouse() {
+  cargoRows.value = []
+  skuRelabelRows.value = []
+  selectedRelabelInboundOrderId.value = ''
+  relabelCandidates.value = []
+  const warehouse = operationWarehouses.value.find((item) => String(item.id) === form.warehouse)
+  form.contact = warehouse?.contactName || ''
+  form.phone = warehouse?.contactPhone || ''
+  if (!form.warehouse) return
+  relabelCandidatesLoading.value = true
+  try { relabelCandidates.value = await listRelabelInventoryCandidates(form.warehouse) }
+  catch (error) { ElMessage.error(error instanceof Error ? error.message : '当前客户库存加载失败') }
+  finally { relabelCandidatesLoading.value = false }
+}
+function selectRelabelInventory(inboundOrderId: string) {
+  const existing = new Map(cargoRows.value.map((row) => [row.sourceInventoryPositionId, row]))
+  cargoRows.value = relabelCandidates.value
+    .filter((candidate) => String(candidate.inboundOrderId) === inboundOrderId)
+    .flatMap((candidate) => candidate.positions.map((position) => {
+      const previous = existing.get(String(position.positionId))
+      return {
+        id: previous?.id || ++cargoSequence, sku: candidate.skuCode || '', name: candidate.productNameZh || '库存货物',
+        quantity: Math.min(previous?.quantity || 1, position.availablePackages), availableQuantity: position.availablePackages,
+        sourceInventoryBalanceId: String(candidate.inventoryBalanceId), sourceInventoryPositionId: String(position.positionId),
+        sourceInboundOrderId: String(candidate.inboundOrderId), sourceInboundOrderNo: candidate.inboundOrderNo,
+        sourceInboundCode: candidate.inboundCode, sourceWarehouseName: candidate.overseasWarehouseName,
+        palletNo: position.palletNo, warehouseLocationCode: position.warehouseLocationCode,
+        fnsku: '', shipmentNo: previous?.shipmentNo || '', newSkuCode: previous?.newSkuCode || '', shippingMark: '',
+        cartonMark: previous?.cartonMark || '', fbaCartonMark: previous?.fbaCartonMark || '',
+        destinationWarehouseId: previous?.destinationWarehouseId || candidate.destinationFbaWarehouseCode || '', remark: previous?.remark || '',
+      }
+    }))
+  skuRelabelRows.value = []
+}
 </script>
 
 <template>
@@ -215,7 +409,7 @@ async function openDetail(value: Record<string, string>) {
         <div class="warehouse-filter-actions"><el-button type="primary" @click="query"><Search :size="16" />查询</el-button><el-button @click="resetFilters(); query()">重置</el-button></div>
       </div>
       <div v-loading="loading" class="warehouse-card warehouse-table-card">
-        <div class="warehouse-table-scroll"><table><thead><tr><th v-for="column in config.columns" :key="column">{{ column }}</th></tr></thead><tbody><tr v-for="(row, rowIndex) in submittedRows" :key="rowIndex"><td v-for="(_, index) in config.columns.slice(0, -1)" :key="index">{{ row[String(index)] }}</td><td><button class="warehouse-link" type="button" @click="openDetail(row)"><Eye :size="15" />查看</button></td></tr><tr v-if="submittedRows.length === 0"><td :colspan="config.columns.length"><div class="warehouse-empty">{{ config.emptyText }}</div></td></tr></tbody></table></div>
+        <div class="warehouse-table-scroll"><table><thead><tr><th v-for="column in config.columns" :key="column">{{ column }}</th></tr></thead><tbody><tr v-for="(row, rowIndex) in submittedRows" :key="rowIndex"><td><button class="warehouse-link" type="button" @click="openDetail(row)"><Eye :size="15" />查看</button></td><td v-for="(_, index) in config.columns.slice(1)" :key="index">{{ row[String(index)] }}</td></tr><tr v-if="submittedRows.length === 0"><td :colspan="config.columns.length"><div class="warehouse-empty">{{ config.emptyText }}</div></td></tr></tbody></table></div>
         <div class="warehouse-pagination"><span>共 <strong>{{ submittedRows.length }}</strong> 条</span><el-button size="small" disabled>上一页</el-button><button type="button" class="warehouse-page-number">1</button><el-button size="small" disabled>下一页</el-button></div>
       </div>
     </template>
@@ -226,32 +420,47 @@ async function openDetail(value: Record<string, string>) {
       <form @submit.prevent="submit">
         <div class="warehouse-card warehouse-form-section"><h3>{{ props.service === 'relabel' ? '退货信息' : props.service === 'labeling' ? '订单信息' : '基础与派送信息' }}</h3>
           <div class="warehouse-form-grid">
-            <label v-if="props.service === 'labeling'"><span><i>*</i>客户单号</span><el-input v-model="form.customerNo" placeholder="请输入客户单号" /></label>
             <label v-if="props.service === 'disposal'" class="warehouse-span-2"><span><i>*</i>选择入库单</span><el-select v-model="selectedDiscardOrderId" filterable :loading="discardCandidatesLoading" placeholder="请选择有可用库存的入库单" @change="selectDiscardInbound"><el-option v-for="candidate in discardCandidates" :key="candidate.orderId" :label="`${candidate.inboundOrderNo || candidate.inboundCode || '—'}｜${candidate.inboundCode || '—'}｜${candidate.overseasWarehouseName || '—'}｜可用 ${candidate.availablePackages} 箱`" :value="candidate.orderId" /></el-select><small class="warehouse-hint">仅显示一件代发中仍有可用箱数的入库单。</small></label>
             <label v-if="props.service === 'transfer' || props.service === 'relabel'"><span><i>*</i>进仓编号</span><el-input v-model="form.inboundNo" placeholder="请输入已有入仓编号" /></label>
-            <label v-if="props.service === 'relabel'"><span><i>*</i>来源 FBA 仓库</span><el-select v-model="form.sourceWarehouse" placeholder="请选择"><el-option label="ONT8" value="ONT8" /><el-option label="ABE8" value="ABE8" /><el-option label="CLT2" value="CLT2" /></el-select></label>
+            <label v-if="props.service === 'relabel'"><span><i>*</i>来源 FBA 仓库</span><el-select v-model="form.sourceWarehouse" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" placeholder="请选择平台维护的 FBA 仓"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select></label>
             <label v-else-if="props.service === 'disposal'"><span>进仓编号</span><el-input v-model="form.inboundNo" readonly /></label>
-            <label v-else><span><i v-if="props.service !== 'labeling'">*</i>{{ props.service === 'labeling' ? '统一目的海外仓' : '操作仓' }}</span><el-select v-model="form.warehouse" clearable placeholder="留空则按货物明细目的仓"><el-option label="美西海外仓-ONT8" value="ONT8" /><el-option label="美东海外仓-ABE8" value="ABE8" /><el-option label="美中海外仓-MDW2" value="MDW2" /></el-select><small v-if="props.service === 'labeling'" class="warehouse-hint">填写后，未单独指定目的仓的货物将使用此仓库。</small></label>
+            <label v-else><span><i>*</i>{{ props.service === 'labeling' ? '海外操作仓（中转仓）' : '操作仓' }}</span><el-select v-model="form.warehouse" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" clearable placeholder="请选择国外中转仓" @change="props.service === 'labeling' && selectOperationWarehouse()"><el-option v-for="warehouse in operationWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="String(warehouse.id)" /></el-select><small v-if="props.service === 'labeling'" class="warehouse-hint">选择后仅查询当前客户在该中转仓的可用库存。</small></label>
+            <label v-if="props.service === 'labeling'" class="warehouse-span-2"><span><i>*</i>选择有库存的历史入仓单</span><el-select v-model="selectedRelabelInboundOrderId" filterable clearable :loading="relabelCandidatesLoading" :disabled="!form.warehouse" no-data-text="当前中转仓暂无已入库可用库存" placeholder="请选择曾经下单且当前仍有库存的入仓单" @change="selectRelabelInventory"><el-option v-for="option in relabelInboundOptions" :key="option.value" :label="`${option.inboundOrderNo}｜入仓码 ${option.inboundCode}｜可用 ${option.availablePackages} 箱`" :value="option.value" /></el-select><small class="warehouse-hint">仅显示当前客户在所选中转仓已经完成入库且仍有可用库存的历史入仓单。</small></label>
             <label v-if="props.service === 'disposal'"><span>操作仓</span><el-input :model-value="discardCandidates.find((item) => item.orderId === selectedDiscardOrderId)?.overseasWarehouseName || form.warehouse" readonly /></label>
-            <label v-if="props.service === 'relabel' || props.service === 'transfer'"><span><i>*</i>目的 FBA 仓</span><el-input v-model="form.destination" placeholder="请输入仓代码" /></label>
+            <label v-if="props.service === 'relabel' || props.service === 'transfer'"><span><i>*</i>目的 FBA 仓</span><el-select v-model="form.destination" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" placeholder="请选择平台维护的 FBA 仓"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select></label>
             <label v-if="props.service === 'transfer' || props.service === 'relabel'"><span><i>*</i>派送方式</span><el-select v-model="form.deliveryMethod" placeholder="请选择"><el-option label="卡车派送" value="卡车派送" /><el-option label="快递派送" value="快递派送" /></el-select></label>
             <label v-if="props.service === 'relabel' || props.service === 'disposal'"><span><i>*</i>{{ props.service === 'relabel' ? '退货原因' : '废弃原因' }}</span><el-select v-model="form.reason" placeholder="请选择"><el-option label="客户退货" value="客户退货" /><el-option label="亚马逊移除" value="亚马逊移除" /><el-option label="残损不可售" value="残损不可售" /></el-select></label>
-            <label v-if="props.service === 'labeling'"><span><i>*</i>联系人</span><el-input v-model="form.contact" placeholder="请输入联系人" /></label>
+            <label v-if="props.service === 'labeling'"><span><i>*</i>海外仓签收联系人<em v-if="form.warehouse && !form.contact" class="warehouse-unmaintained">未维护</em></span><el-input v-model="form.contact" placeholder="选择海外操作仓后自动带出" /></label>
-            <label v-if="props.service === 'labeling'"><span><i>*</i>联系电话</span><el-input v-model="form.phone" placeholder="请输入联系电话" /></label>
+            <label v-if="props.service === 'labeling'"><span><i>*</i>海外仓联系电话<em v-if="form.warehouse && !form.phone" class="warehouse-unmaintained">未维护</em></span><el-input v-model="form.phone" placeholder="选择海外操作仓后自动带出" /></label>
             <label v-if="props.service === 'labeling'"><span><i>*</i>贴标截止时间</span><el-date-picker v-model="form.labelDeadline" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择截止时间" /></label>
-            <label v-if="props.service === 'labeling'"><span><i>*</i>贴标费用（CNY）</span><el-input-number v-model="form.chargeAmount" :min="0" :precision="2" controls-position="right" /></label>
+            <label v-if="props.service === 'labeling'"><span><i>*</i>贴标费用（CNY）</span><el-input-number v-model="form.chargeAmount" :min="0" :precision="2" controls-position="right" placeholder="请输入贴标费用" /></label>
             <label v-if="props.service === 'transfer' || props.service === 'relabel'" class="warehouse-span-2"><span><i>*</i>详细派送地址</span><el-input v-model="form.address" placeholder="请输入派送地址" /></label>
-            <label v-if="props.service === 'transfer' || props.service === 'relabel'"><span><i>*</i>总体积（CBM）</span><el-input-number v-model="form.volumeCbm" :min="0.0001" :precision="4" controls-position="right" /></label>
+            <label v-if="props.service === 'transfer' || props.service === 'relabel'"><span><i>*</i>总体积（CBM）</span><el-input-number v-model="form.volumeCbm" :min="0.0001" :precision="4" controls-position="right" placeholder="请输入总体积" /></label>
             <label v-if="props.service === 'transfer' || props.service === 'relabel'"><span><i>*</i>预计到达时间</span><el-date-picker v-model="form.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计到达时间" /></label>
             <label v-if="props.service === 'transfer' || props.service === 'relabel'"><span><i>*</i>FBA 货件编号</span><el-input v-model="form.fbaShipmentNo" placeholder="请输入 FBA 货件编号" /></label>
-            <label v-if="props.service === 'labeling'"><span>贴标要求</span><el-input v-model="form.requirement" /></label>
+            <label v-if="props.service === 'labeling'"><span>贴标要求</span><el-input v-model="form.requirement" placeholder="请输入贴标要求" /></label>
-            <label v-else-if="props.service !== 'disposal'"><span>物流跟踪号</span><el-input v-model="form.trackingNo" /></label>
+            <label v-else-if="props.service !== 'disposal'"><span>物流跟踪号</span><el-input v-model="form.trackingNo" placeholder="请输入物流跟踪号" /></label>
             <label class="warehouse-span-2"><span>订单备注</span><el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注信息" /></label>
           </div>
         </div>
-        <div class="warehouse-card warehouse-form-section"><div class="warehouse-section-heading"><h3>货物明细</h3><div v-if="props.service !== 'disposal'"><template v-if="props.service === 'labeling'"><el-button size="small" @click="downloadRelabelTemplate"><Download :size="15" />下载关联模板</el-button><el-button size="small" @click="templateInput?.click()"><Upload :size="15" />上传关联面单</el-button><input ref="templateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate"></template><el-button type="primary" size="small" @click="addCargoRow"><Plus :size="15" />添加行</el-button><el-button size="small" @click="cargoRows = []">清空</el-button></div></div>
+        <div class="warehouse-card warehouse-form-section">
-          <p v-if="props.service === 'labeling'" class="warehouse-attachment-tip">模板每行代表一箱；上传后直接回显到下方明细。明细目的仓优先，留空时使用顶部统一目的海外仓。</p>
+          <template v-if="props.service === 'labeling'">
-          <div class="warehouse-table-scroll"><table class="warehouse-edit-table" :class="{ 'warehouse-label-table': props.service === 'labeling' }"><thead><tr><th>商品 SKU<span v-if="props.service !== 'labeling'"> *</span></th><th>中文品名 *</th><th v-if="props.service === 'disposal'">可用箱数</th><th v-else>{{ props.service === 'labeling' ? 'FBA 货件编号 *' : 'FNSKU / 箱唛' }}</th><th v-if="props.service === 'labeling'">换标新 SKU *</th><th v-if="props.service !== 'labeling'">{{ props.service === 'disposal' ? '本次废弃箱数' : props.service === 'relabel' ? '退件数量' : '箱数' }} *</th><template v-if="props.service === 'labeling'"><th>我方箱唛</th><th>FBA 箱唛</th><th>目的仓</th><th>备注</th></template><th v-if="props.service !== 'disposal'">操作</th></tr></thead><tbody><tr v-for="row in cargoRows" :key="row.id"><td><el-input v-model="row.sku" :readonly="props.service === 'disposal'" placeholder="选填" /></td><td><el-input v-model="row.name" :readonly="props.service === 'disposal'" /></td><td v-if="props.service === 'disposal'"><strong>{{ row.availableQuantity }} 箱</strong></td><td v-else><el-input v-if="props.service === 'labeling'" v-model="row.shipmentNo" /><el-input v-else v-model="row.shippingMark" /></td><td v-if="props.service === 'labeling'"><el-input v-model="row.newSkuCode" /></td><td v-if="props.service !== 'labeling'"><el-input-number v-model="row.quantity" :min="props.service === 'disposal' ? 0 : 1" :max="props.service === 'disposal' ? row.availableQuantity : undefined" controls-position="right" /></td><template v-if="props.service === 'labeling'"><td><el-input v-model="row.cartonMark" placeholder="请输入我方箱唛" /></td><td><el-input v-model="row.fbaCartonMark" placeholder="请输入 FBA 箱唛" /></td><td><el-select v-model="row.destinationWarehouseId" clearable placeholder="使用顶部统一目的仓"><el-option label="美西海外仓-ONT8" value="ONT8" /><el-option label="美东海外仓-ABE8" value="ABE8" /><el-option label="美中海外仓-MDW2" value="MDW2" /></el-select></td><td><el-input v-model="row.remark" type="textarea" :rows="2" maxlength="1000" show-word-limit placeholder="请输入明细备注" /></td></template><td v-if="props.service !== 'disposal'"><button type="button" class="warehouse-delete" title="删除" @click="removeCargoRow(row.id)"><Trash2 :size="16" /></button></td></tr><tr v-if="cargoRows.length === 0"><td :colspan="props.service === 'labeling' ? 8 : 5"><div class="warehouse-empty">{{ props.service === 'disposal' ? '请先选择入库单，系统将自动带出 SKU 和可用箱数' : '暂无货物明细，请点击“添加行”' }}</div></td></tr></tbody></table></div>
+            <h3>货物明细</h3>
+            <el-tabs v-model="labelingMode" class="warehouse-labeling-tabs">
+              <el-tab-pane label="箱唛换标" name="carton">
+                <div class="warehouse-section-heading warehouse-tab-actions"><p>按箱关联我方箱唛与新的 FBA 箱唛，提交后按所选库存箱数冻结。</p><div><el-button size="small" @click="downloadRelabelTemplate"><Download :size="15" />下载关联模板</el-button><el-button size="small" :disabled="!cargoRows.length" @click="templateInput?.click()"><Upload :size="15" />上传关联面单</el-button><input ref="templateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate"><el-button type="primary" size="small" @click="addRelabelCargoRow"><Plus :size="15" />手动添加行</el-button><el-button size="small" @click="clearRelabelRows">清空</el-button></div></div>
+                <div class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-label-table"><thead><tr><th>商品 SKU</th><th>中文品名 *</th><th>FBA 货件编号 *</th><th>换标新 SKU *</th><th>箱数 *</th><th>我方箱唛</th><th>FBA 箱唛</th><th>FBA 目的仓</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in cargoRows" :key="row.id"><td><el-input v-model="row.sku" placeholder="选填" /></td><td><el-input v-model="row.name" placeholder="请输入中文品名" /></td><td><el-input v-model="row.shipmentNo" placeholder="请输入FBA货件编号" /></td><td><el-input v-model="row.newSkuCode" placeholder="请输入换标新SKU" /></td><td><el-input-number v-model="row.quantity" :min="1" :max="row.availableQuantity" controls-position="right" placeholder="请输入箱数" /></td><td><el-input v-model="row.cartonMark" placeholder="请输入我方箱唛" /></td><td><el-input v-model="row.fbaCartonMark" placeholder="请输入 FBA 箱唛" /></td><td><el-select v-model="row.destinationWarehouseId" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" placeholder="请选择 FBA 目的仓"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select></td><td><el-input v-model="row.remark" type="textarea" :rows="2" maxlength="1000" show-word-limit placeholder="请输入明细备注" /></td><td><button type="button" class="warehouse-delete" title="删除" @click="removeCargoRow(row.id)"><Trash2 :size="16" />删除</button></td></tr><tr v-if="cargoRows.length === 0"><td colspan="10"><div class="warehouse-empty">请先选择仍有库存的历史入仓单，系统将带出可用库存明细</div></td></tr></tbody></table></div>
+              </el-tab-pane>
+              <el-tab-pane label="SKU 换标" name="sku">
+                <div class="warehouse-section-heading warehouse-tab-actions"><p>指定我方箱唛后，可为同一箱唛添加多条 SKU 换标明细，数量按件填写。</p><div><el-button type="primary" size="small" @click="addSkuRelabelRow"><Plus :size="15" />添加 SKU 明细</el-button><el-button size="small" @click="skuRelabelRows = []">清空</el-button></div></div>
+                <div class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-sku-label-table"><thead><tr><th>来源库存箱 *</th><th>我方箱唛 *</th><th>原 SKU *</th><th>换标后 SKU *</th><th>换标数量（件）*</th><th>同时更换箱唛</th><th>新 FBA 箱唛</th><th>FBA 目的仓</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in skuRelabelRows" :key="row.id"><td><el-select v-model="row.sourceRowId" filterable placeholder="选择来源库存箱" @change="selectSkuSource(row)"><el-option v-for="source in cartonMarkOptions" :key="source.value" :label="source.label" :value="source.value" /></el-select></td><td><el-input v-model="row.cartonMark" placeholder="请输入或核对我方箱唛" /></td><td><el-input v-model="row.originalSku" placeholder="请输入原 SKU" /></td><td><el-input v-model="row.newSku" placeholder="请输入换标后 SKU" /></td><td><el-input-number v-model="row.quantity" :min="1" :precision="0" controls-position="right" placeholder="请输入件数" /></td><td><el-checkbox v-model="row.changeCarton">换箱唛</el-checkbox></td><td><el-input v-model="row.fbaCartonMark" :disabled="!row.changeCarton" placeholder="组合换标时填写" /></td><td><el-select v-model="row.destinationWarehouseId" :loading="fbaWarehousesLoading" :disabled="!row.changeCarton || Boolean(fbaWarehousesError)" placeholder="组合换标时选择"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select></td><td><el-input v-model="row.remark" placeholder="请输入备注" /></td><td><button type="button" class="warehouse-delete" title="删除" @click="removeSkuRelabelRow(row.id)"><Trash2 :size="16" />删除</button></td></tr><tr v-if="skuRelabelRows.length === 0"><td colspan="10"><div class="warehouse-empty">暂无 SKU 换标明细，请点击“添加 SKU 明细”</div></td></tr></tbody></table></div>
+              </el-tab-pane>
+            </el-tabs>
+          </template>
+          <template v-else>
+            <div class="warehouse-section-heading"><h3>货物明细</h3><div v-if="props.service !== 'disposal'"><el-button type="primary" size="small" @click="addCargoRow"><Plus :size="15" />添加行</el-button><el-button size="small" @click="cargoRows = []">清空</el-button></div></div>
+            <div class="warehouse-table-scroll"><table class="warehouse-edit-table"><thead><tr><th>商品 SKU *</th><th>中文品名 *</th><th v-if="props.service === 'disposal'">可用箱数</th><th v-else>FNSKU / 箱唛</th><th>{{ props.service === 'disposal' ? '本次废弃箱数' : '箱数' }} *</th><th v-if="props.service !== 'disposal'">操作</th></tr></thead><tbody><tr v-for="row in cargoRows" :key="row.id"><td><el-input v-model="row.sku" :readonly="props.service === 'disposal'" placeholder="请输入商品 SKU" /></td><td><el-input v-model="row.name" :readonly="props.service === 'disposal'" placeholder="请输入中文品名" /></td><td v-if="props.service === 'disposal'"><strong>{{ row.availableQuantity }} 箱</strong></td><td v-else><el-input v-model="row.shippingMark" placeholder="请输入FNSKU或箱唛" /></td><td><el-input-number v-model="row.quantity" :min="props.service === 'disposal' ? 0 : 1" :max="row.availableQuantity" controls-position="right" placeholder="请输入箱数" /></td><td v-if="props.service !== 'disposal'"><button type="button" class="warehouse-delete" title="删除" @click="removeCargoRow(row.id)"><Trash2 :size="16" />删除</button></td></tr><tr v-if="cargoRows.length === 0"><td :colspan="props.service === 'disposal' ? 4 : 5"><div class="warehouse-empty">{{ props.service === 'disposal' ? '请先选择入库单，系统将自动带出 SKU 和可用箱数' : '暂无货物明细，请点击“添加行”' }}</div></td></tr></tbody></table></div>
+          </template>
         </div>
         <div class="warehouse-submit-bar"><el-button @click="resetForm">重置</el-button><el-button type="primary" native-type="submit" :loading="saving">提交{{ config.title }}</el-button></div>
       </form>
@@ -260,12 +469,12 @@ async function openDetail(value: Record<string, string>) {
     <template v-else>
       <div class="warehouse-breadcrumb"><button type="button" @click="mode = 'list'">{{ config.title }}</button><b>/</b><strong>订单详情</strong></div>
       <div class="warehouse-page-heading"><h2>{{ config.title }}详情</h2><el-button @click="mode = 'list'"><ArrowLeft :size="16" />返回列表</el-button></div>
-      <div class="warehouse-card warehouse-form-section"><h3>订单概览</h3><div class="warehouse-detail-grid"><div v-for="(column, index) in config.columns.slice(0, -1)" :key="column"><span>{{ column }}</span><strong>{{ selectedDetail?.[String(index)] || '—' }}</strong></div></div></div>
+      <div class="warehouse-card warehouse-form-section"><h3>订单概览</h3><div class="warehouse-detail-grid"><div v-for="(column, index) in config.columns.slice(1)" :key="column"><span>{{ column }}</span><strong>{{ selectedDetail?.[String(index)] || '—' }}</strong></div></div></div>
       <div v-if="props.service === 'labeling'" class="warehouse-card warehouse-form-section">
-        <h3>箱唛换标明细</h3>
+        <h3>换标任务明细</h3>
-        <div class="warehouse-table-scroll"><table class="warehouse-relabel-detail-table"><thead><tr><th>我方箱唛</th><th>FBA 箱唛</th><th>商品 SKU</th><th>中文品名</th><th>FBA 货件编号</th><th>换标新 SKU</th><th>目的仓</th><th>贴标要求</th><th>备注</th></tr></thead><tbody>
+        <div class="warehouse-table-scroll"><table class="warehouse-relabel-detail-table"><thead><tr><th>换标模式</th><th>我方箱唛</th><th>新 FBA 箱唛</th><th>FBA 目的仓</th><th>任务箱数</th><th>商品 SKU</th><th>SKU 换标明细</th><th>FBA 货件编号</th><th>贴标要求</th><th>备注</th></tr></thead><tbody>
-          <tr v-for="item in selectedRelabelDetail?.items || []" :key="item.id"><td><strong>{{ item.cartonMark || '—' }}</strong></td><td><strong>{{ item.fbaCartonMark || '—' }}</strong></td><td>{{ item.skuCode || '—' }}</td><td>{{ item.productNameZh || '—' }}</td><td>{{ item.shipmentNo || '—' }}</td><td>{{ item.newSkuCode || '—' }}</td><td>{{ warehouseDisplay(item.destinationWarehouseId) }}</td><td>{{ item.labelRequirement || '—' }}</td><td>{{ item.remark || '—' }}</td></tr>
+          <tr v-for="item in selectedRelabelDetail?.items || []" :key="item.id"><td>{{ item.operationType === 'CARTON_AND_SKU' ? '箱唛 + SKU 换标' : item.operationType === 'SKU_LABEL' ? 'SKU 换标' : '箱唛换标' }}</td><td><strong>{{ item.cartonMark || '—' }}</strong></td><td><strong>{{ item.fbaCartonMark || '—' }}</strong></td><td>{{ warehouseDisplay(item.destinationFbaWarehouseCode) }}</td><td>{{ item.totalPackageCount }} 箱</td><td>{{ item.skuCode || '—' }}</td><td><template v-if="item.skuItems?.length"><div v-for="skuItem in item.skuItems" :key="`${skuItem.skuCode}-${skuItem.newSkuCode}-${skuItem.quantity}`">{{ skuItem.skuCode }} → {{ skuItem.newSkuCode }} × {{ skuItem.quantity }} 件</div></template><span v-else>{{ item.newSkuCode || '—' }}</span></td><td>{{ item.shipmentNo || '—' }}</td><td>{{ item.labelRequirement || '—' }}</td><td>{{ item.remark || '—' }}</td></tr>
-          <tr v-if="!selectedRelabelDetail?.items?.length"><td colspan="9"><div class="warehouse-empty">暂无箱唛换标明细</div></td></tr>
+          <tr v-if="!selectedRelabelDetail?.items?.length"><td colspan="10"><div class="warehouse-empty">暂无换标任务明细</div></td></tr>
         </tbody></table></div>
       </div>
     </template>
@@ -274,6 +483,8 @@ async function openDetail(value: Record<string, string>) {
 
 <style scoped>
 .warehouse-service-page{color:#25324a}.warehouse-breadcrumb{display:flex;align-items:center;gap:9px;margin:0 0 14px;color:#9aa3b2;font-size:12px}.warehouse-breadcrumb b{font-weight:400}.warehouse-breadcrumb strong{color:#606b7c}.warehouse-breadcrumb button{padding:0;border:0;background:transparent;color:#4376b8;cursor:pointer}.warehouse-page-heading{display:flex;align-items:center;justify-content:space-between;margin-bottom:16px}.warehouse-page-heading h2{margin:0;color:#17233a;font-size:22px;letter-spacing:0}.warehouse-card{margin-bottom:12px;border:1px solid #e7ebf1;border-radius:4px;background:#fff;box-shadow:0 1px 3px rgba(25,42,70,.04)}.warehouse-filter-card{padding:20px 22px 16px}.warehouse-filter-grid{display:grid;grid-template-columns:repeat(4,minmax(180px,1fr));gap:16px 20px}.warehouse-filter-grid label,.warehouse-form-grid label{display:flex;min-width:0;flex-direction:column;gap:7px}.warehouse-filter-grid label>span,.warehouse-form-grid label>span{color:#596579;font-size:12px}.warehouse-filter-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:18px}.warehouse-table-card{overflow:hidden}.warehouse-table-scroll{overflow-x:auto}table{width:100%;min-width:940px;border-collapse:collapse;font-size:12px}th{height:44px;padding:0 14px;border-bottom:1px solid #e8edf3;background:#f7f9fc;color:#4d5a6e;font-weight:650;text-align:left;white-space:nowrap}td{height:48px;padding:8px 14px;border-bottom:1px solid #eef1f5;color:#526176;white-space:nowrap}.warehouse-empty{display:grid;height:150px;color:#a0a9b7;place-items:center}.warehouse-link,.warehouse-delete{display:inline-flex;align-items:center;gap:5px;padding:4px;border:0;background:transparent;color:#2176d2;cursor:pointer}.warehouse-delete{color:#d64545}.warehouse-pagination{display:flex;align-items:center;justify-content:flex-end;gap:8px;padding:14px 18px;color:#778398;font-size:12px}.warehouse-pagination span{margin-right:8px}.warehouse-page-number{width:28px;height:28px;border:1px solid #2176d2;border-radius:3px;background:#2176d2;color:#fff}.warehouse-form-section{padding:22px}.warehouse-form-section h3{margin:0 0 18px;padding-bottom:12px;border-bottom:1px solid #edf0f4;color:#26364f;font-size:15px;letter-spacing:0}.warehouse-form-grid{display:grid;grid-template-columns:repeat(2,minmax(240px,1fr));gap:18px 28px}.warehouse-form-grid i{margin-right:3px;color:#e24b4b;font-style:normal}.warehouse-span-2{grid-column:1/-1}.warehouse-section-heading{display:flex;align-items:center;justify-content:space-between}.warehouse-section-heading h3{flex:1}.warehouse-edit-table td{padding:9px 10px}.warehouse-edit-table :deep(.el-input-number){width:130px}.warehouse-hint{margin:12px 0 0;color:#8792a2;font-size:12px}.warehouse-submit-bar{display:flex;justify-content:center;gap:10px;padding:12px 0 30px}.warehouse-detail-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:24px}.warehouse-detail-grid div{display:flex;flex-direction:column;gap:7px}.warehouse-detail-grid span{color:#8a95a5;font-size:12px}.warehouse-detail-grid strong{color:#334157;font-size:13px}:deep(.el-button){border-radius:4px}:deep(.el-button span){display:inline-flex;align-items:center;gap:6px}:deep(.el-select),:deep(.el-date-editor.el-input){width:100%}@media(max-width:1100px){.warehouse-filter-grid{grid-template-columns:repeat(2,1fr)}.warehouse-detail-grid{grid-template-columns:repeat(2,1fr)}}
-.warehouse-hidden-input{display:none}.warehouse-label-table{min-width:1320px}.warehouse-attachment-tip{margin:10px 0 12px;color:#7d8797;font-size:12px}.warehouse-mark-mapping{display:flex;flex-wrap:wrap;gap:8px;margin:4px 0 8px;padding:12px;border:1px solid #dce7f5;border-radius:5px;background:#f7faff}.warehouse-mark-mapping strong{width:100%;color:#34445c}.warehouse-mark-mapping span{padding:5px 9px;border-radius:3px;background:#eaf2fc;color:#3e6593;font-size:12px}
+.warehouse-hidden-input{display:none}.warehouse-label-table{min-width:1120px}.warehouse-attachment-tip{margin:10px 0 12px;color:#7d8797;font-size:12px}.warehouse-mark-mapping{display:flex;flex-wrap:wrap;gap:8px;margin:4px 0 8px;padding:12px;border:1px solid #dce7f5;border-radius:5px;background:#f7faff}.warehouse-mark-mapping strong{width:100%;color:#34445c}.warehouse-mark-mapping span{padding:5px 9px;border-radius:3px;background:#eaf2fc;color:#3e6593;font-size:12px}
+.warehouse-unmaintained{margin-left:8px;color:#e6a23c;font-size:12px;font-style:normal}
+.warehouse-labeling-tabs{margin-top:-8px}.warehouse-tab-actions{align-items:center;margin:2px 0 14px}.warehouse-tab-actions p{margin:0;color:#7d8797;font-size:12px}.warehouse-tab-actions>div{display:flex;gap:8px}.warehouse-sku-notice{margin:0 0 14px;padding:10px 12px;border:1px solid #f2d39b;border-radius:4px;background:#fff8e8;color:#8a6116;font-size:12px}.warehouse-sku-label-table{min-width:980px}.warehouse-sku-label-table :deep(.el-input-number){width:160px}:deep(.warehouse-labeling-tabs>.el-tabs__header){margin-bottom:18px}:deep(.warehouse-labeling-tabs .el-tabs__item){height:42px;padding:0 26px;font-weight:600}
 .warehouse-relabel-detail-table{min-width:1420px}.warehouse-relabel-detail-table td strong{color:#253f67}
 </style>

src/modules/overseas-warehouse/views/relabelAttachments.test.mjs

@@ -4,45 +4,99 @@ import test from 'node:test'
 
 const view = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
 const api = readFileSync(new URL('../api/warehouseServices.ts', import.meta.url), 'utf8')
+const warehouseApi = readFileSync(new URL('../../first-leg/api/firstLeg.ts', import.meta.url), 'utf8')
 
-test('上传关联面单后直接生成箱维度货物明细', () => {
+test('贴标申请从当前客户仍有库存的历史入仓单选择来源', () => {
+  assert.match(view, /海外操作仓（中转仓）/)
+  assert.match(view, /选择有库存的历史入仓单/)
+  assert.match(view, /曾经下单且当前仍有库存的入仓单/)
+  assert.match(view, /当前中转仓暂无已入库可用库存/)
+  assert.match(view, /relabelInboundOptions/)
+  assert.match(view, /listRelabelInventoryCandidates\(form\.warehouse\)/)
+  assert.match(api, /relabel-applications\/inventory-candidates/)
+  assert.match(api, /params: \{ operationWarehouseId/)
+})
+
+test('客户贴标表单不展示客户单号、托盘和内部库存来源列', () => {
+  assert.doesNotMatch(view, /<i>\*<\/i>客户单号/)
+  assert.doesNotMatch(view, /<th>原入仓单<\/th>/)
+  assert.doesNotMatch(view, /<th>托盘<\/th>/)
+  assert.doesNotMatch(view, /<th>中转仓<\/th>/)
+  assert.doesNotMatch(view, /已选托盘组成/)
+})
+
+test('贴标申请保留关联模板下载和上传入口', () => {
+  assert.match(view, /downloadRelabelTemplate/)
   assert.match(view, /下载关联模板/)
+  assert.match(view, /templateInput\?\.click\(\)/)
   assert.match(view, /上传关联面单/)
-  assert.match(view, /cargoRows\.value = imported\.map/)
+  assert.match(view, /importRelabelTemplate/)
-  assert.match(view, /totalPackageCount: 1, notifiedPackageCount: 1/)
+  assert.match(view, /明细行标识/)
-  assert.doesNotMatch(view, /applyCartonMarkBinding/)
+  assert.doesNotMatch(view, /库存位置ID/)
-  assert.doesNotMatch(view, /上传SKU 标签/)
 })
 
-test('目的仓支持顶部兜底并随每箱明细提交', () => {
+test('贴标货物明细支持手动添加和编辑', () => {
-  assert.match(api, /destinationWarehouseId\?: string/)
+  assert.match(view, /手动添加行/)
-  assert.match(view, /!item\.destinationWarehouseId && !form\.warehouse/)
+  assert.match(view, /addRelabelCargoRow/)
-  assert.match(view, /destinationWarehouseId: item\.destinationWarehouseId \|\| undefined/)
+  assert.match(view, /货物明细已按所选入仓单的可用库存带出/)
-  assert.match(view, /cartonMark: item\.cartonMark/)
+  assert.match(view, /<el-input v-model="row\.sku" :readonly="props\.service === 'disposal'"/)
-  assert.match(view, /fbaCartonMark: item\.fbaCartonMark/)
 })
 
-test('贴标明细保留箱唛绑定，不再单独填箱数', () => {
+test('贴标货物明细拆分为箱唛换标和 SKU 换标页签', () => {
-  assert.match(view, /<th>我方箱唛<\/th><th>FBA 箱唛/)
+  assert.match(view, /el-tab-pane label="箱唛换标" name="carton"/)
-  assert.match(view, /v-model="row\.cartonMark"/)
+  assert.match(view, /el-tab-pane label="SKU 换标" name="sku"/)
-  assert.match(view, /v-if="props\.service !== 'labeling'">\{\{ props\.service === 'disposal'/)
+  assert.match(view, /interface SkuRelabelRow/)
+  assert.match(view, /来源库存箱 \*/)
+  assert.match(view, /我方箱唛 \*/)
+  assert.match(view, /换标数量（件）\*/)
+  assert.match(view, /buildSkuRelabelItems/)
+  assert.match(view, /CARTON_AND_SKU/)
+  assert.match(view, /changeCarton/)
+  assert.doesNotMatch(view, /SKU 换标提交待接口接入/)
 })
 
-test('商品 SKU 在贴标模板和明细中为选填', () => {
+test('一次申请单选入仓单且每项保留原库存归属', () => {
-  assert.match(view, /const header = \['商品SKU（选填）'/)
+  assert.doesNotMatch(view, /multiple filterable collapse-tags/)
-  assert.match(view, /const example = \['', '示例商品'/)
+  assert.match(view, /String\(candidate\.inboundOrderId\) === inboundOrderId/)
-  assert.match(view, /headers\.includes\('商品SKU（选填）'\)/)
+  assert.match(view, /sourceInventoryBalanceId: String\(candidate\.inventoryBalanceId\)/)
-  assert.match(view, /const required = \['中文品名', 'FBA货件编号'/)
+  assert.match(view, /sourceInventoryPositionId: String\(position\.positionId\)/)
-  assert.match(view, /商品 SKU<span v-if="props\.service !== 'labeling'"> \*<\/span>/)
+  assert.match(view, /sourceInboundOrderId: String\(candidate\.inboundOrderId\)/)
-  assert.match(api, /skuCode\?: string; productNameZh/)
+  assert.match(api, /sourceInventoryBalanceId: string; sourceInventoryPositionId: string; sourceInboundOrderId: string/)
 })
 
-test('贴标申请详情展示逐箱箱唛换标关系', () => {
+test('海外操作仓和FBA目的仓使用独立字段', () => {
+  assert.match(api, /operationWarehouseId: string/)
+  assert.match(api, /destinationFbaWarehouseCode\?: string/)
+  assert.match(view, /operationWarehouseId: form\.warehouse/)
+  assert.match(view, /destinationFbaWarehouseCode: item\.destinationWarehouseId/)
+  assert.match(view, /<th>FBA 目的仓<\/th>/)
+})
+
+test('操作仓和FBA仓均从商户仓库目录按类型加载', () => {
+  assert.match(view, /getMerchantWarehouses\(\{ warehouseType: 'FBA' \}\)/)
+  assert.match(view, /getMerchantWarehouses\(\{ warehouseType: 'OVERSEAS' \}\)/)
+  assert.match(view, /v-for="warehouse in operationWarehouses"/)
+  assert.match(view, /v-for="warehouse in fbaWarehouses"/)
+  assert.doesNotMatch(view, /美西海外仓-ONT8/)
+})
+
+test('选择海外操作仓后自动带出仓库签收联系方式', () => {
+  assert.match(warehouseApi, /contactName: string \| null/)
+  assert.match(warehouseApi, /contactPhone: string \| null/)
+  assert.match(view, /form\.contact = warehouse\?\.contactName \|\| ''/)
+  assert.match(view, /form\.phone = warehouse\?\.contactPhone \|\| ''/)
+  assert.match(view, /海外仓签收联系人/)
+  assert.match(view, /海外仓联系电话/)
+  assert.doesNotMatch(view, /ElMessage\.warning\('该海外仓主数据未完整维护/)
+  assert.match(view, /form\.warehouse && !form\.contact[^\n]+warehouse-unmaintained[^\n]+未维护/)
+  assert.match(view, /form\.warehouse && !form\.phone[^\n]+warehouse-unmaintained[^\n]+未维护/)
+})
+
+test('贴标详情展示箱唛、SKU 子明细和独立FBA目的仓', () => {
   assert.match(api, /export interface RelabelDetail/)
-  assert.match(api, /return overseasApiRequest<RelabelDetail>/)
-  assert.match(view, /<h3>箱唛换标明细<\/h3>/)
   assert.match(view, /item\.cartonMark \|\| '—'/)
   assert.match(view, /item\.fbaCartonMark \|\| '—'/)
-  assert.match(view, /item\.shipmentNo \|\| '—'/)
+  assert.match(view, /item\.destinationFbaWarehouseCode/)
-  assert.match(view, /item\.newSkuCode \|\| '—'/)
+  assert.match(view, /item\.operationType === 'CARTON_AND_SKU'/)
+  assert.match(view, /item\.skuItems\?\.length/)
 })

src/modules/tenant-management/contracts.ts

@@ -106,6 +106,7 @@ export const FRONTEND_TO_MERCHANT_PERMISSION_CODES: Readonly<Record<string, read
   'merchant:warehouse:delivery:list': ['merchant:warehouse:delivery:list'],
   'merchant:warehouse:delivery:create': ['merchant:warehouse:delivery:create'],
   'merchant:warehouse:inbound:list': ['merchant:warehouse:inbound:list'],
+  'merchant:overseas-warehouse:return-inventory:list': ['merchant:overseas-warehouse:return-inventory:list'],
   'merchant:cross-border:procurement': ['merchant:cross-border:procurement'],
   'merchant:cross-border:domestic-trucking': ['merchant:cross-border:domestic-trucking'],
   'merchant:cross-border:pallet-shipping': ['merchant:cross-border:pallet-shipping'],

src/navigation/clientNavigation.test.mjs

@@ -59,7 +59,7 @@ test('keeps only implemented navigation groups visible', () => {
       },
       {
         title: '海外仓',
-        children: ['贴标申请', '仓储转运', '货物废弃', '退货换标'],
+        children: ['贴标申请', '仓储转运', '货物废弃', '退货签收', '退货库存'],
       },
       {
         title: '订单管理',
@@ -106,6 +106,7 @@ test('flattens visible leaves with unique paths', () => {
     '/overseas-warehouse/storage-transfer',
     '/overseas-warehouse/cargo-disposal',
     '/overseas-warehouse/return-relabel',
+    '/overseas-warehouse/return-inventory',
     '/orders/inbound',
     '/orders/delivery',
     '/finance/account',
@@ -341,7 +342,8 @@ test('keeps only the unified my-orders placeholder cataloged while activating im
     ['overseas-warehouse/labeling', 'WarehouseServiceView.vue'],
     ['overseas-warehouse/storage-transfer', 'WarehouseServiceView.vue'],
     ['overseas-warehouse/cargo-disposal', 'WarehouseServiceView.vue'],
-    ['overseas-warehouse/return-relabel', 'WarehouseServiceView.vue'],
+    ['overseas-warehouse/return-relabel', 'ReturnOrdersView.vue'],
+    ['overseas-warehouse/return-inventory', 'ReturnInventoryView.vue'],
     ['orders/my', 'MyOrdersView.vue'],
     ['orders/inbound', 'InboundOrdersView.vue'],
     ['orders/delivery', 'DeliveryOrdersView.vue'],