Compare commits

..
14 Commits
Author SHA1 Message Date
ouyangxq f1dbb63251 fix(bookings): display saved port codes when names are empty 2026-10-26 10:48:08 +08:00
admin c853b919c0 灰度晋级:2026-10-23 晚间 apps/admin-web
User-authorized fixed-source promotion; deployment and data preservation verified separately.
2026-10-23 21:00:45 +08:00
admin ff071c0159 灰度晋级:Admin 散板发布入口及累计界面修复
User-authorized fixed-source promotion; deployment and data preservation verified separately.
2026-10-23 13:40:46 +08:00
admin 4b47e770a3 发布:将已验 TEST 功能更新至既有生产灰度(2026-10-23)
Promote the fixed, reviewed TEST source to the existing production release. Runtime deployment remains a separate controlled step.
2026-10-23 10:51:27 +08:00
admin eb1d75222a Merge pull request '生产更新:同步已提交的海外仓分析及业务修复(2026-10-16)' (#20) from release/test into main 2026-10-16 18:03:19 +08:00
admin 545205e28d Merge pull request '发布采购、拼车、预约及匹配端侧修复至灰度' (#19) from release/test into main 2026-10-12 10:20:54 +08:00
admin f9dd30b8b9 Merge pull request '发布已验收的跨客户同仓预约到灰度' (#18) from release/appointment-gray-20261009 into main 2026-10-09 13:34:39 +08:00
admin 76a63070c5 Merge pull request '修复车次同名卸货站目的地校验与提示' (#17) from fix/fleet-destination-gray-20261009 into main 2026-10-09 11:57:19 +08:00
ouyangxq cec1e2d77c fix(fleet): validate pallet destination identity before capacity confirmation 2026-10-09 11:48:53 +08:00
admin dd47143d6e Merge pull request '发布已通过 TEST 回归的 2026-10-08 批次至灰度' (#16) from release/test into main 2026-10-08 22:17:40 +08:00
admin 10da46beab Merge pull request '恢复装柜清单及货柜海外操作入口' (#15) from release/test into main 2026-10-08 11:26:58 +08:00
admin cc5ac2e68a Merge pull request 'Release internal fleet capacity pool to gray' (#14) from release/test into main 2026-10-08 08:13:24 +08:00
admin e8e7465e4e Merge pull request '统一司机、车次及出车记录列表样式' (#13) from release/test into main 2026-10-07 12:25:14 +08:00
admin b4b802a547 Merge pull request '发布当前测试版本至临时灰度环境' (#12) from release/test into main 2026-10-07 11:11:52 +08:00
2 changed files with 17 additions and 2 deletions
@@ -15,6 +15,21 @@ const detailResponse = (version = 0, status = 'DRAFT') => ({
})
describe('ocean bookings api', () => {
it.each([
['宁波', '洛杉矶', 'CNNGB', 'USLAX', '宁波', '洛杉矶'],
[null, null, 'CNNGB', 'USLAX', 'CNNGB', 'USLAX'],
['', ' ', 'CNNGB', 'USLAX', 'CNNGB', 'USLAX'],
['宁波', '洛杉矶', null, null, '宁波', '洛杉矶'],
[null, '', null, ' ', null, null],
])('列表港口名称 %s / %s 为空时展示已保存代码', async (departurePortName, destinationPortName, departurePortCode, destinationPortCode, pol, pod) => {
vi.spyOn(http, 'get').mockResolvedValue({ code: '200', data: {
records: [{ ...detailResponse().oceanBooking, departurePortName, destinationPortName, departurePortCode, destinationPortCode }],
page: 1, size: 20, total: 1, pages: 1,
} })
const result = await listOceanBookings({ page: 1, size: 20 })
expect(result.records[0]).toMatchObject({ pol, pod, departurePortName, destinationPortName, departurePortCode, destinationPortCode })
})
it('预计到港使用窄命令并规范化详情回显与列表到港字段', async () => {
const payload = { expectedVersion: 3, estimatedArrivalAt: '2026-10-25T10:00:00' }
const raw = detailResponse(4, 'RELEASED')
@@ -27,8 +27,8 @@ function booking(raw: OceanBookingResource): OceanBookingResource {
actualPackageCount: raw.actualPackageCount == null ? null : Number(raw.actualPackageCount),
actualGrossWeightKg: raw.actualGrossWeightKg == null ? null : Number(raw.actualGrossWeightKg),
actualVolumeCbm: raw.actualVolumeCbm == null ? null : Number(raw.actualVolumeCbm),
pol: raw.pol ?? raw.departurePortName ?? null,
pod: raw.pod ?? raw.destinationPortName ?? null,
pol: raw.departurePortName?.trim() || raw.departurePortCode?.trim() || null,
pod: raw.destinationPortName?.trim() || raw.destinationPortCode?.trim() || null,
carrierName: raw.carrierName ?? raw.shippingCompanyName ?? null,
bookingAgent: raw.bookingAgent ?? raw.bookingAgentName ?? null,
etd: raw.etd ?? raw.estimatedSailingAt ?? null,