优化

lastleg-service/src/main/resources/openapi/fleet-preparation-v1.yaml

@@ -5,28 +5,6 @@ info:
 security:
   - bearerAuth: []
 paths:
-  /api/platform/v1/last-leg/fleet/trips/prepare:
-    post:
-      summary: 原子新建或加入车次并关联所选排车单
-      description: '权限：platform:fleet:trip:edit；新建另需platform:fleet:trip:create和platform:fleet:trip:assign。新建、资源分配和全部关联在同一事务，失败回滚；幂等键同载荷重放原结果，异载荷拒绝。同仓、未执行、未绑定其他车次；不确认容量、不审批、不发车。'
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema: {$ref: '#/components/schemas/Prepare'}
-      responses:
-        '200': {description: '统一ApiResponse，data为FleetTripModels.Detail；code=200才成功'}
-  /api/platform/v1/last-leg/fleet/trips/{tripNo}/dispatch-candidates:
-    parameters: [{$ref: './fleet-trips-v1.yaml#/components/parameters/TripNo'}]
-    get:
-      summary: 本仓未关联且未开始执行的排车候选
-      description: '权限：platform:fleet:trip:list。数据库筛选后分页，绑定时重新锁定校验。候选不代表预约、装载或审核已完成。'
-      parameters:
-        - {name: keyword, in: query, schema: {type: string}}
-        - {name: page, in: query, schema: {type: integer, minimum: 1, default: 1}}
-        - {name: size, in: query, schema: {type: integer, minimum: 1, maximum: 100, default: 20}}
-      responses:
-        '200': {description: '统一分页data：records含dispatchNo、customerId、warehouseId、packageCount、route及total/page/size/pages；内部身份不作为用户业务编号'}
   /api/platform/v1/last-leg/fleet/capacity-offers/inquiries/{bookingNo}/save-and-confirm:
     parameters: [{$ref: './fleet-trips-v1.yaml#/components/parameters/BookingNo'}]
     post:
@@ -74,7 +52,7 @@ paths:
     parameters: [{$ref: './fleet-trips-v1.yaml#/components/parameters/BookingNo'}]
     post:
       summary: 实收后复用或生成排车并原子排入本车
-      description: '权限：platform:fleet:capacity-offer:manage、platform:fleet:trip:booking-edit、platform:fleet:trip:edit和platform:overseas-warehouse:inbound-order:smart-dispatch。锁原车次和本票来货，先校验实收快照、车辆、有效容量；来源有多张排车或不完整时拒绝，不另建。无排车时复用真实预排命令；任何校验或绑定失败整体回滚。同键重放不重复建单。成功将预留替换为BOUND，旧计划失效待核对，仍需审核和现场作业。'
+      description: '权限：platform:fleet:capacity-offer:manage、platform:fleet:trip:booking-edit、platform:fleet:trip:edit和platform:overseas-warehouse:dispatch:create。核对本车唯一排车主单与本票真实客户来货，校验实收快照、车辆及有效容量；货物加入该唯一主单，不能另建或挂入第二张客户排车。校验或整车加货失败整体回滚。同键重放不重复建单。成功将预留替换为BOUND，旧计划失效待核对，仍需审核和现场作业。'
       requestBody:
         required: true
         content:

lastleg-service/src/main/resources/openapi/fleet-trips-v1.yaml

@@ -116,11 +116,6 @@ paths:
                           size: {type: integer}
                           total: {type: integer}
                           pages: {type: integer}
-    post:
-      summary: 幂等创建车次计划
-      description: '权限：platform:fleet:trip:create；起运仓使用公共有效海外仓目录；不推断GPS路线。'
-      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/Create'}}}}
-      responses: {'200': {$ref: '#/components/responses/Detail'}}
   /api/platform/v1/last-leg/fleet/trips/customer-options:
     get:
       summary: 查询有效委托客户候选
@@ -221,22 +216,6 @@ paths:
       summary: 查询车次详情和当前司机资格
       description: '权限：platform:fleet:trip:list；司机资格仅是详情预览，实际命令必须重新核验。'
       responses: {'200': {$ref: '#/components/responses/Detail'}}
-  /api/platform/v1/last-leg/fleet/trips/{tripNo}/dispatches/{dispatchNo}/review:
-    parameters:
-      - {$ref: '#/components/parameters/TripNo'}
-      - {name: dispatchNo, in: path, required: true, schema: {type: string}}
-    post:
-      summary: 通过或打回单张客户排车调度审核
-      description: '权限：platform:fleet:trip:dispatch-review；仅PLANNED；审核所属车次内的排车单，成功后理货审核待审；审批不扣库存。'
-      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/Review'}}}}
-      responses: {'200': {$ref: '#/components/responses/Detail'}, '409': {description: 版本、关联或资格冲突}}
-  /api/platform/v1/last-leg/fleet/trips/{tripNo}/loading-review:
-    parameters: [{$ref: '#/components/parameters/TripNo'}]
-    post:
-      summary: 通过或打回整车理货审核
-      description: '权限：platform:fleet:trip:loading-review；仅PLANNED；通过要求全部调度审核、拣货和实际装载确认已完成，当前司机资格有效。'
-      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/Review'}}}}
-      responses: {'200': {$ref: '#/components/responses/Detail'}, '409': {description: 版本、调度审核、装载或资格冲突}}
   /api/platform/v1/last-leg/fleet/trips/{tripNo}/plan:
     parameters: [{$ref: '#/components/parameters/TripNo'}]
     put:
@@ -278,20 +257,6 @@ paths:
                 recordVersion: {type: integer, format: int64, minimum: 0}
                 reason: {type: string, minLength: 1, maxLength: 1000}
       responses: {'200': {$ref: '#/components/responses/Detail'}}
-  /api/platform/v1/last-leg/fleet/trips/{tripNo}/dispatches/bind:
-    parameters: [{$ref: '#/components/parameters/TripNo'}]
-    post:
-      summary: 将客户排车单关联到车次
-      description: '权限：platform:fleet:trip:edit；按业务单号解析客户归属，同仓且未开工；关联、车/司机快照同步及按真实货物目的地标识补齐卸货站原子提交；目的地缺失拒绝关联，已有有效站点顺序与索引保留，初始默认占位站替换为真实目的地。'
-      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/BindingCommand'}}}}
-      responses: {'200': {$ref: '#/components/responses/Detail'}}
-  /api/platform/v1/last-leg/fleet/trips/{tripNo}/dispatches/unbind:
-    parameters: [{$ref: '#/components/parameters/TripNo'}]
-    post:
-      summary: 解除尚未执行的客户排车单关联
-      description: '权限：platform:fleet:trip:edit；清除排车及派送单当前车辆司机快照，历史保留；已拣货禁止直接解除。'
-      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/BindingCommand'}}}}
-      responses: {'200': {$ref: '#/components/responses/Detail'}}
   /api/platform/v1/last-leg/fleet/trips/{tripNo}/history:
     parameters: [{$ref: '#/components/parameters/TripNo'}]
     get:
@@ -324,12 +289,6 @@ paths:
       description: '权限：platform:fleet:trip:list；返回各客户货物组成、manifestHash和当前装载确认，实际重量不得使用计费材积重。'
       responses:
         '200': {description: 统一响应data为Loading, content: {application/json: {schema: {$ref: '#/components/schemas/LoadingEnvelope'}}}}
-    post:
-      summary: 确认整车实际装载及逐段容量
-      description: '权限：platform:fleet:trip:edit；全部客户拣货核平且转派送后确认；同一实物托盘只计量一次。货物hash或车次版本变化拒绝，托盘卸货站须匹配原货物目的地。'
-      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/ConfirmLoad'}}}}
-      responses:
-        '200': {description: 已确认装载快照，统一响应data为Loading, content: {application/json: {schema: {$ref: '#/components/schemas/LoadingEnvelope'}}}}
   /api/platform/v1/last-leg/fleet/trips/{tripNo}/completion:
     parameters: [{$ref: '#/components/parameters/TripNo'}]
     get:

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

@@ -8,39 +8,292 @@ security:
 paths:
   /api/pda/v1/last-leg/dispatches:
     get:
-      summary: 查询Token绑定仓的排车PDA任务
-      description: 仅 OVERSEAS_WAREHOUSE_PDA_OPERATOR + lastleg:pda:operate；跨客户读取绑定仓任务，不接收customerId或warehouseId。
-      parameters: [{ name: status, in: query, required: false, schema: { type: string } }]
-      responses: { '200': { description: 排车任务列表 }, '403': { description: 角色、权限或仓库绑定缺失 } }
+      summary: 读取Token绑定仓五阶段整车任务
+      description: 权限 OVERSEAS_WAREHOUSE_PDA_OPERATOR + lastleg:pda:operate。不接收客户或仓库范围参数；真实客户归属保留在items，整车公共版本及Gate由服务端返回。
+      security:
+      - bearerAuth: []
+      responses:
+        '200':
+          description: 统一ApiResponse；业务失败通过code返回，不能仅凭HTTP200判断成功。
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code:
+                    type: string
+                  message:
+                    type: string
+                  requestId:
+                    type: string
+                    nullable: true
+                  traceId:
+                    type: string
+                    nullable: true
+                  timestamp:
+                    type: string
+                    format: date-time
+                  data:
+                    allOf:
+                    - type: array
+                      items:
+                        $ref: overseas-business-v1.yaml#/components/schemas/DispatchPdaTask
+                    nullable: true
+      parameters:
+      - name: stage
+        in: query
+        schema:
+          $ref: overseas-business-v1.yaml#/components/schemas/DispatchStage
   /api/pda/v1/last-leg/dispatches/{dispatchNo}:
     get:
-      summary: 查询绑定仓排车任务详情
-      description: 返回 tripNo、tripRecordVersion、tripDispatchCount、driverWarning、canDepart、departBlockReason、canPick 与 pickBlockReason；门禁反映整车所有客户单据、实际装载及当前司机资格，PDA 不得仅按当前子单拣货数量推断。canPick/pickBlockReason仅反映当前客户排车单调度审核，不以其他客户审核结果替代。未关联车次不可拣货或发车；列表按车次复用同次查询的门禁结果。证照30天内到期但覆盖任务时driverWarning提醒且仍允许，预计结束前过期则阻断。
-      parameters: [{ name: dispatchNo, in: path, required: true, schema: { type: string } }]
-      responses: { '200': { description: 排车托盘、目的仓与库存位置详情 }, '404': { description: 当前绑定仓无此排车任务 } }
+      summary: 读取本仓整车任务及真实货物
+      description: 权限 OVERSEAS_WAREHOUSE_PDA_OPERATOR + lastleg:pda:operate。
+      security:
+      - bearerAuth: []
+      responses:
+        '200':
+          description: 统一ApiResponse；业务失败通过code返回，不能仅凭HTTP200判断成功。
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code:
+                    type: string
+                  message:
+                    type: string
+                  requestId:
+                    type: string
+                    nullable: true
+                  traceId:
+                    type: string
+                    nullable: true
+                  timestamp:
+                    type: string
+                    format: date-time
+                  data:
+                    allOf:
+                    - $ref: overseas-business-v1.yaml#/components/schemas/DispatchPdaTask
+                    nullable: true
+    parameters:
+    - name: dispatchNo
+      in: path
+      required: true
+      schema:
+        type: string
+  /api/pda/v1/last-leg/dispatches/{dispatchNo}/loading:
+    get:
+      summary: 读取本车拣货核平和实际测量依据
+      description: 权限 OVERSEAS_WAREHOUSE_PDA_OPERATOR + lastleg:pda:operate。
+      security:
+      - bearerAuth: []
+      responses:
+        '200':
+          description: 统一ApiResponse；业务失败通过code返回，不能仅凭HTTP200判断成功。
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code:
+                    type: string
+                  message:
+                    type: string
+                  requestId:
+                    type: string
+                    nullable: true
+                  traceId:
+                    type: string
+                    nullable: true
+                  timestamp:
+                    type: string
+                    format: date-time
+                  data:
+                    allOf:
+                    - $ref: overseas-business-v1.yaml#/components/schemas/DispatchLoadingPreview
+                    nullable: true
+    parameters:
+    - name: dispatchNo
+      in: path
+      required: true
+      schema:
+        type: string
+  /api/pda/v1/last-leg/dispatches/{dispatchNo}/commands/{idempotencyKey}:
+    get:
+      summary: 核对本人本仓原命令结果
+      description: 权限 OVERSEAS_WAREHOUSE_PDA_OPERATOR + lastleg:pda:operate。
+      security:
+      - bearerAuth: []
+      responses:
+        '200':
+          description: 统一ApiResponse；业务失败通过code返回，不能仅凭HTTP200判断成功。
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code:
+                    type: string
+                  message:
+                    type: string
+                  requestId:
+                    type: string
+                    nullable: true
+                  traceId:
+                    type: string
+                    nullable: true
+                  timestamp:
+                    type: string
+                    format: date-time
+                  data:
+                    allOf:
+                    - $ref: overseas-business-v1.yaml#/components/schemas/DispatchCommandResult
+                    nullable: true
+    parameters:
+    - name: dispatchNo
+      in: path
+      required: true
+      schema:
+        type: string
+    - name: idempotencyKey
+      in: path
+      required: true
+      schema:
+        type: string
   /api/pda/v1/last-leg/dispatches/{dispatchNo}/items/{itemId}/pick:
     post:
-      summary: 扫码拣取排车托盘包裹
-      description: 新请求须当前排车调度审核通过；同键同内容重放已保存结果不重新扣库存。
-      parameters:
-        - { name: dispatchNo, in: path, required: true, schema: { type: string } }
-        - { name: itemId, in: path, required: true, schema: { type: string, pattern: '^[0-9]+$' } }
-      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/DispatchPick' } } } }
-      responses: { '200': { description: 本次及累计拣货结果；同键同请求重放既有结果 }, '409': { description: 跨仓、跨客户、库存、数量或幂等冲突 } }
-  /api/pda/v1/last-leg/dispatches/{dispatchNo}/complete:
+      summary: 按本车真实货物来源执行扫码拣货
+      description: 权限 OVERSEAS_WAREHOUSE_PDA_OPERATOR + lastleg:pda:operate。只用整车recordVersion和全载荷幂等键；扫码执行真实库存SHIP，装车完成和发车不重复SHIP。错误或结果未知保留原请求核对。
+      security:
+      - bearerAuth: []
+      responses:
+        '200':
+          description: 统一ApiResponse；业务失败通过code返回，不能仅凭HTTP200判断成功。
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code:
+                    type: string
+                  message:
+                    type: string
+                  requestId:
+                    type: string
+                    nullable: true
+                  traceId:
+                    type: string
+                    nullable: true
+                  timestamp:
+                    type: string
+                    format: date-time
+                  data:
+                    allOf:
+                    - $ref: overseas-business-v1.yaml#/components/schemas/DispatchCommandResult
+                    nullable: true
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: overseas-business-v1.yaml#/components/schemas/DispatchPick
+    parameters:
+    - name: dispatchNo
+      in: path
+      required: true
+      schema:
+        type: string
+    - name: itemId
+      in: path
+      required: true
+      schema:
+        type: string
+  /api/pda/v1/last-leg/dispatches/{dispatchNo}/loading-complete:
     post:
-      summary: 完成排车拣货
-      description: 当前排车调度审核通过且每个要求托盘及全部包裹必须精确完成；不允许部分完成。
-      parameters: [{ name: dispatchNo, in: path, required: true, schema: { type: string } }]
-      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/IdempotentAction' } } } }
-      responses: { '200': { description: READY_TO_DEPART结果 }, '409': { description: 未全部拣货或幂等冲突 } }
+      summary: 真实拣货核平后显式确认装车完成
+      description: 权限 OVERSEAS_WAREHOUSE_PDA_OPERATOR + lastleg:pda:operate。只用整车recordVersion和全载荷幂等键；扫码执行真实库存SHIP，装车完成和发车不重复SHIP。错误或结果未知保留原请求核对。
+      security:
+      - bearerAuth: []
+      responses:
+        '200':
+          description: 统一ApiResponse；业务失败通过code返回，不能仅凭HTTP200判断成功。
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code:
+                    type: string
+                  message:
+                    type: string
+                  requestId:
+                    type: string
+                    nullable: true
+                  traceId:
+                    type: string
+                    nullable: true
+                  timestamp:
+                    type: string
+                    format: date-time
+                  data:
+                    allOf:
+                    - $ref: overseas-business-v1.yaml#/components/schemas/DispatchCommandResult
+                    nullable: true
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: overseas-business-v1.yaml#/components/schemas/DispatchLoadingComplete
+    parameters:
+    - name: dispatchNo
+      in: path
+      required: true
+      schema:
+        type: string
   /api/pda/v1/last-leg/dispatches/{dispatchNo}/depart:
     post:
-      summary: 从排车任务确认所属车次整车发车
-      description: 按Token绑定仓锁定车次，校验期望车次版本、车辆占用、全部调度审核、实际装载、整车理货审核及全部客户拣货和待出库单，重新核验司机证照、当前海外区域和身份；区域或身份变化与预览门禁一致阻断。一个事务推进所有子单，任一失败全车回滚。扫码阶段已扣库存不重复扣减；同键同内容重放整车结果，不同内容冲突。DEPARTING仅是同事务内部状态，不对外提交。
-      parameters: [{ name: dispatchNo, in: path, required: true, schema: { type: string } }]
-      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/DepartAction' } } } }
-      responses: { '200': { description: '统一响应data包含tripNo、status=IN_TRANSIT、departedAt、shippedPackages、dispatches数组（dispatchNo/shippedPackages）和replayed；每张子排车状态均为DEPARTED' }, '409': { description: 车次版本、装载、资格、拣货、出库或幂等门禁未满足 } }
+      summary: 完整安排派送后确认实际发车
+      description: 权限 OVERSEAS_WAREHOUSE_PDA_OPERATOR + lastleg:pda:operate。只用整车recordVersion和全载荷幂等键；扫码执行真实库存SHIP，装车完成和发车不重复SHIP。错误或结果未知保留原请求核对。
+      security:
+      - bearerAuth: []
+      responses:
+        '200':
+          description: 统一ApiResponse；业务失败通过code返回，不能仅凭HTTP200判断成功。
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code:
+                    type: string
+                  message:
+                    type: string
+                  requestId:
+                    type: string
+                    nullable: true
+                  traceId:
+                    type: string
+                    nullable: true
+                  timestamp:
+                    type: string
+                    format: date-time
+                  data:
+                    allOf:
+                    - $ref: overseas-business-v1.yaml#/components/schemas/DispatchCommandResult
+                    nullable: true
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: overseas-business-v1.yaml#/components/schemas/DispatchDepart
+    parameters:
+    - name: dispatchNo
+      in: path
+      required: true
+      schema:
+        type: string
   /api/pda/v1/last-leg/outbound-tasks:
     get:
       summary: 查询Token绑定仓的一件代发出库任务
@@ -962,24 +1215,6 @@ components:
       type: object
       required: [idempotencyKey]
       properties: { idempotencyKey: { type: string, minLength: 1, maxLength: 255 } }
-    DepartAction:
-      type: object
-      required: [recordVersion, idempotencyKey]
-      properties:
-        recordVersion: { type: integer, format: int64, minimum: 0, description: 当前车次版本，来自tripRecordVersion}
-        idempotencyKey: { type: string, minLength: 8, maxLength: 128 }
-        remark: { type: string, maxLength: 1000, nullable: true }
-    DispatchPick:
-      type: object
-      description: 普通库存提交positionId；原生退货换标箱提交cartonMark、positionId为空、packages=1，productQuantity必须与箱快照一致。两类来源互斥。
-      required: [packages, productQuantity, idempotencyKey]
-      properties:
-        positionId: { type: string, pattern: '^[0-9]+$', nullable: true }
-        cartonMark: { type: string, maxLength: 255, description: 本排车来源的系统箱唛 }
-        packages: { type: integer, format: int64, minimum: 1 }
-        productQuantity: { type: integer, format: int64, minimum: 0 }
-        idempotencyKey: { type: string, minLength: 1, maxLength: 255 }
-        remark: { type: string, maxLength: 1000, nullable: true }
     OutboundPick:
       type: object
       required: [outboundPalletItemId, packages, idempotencyKey]