优化

lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml

@@ -4038,10 +4038,6 @@ components:
           type: string
           format: date-time
           nullable: true
-        vehicleAppointment:
-          allOf:
-          - $ref: '#/components/schemas/DispatchAppointmentReference'
-          nullable: true
         remark:
           type: string
           nullable: true
@@ -5602,6 +5598,10 @@ components:
           items:
             $ref: '#/components/schemas/DispatchBatchAllocation'
           nullable: true
+        sourceOrigin:
+          allOf:
+          - $ref: '#/components/schemas/DispatchSourceOrigin'
+          nullable: true
       required:
       - dispatchItemId
       - customerId
@@ -5630,6 +5630,7 @@ components:
       - grossWeightKg
       - volumeCbm
       - batchAllocations
+      - sourceOrigin
     DispatchCommandResult:
       type: object
       x-java-record: DispatchContracts.CommandResult
@@ -5797,7 +5798,6 @@ components:
         sourceType:
           allOf:
           - $ref: '#/components/schemas/DispatchSourceType'
-          nullable: true
         planPalletId:
           type: string
           pattern: ^[0-9]+$
@@ -5815,7 +5815,9 @@ components:
           nullable: true
         sourceVersion:
           type: string
-          nullable: true
+      required:
+      - sourceType
+      - sourceVersion
     DispatchCreate:
       type: object
       x-java-record: DispatchCommands.Create
@@ -5857,22 +5859,6 @@ components:
       - idempotencyKey
       - warehouseId
       description: 同一起运仓，允许空单或多客户、多目的仓。客户和来源归属由服务端解析，临时资源不生成假档案。
-    DispatchAppointmentReference:
-      type: object
-      x-java-record: DispatchCommands.AppointmentReference
-      properties:
-        referenceNo:
-          type: string
-          nullable: true
-        recordVersion:
-          oneOf:
-          - type: string
-            pattern: ^[0-9]+$
-          - type: integer
-            minimum: 0
-          description: 已有单写入必填；0合法。响应Long按十进制字符串输出。
-      required:
-      - recordVersion
     DispatchAddCargo:
       type: object
       x-java-record: DispatchCommands.AddCargo
@@ -6351,24 +6337,6 @@ components:
       - status
       - confirmedAt
       - blockReason
-    DispatchVehicleAppointment:
-      type: object
-      x-java-record: DispatchViews.VehicleAppointment
-      properties:
-        referenceNo:
-          type: string
-          nullable: true
-        status:
-          type: string
-          nullable: true
-        appointmentAt:
-          type: string
-          format: date-time
-          nullable: true
-      required:
-      - referenceNo
-      - status
-      - appointmentAt
     DispatchDispatchInfo:
       type: object
       x-java-record: DispatchViews.DispatchInfo
@@ -6393,10 +6361,6 @@ components:
           items:
             $ref: '#/components/schemas/DispatchFbaAppointment'
           nullable: true
-        vehicleAppointment:
-          allOf:
-          - $ref: '#/components/schemas/DispatchVehicleAppointment'
-          nullable: true
         appointmentBatches:
           type: array
           items:
@@ -6408,7 +6372,6 @@ components:
       - departedAt
       - estimatedArrivalAt
       - fbaAppointments
-      - vehicleAppointment
       - appointmentBatches
     DispatchDocuments:
       type: object
@@ -6479,6 +6442,12 @@ components:
         sourceKey:
           type: string
           nullable: true
+        sourceBusinessType:
+          type: string
+          nullable: true
+        sourceBusinessNo:
+          type: string
+          nullable: true
       required:
       - customerId
       - customerName
@@ -6490,6 +6459,8 @@ components:
       - volumeCbm
       - containerNo
       - sourceKey
+      - sourceBusinessType
+      - sourceBusinessNo
     DispatchDetail:
       type: object
       x-java-record: DispatchViews.Detail
@@ -6660,6 +6631,14 @@ components:
           items:
             $ref: '#/components/schemas/DispatchReturnCarton'
           nullable: true
+        sourceKey:
+          type: string
+        sourceBusinessType:
+          type: string
+          nullable: true
+        sourceBusinessNo:
+          type: string
+          nullable: true
       required:
       - dispatchItemId
       - customerId
@@ -6670,6 +6649,9 @@ components:
       - pickedPackages
       - positions
       - returnCartons
+      - sourceKey
+      - sourceBusinessType
+      - sourceBusinessNo
     DispatchPosition:
       type: object
       x-java-record: DispatchViews.Position
@@ -6970,6 +6952,11 @@ components:
           items:
             type: string
           nullable: true
+        selectionGroup:
+          allOf:
+          - $ref: '#/components/schemas/DispatchSelectionGroup'
+      required:
+      - selectionGroup
     DispatchCandidateList:
       type: object
       x-java-record: DispatchPlanningModels.CandidateList
@@ -7860,5 +7847,132 @@ components:
         sizeBytes:
           type: string
           pattern: ^[0-9]+$
+    DispatchSelectionGroup:
+      type: object
+      x-java-record: DispatchPlanningModels.SelectionGroup
+      properties:
+        groupKey:
+          type: string
+        groupVersion:
+          type: string
+        sources:
+          type: array
+          items:
+            $ref: '#/components/schemas/DispatchSelectionGroupSource'
+        pallets:
+          type: array
+          items:
+            $ref: '#/components/schemas/DispatchSelectionGroupPallet'
+        complete:
+          type: boolean
+        blockReasons:
+          type: array
+          items:
+            type: string
+      required:
+      - groupKey
+      - groupVersion
+      - sources
+      - pallets
+      - complete
+      - blockReasons
+      description: 服务端按完整实托及整换标申请计算未被页面筛选截断的来源集合；版本绑定组成、完工轮次、实际位置和各来源版本。complete=false或blockReasons非空禁止选入。
+    DispatchSelectionGroupSource:
+      type: object
+      x-java-record: DispatchPlanningModels.SelectionGroupSource
+      properties:
+        selection:
+          allOf:
+          - $ref: '#/components/schemas/DispatchCargoSelection'
+        sourceKey:
+          type: string
+        customerId:
+          type: string
+        customerName:
+          type: string
+          nullable: true
+        sourceBusinessType:
+          type: string
+          nullable: true
+        sourceBusinessNo:
+          type: string
+          nullable: true
+        packages:
+          type: string
+          pattern: ^[0-9]+$
+      required:
+      - selection
+      - sourceKey
+      - customerId
+      - customerName
+      - sourceBusinessType
+      - sourceBusinessNo
+      - packages
+      description: 客户和换标业务号按逻辑来源保留；selection携带本来源权威版本，正式建单和加货显式提交完整组，不从展示sourceKey推业务号。
+    DispatchSelectionGroupPallet:
+      type: object
+      x-java-record: DispatchPlanningModels.SelectionGroupPallet
+      properties:
+        warehousePalletId:
+          type: string
+          pattern: ^[0-9]+$
+        palletNo:
+          type: string
+        sourceKeys:
+          type: array
+          items:
+            type: string
+        packageCount:
+          type: string
+          pattern: ^[0-9]+$
+      required:
+      - warehousePalletId
+      - palletNo
+      - sourceKeys
+      - packageCount
+      description: 每实托只列一次，sourceKeys列出全部逻辑贡献；实际装载按实托测量，不能把整托容量重复计到各来源。
+    DispatchSourceOrigin:
+      type: object
+      x-java-record: DispatchContracts.SourceOrigin
+      properties:
+        dispatchItemSourceId:
+          type: string
+          pattern: ^[0-9]+$
+          nullable: true
+        relabelApplicationId:
+          type: string
+          pattern: ^[0-9]+$
+          nullable: true
+        relabelItemId:
+          type: string
+          pattern: ^[0-9]+$
+          nullable: true
+        sourceInventoryBalanceId:
+          type: string
+          pattern: ^[0-9]+$
+          nullable: true
+        sourceInboundOrderId:
+          type: string
+          pattern: ^[0-9]+$
+          nullable: true
+        sourceInboundOrderNo:
+          type: string
+          nullable: true
+        sourceInboundCode:
+          type: string
+          nullable: true
+        productQuantity:
+          type: string
+          pattern: ^[0-9]+$
+          nullable: true
+      required:
+      - dispatchItemSourceId
+      - relabelApplicationId
+      - relabelItemId
+      - sourceInventoryBalanceId
+      - sourceInboundOrderId
+      - sourceInboundOrderNo
+      - sourceInboundCode
+      - productQuantity
   securitySchemes:
     bearerAuth: { type: http, scheme: bearer, bearerFormat: JWT }