diff --git a/src/modules/overseas-warehouse/lastMilePresentation.test.ts b/src/modules/overseas-warehouse/lastMilePresentation.test.ts index 1415c320..f8aa73e5 100644 --- a/src/modules/overseas-warehouse/lastMilePresentation.test.ts +++ b/src/modules/overseas-warehouse/lastMilePresentation.test.ts @@ -32,4 +32,13 @@ describe('last-mile order presentation adapter', () => { const row = toLastMileOrderListItem({ id: '1', customerId: '100', orderNo: 'LL-1', orderType }) expect(row.orderType).toBe(expected) }) + + it('shows the actual related order numbers returned after pallet merge', () => { + const row = toLastMileOrderListItem({ + id: '11', customerId: '100', orderNo: 'LMO-1', palletMergeFlag: 'MERGED', + palletMergeBatchId: 'PMG-1', palletMergeOrderNos: ['LMO-2', 'LMO-3'], + }) + + expect(row.palletMergeRelation).toBe('LMO-2、LMO-3') + }) }) diff --git a/src/modules/overseas-warehouse/lastMilePresentation.ts b/src/modules/overseas-warehouse/lastMilePresentation.ts index 7f7877fb..591158f8 100644 --- a/src/modules/overseas-warehouse/lastMilePresentation.ts +++ b/src/modules/overseas-warehouse/lastMilePresentation.ts @@ -101,9 +101,7 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO palletMergeFlag: String(dto.palletMergeFlag ?? '').trim(), palletMergeRelation: Array.isArray(dto.palletMergeOrderNos) && dto.palletMergeOrderNos.length ? dto.palletMergeOrderNos.map((value) => text(value)).join('、') - : dto.palletMergeBatchId ? `批次 ${text(dto.palletMergeBatchId)}` - : dto.palletMergeFlag === 'MERGED' ? '已完成合托(关联明细待服务端返回)' - : dto.palletMergeFlag === 'REQUIRED' ? '待PDA合托(关联明细待服务端返回)' : '—', + : dto.palletMergeBatchId ? `批次 ${text(dto.palletMergeBatchId)}` : '—', status: lastMileStatusLabel(dto.currentStatus), internalRemark: text(dto.privateRemark), customerRemark: text(dto.customerRemark), diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue index 04925e77..618d6e0d 100644 --- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue +++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue @@ -64,6 +64,7 @@ const columns: DataTableColumn[] = [ { key: 'actions', label: '操作', width: 270, fixed: 'left', slotName: 'actions' }, { key: 'selection', type: 'selection', width: 48, fixed: 'left' }, { key: 'orderNo', prop: 'orderNo', label: '尾程单号', minWidth: 170 }, + { key: 'palletMergeRelation', prop: 'palletMergeRelation', label: '合托关联订单', minWidth: 220, hideable: false }, { key: 'warning', prop: 'warning', label: '预警', width: 90 }, { key: 'orderType', prop: 'orderType', label: '订单类型', minWidth: 110 }, { key: 'rejectedAt', prop: 'rejectedAt', label: '拒收时间', minWidth: 150 }, diff --git a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts index db720f1d..161cf81a 100644 --- a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts +++ b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts @@ -327,7 +327,7 @@ describe('overseas warehouse first-batch prototype contract', () => { it('keeps every prototype list column in its frozen order', () => { expect(columnKeys('LastMileOrdersView.vue')).toEqual([ - 'actions', 'selection', 'orderNo', 'warning', 'orderType', 'rejectedAt', 'inboundCode', 'owner', 'warehouse', + 'actions', 'selection', 'orderNo', 'palletMergeRelation', 'warning', 'orderType', 'rejectedAt', 'inboundCode', 'owner', 'warehouse', 'transferWarehouse', 'fbaWarehouse', 'containerNo', 'abnormal', 'held', 'pallets', 'cartons', 'volume', 'quantity', 'volumeWeight', 'portEta', 'portAta', 'warehouseEta', 'inboundOrderNo', 'outboundOrderNo', 'dispatchOrderNo', 'relabelOrderNo', 'relabelStatus', 'status',