提交

2026-10-30 17:59:12 +08:00
parent 872215367b
commit 51a93a69af
48 changed files with 1143 additions and 74 deletions
@@ -1741,7 +1741,7 @@ paths:
  /api/platform/v1/last-leg/dispatches/{dispatchNo}/exceptions:
    post:
      summary: 登记派送异常
-      description: 权限 platform:overseas-warehouse:dispatch:edit；仅有效仓库派送单DELIVERING可登记，保存后阶段不变，不产生退货、签收或库存变化。原键重试恢复原结果。
+      description: 权限 platform:overseas-warehouse:dispatch:edit；仅有效仓库派送单DELIVERING可登记，保存后阶段不变，同事务生成异常工单；选择退回海外仓时必须提交原出库来源和退回数量，冻结退回范围但不增加库存。原键重试恢复原结果。退回尾程建单与PDA列表验收契约见exception-return-inbound-v1.yaml。
      security:
      - bearerAuth: []
      responses:
@@ -2639,7 +2639,7 @@ paths:
  /api/merchant/v1/last-leg/overseas-procurements:
    post:
      summary: 客户创建海外采购订单
-      description: 权限 merchant:cross-border:procurement:create；客户 ID 只取认证身份且不接收 customerId；新单固定进入 PENDING_REVIEW。同幂等键同请求返回既有订单，异请求返回 A0409。
+      description: 权限 merchant:cross-border:procurement:create；客户 ID 只取认证身份且不接收 customerId；新单先进入 FUNDING_PENDING，异步冻结成功进入 PENDING_REVIEW，失败进入 FUNDING_FAILED 并可原单重试；零金额直接待审核。同幂等键同请求返回既有订单，异请求返回 A0409。
      security: [{ bearerAuth: [] }]
      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/ProcurementCreate' } } } }
      responses: { '200': { description: 采购订单详情, content: { application/json: { schema: { $ref: 'procurement-fulfillment-v1.yaml#/components/schemas/ProcurementCustomerResponse' } } } }, '409': { description: 幂等冲突 } }
@@ -2682,7 +2682,7 @@ paths:
      responses: { '200': { description: 当前客户本土卡订单分页, content: { application/json: { schema: { $ref: '#/components/schemas/TruckPageResponse' } } } } }
    post:
      summary: 客户创建美国本土卡订单
-      description: 权限 merchant:cross-border:domestic-trucking:create；新单固定进入 PENDING_REVIEW，客户不能调用平台审核或状态推进端点。
+      description: 权限 merchant:cross-border:domestic-trucking:create；新单先进入 FUNDING_PENDING，异步冻结成功进入 PENDING_REVIEW，失败进入 FUNDING_FAILED 并可原单重试；客户不能调用平台审核或状态推进端点。
      security: [{ bearerAuth: [] }]
      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/TruckCreate' } } } }
      responses: { '200': { description: 本土卡订单详情, content: { application/json: { schema: { $ref: '#/components/schemas/TruckDetailResponse' } } } }, '409': { description: 幂等冲突 } }
@@ -5077,7 +5077,7 @@ components:
        actualVolumeCbm: { type: number, nullable: true }
        status: { type: string }
        version: { type: integer }
-    ProcurementStatus: { type: string, enum: [PENDING_REVIEW, RECEIVING, WAIT_CUSTOMER_CONFIRM, CONFIRMED, IN_TRANSIT, DELIVERING, COMPLETED, REJECTED, CANCELLED, EXCEPTION_CLOSED, WAIT_PURCHASE, WAIT_OVERSEAS_RECEIPT, OVERSEAS_RECEIVING, WAIT_PACKING, WAIT_LABELS, WAIT_OVERSEAS_DISPATCH, WAIT_OVERSEAS_SHIPMENT, INTERNATIONAL_TRANSIT, DOMESTIC_RECEIVING, WAIT_CHARGES, WAIT_CUSTOMER_DISPATCH, WAIT_CUSTOMER_SHIPMENT, SHIPPED_TO_CUSTOMER] }
+    ProcurementStatus: { type: string, enum: [FUNDING_PENDING, FUNDING_FAILED, PENDING_REVIEW, RECEIVING, WAIT_CUSTOMER_CONFIRM, CONFIRMED, IN_TRANSIT, DELIVERING, COMPLETED, REJECTED, CANCELLED, EXCEPTION_CLOSED, WAIT_PURCHASE, WAIT_OVERSEAS_RECEIPT, OVERSEAS_RECEIVING, WAIT_PACKING, WAIT_LABELS, WAIT_OVERSEAS_DISPATCH, WAIT_OVERSEAS_SHIPMENT, INTERNATIONAL_TRANSIT, DOMESTIC_RECEIVING, WAIT_CHARGES, WAIT_CUSTOMER_DISPATCH, WAIT_CUSTOMER_SHIPMENT, SHIPPED_TO_CUSTOMER] }
    ProcurementReview:
      type: object
      required: [version, decision, idempotencyKey]
@@ -5126,7 +5126,7 @@ components:
      properties:
        code: { type: string, enum: ['200'] }
        data: { type: array, items: { type: object, properties: { warehouseId: { type: string }, warehouseCode: { type: string }, warehouseName: { type: string }, countryCode: { type: string } } } }
-    TruckStatus: { type: string, enum: [PENDING_REVIEW, WAITING_INBOUND, RECEIVING, WAITING_CONSOLIDATION, PALLET_OVERAGE_REVIEW, PARTIALLY_ALLOCATED, ALLOCATED, PENDING_DISPATCH, DISPATCHED, IN_TRANSIT, COMPLETED, REJECTED, CANCELLED] }
+    TruckStatus: { type: string, enum: [FUNDING_PENDING, FUNDING_FAILED, PENDING_REVIEW, WAITING_INBOUND, RECEIVING, WAITING_CONSOLIDATION, PALLET_OVERAGE_REVIEW, PARTIALLY_ALLOCATED, ALLOCATED, PENDING_DISPATCH, DISPATCHED, IN_TRANSIT, COMPLETED, REJECTED, CANCELLED] }
    TruckReview:
      type: object
      required: [version, decision, idempotencyKey]
@@ -8378,7 +8378,7 @@ components:
    DispatchReturnDirection:
      type: string
      enum: [OVERSEAS_WAREHOUSE, OTHER]
-      description: 退回海外仓、其他；仅登记去向，不自动退货入库。
+      description: 退回海外仓、其他；退回海外仓须选择原出库货物生成异常单，建单不自动增加库存。
    DispatchMarkException:
      type: object
      x-java-record: DispatchCommands.MarkException
@@ -8409,6 +8409,27 @@ components:
          items:
            type: string
            pattern: ^[1-9][0-9]*$
+        returnSelections:
+          type: array
+          description: 退回海外仓必填。来源必须属于本车派送，箱数不超过原拣货及未签收余量。
+          items:
+            type: object
+            required: [deliveryNo, lastMileOrderId, items]
+            properties:
+              deliveryNo: { type: string }
+              lastMileOrderId: { type: string }
+              items:
+                type: array
+                minItems: 1
+                maxItems: 200
+                items:
+                  type: object
+                  required: [outboundPalletItemId, packageCount]
+                  properties:
+                    outboundPalletItemId: { type: string }
+                    inventoryPositionId: { type: string, nullable: true }
+                    returnCartonId: { type: string, nullable: true }
+                    packageCount: { type: integer, minimum: 1 }
    DispatchExceptionRecord:
      type: object
      x-java-record: DispatchViews.ExceptionRecord