From 72027e7ff20e287a10a1641e782e25e447410dbd Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Mon, 7 Sep 2026 15:34:51 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index e454460..87e05ae 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -52,9 +52,9 @@ | 统一订单展示 | `src/modules/order-management/` | `src/modules/first-leg/` 与对应后端订单契约 | | 客户财务账单、入仓码联查、收款、未收余额与客户确认 | `src/modules/finance/`；确认与明细入口 `views/FinanceBillsView.vue`、`api/finance.ts`，入仓码通过 `src/modules/first-leg/public.ts` 复用 `InboundCodeAssociationDialog` | Backend `finance/`；账单行只显示服务端 `inboundCode` 并按登录客户查询业务关系，缺失显示“—”，不得回退内部 ID。收款方式由服务端枚举映射中文。出账或已出账调整后为 `PENDING_CONFIRMATION`，客户确认提交登录成员、`expectedVersion` 和幂等键 | | 客户资金账户与充值申请 | `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/cross-border/routes.ts`、`components/BusinessOrdersView.vue`、`api/businessOrders.ts` | 三个路由均为 `active`，客户范围只取 Token；采购创建的 `customerName` 只取当前认证会话企业名称，不允许自由输入或冒用其他客户。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`；换标申请必须提交正数 CNY `chargeAmount`，页面展示服务端钱包冻结/结算/释放状态及错误，不本地推导余额结果。Backend `lastleg-service/` 的 `relabel/`、`transfer/`、`discard/`，请求统一经 `src/api/overseasHttp.ts` 与 `gateway-overseas/` | ## 租户、认证与数据安全 From f76c5cfd0928de6c1f723d965a681c6a47e47f88 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Tue, 8 Sep 2026 17:24:51 +0800 Subject: [PATCH 02/12] feat: expose dropship palletization progress --- shared/src/index.ts | 1 + src/modules/first-leg/api/firstLeg.ts | 1 + src/modules/first-leg/api/inboundBilling.test.mjs | 4 ++++ src/modules/first-leg/api/unifiedOrders.test.mjs | 5 ++++- src/modules/first-leg/api/unifiedOrders.ts | 3 +++ .../first-leg/components/OrderProgressPanel.vue | 2 +- src/modules/first-leg/store/firstLegOrders.test.mjs | 7 +++++++ src/modules/first-leg/store/firstLegOrders.ts | 7 +++++-- src/modules/first-leg/types/inboundBilling.ts | 1 + src/modules/first-leg/utils/firstLegOrder.test.mjs | 9 ++++++++- .../first-leg/views/FirstLegOrdersView.test.mjs | 8 +++++++- src/modules/first-leg/views/FirstLegOrdersView.vue | 2 +- .../overseas-warehouse/views/WarehouseServiceView.vue | 10 +++++++++- 13 files changed, 52 insertions(+), 8 deletions(-) diff --git a/shared/src/index.ts b/shared/src/index.ts index ceb64c2..42c4559 100644 --- a/shared/src/index.ts +++ b/shared/src/index.ts @@ -86,6 +86,7 @@ export const FIRST_LEG_ORDER_STATUSES = [ { code: 'DRAFT', label: '草稿' }, { code: 'PENDING_REVIEW', label: '待审核' }, { code: 'WAIT_MEASURE', label: '待测量数据' }, + { code: 'WAIT_PALLETIZE', label: '待组托' }, { code: 'WAIT_SPLIT', label: '待分柜' }, { code: 'LOADING', label: '装柜中' }, { code: 'LOADED', label: '装柜完成' }, diff --git a/src/modules/first-leg/api/firstLeg.ts b/src/modules/first-leg/api/firstLeg.ts index 8cbfa7c..5273066 100644 --- a/src/modules/first-leg/api/firstLeg.ts +++ b/src/modules/first-leg/api/firstLeg.ts @@ -217,6 +217,7 @@ export interface MerchantFirstLegOrder { customerId: number | string | null customerName: string fulfillmentType?: 'STANDARD' | 'ONE_CLICK_DROPSHIP' | null + lxCode?: string | null status: ApiFirstLegStatus transportMode?: ApiTransportMode tradeTerm: string | null diff --git a/src/modules/first-leg/api/inboundBilling.test.mjs b/src/modules/first-leg/api/inboundBilling.test.mjs index d0742c1..c238a74 100644 --- a/src/modules/first-leg/api/inboundBilling.test.mjs +++ b/src/modules/first-leg/api/inboundBilling.test.mjs @@ -35,3 +35,7 @@ test('keeps all backend Long identifiers as strings', () => { assert.doesNotMatch(typesSource, /(?:id|Id): number/) assert.doesNotMatch(typesSource, /internalNotes|statusHistory|files/) }) + +test('accepts the one-click dropship palletization process status', () => { + assert.match(typesSource, /MerchantInboundProcessStatus[\s\S]*?'WAIT_PALLETIZE'[\s\S]*?'WAIT_SPLIT'/) +}) diff --git a/src/modules/first-leg/api/unifiedOrders.test.mjs b/src/modules/first-leg/api/unifiedOrders.test.mjs index ca874ef..9e1ee43 100644 --- a/src/modules/first-leg/api/unifiedOrders.test.mjs +++ b/src/modules/first-leg/api/unifiedOrders.test.mjs @@ -4,8 +4,11 @@ import test from 'node:test' const source = readFileSync(new URL('./unifiedOrders.ts', import.meta.url), 'utf8') -test('keeps the merchant unified-order boundary and phase-two WAIT_SPLIT status', () => { +test('keeps the merchant unified-order boundary and one-click palletization status', () => { assert.match(source, /const unifiedOrderBaseUrl = '\/merchant\/v1\/orders'/) + assert.match(source, /ApiUnifiedOrderMainStatus[\s\S]*?'WAIT_PALLETIZE'/) assert.match(source, /ApiUnifiedOrderMainStatus[\s\S]*?'WAIT_SPLIT'/) + assert.match(source, /fulfillmentType\?: 'STANDARD' \| 'ONE_CLICK_DROPSHIP' \| null/) + assert.match(source, /lxCode\?: string \| null/) assert.match(source, /mainStatus\?: ApiUnifiedOrderMainStatus/) }) diff --git a/src/modules/first-leg/api/unifiedOrders.ts b/src/modules/first-leg/api/unifiedOrders.ts index fad19f2..e32787f 100644 --- a/src/modules/first-leg/api/unifiedOrders.ts +++ b/src/modules/first-leg/api/unifiedOrders.ts @@ -4,6 +4,7 @@ import type { ApiContainerMode, ApiDestinationType, ApiFirstLegStatus, ApiPickup export type ApiUnifiedOrderMainStatus = | 'PENDING_REVIEW' | 'WAIT_MEASURE' + | 'WAIT_PALLETIZE' | 'WAIT_SPLIT' | 'LOADING' | 'LOADED' @@ -54,6 +55,8 @@ export interface MerchantUnifiedOrderRow { orderId: number | string tenantId: number | string orderNo: string | null + fulfillmentType?: 'STANDARD' | 'ONE_CLICK_DROPSHIP' | null + lxCode?: string | null mainStatus: ApiUnifiedOrderMainStatus nextAction: string | null internalOrderStatus: ApiFirstLegStatus | null diff --git a/src/modules/first-leg/components/OrderProgressPanel.vue b/src/modules/first-leg/components/OrderProgressPanel.vue index 32198cc..d56f20c 100644 --- a/src/modules/first-leg/components/OrderProgressPanel.vue +++ b/src/modules/first-leg/components/OrderProgressPanel.vue @@ -23,7 +23,7 @@ function stageState(index: number) {

订单进度

- 国内装柜进度及后续履约同步 + 国内入仓、组托、装柜及后续履约同步
{{ getFirstLegStatusLabel(order.status) }} diff --git a/src/modules/first-leg/store/firstLegOrders.test.mjs b/src/modules/first-leg/store/firstLegOrders.test.mjs index 095cb15..9cdeba9 100644 --- a/src/modules/first-leg/store/firstLegOrders.test.mjs +++ b/src/modules/first-leg/store/firstLegOrders.test.mjs @@ -80,6 +80,8 @@ test('declares the final C02 row and detail contract in the API adapter', () => assert.match(unifiedApiSource, /orderId: number \| string/) assert.match(unifiedApiSource, /mainStatus: ApiUnifiedOrderMainStatus/) assert.match(unifiedApiSource, /nextAction: string \| null/) + assert.match(unifiedApiSource, /fulfillmentType\?: 'STANDARD' \| 'ONE_CLICK_DROPSHIP' \| null/) + assert.match(unifiedApiSource, /lxCode\?: string \| null/) assert.match(unifiedApiSource, /customerRemark: string \| null/) for (const field of ['pickupMethod', 'requestedPickupAt', 'containerMode', 'destinationType', 'destinationCode', 'skuNos', 'totalQuantity', 'totalNetWeightKg', 'chargeableVolumeCbm', 'inboundCompletedAt', 'shipmentId', 'referenceId']) { assert.match(unifiedApiSource, new RegExp(`${field}:`)) @@ -117,6 +119,10 @@ test('maps C02 authoritative status, transport, cargo and pickup snapshots', () assert.match(storeSource, /id: String\(summary\.orderId\)/) assert.match(storeSource, /transportMode: unifiedTransport\(summary\.containerMode\)/) assert.match(storeSource, /status: summary\.mainStatus/) + assert.match(storeSource, /fulfillmentType: summary\.fulfillmentType \?\? 'STANDARD'/) + assert.match(storeSource, /lxCode: summary\.lxCode \?\? ''/) + assert.match(storeSource, /mapped\.fulfillmentType = detail\.summary\.fulfillmentType \?\? mapped\.fulfillmentType/) + assert.match(storeSource, /mapped\.lxCode = detail\.summary\.lxCode \?\? mapped\.lxCode/) assert.match(storeSource, /requestedPickupAt: summary\.requestedPickupAt \?\? ''/) assert.match(storeSource, /chargeableVolumeCbm: summary\.chargeableVolumeCbm \?\? null/) assert.match(storeSource, /inboundedAt: summary\.inboundCompletedAt \?\? ''/) @@ -127,6 +133,7 @@ test('maps C02 authoritative status, transport, cargo and pickup snapshots', () assert.match(storeSource, /summary\?\.loading\?\.pickingVersion/) assert.match(storeSource, /summary\?\.inboundId == null \? '' : String\(summary\.inboundId\)/) assert.match(storeSource, /customerRemark: summary\.customerRemark \?\? ''/) + assert.match(storeSource, /PALLETIZE_DROPSHIP: '一件代发组托'/) }) test('sends a manually entered old-system inbound code with the draft payload', () => { diff --git a/src/modules/first-leg/store/firstLegOrders.ts b/src/modules/first-leg/store/firstLegOrders.ts index 732728f..5fc9e54 100644 --- a/src/modules/first-leg/store/firstLegOrders.ts +++ b/src/modules/first-leg/store/firstLegOrders.ts @@ -231,6 +231,7 @@ const unifiedActionLabels: Readonly> = { SUBMIT_ORDER: '订单已提交', APPROVE_ORDER: '订单审核通过', CONFIRM_MEASUREMENT: '测量数据已确认', + PALLETIZE_DROPSHIP: '一件代发组托', SMART_SPLIT: '分柜方案已更新', CONFIRM_PRELOAD: '预装清单已确认', COMPLETE_LOADING: '装柜已完成', @@ -279,7 +280,7 @@ function mapOrder(order: MerchantFirstLegOrder, warehouses: PlatformReceivingWar return { id: String(order.id ?? order.orderId ?? ''), orderNo: order.orderNo, referenceNo: order.referenceId ?? '', transportMode: order.transportMode ? clientTransport(order) : null, - businessType: 'EXPORT', fulfillmentType: order.fulfillmentType ?? 'STANDARD', origin: shipper?.city ?? '', destination: order.destinationWarehouseName || order.destinationCountryCode || '', + businessType: 'EXPORT', fulfillmentType: order.fulfillmentType ?? 'STANDARD', lxCode: order.lxCode ?? '', origin: shipper?.city ?? '', destination: order.destinationWarehouseName || order.destinationCountryCode || '', receivingWarehouseId: String(order.receivingWarehouseId), receivingWarehouseName: order.receivingWarehouseName, receivingWarehouseSnapshot: orderWarehouseSnapshot(order, warehouse), expectedDepartureDate: order.expectedShipDate ?? '', etd: '', eta: '', shipperPartyId: shipper?.id ?? '', shipperPartySnapshot: shipper, shipper: shipper?.name ?? '', @@ -328,7 +329,7 @@ function mapUnifiedOrderRow(summary: MerchantUnifiedOrderRow, warehouses: Platfo const warehouse = warehouses.find((item) => item.id === String(summary.receivingWarehouseId)) return { id: String(summary.orderId), orderNo: summary.orderNo, referenceNo: summary.referenceId ?? '', transportMode: unifiedTransport(summary.containerMode), - businessType: 'EXPORT', origin: '', destination: summary.destinationWarehouseName ?? '', + businessType: 'EXPORT', fulfillmentType: summary.fulfillmentType ?? 'STANDARD', lxCode: summary.lxCode ?? '', origin: '', destination: summary.destinationWarehouseName ?? '', receivingWarehouseId: summary.receivingWarehouseId == null ? '' : String(summary.receivingWarehouseId), receivingWarehouseName: summary.receivingWarehouseName ?? '', receivingWarehouseSnapshot: warehouseSnapshot(warehouse), expectedDepartureDate: summary.expectedShipDate ?? '', etd: '', eta: '', shipperPartyId: '', shipperPartySnapshot: null, @@ -381,6 +382,8 @@ function mapUnifiedOrderDetail(detail: MerchantUnifiedOrderDetail, warehouses: P const mapped = mapOrder(detail.order.order, warehouses, detail.order) mapped.id = String(detail.summary.orderId) mapped.status = detail.summary.mainStatus + mapped.fulfillmentType = detail.summary.fulfillmentType ?? mapped.fulfillmentType + mapped.lxCode = detail.summary.lxCode ?? mapped.lxCode mapped.businessSummary = businessSummary(detail.summary) mapped.timeline = unifiedTimeline(detail) const summary = mapUnifiedOrderRow(detail.summary, warehouses) diff --git a/src/modules/first-leg/types/inboundBilling.ts b/src/modules/first-leg/types/inboundBilling.ts index bb34de7..101a2a5 100644 --- a/src/modules/first-leg/types/inboundBilling.ts +++ b/src/modules/first-leg/types/inboundBilling.ts @@ -6,6 +6,7 @@ export type MerchantInboundProcessStatus = | 'WAIT_PRICING' | 'FEE_CONFIRMING' | 'INBOUNDING' + | 'WAIT_PALLETIZE' | 'WAIT_SPLIT' | 'VOIDED' diff --git a/src/modules/first-leg/utils/firstLegOrder.test.mjs b/src/modules/first-leg/utils/firstLegOrder.test.mjs index 6ce01cf..65a4c79 100644 --- a/src/modules/first-leg/utils/firstLegOrder.test.mjs +++ b/src/modules/first-leg/utils/firstLegOrder.test.mjs @@ -5,6 +5,8 @@ import { canClientCancelFirstLegOrder, canClientEditFirstLegOrder, createEmptyCargoItem, + FIRST_LEG_PROGRESS_STAGES, + getFirstLegProgressIndex, getFirstLegStatusLabel, getFirstLegTransportModeLabel, summarizeFirstLegCargo, @@ -58,12 +60,16 @@ function validDraft() { test('uses the confirmed status and transport labels', () => { assert.equal(getFirstLegStatusLabel('WAIT_MEASURE'), '待测量数据') - assert.equal(getFirstLegStatusLabel('WAIT_SPLIT'), '待分柜') + assert.equal(getFirstLegStatusLabel('WAIT_PALLETIZE'), '待组托') assert.equal(getFirstLegStatusLabel('WAIT_SPLIT'), '待分柜') assert.equal(getFirstLegStatusLabel('LOADING'), '装柜中') assert.equal(getFirstLegStatusLabel('LOADED'), '装柜完成') assert.equal(getFirstLegStatusLabel('DELIVERED'), '派送完成') assert.equal(getFirstLegTransportModeLabel('FCL'), '海运整箱 FCL') + assert.deepEqual(FIRST_LEG_PROGRESS_STAGES.map((item) => item.code), [ + 'PENDING_REVIEW', 'WAIT_MEASURE', 'WAIT_PALLETIZE', 'WAIT_SPLIT', 'LOADING', 'LOADED', 'DELIVERED', + ]) + assert.equal(getFirstLegProgressIndex('WAIT_PALLETIZE'), 2) }) test('only allows draft orders to be edited in the confirmed phase-one flow', () => { @@ -72,6 +78,7 @@ test('only allows draft orders to be edited in the confirmed phase-one flow', () assert.equal(canClientCancelFirstLegOrder('DRAFT'), true) assert.equal(canClientCancelFirstLegOrder('PENDING_REVIEW'), true) assert.equal(canClientCancelFirstLegOrder('WAIT_MEASURE'), false) + assert.equal(canClientCancelFirstLegOrder('WAIT_PALLETIZE'), false) assert.equal(canClientCancelFirstLegOrder('WAIT_SPLIT'), false) }) diff --git a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs index 351c9c9..5653e00 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs +++ b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs @@ -199,7 +199,7 @@ test('shows one unified progress line and C02 business summaries without detail assert.match(source, /summary\.expectedPickCount/) assert.match(source, /summary\.deliveryTrackingNo/) assert.match(progressSource, /FIRST_LEG_PROGRESS_STAGES/) - assert.match(progressSource, /国内装柜进度及后续履约同步/) + assert.match(progressSource, /国内入仓、组托、装柜及后续履约同步/) assert.doesNotMatch(progressSource, /进度记录|el-timeline|timeline/) assert.doesNotMatch(source, /

报关回执<\/h3>/) assert.match(source, /船期摘要/) @@ -369,6 +369,12 @@ test('distills order creation into the confirmed prototype sections with server assert.doesNotMatch(source, /v-model="form\.(?:businessType|origin|destination|priority|tradeTerm)"/) }) +test('shows an optional LX inbound order number for one-click dropship orders', () => { + assert.match(source, /v-if="form\.fulfillmentType === 'ONE_CLICK_DROPSHIP'" label="LX入库单号" prop="lxCode"/) + assert.match(source, /v-model="form\.lxCode"[^>]*placeholder="请输入LX入库单号"/) + assert.doesNotMatch(source, /label="LX入库单号"[^>]*required/) +}) + test('loads only active server channels for the selected domestic warehouse', () => { assert.match(source, /getMerchantPricingChannels\(warehouseId\)/) assert.match(source, /const channelOptions = ref\(\[\]\)/) diff --git a/src/modules/first-leg/views/FirstLegOrdersView.vue b/src/modules/first-leg/views/FirstLegOrdersView.vue index 1b66bbf..f9f67a0 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.vue +++ b/src/modules/first-leg/views/FirstLegOrdersView.vue @@ -1898,7 +1898,7 @@ async function searchOrders(model: QueryModel) {

客户下单

先选择货物如何送到国内收货仓，并填写本次运输安排。

普通头程一件代发测量完成后不办理国内库存入库，将直接推送 PDA 合托。 - 用于绑定领星入库单，提交后可在尾程订单、入库单和出库单中查询。 + 用于绑定领星入库单，提交后可在尾程订单、入库单和出库单中查询。 快递自送我司提货卡车自送 @@ -260,14 +264,18 @@ async function openDetail(value: Record) { + +

货物明细

添加行清空

模板每行代表一箱；上传后直接回显到下方明细。明细目的仓优先，留空时使用顶部统一目的海外仓。

-
商品 SKU *中文品名 *可用箱数{{ props.service === 'labeling' ? 'FBA 货件编号 *' : 'FNSKU / 箱唛' }}换标新 SKU *{{ props.service === 'disposal' ? '本次废弃箱数' : props.service === 'relabel' ? '退件数量' : '箱数' }} *操作
{{ row.availableQuantity }} 箱
{{ props.service === 'disposal' ? '请先选择入库单，系统将自动带出 SKU 和可用箱数' : '暂无货物明细，请点击“添加行”' }}
+ +
操作商品 SKU *中文品名 *可用箱数{{ props.service === 'labeling' ? 'FBA 货件编号 *' : 'FNSKU / 箱唛' }}换标新 SKU *{{ props.service === 'disposal' ? '本次废弃箱数' : props.service === 'relabel' ? '退件数量' : '箱数' }} *
{{ row.availableQuantity }} 箱
{{ props.service === 'disposal' ? '请先选择入库单，系统将自动带出 SKU 和可用箱数' : '暂无货物明细，请点击“添加行”' }}
+
重置提交{{ config.title }}
From a7f073c7831a9733e80e7ffef9ef23dc0f8cbfd8 Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Tue, 8 Sep 2026 20:28:05 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 2 +- src/components.d.ts | 3 + .../views/businessIdentifiers.test.mjs | 1 - .../overseas-warehouse/api/returnInventory.ts | 59 ++++ .../overseas-warehouse/api/returnOrders.ts | 29 ++ .../api/warehouseServices.ts | 28 +- src/modules/overseas-warehouse/routes.ts | 18 +- .../views/ReturnInventoryView.vue | 124 +++++++ .../views/ReturnOrdersView.vue | 116 +++++++ .../views/WarehouseServiceView.vue | 327 ++++++++++++++---- .../views/relabelAttachments.test.mjs | 108 ++++-- src/modules/tenant-management/contracts.ts | 1 + src/navigation/clientNavigation.test.mjs | 6 +- 13 files changed, 725 insertions(+), 97 deletions(-) create mode 100644 src/modules/overseas-warehouse/api/returnInventory.ts create mode 100644 src/modules/overseas-warehouse/api/returnOrders.ts create mode 100644 src/modules/overseas-warehouse/views/ReturnInventoryView.vue create mode 100644 src/modules/overseas-warehouse/views/ReturnOrdersView.vue diff --git a/AGENTS.md b/AGENTS.md index e454460..3100764 100644 --- a/AGENTS.md +++ b/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/` | ## 租户、认证与数据安全 diff --git a/src/components.d.ts b/src/components.d.ts index 723bdea..2240e47 100644 --- a/src/components.d.ts +++ b/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'] diff --git a/src/modules/first-leg/views/businessIdentifiers.test.mjs b/src/modules/first-leg/views/businessIdentifiers.test.mjs index 300481a..4d94bf6 100644 --- a/src/modules/first-leg/views/businessIdentifiers.test.mjs +++ b/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\)/) diff --git a/src/modules/overseas-warehouse/api/returnInventory.ts b/src/modules/overseas-warehouse/api/returnInventory.ts new file mode 100644 index 0000000..560a504 --- /dev/null +++ b/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) { + return overseasApiRequest>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory', params }) +} + +export function listReturnInventorySummary(params: Record) { + return overseasApiRequest>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory/summary', params }) +} + +export function getReturnInventoryCarton(cartonMark: string) { + return overseasApiRequest({ method: 'GET', url: `/merchant/v1/last-leg/return-inventory/cartons/${encodeURIComponent(cartonMark)}` }) +} + +export function getReturnInventoryLabel(cartonMark: string) { + return overseasApiRequest({ 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({ 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, + }) +} diff --git a/src/modules/overseas-warehouse/api/returnOrders.ts b/src/modules/overseas-warehouse/api/returnOrders.ts new file mode 100644 index 0000000..70b354b --- /dev/null +++ b/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) { + return overseasApiRequest>({ method: 'GET', url: '/merchant/v1/last-leg/return-orders', params }) +} +export function getReturnOrder(returnNo: string) { + return overseasApiRequest({ method: 'GET', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}` }) +} +export function createReturnOrder(payload: ReturnOrderCreate) { + return overseasApiRequest({ method: 'POST', url: '/merchant/v1/last-leg/return-orders', data: payload }) +} diff --git a/src/modules/overseas-warehouse/api/warehouseServices.ts b/src/modules/overseas-warehouse/api/warehouseServices.ts index 6f1dba1..c070e90 100644 --- a/src/modules/overseas-warehouse/api/warehouseServices.ts +++ b/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 - cartonMark: string; fbaCartonMark: string; destinationWarehouseId?: string; remark?: 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; 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) { export function getRelabel(relabelNo: string) { return overseasApiRequest({ method: 'GET', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}` }) } + +export function listRelabelInventoryCandidates(operationWarehouseId: string, inboundCode?: string) { + return overseasApiRequest({ + method: 'GET', url: '/merchant/v1/last-leg/relabel-applications/inventory-candidates', + params: { operationWarehouseId, inboundCode: inboundCode || undefined }, + }) +} export function createRelabel(payload: RelabelCreate) { return overseasApiRequest>({ method: 'POST', url: '/merchant/v1/last-leg/relabel-applications', data: payload }) } diff --git a/src/modules/overseas-warehouse/routes.ts b/src/modules/overseas-warehouse/routes.ts index 9bc50df..01ed1e6 100644 --- a/src/modules/overseas-warehouse/routes.ts +++ b/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', - meta: { title: '退货换标', description: '查询并管理退货换标订单', permission: 'dashboard:view' }, + component: () => import('./views/ReturnOrdersView.vue'), release: 'active', + 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 diff --git a/src/modules/overseas-warehouse/views/ReturnInventoryView.vue b/src/modules/overseas-warehouse/views/ReturnInventoryView.vue new file mode 100644 index 0000000..670b3af --- /dev/null +++ b/src/modules/overseas-warehouse/views/ReturnInventoryView.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue new file mode 100644 index 0000000..443ac05 --- /dev/null +++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue index 5807c11..8ca2ad9 100644 --- a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue +++ b/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 = { - labeling: { title: '贴标申请', createTitle: '新增贴标申请', numberLabel: '贴标申请单号', emptyText: '暂无贴标申请', columns: ['贴标申请单号', '客户单号', '目的海外仓', '贴标要求', 'SKU 数', '总箱数', '状态', '创建时间', '操作'] }, - transfer: { title: '仓储转运单', createTitle: '新增仓储转运单', numberLabel: '转运单号', emptyText: '暂无仓储转运订单', columns: ['转运单号', '进仓编号', '发货箱数', '操作仓', 'FBA 目的仓', '派送方式', '是否换标', '状态', '创建时间', '操作'] }, - disposal: { title: '货物废弃', createTitle: '新增货物废弃申请', numberLabel: '废弃申请单号', emptyText: '暂无货物废弃申请', columns: ['废弃申请单号', '进仓编号', '操作仓', 'SKU 汇总', '废弃数量', '预估费用', '状态', '创建时间', '操作'] }, - relabel: { title: '退货换标', createTitle: '新建退货换标单', numberLabel: '退货换标单号', emptyText: '暂无退货换标订单', columns: ['退货换标单号', '来源 FBA 仓', '目的 FBA 仓', 'SKU 汇总', '退件总数', '是否换标', '换标状态', '尾程状态', '创建时间', '操作'] }, + labeling: { title: '贴标申请', createTitle: '新增贴标申请', numberLabel: '贴标申请单号', emptyText: '暂无贴标申请', columns: ['操作', '贴标申请单号', '客户单号', '海外操作仓', '贴标要求', 'SKU 数', '总箱数', '状态', '创建时间'] }, + transfer: { title: '仓储转运单', createTitle: '新增仓储转运单', numberLabel: '转运单号', emptyText: '暂无仓储转运订单', columns: ['操作', '转运单号', '进仓编号', '发货箱数', '操作仓', 'FBA 目的仓', '派送方式', '是否换标', '状态', '创建时间'] }, + disposal: { title: '货物废弃', createTitle: '新增货物废弃申请', numberLabel: '废弃申请单号', emptyText: '暂无货物废弃申请', columns: ['操作', '废弃申请单号', '进仓编号', '操作仓', '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('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([]) +const labelingMode = ref('carton') +const skuRelabelRows = ref([]) +const cartonMarkOptions = computed(() => cargoRows.value.map((item) => ({ + value: item.id, + label: `${item.cartonMark || item.sku || '库存货物'}｜可用 ${item.availableQuantity || item.quantity} 箱`, +}))) const submittedRows = ref[]>([]) const selectedDetail = ref | null>(null) const selectedRelabelDetail = ref(null) +const fbaWarehouses = ref([]) +const operationWarehouses = ref([]) +const fbaWarehousesLoading = ref(false) +const fbaWarehousesError = ref('') const discardCandidates = ref([]) const selectedDiscardOrderId = ref('') const discardCandidatesLoading = ref(false) +const relabelCandidates = ref([]) +const selectedRelabelInboundOrderId = ref('') +const relabelCandidatesLoading = ref(false) +const relabelInboundOptions = computed(() => { + const grouped = new Map() + 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(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 csvCell(value: string) { return `"${value.replaceAll('"', '""')}"` } +function addSkuRelabelRow() { skuRelabelRows.value.push({ id: ++skuRelabelSequence, sourceRowId: null, cartonMark: '', originalSku: '', newSku: '', quantity: 1, changeCarton: false, fbaCartonMark: '', destinationWarehouseId: '', remark: '' }) } +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() + 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箱唛', '目的仓', '备注'] - const example = ['', '示例商品', 'FBA-SHIPMENT-001', 'LX1000-NEW', 'LX1000箱唛', 'FBA-LX1000箱唛', 'ONT8', ''] - const blob = new Blob([`\uFEFF${header.map(csvCell).join(',')}\r\n${example.map(csvCell).join(',')}\r\n`], { type: 'text/csv;charset=utf-8' }) + if (!cargoRows.value.length) { ElMessage.warning('请先选择有库存的历史入仓单'); return } + const header = ['明细行标识', '本次箱数', '商品SKU', '中文品名', 'FBA货件编号', '换标新SKU', '我方箱唛', 'FBA箱唛', 'FBA目的仓', '备注'] + 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 skuHeader = headers.includes('商品SKU（选填）') ? '商品SKU（选填）' : '商品SKU' - if (!headers.includes(skuHeader)) { ElMessage.error('模板格式不正确，请重新下载模板填写'); return } + const headers = parseCsvLine(lines[0]) + const required = ['明细行标识', '本次箱数', 'FBA货件编号', '换标新SKU', '我方箱唛', 'FBA箱唛', 'FBA目的仓'] 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])) - if (!imported.length || imported.some((item) => required.some((key) => !item[key]))) { ElMessage.error('模板中的商品、货件、换标 SKU 和箱唛信息必须填写完整'); return } - if (new Set(imported.map((item) => item['我方箱唛'])).size !== imported.length) { ElMessage.error('模板中的我方箱唛不能重复'); return } - cargoRows.value = imported.map((item) => ({ - id: ++cargoSequence, sku: item[skuHeader], name: item['中文品名'], quantity: 1, fnsku: '', - shipmentNo: item['FBA货件编号'], newSkuCode: item['换标新SKU'], shippingMark: '', - cartonMark: item['我方箱唛'], fbaCartonMark: item['FBA箱唛'], - destinationWarehouseId: item['目的仓'] || '', remark: item['备注'] || '', - })) - ElMessage.success(`已导入 ${cargoRows.value.length} 箱货物明细`) + const imported = lines.slice(1).map(parseCsvLine) + .map((values) => Object.fromEntries(headers.map((key, index) => [key, values[index] || '']))) + .filter((item) => item['明细行标识']) + if (!imported.length || imported.some((item) => required.some((key) => !item[key]))) { + ElMessage.error('模板中的明细行、箱数、货件、换标 SKU、箱唛和 FBA 目的仓必须填写完整'); return + } + if (new Set(imported.map((item) => item['明细行标识'])).size !== imported.length) { + ElMessage.error('模板中的明细行标识不能重复'); return + } + 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) { 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)[value] || value +} +function formatDateTime(value: string) { + return value ? value.replace('T', ' ').slice(0, 19) : '—' +} function warehouseDisplay(value?: string) { if (!value) return '—' - const labels: Record = { ONT8: '美西海外仓-ONT8', ABE8: '美东海外仓-ABE8', MDW2: '美中海外仓-MDW2' } - return value.split(',').map((warehouse) => labels[warehouse] || warehouse).join('、') + return value.split(',').map((code) => { + 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.fbaWarehouseCode, '—', item.packageCount, '是', item.relabelNo ? '已生成' : '待生成', 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 ? '已生成' : '待生成', 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) - if ((!form.customerNo && !form.inboundNo) || (props.service !== 'labeling' && !primaryWarehouse) || invalidCargo) { + : relabelRows.length === 0 || (props.service === 'labeling' && labelingMode.value === 'sku' + ? 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))) { - ElMessage.warning('请填写贴标截止时间、联系人、贴标费用以及货物的货件编号和新 SKU'); return + if (props.service === 'labeling' && (!form.labelDeadline || !form.contact || !form.phone || form.chargeAmount <= 0)) { + 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)) { - ElMessage.warning('请填写统一目的海外仓，或为每箱货物填写目的仓'); return + if (props.service === 'labeling' && labelingMode.value === 'carton' && cargoRows.value.some((item) => !item.destinationWarehouseId || !item.sourceInventoryPositionId)) { + 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) { 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 = [] +} @@ -226,32 +420,47 @@ async function openDetail(value: Record) {

{{ props.service === 'relabel' ? '退货信息' : props.service === 'labeling' ? '订单信息' : '基础与派送信息' }}

- - + - + + - + - - + + - + - + - - + +
-

货物明细

添加行清空
-

模板每行代表一箱；上传后直接回显到下方明细。明细目的仓优先，留空时使用顶部统一目的海外仓。

-
商品 SKU *中文品名 *可用箱数{{ props.service === 'labeling' ? 'FBA 货件编号 *' : 'FNSKU / 箱唛' }}换标新 SKU *{{ props.service === 'disposal' ? '本次废弃箱数' : props.service === 'relabel' ? '退件数量' : '箱数' }} *操作
{{ row.availableQuantity }} 箱
{{ props.service === 'disposal' ? '请先选择入库单，系统将自动带出 SKU 和可用箱数' : '暂无货物明细，请点击“添加行”' }}
+
+ +
重置提交{{ config.title }}
@@ -260,12 +469,12 @@ async function openDetail(value: Record) { @@ -274,6 +483,8 @@ async function openDetail(value: Record) { diff --git a/src/modules/overseas-warehouse/views/relabelAttachments.test.mjs b/src/modules/overseas-warehouse/views/relabelAttachments.test.mjs index c351535..243d8d9 100644 --- a/src/modules/overseas-warehouse/views/relabelAttachments.test.mjs +++ b/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>客户单号/) + assert.doesNotMatch(view, /原入仓单<\/th>/) + assert.doesNotMatch(view, /托盘<\/th>/) + assert.doesNotMatch(view, /中转仓<\/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, /totalPackageCount: 1, notifiedPackageCount: 1/) - assert.doesNotMatch(view, /applyCartonMarkBinding/) - assert.doesNotMatch(view, /上传SKU 标签/) + assert.match(view, /importRelabelTemplate/) + assert.match(view, /明细行标识/) + assert.doesNotMatch(view, /库存位置ID/) }) -test('目的仓支持顶部兜底并随每箱明细提交', () => { - assert.match(api, /destinationWarehouseId\?: string/) - assert.match(view, /!item\.destinationWarehouseId && !form\.warehouse/) - assert.match(view, /destinationWarehouseId: item\.destinationWarehouseId \|\| undefined/) - assert.match(view, /cartonMark: item\.cartonMark/) - assert.match(view, /fbaCartonMark: item\.fbaCartonMark/) +test('贴标货物明细支持手动添加和编辑', () => { + assert.match(view, /手动添加行/) + assert.match(view, /addRelabelCargoRow/) + assert.match(view, /货物明细已按所选入仓单的可用库存带出/) + assert.match(view, / { - assert.match(view, /我方箱唛<\/th>FBA 箱唛/) - assert.match(view, /v-model="row\.cartonMark"/) - assert.match(view, /v-if="props\.service !== 'labeling'">\{\{ props\.service === 'disposal'/) +test('贴标货物明细拆分为箱唛换标和 SKU 换标页签', () => { + assert.match(view, /el-tab-pane label="箱唛换标" name="carton"/) + assert.match(view, /el-tab-pane label="SKU 换标" name="sku"/) + 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 在贴标模板和明细中为选填', () => { - assert.match(view, /const header = \['商品SKU（选填）'/) - assert.match(view, /const example = \['', '示例商品'/) - assert.match(view, /headers\.includes\('商品SKU（选填）'\)/) - assert.match(view, /const required = \['中文品名', 'FBA货件编号'/) - assert.match(view, /商品 SKU \*<\/span>/) - assert.match(api, /skuCode\?: string; productNameZh/) +test('一次申请单选入仓单且每项保留原库存归属', () => { + assert.doesNotMatch(view, /multiple filterable collapse-tags/) + assert.match(view, /String\(candidate\.inboundOrderId\) === inboundOrderId/) + assert.match(view, /sourceInventoryBalanceId: String\(candidate\.inventoryBalanceId\)/) + assert.match(view, /sourceInventoryPositionId: String\(position\.positionId\)/) + assert.match(view, /sourceInboundOrderId: String\(candidate\.inboundOrderId\)/) + 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, /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/) - assert.match(view, /

箱唛换标明细<\/h3>/) assert.match(view, /item\.cartonMark \|\| '—'/) assert.match(view, /item\.fbaCartonMark \|\| '—'/) - assert.match(view, /item\.shipmentNo \|\| '—'/) - assert.match(view, /item\.newSkuCode \|\| '—'/) + assert.match(view, /item\.destinationFbaWarehouseCode/) + assert.match(view, /item\.operationType === 'CARTON_AND_SKU'/) + assert.match(view, /item\.skuItems\?\.length/) }) diff --git a/src/modules/tenant-management/contracts.ts b/src/modules/tenant-management/contracts.ts index b19e0dd..c59dfd1 100644 --- a/src/modules/tenant-management/contracts.ts +++ b/src/modules/tenant-management/contracts.ts @@ -106,6 +106,7 @@ export const FRONTEND_TO_MERCHANT_PERMISSION_CODES: Readonly { }, { 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'], From 7dc02d832797f0413b94003b28cc2a197c7c10b1 Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Wed, 9 Sep 2026 13:35:51 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 2 +- .../overseas-warehouse/api/returnOrders.ts | 4 +- src/modules/overseas-warehouse/routes.ts | 2 +- .../views/ReturnOrdersView.vue | 8 +- .../views/WarehouseServiceView.vue | 113 ++++++++++-------- src/navigation/clientNavigation.test.mjs | 2 +- 6 files changed, 71 insertions(+), 60 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 4f7a9d2..bc3c597 100644 --- a/AGENTS.md +++ b/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；采购创建的 `customerName` 只取当前认证会话企业名称，不允许自由输入或冒用其他客户。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`；贴标申请先从共享仓库主数据选择国外中转仓，并自动带出海外仓签收联系人和联系电话，再从当前客户已经完成入库且仍有可用库存的历史入仓单中单选。货物明细支持箱唛换标、SKU 换标和同箱组合换标：SKU 明细按来源库存箱聚合为一个箱唛任务，整箱只冻结一次，SKU 数量按件保存为子明细；PDA 扫我方箱唛定位任务，返回新 FBA 箱唛和 SKU 子明细，照片完工并复核通过后释放原库存，后续仍进入既有排车出库。客户页面不暴露托盘、库位和内部库存 ID；换标申请必须提交正数 CNY `chargeAmount`，页面展示服务端钱包冻结/结算/释放状态及错误，不本地推导余额结果。Backend `lastleg-service/` 的 `relabel/`、`relabel/pda/`、`transfer/`、`discard/`，请求统一经 `src/api/overseasHttp.ts` 与 `gateway-overseas/` | +| 海外仓贴标、仓储转运、货物废弃、退货换标 | `src/modules/overseas-warehouse/routes.ts`、`views/WarehouseServiceView.vue`、`api/warehouseServices.ts` | 四个路由均为 `active`；贴标申请先从共享仓库主数据选择国外中转仓，并自动带出海外仓签收联系人和联系电话，再从当前客户已经完成入库且仍有可用库存的历史入仓单中单选。货物明细在同一页面通过“换标类型”单选区分只换 SKU 标签、只换箱唛、SKU+箱唛都换，避免两个 Tab 造成语义混淆：客户自行填写我方箱唛，同一箱唛的多条 SKU 明细聚合为一个箱任务，整箱只冻结一次，SKU 数量按件保存为子明细；历史入仓库存只提供大概位置和可用箱数，不能据此推断箱唛与具体托盘的绑定关系。PDA 扫我方箱唛定位任务，仓库人员在大概位置内找到实物后完成换标，返回新 FBA 箱唛和 SKU 子明细，照片完工并复核通过后释放原库存，后续仍进入既有排车出库。客户页面不暴露托盘、库位和内部库存 ID；换标申请必须提交正数 CNY `chargeAmount`，页面展示服务端钱包冻结/结算/释放状态及错误，不本地推导余额结果。Backend `lastleg-service/` 的 `relabel/`、`relabel/pda/`、`transfer/`、`discard/`，请求统一经 `src/api/overseasHttp.ts` 与 `gateway-overseas/` | ## 租户、认证与数据安全 diff --git a/src/modules/overseas-warehouse/api/returnOrders.ts b/src/modules/overseas-warehouse/api/returnOrders.ts index 70b354b..bbcad64 100644 --- a/src/modules/overseas-warehouse/api/returnOrders.ts +++ b/src/modules/overseas-warehouse/api/returnOrders.ts @@ -3,7 +3,7 @@ import type { PageResult } from './warehouseServices' export interface ReturnOrderSummary { returnNo: string; overseasWarehouseId: string; customerReferenceNo?: string; status: string - skuTypes: number; expectedQuantity: number; receivedQuantity: number; createdAt: string + skuTypes: number; expectedQuantity: number; receivedQuantity: number; needRelabel: boolean; createdAt: string } export interface ReturnOrderItem { skuCode: string; productNameZh?: string; expectedQuantity: number; receivedQuantity: number @@ -14,7 +14,7 @@ export interface ReturnReceipt { } export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[] } export interface ReturnOrderCreate { - overseasWarehouseId: string; customerReferenceNo?: string; remark?: string; idempotencyKey: string + overseasWarehouseId: string; customerReferenceNo?: string; remark?: string; needRelabel: boolean; idempotencyKey: string items: Array<{ skuCode: string; productNameZh?: string; expectedQuantity: number }> } diff --git a/src/modules/overseas-warehouse/routes.ts b/src/modules/overseas-warehouse/routes.ts index 01ed1e6..12294d0 100644 --- a/src/modules/overseas-warehouse/routes.ts +++ b/src/modules/overseas-warehouse/routes.ts @@ -26,7 +26,7 @@ export const overseasWarehouseModule = { { path: 'overseas-warehouse/return-relabel', name: 'overseas-return-relabel', 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 }, }, { diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue index 443ac05..351b85d 100644 --- a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue +++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue @@ -19,7 +19,7 @@ const query = reactive({ page: 1, size: 20, returnNo: '', trackingNo: '', skuCod 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()] }) +const form = reactive({ overseasWarehouseId: '', customerReferenceNo: '', remark: '', needRelabel: false, items: [emptySku()] }) function normalizedSku(value: string) { return value.trim().toUpperCase() } const duplicateSkuIds = computed(() => { const grouped = new Map() @@ -29,7 +29,7 @@ const duplicateSkuIds = computed(() => { } return new Set([...grouped.values()].filter(ids => ids.length > 1).flat()) }) -function resetForm() { Object.assign(form, { overseasWarehouseId: '', customerReferenceNo: '', remark: '', items: [emptySku()] }) } +function resetForm() { Object.assign(form, { overseasWarehouseId: '', customerReferenceNo: '', remark: '', needRelabel: false, items: [emptySku()] }) } function warehouseLabel(warehouse: MerchantWarehouse) { return `${warehouse.warehouseName} · ${warehouse.warehouseCode}` } async function loadOperationWarehouses() { operationWarehousesLoading.value = true @@ -63,7 +63,7 @@ async function submit() { 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 })) }) + const detail = await createReturnOrder({ overseasWarehouseId: form.overseasWarehouseId, customerReferenceNo: form.customerReferenceNo || undefined, remark: form.remark || undefined, needRelabel: form.needRelabel, 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 } } @@ -85,6 +85,7 @@ onMounted(load) + @@ -97,6 +98,7 @@ onMounted(load)
{{ operationWarehousesError }}
SKU 预报明细添加 SKU
+
换标需要换标
客户只需填写预计退回的 SKU 和数量；快递单号由仓库签收时按实际包裹扫描绑定。
diff --git a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue index 0be46fb..45ecb44 100644 --- a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue +++ b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue @@ -14,9 +14,9 @@ import { getMerchantWarehouses, type MerchantWarehouse } from '@/modules/first-l type ServiceType = 'labeling' | 'transfer' | 'disposal' | 'relabel' type PageMode = 'list' | 'create' | 'detail' -type LabelingMode = 'carton' | 'sku' +type LabelingMode = 'carton' | 'sku' | 'carton_and_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 SkuRelabelRow { id: number; sourceRowId: number | null; cartonMark: string; originalSku: string; newSku: string; quantity: number; fbaCartonMark: string; destinationWarehouseId: string; remark: string } interface ServiceConfig { title: string; createTitle: string; numberLabel: string; emptyText: string; columns: string[] } const props = defineProps<{ service: ServiceType }>() @@ -38,10 +38,11 @@ const form = reactive({ customerNo: '', inboundNo: '', sourceWarehouse: '', ware const cargoRows = ref([]) const labelingMode = ref('carton') const skuRelabelRows = ref([]) -const cartonMarkOptions = computed(() => cargoRows.value.map((item) => ({ - value: item.id, - label: `${item.cartonMark || item.sku || '库存货物'}｜可用 ${item.availableQuantity || item.quantity} 箱`, -}))) +const labelingModeHint = computed(() => labelingMode.value === 'carton' + ? '只替换外箱箱唛，不修改箱内商品 SKU 标签；按箱填写新的 FBA 箱唛和目的仓。' + : labelingMode.value === 'sku' + ? '只替换箱内商品 SKU 标签，保留原箱唛；同一箱唛可以添加多条 SKU 明细。' + : '同一箱同时替换商品 SKU 标签和外箱箱唛；同一箱唛的多条 SKU 使用同一个新 FBA 箱唛和目的仓。') const submittedRows = ref[]>([]) const selectedDetail = ref | null>(null) const selectedRelabelDetail = ref(null) @@ -77,7 +78,7 @@ 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() }) +watch(labelingMode, (value) => { if (value !== 'carton' && !skuRelabelRows.value.length) addSkuRelabelRow() }) onMounted(() => { void load() }) function resetFilters() { Object.assign(filters, { number: '', inboundNo: '', warehouse: '', destination: '', status: '', start: '', end: '' }) } function resetForm() { @@ -101,36 +102,36 @@ 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 addSkuRelabelRow() { skuRelabelRows.value.push({ id: ++skuRelabelSequence, sourceRowId: null, cartonMark: '', originalSku: '', newSku: '', quantity: 1, changeCarton: false, fbaCartonMark: '', destinationWarehouseId: '', remark: '' }) } -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 addSkuRelabelRow() { + const source = cargoRows.value[Math.min(skuRelabelRows.value.length, Math.max(0, cargoRows.value.length - 1))] + skuRelabelRows.value.push({ id: ++skuRelabelSequence, sourceRowId: source?.id || null, + cartonMark: '', originalSku: source?.sku || '', newSku: '', quantity: 1, + fbaCartonMark: '', destinationWarehouseId: source?.destinationWarehouseId || '', remark: '' }) } +function removeSkuRelabelRow(id: number) { skuRelabelRows.value = skuRelabelRows.value.filter((row) => row.id !== id) } function buildSkuRelabelItems(): RelabelCreate['items'] { - const groups = new Map() + const groups = new Map() for (const row of skuRelabelRows.value) { - if (row.sourceRowId == null) throw new Error('请选择每条 SKU 明细对应的来源库存箱') - const rows = groups.get(row.sourceRowId) || [] + const cartonMark = row.cartonMark.trim().toUpperCase() + if (!cartonMark) throw new Error('请填写每个箱子的我方箱唛') + const rows = groups.get(cartonMark) || [] rows.push(row) - groups.set(row.sourceRowId, rows) + groups.set(cartonMark, rows) } - return [...groups.entries()].map(([sourceRowId, rows]) => { - const source = cargoRows.value.find((item) => item.id === sourceRowId) + const anchors = cargoRows.value.flatMap((item) => Array.from( + { length: Number(item.availableQuantity || 0) }, () => item, + )) + if (!anchors.length) throw new Error('请先选择有库存的历史入仓单') + if (groups.size > anchors.length) { + throw new Error('填写的箱唛数量超过当前入仓单可用库存箱数') + } + return [...groups.entries()].map(([_, rows], groupIndex) => { + const source = anchors[groupIndex] 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 changeCarton = labelingMode.value === 'carton_and_sku' const fbaCartonMark = rows[0].fbaCartonMark.trim() const destinationWarehouseId = rows[0].destinationWarehouseId if (changeCarton && (!fbaCartonMark || !destinationWarehouseId @@ -143,8 +144,8 @@ function buildSkuRelabelItems(): RelabelCreate['items'] { sourceInboundOrderId: source.sourceInboundOrderId, skuCode: source.sku || rows[0].originalSku, productNameZh: source.name, - totalPackageCount: source.quantity, - notifiedPackageCount: source.quantity, + totalPackageCount: 1, + notifiedPackageCount: 1, shipmentNo: source.shipmentNo || cartonMark, trackingCode: form.trackingNo || undefined, newSkuCode: rows[0].newSku, @@ -169,8 +170,8 @@ function clearRelabelRows() { cargoRows.value = []; selectedRelabelInboundOrderI function csvCell(value: string | number | undefined) { return `"${String(value ?? '').replaceAll('"', '""')}"` } function downloadRelabelTemplate() { if (!cargoRows.value.length) { ElMessage.warning('请先选择有库存的历史入仓单'); return } - const header = ['明细行标识', '本次箱数', '商品SKU', '中文品名', 'FBA货件编号', '换标新SKU', '我方箱唛', 'FBA箱唛', 'FBA目的仓', '备注'] - const rows = cargoRows.value.map((item) => [item.id, item.quantity, item.sku, item.name, item.shipmentNo, item.newSkuCode, + const header = ['明细行标识', '本次箱数', '商品SKU', '中文品名', 'FBA货件编号', '我方箱唛', 'FBA箱唛', 'FBA目的仓', '备注'] + const rows = cargoRows.value.map((item) => [item.id, item.quantity, item.sku, item.name, item.shipmentNo, 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) @@ -193,13 +194,13 @@ async function importRelabelTemplate(event: Event) { 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箱唛', 'FBA目的仓'] + const required = ['明细行标识', '本次箱数', 'FBA货件编号', '我方箱唛', 'FBA箱唛', 'FBA目的仓'] 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) => item['明细行标识']) if (!imported.length || imported.some((item) => required.some((key) => !item[key]))) { - ElMessage.error('模板中的明细行、箱数、货件、换标 SKU、箱唛和 FBA 目的仓必须填写完整'); return + ElMessage.error('模板中的明细行、箱数、货件、箱唛和 FBA 目的仓必须填写完整'); return } if (new Set(imported.map((item) => item['明细行标识'])).size !== imported.length) { ElMessage.error('模板中的明细行标识不能重复'); return @@ -216,7 +217,6 @@ async function importRelabelTemplate(event: Event) { } row.quantity = quantity row.shipmentNo = item['FBA货件编号'] - row.newSkuCode = item['换标新SKU'] row.cartonMark = item['我方箱唛'] row.fbaCartonMark = item['FBA箱唛'] row.destinationWarehouseId = item['FBA目的仓'] @@ -285,13 +285,13 @@ 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 relabelRows = labelingMode.value === 'carton' ? cargoRows.value : skuRelabelRows.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)) - : relabelRows.length === 0 || (props.service === 'labeling' && labelingMode.value === 'sku' - ? skuRelabelRows.value.some((item) => !item.sourceRowId || !item.cartonMark || !item.originalSku || !item.newSku || item.quantity < 1 - || (item.changeCarton && (!item.fbaCartonMark || !item.destinationWarehouseId))) + : relabelRows.length === 0 || (props.service === 'labeling' && labelingMode.value !== 'carton' + ? skuRelabelRows.value.some((item) => !item.cartonMark || !item.originalSku || !item.newSku || item.quantity < 1 + || (labelingMode.value === 'carton_and_sku' && (!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 @@ -299,7 +299,7 @@ async function submit() { if (props.service === 'labeling' && (!form.labelDeadline || !form.contact || !form.phone || form.chargeAmount <= 0)) { ElMessage.warning('请填写贴标截止时间、联系人和贴标费用'); return } - if (props.service === 'labeling' && labelingMode.value === 'carton' && cargoRows.value.some((item) => !item.shipmentNo || !item.newSkuCode || !item.cartonMark || !item.fbaCartonMark)) { + if (props.service === 'labeling' && labelingMode.value === 'carton' && cargoRows.value.some((item) => !item.shipmentNo || !item.cartonMark || !item.fbaCartonMark)) { ElMessage.warning('请上传关联面单，确保每箱的我方箱唛和 FBA 箱唛完整'); return } if (props.service === 'labeling' && labelingMode.value === 'carton' && cargoRows.value.some((item) => !item.destinationWarehouseId || !item.sourceInventoryPositionId)) { @@ -318,7 +318,7 @@ async function submit() { if (props.service === 'labeling') { 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 })) + ? 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: undefined, 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') { @@ -397,6 +397,7 @@ function selectRelabelInventory(inboundOrderId: string) { } })) skuRelabelRows.value = [] + if (labelingMode.value !== 'carton') addSkuRelabelRow() } @@ -450,21 +451,28 @@ function selectRelabelInventory(inboundOrderId: string) { +
是否换标需要换标

From 354f65afe85f24feb4ad1306782b0a56a4f794e8 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Thu, 10 Sep 2026 11:25:50 +0800 Subject: [PATCH 07/12] fix: avoid deprecated finance pagination control --- src/modules/finance/views/FinanceAccountView.test.mjs | 6 +++--- src/modules/finance/views/FinanceAccountView.vue | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/finance/views/FinanceAccountView.test.mjs b/src/modules/finance/views/FinanceAccountView.test.mjs index fd863e7..3c0d176 100644 --- a/src/modules/finance/views/FinanceAccountView.test.mjs +++ b/src/modules/finance/views/FinanceAccountView.test.mjs @@ -39,9 +39,9 @@ test('renders server balances, ledger and recharge states without internal ident assert.match(viewSource, /v-loading="pageLoading"/) assert.match(viewSource, /function formatAccountAmount[\s\S]*value == null \? '—' : formatAmount\(value\)/) assert.match(viewSource, /formatAccountAmount\(account\?\.actualBalance\)/) - assert.match(viewSource, /v-model:current-page="ledgerPage"/) - assert.match(viewSource, /v-model:current-page="rechargePage"/) - assert.doesNotMatch(viewSource, / { void loadAccountData() }) -
共 {{ ledgerTotal }} 条
+
共 {{ ledgerTotal }} 条
From 911623d5a32d8245997aa62027e0720db8097e97 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Thu, 10 Sep 2026 11:32:38 +0800 Subject: [PATCH 08/12] fix: normalize finance page metadata --- src/modules/finance/api/account.ts | 27 ++++++++++++++++--- .../finance/views/FinanceAccountView.test.mjs | 2 ++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/modules/finance/api/account.ts b/src/modules/finance/api/account.ts index 1928d09..703036f 100644 --- a/src/modules/finance/api/account.ts +++ b/src/modules/finance/api/account.ts @@ -8,6 +8,23 @@ export interface PageResult { pages: number } +interface PageResultWire extends Omit, 'total' | 'page' | 'size' | 'pages'> { + total: number | string + page: number | string + size: number | string + pages: number | string +} + +function normalizePageResult(result: PageResultWire): PageResult { + return { + ...result, + total: Number(result.total), + page: Number(result.page), + size: Number(result.size), + pages: Number(result.pages), + } +} + export interface FinanceAccount { currencyCode: 'CNY' actualBalance: string @@ -71,20 +88,22 @@ export function getFinanceAccount() { return apiRequest({ method: 'GET', url: '/client/finance/v1/account' }) } -export function getAccountLedger(page: number, size: number) { - return apiRequest>({ +export async function getAccountLedger(page: number, size: number) { + const result = await apiRequest>({ method: 'GET', url: '/client/finance/v1/account/ledger', params: { page, size }, }) + return normalizePageResult(result) } -export function getRechargeRequests(page: number, size: number) { - return apiRequest>({ +export async function getRechargeRequests(page: number, size: number) { + const result = await apiRequest>({ method: 'GET', url: '/client/finance/v1/recharge-requests', params: { page, size }, }) + return normalizePageResult(result) } export function getRechargeChannels() { diff --git a/src/modules/finance/views/FinanceAccountView.test.mjs b/src/modules/finance/views/FinanceAccountView.test.mjs index 3c0d176..db18376 100644 --- a/src/modules/finance/views/FinanceAccountView.test.mjs +++ b/src/modules/finance/views/FinanceAccountView.test.mjs @@ -42,6 +42,8 @@ test('renders server balances, ledger and recharge states without internal ident assert.match(viewSource, /:default-current-page="ledgerPage"/) assert.match(viewSource, /:default-current-page="rechargePage"/) assert.doesNotMatch(viewSource, / Date: Thu, 10 Sep 2026 15:34:03 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 2 +- src/components.d.ts | 1 - .../overseas-warehouse/api/returnOrders.ts | 4 +- .../api/warehouseServices.ts | 25 ++- .../views/ReturnOrdersView.test.mjs | 23 +++ .../views/ReturnOrdersView.vue | 27 ++- .../views/WarehouseServiceView.vue | 162 +++++++++++++++--- .../views/relabelAttachments.test.mjs | 20 ++- .../views/warehouseTransferForm.test.mjs | 25 +++ 9 files changed, 240 insertions(+), 49 deletions(-) create mode 100644 src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs create mode 100644 src/modules/overseas-warehouse/views/warehouseTransferForm.test.mjs diff --git a/AGENTS.md b/AGENTS.md index bc3c597..26ff0ff 100644 --- a/AGENTS.md +++ b/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；采购创建的 `customerName` 只取当前认证会话企业名称，不允许自由输入或冒用其他客户。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`；贴标申请先从共享仓库主数据选择国外中转仓，并自动带出海外仓签收联系人和联系电话，再从当前客户已经完成入库且仍有可用库存的历史入仓单中单选。货物明细在同一页面通过“换标类型”单选区分只换 SKU 标签、只换箱唛、SKU+箱唛都换，避免两个 Tab 造成语义混淆：客户自行填写我方箱唛，同一箱唛的多条 SKU 明细聚合为一个箱任务，整箱只冻结一次，SKU 数量按件保存为子明细；历史入仓库存只提供大概位置和可用箱数，不能据此推断箱唛与具体托盘的绑定关系。PDA 扫我方箱唛定位任务，仓库人员在大概位置内找到实物后完成换标，返回新 FBA 箱唛和 SKU 子明细，照片完工并复核通过后释放原库存，后续仍进入既有排车出库。客户页面不暴露托盘、库位和内部库存 ID；换标申请必须提交正数 CNY `chargeAmount`，页面展示服务端钱包冻结/结算/释放状态及错误，不本地推导余额结果。Backend `lastleg-service/` 的 `relabel/`、`relabel/pda/`、`transfer/`、`discard/`，请求统一经 `src/api/overseasHttp.ts` 与 `gateway-overseas/` | +| 海外仓贴标、仓储转运、货物废弃、退货换标 | `src/modules/overseas-warehouse/routes.ts`、`views/WarehouseServiceView.vue`、`api/warehouseServices.ts` | 四个路由均为 `active`；贴标申请先选国外中转仓和有库存历史入仓单，换标类型为只换 SKU、只换箱唛、SKU+箱唛。涉及箱唛换标时必须选择卡车、自提或快递；快递可选择打印面单并上传 PDF/图片。PDA 逐箱换标、上传照片并由仓库复核后，客户详情展示完工照片和“换标完成确认”；客户确认前不得继续出库，确认后卡车进入预排车，自提/快递进入换标出库待创建。历史库存位置不能解释成箱唛与具体托盘快照，客户页面不暴露托盘、库位和内部库存 ID | ## 租户、认证与数据安全 diff --git a/src/components.d.ts b/src/components.d.ts index 7e1b2ec..befd71f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -36,7 +36,6 @@ 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'] diff --git a/src/modules/overseas-warehouse/api/returnOrders.ts b/src/modules/overseas-warehouse/api/returnOrders.ts index bbcad64..a28af3e 100644 --- a/src/modules/overseas-warehouse/api/returnOrders.ts +++ b/src/modules/overseas-warehouse/api/returnOrders.ts @@ -2,7 +2,7 @@ import { overseasApiRequest } from '@/api/overseasHttp' import type { PageResult } from './warehouseServices' export interface ReturnOrderSummary { - returnNo: string; overseasWarehouseId: string; customerReferenceNo?: string; status: string + returnNo: string; overseasWarehouseId: string; warehouseContactName?: string; warehouseContactPhone?: string; customerReferenceNo?: string; status: string skuTypes: number; expectedQuantity: number; receivedQuantity: number; needRelabel: boolean; createdAt: string } export interface ReturnOrderItem { @@ -14,7 +14,7 @@ export interface ReturnReceipt { } export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[] } export interface ReturnOrderCreate { - overseasWarehouseId: string; customerReferenceNo?: string; remark?: string; needRelabel: boolean; idempotencyKey: string + overseasWarehouseId: string; warehouseContactName: string; warehouseContactPhone: string; customerReferenceNo?: string; remark?: string; needRelabel: boolean; idempotencyKey: string items: Array<{ skuCode: string; productNameZh?: string; expectedQuantity: number }> } diff --git a/src/modules/overseas-warehouse/api/warehouseServices.ts b/src/modules/overseas-warehouse/api/warehouseServices.ts index c070e90..f3c3163 100644 --- a/src/modules/overseas-warehouse/api/warehouseServices.ts +++ b/src/modules/overseas-warehouse/api/warehouseServices.ts @@ -1,9 +1,11 @@ import { overseasApiRequest } from '@/api/overseasHttp' +export type RelabelDeliveryMethod = 'TRUCK' | 'EXPRESS' | 'TRUCK_PICKUP' | 'EXPRESS_PICKUP' + export interface PageResult { records: T[]; page: number; size: number; total: number; pages: number } export interface LastlegOrderSummary { id: string; orderNo: string; inboundCode: string; orderType: string; packageCount: number; overseasWarehouseId?: string } -export interface TransferSummary { id: string; transferNo: string; inboundCode: string; lastlegOrderId: string; lastlegOrderNo: string; operatingWarehouseId: string; fbaWarehouseCode: string; packageCount: number; deliveryMethod: string; needRelabel: boolean; relabelNo?: string; status: string; estimatedArrivalAt: string; createdAt: string } -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 TransferSummary { id: string; transferNo: string; inboundCode: string; lastlegOrderId: string; lastlegOrderNo: string; operatingWarehouseId: string; fbaWarehouseCode?: string; packageCount: number; deliveryMethod: string; needRelabel: boolean; relabelNo?: string; status: string; estimatedArrivalAt: string; createdAt: string } +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; deliveryMethod?: RelabelDeliveryMethod; printShippingLabel?: boolean; shippingLabelFileId?: string; shippingLabelFileName?: string; shippingLabelFileUrl?: string; fulfillmentStatus?: string; outboundOrderNo?: string; customerConfirmedAt?: string } export interface RelabelItemDetail { id: string; skuCode?: string; productNameZh: string; totalPackageCount: number; notifiedPackageCount: number shipmentNo: string; trackingCode?: string; newSkuCode?: string; labelRequirement?: string; remark?: string @@ -19,6 +21,7 @@ export interface RelabelDetail { remark?: string; items: RelabelItemDetail[] history: Array<{ fromStatus?: string; toStatus?: string; operatorId?: string; remark?: string; createdAt: string }> tailOrders?: Array<{ id: string; orderNo: string; overseasWarehouseId: string; packageCount: number; status: string }> + completionEvidence?: { taskId: string; photoFileIds: string[]; completionRemark?: string; reviewerName?: string; reviewRemark?: string; completedAt?: string } } 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 }> } @@ -31,14 +34,14 @@ export interface RelabelInventoryCandidate { } export interface TransferCreate { - inboundCode: string; sourceLastlegOrderIds: string[]; operatingWarehouseId: string; fbaWarehouseCode: string + inboundCode: string; sourceLastlegOrderIds: string[]; operatingWarehouseId: string; fbaWarehouseCode?: string deliveryAddress: string; packageCount: number; volumeCbm: number; deliveryMethod: string; estimatedArrivalAt: string - fbaShipmentNo: string; trackingNo?: string; fbaBoxNos?: string; remark?: string; needRelabel: boolean; idempotencyKey: string + fbaShipmentNo?: string; trackingNo?: string; fbaBoxNos?: string; remark?: string; needRelabel: boolean; idempotencyKey: string items: Array<{ skuCode: string; productNameZh: string; packageCount: number; shippingMark?: string }> } export interface RelabelCreate { customerOrderNo: string; operationWarehouseId: string; labelDeadline: string; contactName: string; contactPhone: string; chargeAmount: number - remark?: string; idempotencyKey: string + remark?: string; idempotencyKey: string; deliveryMethod?: RelabelDeliveryMethod; printShippingLabel?: boolean 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; destinationFbaWarehouseCode?: string; operationType: 'CARTON_LABEL' | 'SKU_LABEL' | 'CARTON_AND_SKU'; skuItems?: Array<{ skuCode: string; newSkuCode: string; quantity: number; remark?: string }>; remark?: string }> } @@ -69,7 +72,17 @@ export function listRelabelInventoryCandidates(operationWarehouseId: string, inb }) } export function createRelabel(payload: RelabelCreate) { - return overseasApiRequest>({ method: 'POST', url: '/merchant/v1/last-leg/relabel-applications', data: payload }) + return overseasApiRequest({ method: 'POST', url: '/merchant/v1/last-leg/relabel-applications', data: payload }) +} +export function uploadRelabelShippingLabel(relabelNo: string, file: File) { + const data = new FormData(); data.append('file', file) + return overseasApiRequest({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/shipping-label`, data, headers: { 'Content-Type': 'multipart/form-data' } }) +} +export function confirmRelabelCompletion(relabelNo: string, remark?: string) { + return overseasApiRequest({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/confirm-completion`, data: { idempotencyKey: crypto.randomUUID(), remark } }) +} +export function downloadRelabelCompletionPhoto(relabelNo: string, fileId: string) { + return overseasApiRequest({ method: 'GET', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/completion-photos/${encodeURIComponent(fileId)}/download`, responseType: 'blob' }) } export function listDiscards(params: Record) { return overseasApiRequest>({ method: 'GET', url: '/merchant/v1/last-leg/cargo-discards', params }) diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs b/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs new file mode 100644 index 0000000..4b77e69 --- /dev/null +++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs @@ -0,0 +1,23 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import test from 'node:test' + +const view = readFileSync(new URL('./ReturnOrdersView.vue', import.meta.url), 'utf8') + +test('新建退货预报选择中转仓后带出联系人和电话', () => { + assert.match(view, /@change="selectOperationWarehouse"/) + assert.match(view, /warehouseContactName = warehouse\?\.contactName \|\| ''/) + assert.match(view, /warehouseContactPhone = warehouse\?\.contactPhone \|\| ''/) + assert.match(view, /label="中转仓联系人"/) + assert.match(view, /label="中转仓联系电话"/) + assert.match(view, /:readonly="Boolean\(selectedOperationWarehouse\?\.contactName\)"/) + assert.match(view, /:readonly="Boolean\(selectedOperationWarehouse\?\.contactPhone\)"/) + assert.match(view, /该中转仓未维护，请手动填写/) + assert.match(view, /warehouseContactName: form\.warehouseContactName\.trim\(\)/) + assert.match(view, /warehouseContactPhone: form\.warehouseContactPhone\.trim\(\)/) +}) + +test('新建退货预报使用加宽的双列表单弹窗', () => { + assert.match(view, /title="新建退货预报" width="1120px"/) + assert.match(view, /return-create-form \{ display:grid; grid-template-columns:repeat\(2,minmax\(0,1fr\)\)/) +}) diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue index 351b85d..e385c89 100644 --- a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue +++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue @@ -19,7 +19,8 @@ const query = reactive({ page: 1, size: 20, returnNo: '', trackingNo: '', skuCod 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: '', needRelabel: false, items: [emptySku()] }) +const form = reactive({ overseasWarehouseId: '', warehouseContactName: '', warehouseContactPhone: '', customerReferenceNo: '', remark: '', needRelabel: false, items: [emptySku()] }) +const selectedOperationWarehouse = computed(() => operationWarehouses.value.find(item => String(item.id) === form.overseasWarehouseId)) function normalizedSku(value: string) { return value.trim().toUpperCase() } const duplicateSkuIds = computed(() => { const grouped = new Map() @@ -29,8 +30,13 @@ const duplicateSkuIds = computed(() => { } return new Set([...grouped.values()].filter(ids => ids.length > 1).flat()) }) -function resetForm() { Object.assign(form, { overseasWarehouseId: '', customerReferenceNo: '', remark: '', needRelabel: false, items: [emptySku()] }) } +function resetForm() { Object.assign(form, { overseasWarehouseId: '', warehouseContactName: '', warehouseContactPhone: '', customerReferenceNo: '', remark: '', needRelabel: false, items: [emptySku()] }) } function warehouseLabel(warehouse: MerchantWarehouse) { return `${warehouse.warehouseName} · ${warehouse.warehouseCode}` } +function selectOperationWarehouse() { + const warehouse = operationWarehouses.value.find(item => String(item.id) === form.overseasWarehouseId) + form.warehouseContactName = warehouse?.contactName || '' + form.warehouseContactPhone = warehouse?.contactPhone || '' +} async function loadOperationWarehouses() { operationWarehousesLoading.value = true operationWarehousesError.value = '' @@ -60,10 +66,11 @@ async function openDetail(returnNo: string) { selected.value = await getReturnOr 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 (!form.warehouseContactName.trim() || !form.warehouseContactPhone.trim()) { ElMessage.warning('请填写中转仓联系人和联系电话'); 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, needRelabel: form.needRelabel, idempotencyKey: crypto.randomUUID(), items: items.map(item => ({ ...item, productNameZh: item.productNameZh || undefined })) }) + const detail = await createReturnOrder({ overseasWarehouseId: form.overseasWarehouseId, warehouseContactName: form.warehouseContactName.trim(), warehouseContactPhone: form.warehouseContactPhone.trim(), customerReferenceNo: form.customerReferenceNo || undefined, remark: form.remark || undefined, needRelabel: form.needRelabel, 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 } } @@ -95,8 +102,14 @@ onMounted(load) - -
{{ operationWarehousesError }}
 + + +
{{ operationWarehousesError }}
 + + + + +
SKU 预报明细添加 SKU
换标需要换标
客户只需填写预计退回的 SKU 和数量；快递单号由仓库签收时按实际包裹扫描绑定。
@@ -108,11 +121,11 @@ onMounted(load) - + diff --git a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue index 45ecb44..d3e2590 100644 --- a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue +++ b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue @@ -5,12 +5,18 @@ import { ArrowLeft, Download, Eye, Plus, Search, Trash2, Upload } from '@lucide/ import SingleLineText from '@/components/common/SingleLineText.vue' import { createDiscard, createRelabel, createTransfer, getDiscard, getRelabel, getTransfer, + confirmRelabelCompletion, downloadRelabelCompletionPhoto, uploadRelabelShippingLabel, 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' +import { + getMerchantWarehouseDetail, + getMerchantWarehouses, + type MerchantWarehouse, + type MerchantWarehouseDetail, +} from '@/modules/first-leg/api/firstLeg' type ServiceType = 'labeling' | 'transfer' | 'disposal' | 'relabel' type PageMode = 'list' | 'create' | 'detail' @@ -22,21 +28,31 @@ interface ServiceConfig { title: string; createTitle: string; numberLabel: strin const props = defineProps<{ service: ServiceType }>() const configs: Record = { 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 汇总', '废弃数量', '预估费用', '状态', '创建时间'] }, relabel: { title: '退货换标', createTitle: '新建退货换标单', numberLabel: '退货换标单号', emptyText: '暂无退货换标订单', columns: ['操作', '退货换标单号', '来源 FBA 仓', '目的 FBA 仓', 'SKU 汇总', '退件总数', '是否换标', '换标状态', '尾程状态', '创建时间'] }, } const config = computed(() => configs[props.service]) const statusOptions = computed(() => props.service === 'labeling' - ? [{ label: '待处理', value: 'PENDING_PROCESSING' }, { label: '处理中', value: 'PROCESSING' }, { label: '已完成', value: 'COMPLETED' }, { label: '已拒绝', value: 'REJECTED' }, { label: '已取消', value: 'CANCELLED' }] + ? [{ label: '待处理', value: 'PENDING_PROCESSING' }, { label: '处理中', value: 'PROCESSING' }, { label: '待客户确认', value: 'CUSTOMER_CONFIRM_PENDING' }, { label: '待出库', value: 'READY_FOR_OUTBOUND' }, { label: '已完成', value: 'COMPLETED' }, { label: '已拒绝', value: 'REJECTED' }, { label: '已取消', value: 'CANCELLED' }] : props.service === 'disposal' ? [{ label: '待审核', value: 'PENDING_REVIEW' }, { label: '已通过', value: 'APPROVED' }, { label: '已拒绝', value: 'REJECTED' }] : [{ label: '待审核', value: 'PENDING_REVIEW' }, { label: '已通过', value: 'APPROVED' }, { label: '待分配', value: 'PENDING_ASSIGNMENT' }, { label: '已分配', value: 'ALLOCATED' }, { label: '已出库', value: 'OUTBOUNDED' }, { label: '部分收货', value: 'PARTIALLY_RECEIVED' }, { label: '已收货', value: 'RECEIVED' }, { label: '已拒绝', value: 'REJECTED' }]) const mode = ref('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 transferHasFbaDestination = ref(false) +const selectedOperationWarehouse = ref(null) +const operationWarehouseDetailLoading = ref(false) +const operationWarehouseAddress = computed(() => { + const address = selectedOperationWarehouse.value?.addresses[0] + if (!address) return '' + return [address.addressLine1, address.addressLine2, address.city, address.stateProvince, address.postalCode, address.countryCode] + .filter(Boolean).join(', ') +}) const cargoRows = ref([]) const labelingMode = ref('carton') +const shippingLabelFile = ref(null) const skuRelabelRows = ref([]) const labelingModeHint = computed(() => labelingMode.value === 'carton' ? '只替换外箱箱唛，不修改箱内商品 SKU 标签；按箱填写新的 FBA 箱唛和目的仓。' @@ -90,6 +106,8 @@ function resetForm() { selectedDiscardOrderId.value = '' relabelCandidates.value = [] selectedRelabelInboundOrderId.value = '' + transferHasFbaDestination.value = false + selectedOperationWarehouse.value = null } async function openCreate() { resetForm(); mode.value = 'create' @@ -109,6 +127,7 @@ function addSkuRelabelRow() { fbaCartonMark: '', destinationWarehouseId: source?.destinationWarehouseId || '', remark: '' }) } function removeSkuRelabelRow(id: number) { skuRelabelRows.value = skuRelabelRows.value.filter((row) => row.id !== id) } +function selectShippingLabel(event: Event) { shippingLabelFile.value = (event.target as HTMLInputElement).files?.[0] || null } function buildSkuRelabelItems(): RelabelCreate['items'] { const groups = new Map() for (const row of skuRelabelRows.value) { @@ -247,7 +266,8 @@ function warehouseDisplay(value?: string) { function statusLabel(value: string) { const labels: Record = { - PENDING_PROCESSING: '待处理', PROCESSING: '处理中', COMPLETED: '已完成', CANCELLED: '已取消', + PENDING_PROCESSING: '待处理', PROCESSING: '处理中', CUSTOMER_CONFIRM_PENDING: '待客户确认', + READY_FOR_OUTBOUND: '待出库', COMPLETED: '已完成', CANCELLED: '已取消', PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_ASSIGNMENT: '待分配', ALLOCATED: '已分配', OUTBOUNDED: '已出库', PARTIALLY_RECEIVED: '部分收货', RECEIVED: '已收货', @@ -255,10 +275,15 @@ function statusLabel(value: string) { return labels[value] || value || '—' } function deliveryMethodLabel(value: string) { - const labels: Record = { TRUCK: '卡车派送', EXPRESS: '快递派送' } + const labels: Record = { + TRUCK: '卡车派送', EXPRESS: '快递派送', TRUCK_PICKUP: '卡车自提', EXPRESS_PICKUP: '快递自提', + WAREHOUSE_PICKUP: '仓库上门提货', CUSTOMER_DELIVERY: '客户送货到仓', + // Keep the legacy value readable for historical applications created before the four-way split. + PICKUP: '仓库自提', + } return labels[value] || value || '—' } -function formatDateTime(value: string) { +function formatDateTime(value?: string | null) { return value ? value.replace('T', ' ').slice(0, 19) : '—' } async function load() { @@ -299,6 +324,13 @@ async function submit() { if (props.service === 'labeling' && (!form.labelDeadline || !form.contact || !form.phone || form.chargeAmount <= 0)) { ElMessage.warning('请填写贴标截止时间、联系人和贴标费用'); return } + if (props.service === 'labeling' && labelingMode.value !== 'sku' && !form.deliveryMethod) { + ElMessage.warning('请选择换标完成后的派送方式'); return + } + if (props.service === 'labeling' && labelingMode.value !== 'sku' && (form.deliveryMethod === 'EXPRESS' || form.deliveryMethod === 'EXPRESS_PICKUP') + && form.relabel && !shippingLabelFile.value) { + ElMessage.warning('选择打印面单时必须上传面单文件'); return + } if (props.service === 'labeling' && labelingMode.value === 'carton' && cargoRows.value.some((item) => !item.shipmentNo || !item.cartonMark || !item.fbaCartonMark)) { ElMessage.warning('请上传关联面单，确保每箱的我方箱唛和 FBA 箱唛完整'); return } @@ -308,9 +340,15 @@ async function submit() { if (props.service === 'disposal' && !form.reason) { ElMessage.warning('请选择废弃原因'); return } - if ((props.service === 'transfer' || props.service === 'relabel') && (!form.destination || !form.address || !form.deliveryMethod || !form.estimatedArrivalAt || !form.fbaShipmentNo || form.volumeCbm <= 0)) { + if (props.service === 'relabel' && (!form.destination || !form.address || !form.deliveryMethod || !form.estimatedArrivalAt || !form.fbaShipmentNo || form.volumeCbm <= 0)) { ElMessage.warning('请填写完整的派送信息、体积、预计到达时间和 FBA 货件号'); return } + if (props.service === 'transfer' && (!form.warehouse || !form.deliveryMethod || !form.address || !form.estimatedArrivalAt || form.volumeCbm <= 0)) { + ElMessage.warning(form.deliveryMethod === 'WAREHOUSE_PICKUP' ? '请填写中转仓、提货地址和预计入仓时间' : '请选择中转仓并确认预计入仓时间'); return + } + if (props.service === 'transfer' && transferHasFbaDestination.value && (!form.destination || !form.fbaShipmentNo)) { + ElMessage.warning('已选择有 FBA 去向，请填写 FBA 目的仓和货件编号'); return + } try { await ElMessageBox.confirm(`确认提交${config.value.title}吗？`, '提交确认', { confirmButtonText: '提交', cancelButtonText: '取消' }) } catch { return } saving.value = true try { @@ -320,7 +358,10 @@ async function submit() { 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: undefined, 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 }) + const created = 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, + deliveryMethod: labelingMode.value === 'sku' ? undefined : form.deliveryMethod as 'TRUCK' | 'EXPRESS' | 'TRUCK_PICKUP' | 'EXPRESS_PICKUP', + printShippingLabel: labelingMode.value !== 'sku' && (form.deliveryMethod === 'EXPRESS' || form.deliveryMethod === 'EXPRESS_PICKUP') && form.relabel }) + if (shippingLabelFile.value) await uploadRelabelShippingLabel(created.application.relabelNo, shippingLabelFile.value) } 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)) { @@ -333,7 +374,7 @@ async function submit() { const sources = await listLastlegOrders(form.inboundNo) if (sources.records.length === 0) throw new Error('未找到该入仓码对应的尾程订单') const packageCount = cargoRows.value.reduce((sum, item) => sum + item.quantity, 0) - await createTransfer({ inboundCode: form.inboundNo, sourceLastlegOrderIds: sources.records.map((item) => item.id), operatingWarehouseId: primaryWarehouse, fbaWarehouseCode: form.destination, deliveryAddress: form.address, packageCount, volumeCbm: form.volumeCbm, deliveryMethod: form.deliveryMethod, estimatedArrivalAt: form.estimatedArrivalAt, fbaShipmentNo: form.fbaShipmentNo, trackingNo: form.trackingNo || undefined, remark: form.remark || undefined, needRelabel: props.service === 'relabel' || form.relabel, idempotencyKey, items: cargoRows.value.map((item) => ({ skuCode: item.sku, productNameZh: item.name, packageCount: item.quantity, shippingMark: item.shippingMark || undefined })) }) + await createTransfer({ inboundCode: form.inboundNo, sourceLastlegOrderIds: sources.records.map((item) => item.id), operatingWarehouseId: primaryWarehouse, fbaWarehouseCode: form.destination || undefined, deliveryAddress: form.address, packageCount, volumeCbm: form.volumeCbm, deliveryMethod: form.deliveryMethod, estimatedArrivalAt: form.estimatedArrivalAt, fbaShipmentNo: form.fbaShipmentNo || undefined, trackingNo: form.trackingNo || undefined, remark: form.remark || undefined, needRelabel: props.service === 'relabel' || form.relabel, idempotencyKey, items: cargoRows.value.map((item) => ({ skuCode: item.sku, productNameZh: item.name, packageCount: item.quantity, shippingMark: item.shippingMark || undefined })) }) } ElMessage.success(`${config.value.title}提交成功`); mode.value = 'list'; await load() } catch (error) { ElMessage.error(error instanceof Error ? error.message : '提交失败') } @@ -347,6 +388,25 @@ async function openDetail(value: Record) { mode.value = 'detail' } catch (error) { ElMessage.error(error instanceof Error ? error.message : '详情加载失败') } } +async function confirmRelabel() { + const relabelNo = selectedRelabelDetail.value?.application.relabelNo + if (!relabelNo) return + try { + await ElMessageBox.confirm('确认仓库上传的换标结果无误并继续出库流程吗？', '换标完成确认', { confirmButtonText: '确认并继续', cancelButtonText: '取消' }) + selectedRelabelDetail.value = await confirmRelabelCompletion(relabelNo) + ElMessage.success('已确认换标完成，订单已进入后续出库流程') + } catch (error) { if (error !== 'cancel') ElMessage.error(error instanceof Error ? error.message : '确认失败') } +} +async function previewCompletionPhoto(fileId: string) { + const relabelNo = selectedRelabelDetail.value?.application.relabelNo + if (!relabelNo) return + try { + const blob = await downloadRelabelCompletionPhoto(relabelNo, fileId) + const url = URL.createObjectURL(blob) + window.open(url, '_blank', 'noopener,noreferrer') + window.setTimeout(() => URL.revokeObjectURL(url), 60_000) + } catch (error) { ElMessage.error(error instanceof Error ? error.message : '完工照片加载失败') } +} async function loadWarehouses() { fbaWarehousesLoading.value = true fbaWarehousesError.value = '' @@ -364,6 +424,31 @@ async function loadWarehouses() { } finally { fbaWarehousesLoading.value = false } } function warehouseLabel(value: MerchantWarehouse) { return `${value.warehouseName} · ${value.warehouseCode}` } +async function selectTransferWarehouse() { + selectedOperationWarehouse.value = null + form.contact = '' + form.phone = '' + if (form.deliveryMethod === 'CUSTOMER_DELIVERY') form.address = '' + if (!form.warehouse) return + operationWarehouseDetailLoading.value = true + try { + const detail = await getMerchantWarehouseDetail(form.warehouse) + selectedOperationWarehouse.value = detail + form.contact = detail.warehouse.contactName || '' + form.phone = detail.warehouse.contactPhone || '' + if (form.deliveryMethod === 'CUSTOMER_DELIVERY') form.address = operationWarehouseAddress.value + } catch (error) { + ElMessage.error(error instanceof Error ? error.message : '中转仓联系信息加载失败') + } finally { operationWarehouseDetailLoading.value = false } +} +function selectTransferInboundMethod(value: string | number | boolean | undefined) { + form.address = value === 'CUSTOMER_DELIVERY' ? operationWarehouseAddress.value : '' +} +function selectTransferFbaAvailability(value: string | number | boolean | undefined) { + if (value === true) return + form.destination = '' + form.fbaShipmentNo = '' +} async function selectOperationWarehouse() { cargoRows.value = [] skuRelabelRows.value = [] @@ -379,24 +464,20 @@ async function selectOperationWarehouse() { 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, + .flatMap((candidate) => candidate.positions.flatMap((position) => Array.from({ length: Math.min(position.availablePackages, 500) }, () => ({ + id: ++cargoSequence, sku: candidate.skuCode || '', name: candidate.productNameZh || '库存货物', + quantity: 1, availableQuantity: 1, 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 || '', - } - })) + fnsku: '', shipmentNo: '', newSkuCode: '', shippingMark: '', cartonMark: '', fbaCartonMark: '', + destinationWarehouseId: candidate.destinationFbaWarehouseCode || '', remark: '', + })))).slice(0, 500) skuRelabelRows.value = [] + shippingLabelFile.value = null if (labelingMode.value !== 'carton') addSkuRelabelRow() } @@ -428,30 +509,43 @@ function selectRelabelInventory(inboundOrderId: string) {
/新增

{{ config.createTitle }}

返回列表
-

{{ props.service === 'relabel' ? '退货信息' : props.service === 'labeling' ? '订单信息' : '基础与派送信息' }}

+

{{ props.service === 'transfer' ? '入库与转运信息' : props.service === 'relabel' ? '退货信息' : props.service === 'labeling' ? '订单信息' : '基础信息' }}

- + - - +
*货物如何送到中转仓仓库上门提货客户送货到仓仓库上门提货：填写货物当前地址；客户送货到仓：下方自动展示中转仓收货信息。
+ +
+
送货地址{{ operationWarehouseAddress || '该中转仓暂未维护收货地址' }}
+
收货联系人{{ form.contact || '未维护' }}
+
联系电话{{ form.phone || '未维护' }}
+
+ + - + +
是否打印面单需要仓库打印面单
+ + - - + +
*是否已有 FBA 去向暂未确定已有 FBA 去向暂未确定也可以提交，货物先正常入中转仓，后续再补充转运指令。
+ + + -
是否换标需要换标
+
*是否需要换标不需要换标需要换标提交后将同时生成待处理的换标任务。
@@ -487,6 +581,16 @@ function selectRelabelInventory(inboundOrderId: string) {
/订单详情

{{ config.title }}详情

返回列表

订单概览

{{ column }}{{ selectedDetail?.[String(index)] || '—' }}
+
+

换标完成与出库

换标完成确认
+
+
派送方式{{ deliveryMethodLabel(selectedRelabelDetail?.application.deliveryMethod || '') || '无需出库' }}
+
履约状态{{ selectedRelabelDetail?.application.fulfillmentStatus || '—' }}
+
客户确认时间{{ formatDateTime(selectedRelabelDetail?.application.customerConfirmedAt) }}
+
+
仓库完工照片
照片 {{ index + 1 }}
仓库尚未上传完工照片
+

完工备注：{{ selectedRelabelDetail.completionEvidence.completionRemark }}

+

换标任务明细

@@ -501,8 +605,10 @@ function selectRelabelInventory(inboundOrderId: string) { diff --git a/src/modules/overseas-warehouse/views/relabelAttachments.test.mjs b/src/modules/overseas-warehouse/views/relabelAttachments.test.mjs index 243d8d9..77614de 100644 --- a/src/modules/overseas-warehouse/views/relabelAttachments.test.mjs +++ b/src/modules/overseas-warehouse/views/relabelAttachments.test.mjs @@ -42,11 +42,14 @@ test('贴标货物明细支持手动添加和编辑', () => { assert.match(view, / { - assert.match(view, /el-tab-pane label="箱唛换标" name="carton"/) - assert.match(view, /el-tab-pane label="SKU 换标" name="sku"/) +test('贴标货物明细在同一页面支持三种换标类型', () => { + assert.match(view, /el-radio-group v-model="labelingMode" aria-label="换标类型"/) + assert.match(view, /el-radio-button value="carton">只换箱唛/) + assert.match(view, /el-radio-button value="sku">只换 SKU 标签/) + assert.match(view, /el-radio-button value="carton_and_sku">SKU 和箱唛都换/) + assert.doesNotMatch(view, /el-tab-pane label="箱唛换标"/) + assert.doesNotMatch(view, /el-tab-pane label="SKU 换标"/) assert.match(view, /interface SkuRelabelRow/) - assert.match(view, /来源库存箱 \*/) assert.match(view, /我方箱唛 \*/) assert.match(view, /换标数量（件）\*/) assert.match(view, /buildSkuRelabelItems/) @@ -55,6 +58,15 @@ test('贴标货物明细拆分为箱唛换标和 SKU 换标页签', () => { assert.doesNotMatch(view, /SKU 换标提交待接口接入/) }) +test('箱唛相关换标必须选择四选一派送方式', () => { + assert.match(view, /label="卡车派送" value="TRUCK"/) + assert.match(view, /label="快递派送" value="EXPRESS"/) + assert.match(view, /label="卡车自提" value="TRUCK_PICKUP"/) + assert.match(view, /label="快递自提" value="EXPRESS_PICKUP"/) + assert.match(api, /RelabelDeliveryMethod = 'TRUCK' \| 'EXPRESS' \| 'TRUCK_PICKUP' \| 'EXPRESS_PICKUP'/) + assert.match(view, /labelingMode\.value !== 'sku' && !form\.deliveryMethod/) +}) + test('一次申请单选入仓单且每项保留原库存归属', () => { assert.doesNotMatch(view, /multiple filterable collapse-tags/) assert.match(view, /String\(candidate\.inboundOrderId\) === inboundOrderId/) diff --git a/src/modules/overseas-warehouse/views/warehouseTransferForm.test.mjs b/src/modules/overseas-warehouse/views/warehouseTransferForm.test.mjs new file mode 100644 index 0000000..d6313be --- /dev/null +++ b/src/modules/overseas-warehouse/views/warehouseTransferForm.test.mjs @@ -0,0 +1,25 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +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') + +test('仓储转运先选择入仓方式并按方式切换地址信息', () => { + assert.match(view, /value="WAREHOUSE_PICKUP">仓库上门提货/) + assert.match(view, /value="CUSTOMER_DELIVERY">客户送货到仓/) + assert.match(view, /form\.deliveryMethod === 'WAREHOUSE_PICKUP'.*提货地址/s) + assert.match(view, /form\.deliveryMethod === 'CUSTOMER_DELIVERY'.*送货地址.*收货联系人.*联系电话/s) + assert.match(view, /getMerchantWarehouseDetail\(form\.warehouse\)/) +}) + +test('仓储转运允许暂未确定 FBA 去向并显式选择是否换标', () => { + assert.match(view, /是否已有 FBA 去向/) + assert.match(view, /:value="false">暂未确定/) + assert.match(view, /transferHasFbaDestination.*目的 FBA 仓/s) + assert.match(view, /是否需要换标/) + assert.match(view, /:value="false">不需要换标/) + assert.match(view, /:value="true">需要换标/) + assert.match(api, /fbaWarehouseCode\?: string/) + assert.match(api, /fbaShipmentNo\?: string/) +}) From 5c4578ce00e3bc2e1a919881b11107dff08d5323 Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Thu, 10 Sep 2026 15:56:39 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 2 +- .../views/WarehouseServiceView.vue | 67 +++++++++++++++++-- .../views/relabelAttachments.test.mjs | 7 +- .../views/warehouseTransferForm.test.mjs | 16 +++++ 4 files changed, 82 insertions(+), 10 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 26ff0ff..4a9d048 100644 --- a/AGENTS.md +++ b/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；采购创建的 `customerName` 只取当前认证会话企业名称，不允许自由输入或冒用其他客户。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`；贴标申请先选国外中转仓和有库存历史入仓单，换标类型为只换 SKU、只换箱唛、SKU+箱唛。涉及箱唛换标时必须选择卡车、自提或快递；快递可选择打印面单并上传 PDF/图片。PDA 逐箱换标、上传照片并由仓库复核后，客户详情展示完工照片和“换标完成确认”；客户确认前不得继续出库，确认后卡车进入预排车，自提/快递进入换标出库待创建。历史库存位置不能解释成箱唛与具体托盘快照，客户页面不暴露托盘、库位和内部库存 ID | +| 海外仓贴标、仓储转运、货物废弃、退货换标 | `src/modules/overseas-warehouse/routes.ts`、`views/WarehouseServiceView.vue`、`api/warehouseServices.ts` | 四个路由均为 `active`；贴标申请先选国外中转仓和有库存历史入仓单，换标类型为只换 SKU、只换箱唛、SKU+箱唛。模板上传和下载固定在货物明细外层：箱唛模式使用箱唛模板，SKU 模式使用包含我方箱唛、旧 SKU 标签、新 SKU 标签和换标数量的 SKU 模板，SKU+箱唛模板另含新 FBA 箱唛与目的仓。涉及箱唛换标时必须选择卡车、自提或快递；快递可选择打印面单并上传 PDF/图片。PDA 逐箱换标、上传照片并由仓库复核后，客户详情展示完工照片和“换标完成确认”；客户确认前不得继续出库，确认后卡车进入预排车，自提/快递进入换标出库待创建。历史库存位置不能解释成箱唛与具体托盘快照，客户页面不暴露托盘、库位和内部库存 ID | ## 租户、认证与数据安全 diff --git a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue index 13e0205..ee1486c 100644 --- a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue +++ b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue @@ -189,13 +189,24 @@ function clearRelabelRows() { cargoRows.value = []; selectedRelabelInboundOrderI function csvCell(value: string | number | undefined) { return `"${String(value ?? '').replaceAll('"', '""')}"` } function downloadRelabelTemplate() { if (!cargoRows.value.length) { ElMessage.warning('请先选择有库存的历史入仓单'); return } - const header = ['明细行标识', '本次箱数', '商品SKU', '中文品名', 'FBA货件编号', '我方箱唛', 'FBA箱唛', 'FBA目的仓', '备注'] - const rows = cargoRows.value.map((item) => [item.id, item.quantity, item.sku, item.name, item.shipmentNo, - item.cartonMark, item.fbaCartonMark, item.destinationWarehouseId, item.remark]) + const cartonTemplate = labelingMode.value === 'carton' + const combinedTemplate = labelingMode.value === 'carton_and_sku' + const header = cartonTemplate + ? ['明细行标识', '本次箱数', '商品SKU', '中文品名', 'FBA货件编号', '我方箱唛', 'FBA箱唛', 'FBA目的仓', '备注'] + : ['我方箱唛', '旧SKU标签', '新SKU标签', '换标数量（件）', + ...(combinedTemplate ? ['新FBA箱唛', 'FBA目的仓'] : []), '备注'] + const rows = cartonTemplate + ? cargoRows.value.map((item) => [item.id, item.quantity, item.sku, item.name, item.shipmentNo, + item.cartonMark, item.fbaCartonMark, item.destinationWarehouseId, item.remark]) + : skuRelabelRows.value.map((item) => [item.cartonMark, item.originalSku, item.newSku, item.quantity, + ...(combinedTemplate ? [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) + anchor.href = url + anchor.download = cartonTemplate ? '贴标申请-箱唛换标模板.csv' + : combinedTemplate ? '贴标申请-SKU和箱唛换标模板.csv' : '贴标申请-SKU换标模板.csv' + anchor.click(); URL.revokeObjectURL(url) } function parseCsvLine(line: string) { const values: string[] = []; let value = ''; let quoted = false @@ -213,6 +224,41 @@ async function importRelabelTemplate(event: Event) { 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]) + if (labelingMode.value !== 'carton') { + const combinedTemplate = labelingMode.value === 'carton_and_sku' + const required = ['我方箱唛', '旧SKU标签', '新SKU标签', '换标数量（件）', + ...(combinedTemplate ? ['新FBA箱唛', 'FBA目的仓'] : [])] + if (required.some((name) => !headers.includes(name))) { + ElMessage.error('SKU 换标模板格式不正确，请重新下载当前换标类型的模板'); return + } + const imported = lines.slice(1).map(parseCsvLine) + .map((values) => Object.fromEntries(headers.map((key, index) => [key, values[index] || '']))) + .filter((item) => Object.values(item).some(Boolean)) + if (!imported.length || imported.some((item) => required.some((key) => !item[key]))) { + ElMessage.error('我方箱唛、旧 SKU 标签、新 SKU 标签和换标数量必须填写完整'); return + } + const rows: SkuRelabelRow[] = [] + for (const item of imported) { + const quantity = Number(item['换标数量（件）']) + if (!Number.isInteger(quantity) || quantity < 1) { + ElMessage.error(`箱唛 ${item['我方箱唛']} 的换标数量必须是大于 0 的整数`); return + } + rows.push({ + id: ++skuRelabelSequence, + sourceRowId: null, + cartonMark: item['我方箱唛'].trim(), + originalSku: item['旧SKU标签'].trim(), + newSku: item['新SKU标签'].trim(), + quantity, + fbaCartonMark: combinedTemplate ? item['新FBA箱唛'].trim() : '', + destinationWarehouseId: combinedTemplate ? item['FBA目的仓'].trim() : '', + remark: item['备注'] || '', + }) + } + skuRelabelRows.value = rows + ElMessage.success(`已导入 ${rows.length} 条 SKU 换标明细`) + return + } const required = ['明细行标识', '本次箱数', 'FBA货件编号', '我方箱唛', 'FBA箱唛', 'FBA目的仓'] if (required.some((name) => !headers.includes(name))) { ElMessage.error('模板格式不正确，请重新下载模板填写'); return } const imported = lines.slice(1).map(parseCsvLine) @@ -548,7 +594,14 @@ function selectRelabelInventory(inboundOrderId: string) {
换标模式我方箱唛新 FBA 箱唛FBA 目的仓任务箱数商品 SKUSKU 换标明细FBA 货件编号贴标要求备注