merge release test changes and preserve local frontend updates
This commit is contained in:
@@ -15,10 +15,12 @@ const orderTypeLabels: Record<string, string> = {
|
||||
|
||||
const statusLabels: Record<string, string> = {
|
||||
PENDING_REVIEW: '待审核',
|
||||
PENDING_RECEIPT: '待签收入库',
|
||||
PARTIALLY_RECEIVED: '部分入库',
|
||||
INBOUND_COMPLETED: '全部入库',
|
||||
WAIT_PDA_RECEIVING: '入库测量中',
|
||||
INBOUND_MEASURING: '入库测量中',
|
||||
WAIT_CUSTOMER_CONFIRMATION: '待客户确认实测',
|
||||
INBOUND_COMPLETED: '入库完成',
|
||||
APPROVED: '审核通过',
|
||||
PENDING_ASSIGNMENT: '待分配',
|
||||
WAIT_RELABEL: '待换标',
|
||||
@@ -27,7 +29,6 @@ const statusLabels: Record<string, string> = {
|
||||
WAIT_OUTBOUND: '待出库',
|
||||
ALLOCATED: '已分配库存',
|
||||
OUTBOUNDED: '已出库',
|
||||
PARTIALLY_RECEIVED: '部分收货',
|
||||
RECEIVED: '已收货',
|
||||
IN_TRANSIT: '运输中',
|
||||
DESTINATION_ASSIGNED: '已分配目的仓',
|
||||
@@ -35,6 +36,7 @@ const statusLabels: Record<string, string> = {
|
||||
PENDING_PROCESSING: '待处理',
|
||||
PROCESSING: '处理中',
|
||||
COMPLETED: '已完成',
|
||||
REJECTED: '已驳回',
|
||||
CANCELLED: '已取消',
|
||||
}
|
||||
|
||||
@@ -145,6 +147,7 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO
|
||||
customerId: String(dto.customerId),
|
||||
sourceContainerBookingId: String(dto.sourceContainerBookingId ?? '').trim(),
|
||||
orderNo: lastMileOrderReference(dto.orderNo),
|
||||
sourceOrderNo: lastMileOrderReference(dto.sourceOrderNo, ''),
|
||||
orderTypeCode: String(dto.orderType ?? '').trim(),
|
||||
currentStatusCode: String(dto.currentStatus ?? '').trim(),
|
||||
warning: dto.abnormal ? '异常' : '—',
|
||||
|
||||
Reference in New Issue
Block a user