优化

src/modules/loading-lists/api/platformLoadingLists.test.ts

@@ -9,6 +9,7 @@ import {
   listConfirmedLoadingLists,
   listPreloadPlans,
   updatePreloadTransport,
+  updateLoadingItemWarehouseRemark,
 } from './platformLoadingLists'
 
 const preloadSummary = {
@@ -49,7 +50,7 @@ const preloadSummary = {
 const detail = {
   summary: preloadSummary,
   items: [{
-    itemId: 11, accountId: 12, orderId: 15, orderNo: 'ORD-001', inboundId: 13, inboundDetailId: 14, containerNo: 'MSCU1234567', productQuantity: 20,
+    itemId: 11, itemVersion: 4, accountId: 12, orderId: 15, orderNo: 'ORD-001', inboundId: 13, inboundDetailId: 14, containerNo: 'MSCU1234567', productQuantity: 20,
     customerName: '测试客户', inboundCode: 'RK001', skuCode: 'SKU001', destinationWarehouse: 'ONT8', chineseName: '产品', englishName: null,
     goodsImageUrl: null, packageCount: 2, palletCount: 1, grossWeightKg: 10, netWeightKg: 9, volumeCbm: 1,
     dimensionalWeightKg: 2, unitsPerPackage: 10, fbaTrackingNo: null, shipmentNo: null, shippingMark: null,
@@ -108,6 +109,22 @@ describe('platform loading lists API', () => {
     expect(loaded.summary.status).toBe('COMPLETED')
   })
 
+  it('updates one item warehouse remark with both optimistic-lock versions and operation id', async () => {
+    const patch = vi.spyOn(http, 'patch').mockResolvedValue({ code: '200', message: 'ok', data: { id: 100, version: 4, items: [{ id: 11, warehouseRemark: '装柜时注意外箱', version: 5 }] } })
+    const result = await updateLoadingItemWarehouseRemark('100', '11', {
+      warehouseRemark: '装柜时注意外箱',
+      expectedPlanVersion: 3,
+      expectedItemVersion: 4,
+      operationId: 'warehouse-remark-1',
+    })
+
+    expect(patch).toHaveBeenCalledWith(
+      '/platform/v1/first-leg/smart-loading/plans/100/items/11/warehouse-remark',
+      { warehouseRemark: '装柜时注意外箱', expectedPlanVersion: 3, expectedItemVersion: 4, operationId: 'warehouse-remark-1' },
+    )
+    expect(result).toMatchObject({ id: '100', version: 4, items: [{ id: '11', version: 5, warehouseRemark: '装柜时注意外箱' }] })
+  })
+
   it('confirms the whole preload plan with expectedVersion and the caller operation id', async () => {
     const post = vi.spyOn(http, 'post').mockResolvedValue({
       code: '200', message: 'ok', data: {

src/modules/loading-lists/api/platformLoadingLists.ts

@@ -80,6 +80,7 @@ export type LoadingListSummary = PreloadSummary | ConfirmedSummary
 
 export interface LoadingItem {
   itemId: string
+  itemVersion: number
   accountId: string
   customerName: string | null
   orderId: string
@@ -172,6 +173,19 @@ export interface TransportUpdateRequest {
   operationReason: string | null
 }
 
+export interface WarehouseRemarkUpdateRequest {
+  warehouseRemark: string | null
+  expectedPlanVersion: number
+  expectedItemVersion: number
+  operationId: string
+}
+
+export interface WarehouseRemarkUpdateResponse {
+  id: string
+  version: number
+  items: Array<{ id: string; version: number; warehouseRemark: string | null }>
+}
+
 export interface PreloadConfirmationResponse {
   planId: string
   containerBookingId: string
@@ -239,6 +253,7 @@ function normalizeItem(raw: LoadingItem): LoadingItem {
   return {
     ...raw,
     itemId: requiredId(raw.itemId),
+    itemVersion: Number(raw.itemVersion),
     accountId: requiredId(raw.accountId),
     orderId: requiredId(raw.orderId),
     inboundId: requiredId(raw.inboundId),
@@ -312,6 +327,19 @@ export async function updatePreloadTransport(planId: string, warehouseId: string
   }
 }
 
+export async function updateLoadingItemWarehouseRemark(planId: string, itemId: string, request: WarehouseRemarkUpdateRequest) {
+  const response = await http.patch<ApiEnvelope<WarehouseRemarkUpdateResponse>, ApiEnvelope<WarehouseRemarkUpdateResponse>>(
+    `${basePath}/smart-loading/plans/${encodeURIComponent(planId)}/items/${encodeURIComponent(itemId)}/warehouse-remark`,
+    request,
+  )
+  const result = unwrapApiResponse(response)
+  return {
+    ...result,
+    id: requiredId(result.id),
+    items: (result.items || []).map((item) => ({ ...item, id: requiredId(item.id), version: Number(item.version) })),
+  }
+}
+
 export async function confirmPreloadPlan(planId: string, expectedVersion: number, operationId: string) {
   const response = await http.post<ApiEnvelope<PreloadConfirmationResponse>, ApiEnvelope<PreloadConfirmationResponse>>(
     `${basePath}/loading-plans/${encodeURIComponent(planId)}/confirm`,