优化

2026-08-20 18:02:52 +08:00
parent 4ae5e7c672
commit 80947cd9ce
65 changed files with 1386 additions and 1083 deletions
@@ -16,13 +16,12 @@ const queryView = {
    id: '11', queryNo: 'CSQ11', customerId: '1', oceanBookingId: '2', containerBookingId: '3',
    carrierCode: 'COSCO', trackingType: 'CONTAINER_NO', trackingNo: 'CSNU1234567',
    officialUrl: 'https://elines.coscoshipping.com/ebusiness/', accessMode: 'DYNAMIC_IFRAME',
-    status: 'MANUAL_REQUIRED' as const, attemptCount: 2, lastAttemptStatus: 'MANUAL_REQUIRED',
+    status: 'MANUAL_REQUIRED' as const, triggerSource: 'OUTBOUND_CONFIRM',
+    latestStandardNode: 'DEPARTED_WAREHOUSE' as const, latestNodeObservedAt: '2026-08-20T10:00:00',
    lastErrorCode: 'DYNAMIC_IFRAME_REQUIRED', lastErrorMessage: '必须人工查询',
    resultPortScheduleId: '21', version: 1,
  },
  expired: true,
-  maxAttempts: 3,
-  nextAllowedAt: '2026-08-22T10:00:00',
 }

 describe('CarrierScheduleQueryPanel loading states', () => {
@@ -40,7 +39,7 @@ describe('CarrierScheduleQueryPanel loading states', () => {
    expect(getCarrierScheduleQuery).toHaveBeenCalledWith('11')
    expect(getPortSchedule).toHaveBeenCalledWith('21')
    expect(wrapper.text()).toContain('CSQ11')
-    expect(wrapper.text()).toContain('查询尝试与变更历史暂不可用')
+    expect(wrapper.text()).toContain('标准节点与变更历史暂不可用')
    expect(wrapper.text()).toContain('关联船期结果暂不可用')
    expect(wrapper.text()).toContain('DYNAMIC_IFRAME_REQUIRED')
  })
@@ -50,8 +49,37 @@ describe('CarrierScheduleQueryPanel loading states', () => {
    const wrapper = mount(CarrierScheduleQueryPanel, { props: { oceanBookingId: '2' }, global: { plugins: [ElementPlus] } })
    await flushPromises()

-    expect(wrapper.text()).toContain('不会模拟节点或自动创建任务')
+    expect(wrapper.text()).toContain('本页面不会创建或模拟任务')
    expect(getCarrierScheduleQuery).not.toHaveBeenCalled()
    expect(getPortSchedule).not.toHaveBeenCalled()
  })
+
+  it('falls back to the booking/container task when an automatic task has no linked port schedule', async () => {
+    vi.mocked(listCarrierScheduleQueries).mockResolvedValue({ records: [{ ...queryView, query: { ...queryView.query, resultPortScheduleId: null } }], page: 1, size: 200, total: 1, pages: 1 })
+    vi.mocked(getCarrierScheduleQuery).mockResolvedValue({ query: { ...queryView, query: { ...queryView.query, resultPortScheduleId: null } }, nodes: [], histories: [] })
+    const wrapper = mount(CarrierScheduleQueryPanel, { props: { oceanBookingId: '2', containerBookingId: '3', portScheduleId: '99' }, global: { plugins: [ElementPlus] } })
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('CSQ11')
+    expect(getCarrierScheduleQuery).toHaveBeenCalledWith('11')
+    expect(getPortSchedule).not.toHaveBeenCalled()
+  })
+
+  it('renders canonical node location, actual time, source and stopped facts from detail DTO', async () => {
+    vi.mocked(listCarrierScheduleQueries).mockResolvedValue({ records: [{ ...queryView, query: { ...queryView.query, status: 'STOPPED', latestStandardNode: 'PICKUP_READY', stoppedAt: '2026-08-20T18:00:00', stopReason: '目的港可提柜后停止', resultPortScheduleId: null }, expired: false }], page: 1, size: 200, total: 1, pages: 1 })
+    vi.mocked(getCarrierScheduleQuery).mockResolvedValue({
+      query: { query: { ...queryView.query, status: 'STOPPED', latestStandardNode: 'PICKUP_READY', stoppedAt: '2026-08-20T18:00:00', stopReason: '目的港可提柜后停止', resultPortScheduleId: null }, expired: false },
+      nodes: [{ id: '31', providerCode: 'COSCO', providerNodeCode: 'PICKUP', standardNode: 'PICKUP_READY', nodeSequence: 60, observedAt: '2026-08-20T17:50:00', estimatedAt: null, actualAt: '2026-08-20T17:45:00', locationCode: 'USLAX', locationName: 'Los Angeles', sourceReference: 'provider-event-31', rawPayloadHash: 'a'.repeat(64), createdAt: '2026-08-20T17:51:00' }],
+      histories: [{ id: '41', action: 'STOP', fromVersion: 4, toVersion: 5, reason: '目的港可提柜后停止', operatorId: null, operatorName: '系统', createdAt: '2026-08-20T18:00:00' }],
+    })
+    const wrapper = mount(CarrierScheduleQueryPanel, { props: { oceanBookingId: '2', containerBookingId: '3' }, global: { plugins: [ElementPlus] } })
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('已停止')
+    expect(wrapper.text()).toContain('可提柜')
+    expect(wrapper.text()).toContain('USLAX · Los Angeles')
+    expect(wrapper.text()).toContain('2026-08-20 17:45')
+    expect(wrapper.text()).toContain('COSCO')
+    expect(wrapper.text()).toContain('目的港可提柜后停止')
+  })
 })