Merge remote-tracking branch 'origin/release/test' into dev

# Conflicts:
#	src/modules/container-loading/pages/ContainersView.vue

src/modules/overseas-warehouse/api/deliveryOrders.test.ts

@@ -18,11 +18,23 @@ describe('delivery order API', () => {
   })
 
   it('loads an encoded detail in its explicit customer scope', async () => {
-    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { order: { deliveryNo: 'DEL/1' }, skus: [], fees: [], operations: [] } })
+    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { order: { deliveryNo: 'DEL/1', version: '0' }, skus: [], fees: [], operations: [] } })
     await getDeliveryOrder('DEL/1', '1001')
     expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1', { params: { customerId: '1001', page: 1, size: 200 } })
   })
 
+  it.each(['0', '7', '9007199254740991'])('reads Java Long version %s for status editing', async version => {
+    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { order: { version, id: '2097515131537313794' } } })
+    const detail = await getDeliveryOrder('DEL/1', '1001')
+    expect(detail.order.version).toBe(Number(version))
+    expect(detail.order.id).toBe('2097515131537313794')
+  })
+
+  it.each([null, undefined, '', ' ', '-1', '1.5', '9007199254740992', -1])('rejects invalid version %s', async version => {
+    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { order: { version } } })
+    await expect(getDeliveryOrder('DEL/1', '1001')).rejects.toThrow('派送单缺少有效版本')
+  })
+
   it('loads return options and marks a return in the explicit customer scope', async () => {
     vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: [{ inboundOrderId: '9', inboundCode: 'IN-1' }] })
     await listDeliveryReturnInboundOptions('DEL/1', '1001')

src/modules/overseas-warehouse/api/deliveryOrders.ts

@@ -97,7 +97,15 @@ export async function getDeliveryOrder(deliveryNo: string, customerId: string) {
   const response = await overseasHttp.get<ApiEnvelope<DeliveryOrderDetail>, ApiEnvelope<DeliveryOrderDetail>>(
     `/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}`, { params: { customerId, page: 1, size: 200 } },
   )
-  return unwrapApiResponse(response)
+  const detail = unwrapApiResponse(response)
+  // Java Long values are serialized as decimal strings, including the version.
+  const rawVersion: unknown = detail.order.version
+  const version = typeof rawVersion === 'string' && /^(0|[1-9]\d*)$/.test(rawVersion)
+    ? Number(rawVersion) : rawVersion
+  if (typeof version !== 'number' || !Number.isSafeInteger(version) || version < 0) {
+    throw new Error('派送单缺少有效版本，请刷新后重试')
+  }
+  return { ...detail, order: { ...detail.order, version } }
 }
 
 export async function listDeliveryReturnInboundOptions(deliveryNo: string, customerId: string) {