优化

2026-08-28 13:54:32 +08:00
parent fe68551124
commit 6b5f2f0565
29 changed files with 959 additions and 178 deletions
@@ -101,7 +101,7 @@ CREATE TABLE IF NOT EXISTS ll_order (
  KEY idx_ll_order_group(customer_id,order_no),
  KEY idx_ll_order_container(customer_id,container_no),
  KEY idx_ll_order_list(customer_id,current_status,created_at),
-  KEY idx_ll_order_pending_container(source_container_booking_id,current_status,created_at)
+  KEY idx_ll_order_container_progress(source_container_booking_id,estimated_warehouse_at,created_at,id)
 ) ENGINE=InnoDB COMMENT='尾程订单主表';

 CREATE TABLE IF NOT EXISTS ll_order_detail (
@@ -199,8 +199,10 @@ ALTER TABLE ll_loading_event_inbox COMMENT='头程装柜完成事件接收幂等
 ALTER TABLE ll_order COMMENT='尾程订单主表';
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_order' AND column_name='source_container_booking_id'), 'SELECT 1', 'ALTER TABLE ll_order ADD COLUMN source_container_booking_id VARCHAR(128) NULL COMMENT ''来源头程货柜预订ID'' AFTER source_loading_plan_id'));
 PREPARE lastleg_order_container_booking_stmt FROM @ddl; EXECUTE lastleg_order_container_booking_stmt; DEALLOCATE PREPARE lastleg_order_container_booking_stmt;
-SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_order' AND index_name='idx_ll_order_pending_container'), 'SELECT 1', 'ALTER TABLE ll_order ADD INDEX idx_ll_order_pending_container(source_container_booking_id,current_status,created_at)'));
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_order' AND index_name='idx_ll_order_pending_container'), 'ALTER TABLE ll_order DROP INDEX idx_ll_order_pending_container', 'SELECT 1'));
 PREPARE lastleg_order_pending_container_idx_stmt FROM @ddl; EXECUTE lastleg_order_pending_container_idx_stmt; DEALLOCATE PREPARE lastleg_order_pending_container_idx_stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_order' AND index_name='idx_ll_order_container_progress'), 'SELECT 1', 'ALTER TABLE ll_order ADD INDEX idx_ll_order_container_progress(source_container_booking_id,estimated_warehouse_at,created_at,id)'));
+PREPARE lastleg_order_container_progress_idx_stmt FROM @ddl; EXECUTE lastleg_order_container_progress_idx_stmt; DEALLOCATE PREPARE lastleg_order_container_progress_idx_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_order' AND column_name='destination_type'), 'SELECT 1', 'ALTER TABLE ll_order ADD COLUMN destination_type VARCHAR(32) NULL COMMENT ''目的类型：FBA按箱数接收、OVERSEAS逐箱扫码'' AFTER order_type'));
 PREPARE lastleg_order_destination_type_stmt FROM @ddl; EXECUTE lastleg_order_destination_type_stmt; DEALLOCATE PREPARE lastleg_order_destination_type_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_order' AND column_name='destination_type'), 'SELECT 1', 'ALTER TABLE ll_inbound_order ADD COLUMN destination_type VARCHAR(32) NULL COMMENT ''目的类型：FBA按箱数接收、OVERSEAS逐箱扫码'' AFTER destination_warehouse_name'));
@@ -708,6 +710,7 @@ WHERE (l.fba_warehouse_code IS NULL AND o.fba_warehouse_code IS NOT NULL)

 CREATE TABLE IF NOT EXISTS ll_receiving_container_session (
  id BIGINT NOT NULL COMMENT '柜号签收会话ID', customer_id VARCHAR(128) NOT NULL COMMENT '所选柜解析出的客户标识',
+  source_container_booking_id VARCHAR(128) NOT NULL COMMENT '稳定来源柜预订ID', container_fact_hash VARCHAR(64) NOT NULL COMMENT '领取时整柜订单与计划事实摘要',
  container_no VARCHAR(64) NOT NULL COMMENT '集装箱号', overseas_warehouse_id BIGINT NOT NULL COMMENT '操作员Token绑定并冻结的海外实际收货共享物理仓ID', overseas_warehouse_name VARCHAR(255) NOT NULL COMMENT '仓库服务校验后的海外实际收货共享物理仓名称快照', operator_key VARCHAR(128) NOT NULL COMMENT '操作账号唯一标识',
  operator_name VARCHAR(255) NULL COMMENT '操作账号名称', active_operator_key VARCHAR(255) NULL COMMENT '未完成会话平台操作账号全局唯一锁键',
  active_container_key VARCHAR(255) NULL COMMENT '未完成会话柜号全局唯一锁键', status VARCHAR(32) NOT NULL DEFAULT 'WAIT_SIGN' COMMENT '会话状态：WAIT_SIGN、SIGNED、RECEIVING、COMPLETED',
@@ -158,8 +158,8 @@ paths:
      responses: { '200': { description: 统一 ApiResponse 包装的尾程订单分页；列表行 destinationType 为 FBA 或 OVERSEAS } }
  /api/platform/v1/last-leg/orders/container-summaries:
    get:
-      summary: 分页查询待分配柜级摘要
-      description: 权限 platform:overseas-warehouse:order:list；平台跨客户按稳定 sourceContainerBookingId 聚合。仅返回至少有一票待分配的柜；eligible=false 表示柜内状态或柜号不一致，禁止转换。
+      summary: 分页查询柜级入库计划进度
+      description: 权限 platform:overseas-warehouse:order:list；平台跨客户按稳定 sourceContainerBookingId 服务端聚合，不受订单分页影响。plannedArrivalAt 仅来自装柜完成事件 estimatedWarehouseArrivalAt 冻结的 ll_order.estimated_warehouse_at；按该时间升序、null 最后、稳定柜 ID 升序。
      security: [{ bearerAuth: [] }]
      parameters:
        - { name: page, in: query, schema: { type: integer, minimum: 1, default: 1 } }
@@ -185,7 +185,58 @@ paths:
                      pages: { type: integer, format: int64 }
                      records:
                        type: array
-                        items: { $ref: '#/components/schemas/PendingContainerSummary' }
+                        items: { $ref: '#/components/schemas/ContainerPlanProgressSummary' }
+  /api/platform/v1/last-leg/orders/container-summaries/{sourceContainerBookingId}:
+    get:
+      summary: 查询柜级入库计划进度详情
+      description: 权限 platform:overseas-warehouse:order:list；按稳定柜 ID 返回柜内全部尾程订单、入仓码及各自计划状态，不受订单分页截断。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: sourceContainerBookingId, in: path, required: true, schema: { type: string, minLength: 1, maxLength: 128 } }
+      responses:
+        '200':
+          description: 统一 ApiResponse 包装的柜级进度详情
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code: { type: string, enum: ['200'] }
+                  data: { $ref: '#/components/schemas/ContainerPlanProgressDetail' }
+        '404': { description: 稳定柜 ID 不存在 }
+  /api/platform/v1/last-leg/orders/{id}/destination:
+    put:
+      summary: 将单票尾程订单转入 FBA 目的仓
+      description: 权限 platform:overseas-warehouse:order:edit；目标必须来自国内 Warehouse Service 平台公共 ACTIVE FBA 主档，warehouseId/warehouseCode/warehouseName 必须与权威记录一致。实际海外收货仓、普通国内中转仓、停用仓或伪造字段均返回 A0400“所选FBA仓不存在或已停用”。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: id, in: path, required: true, schema: { type: string, pattern: '^[1-9][0-9]*$' } }
+        - { name: customerId, in: query, required: false, schema: { type: string, pattern: '^[1-9][0-9]*$' } }
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: { $ref: '#/components/schemas/FbaTransferDestination' }
+      responses:
+        '200': { description: 统一 ApiResponse 包装的更新订单数 }
+        '400': { description: 所选FBA仓不存在、已停用、类型错误或字段不一致 }
+        '503': { description: 国内FBA仓权威主数据暂不可用，写入失败关闭 }
+  /api/platform/v1/last-leg/orders/destination:
+    put:
+      summary: 批量将尾程订单转入 FBA 目的仓
+      description: 权限 platform:overseas-warehouse:order:edit；一次校验国内 Warehouse Service 权威 FBA 主档后，在 Lastleg 事务内更新所选订单及冻结明细。目标仓必须为平台公共 ACTIVE FBA 且 ID/编码/名称完全一致。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: customerId, in: query, required: false, schema: { type: string, pattern: '^[1-9][0-9]*$' } }
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: { $ref: '#/components/schemas/FbaBatchTransferDestination' }
+      responses:
+        '200': { description: 统一 ApiResponse 包装的更新订单数 }
+        '400': { description: 所选FBA仓不存在、已停用、类型错误或字段不一致 }
+        '503': { description: 国内FBA仓权威主数据暂不可用，写入失败关闭 }
  /api/platform/v1/last-leg/inbound-plans/convert:
    post:
      summary: 平台生成入库计划
@@ -592,20 +643,63 @@ paths:
      responses: { '200': { description: 统一 ApiResponse 包装的换标单详情 }, '409': { description: 非法状态迁移或关联尾程单缺失 } }
 components:
  schemas:
-    PendingContainerSummary:
+    FbaTransferDestination:
      type: object
-      required: [sourceContainerBookingId, orderCount, inboundCodeCount, customerCount, totalPackageCount, totalPalletCount, totalVolumeCbm, eligible]
+      required: [warehouseId, warehouseCode, warehouseName]
+      properties:
+        warehouseId: { type: string, pattern: '^[1-9][0-9]*$', description: 国内 Warehouse Service 平台公共 FBA 仓 ID }
+        warehouseCode: { type: string, minLength: 1, maxLength: 128 }
+        warehouseName: { type: string, minLength: 1, maxLength: 255 }
+        remark: { type: string, nullable: true, maxLength: 500 }
+    FbaBatchTransferDestination:
+      allOf:
+        - { $ref: '#/components/schemas/FbaTransferDestination' }
+        - type: object
+          required: [orderIds]
+          properties:
+            orderIds:
+              type: array
+              minItems: 1
+              maxItems: 200
+              uniqueItems: true
+              items: { type: string, pattern: '^[1-9][0-9]*$' }
+    ContainerPlanProgressSummary:
+      type: object
+      required: [sourceContainerBookingId, totalOrderCount, inboundCodeCount, missingInboundCodeCount, planCount, plannedInboundCodeCount, pendingPlanCount, allPlansReady]
      properties:
        sourceContainerBookingId: { type: string }
        containerNo: { type: string, nullable: true }
-        orderCount: { type: integer, format: int64 }
+        totalOrderCount: { type: integer, format: int64 }
        inboundCodeCount: { type: integer, format: int64 }
-        customerCount: { type: integer, format: int64 }
-        totalPackageCount: { type: integer, format: int64 }
-        totalPalletCount: { type: integer, format: int64 }
-        totalVolumeCbm: { type: number }
-        eligible: { type: boolean }
-        ineligibleReason: { type: string, nullable: true }
+        missingInboundCodeCount: { type: integer, format: int64 }
+        planCount: { type: integer, format: int64 }
+        plannedInboundCodeCount: { type: integer, format: int64 }
+        pendingPlanCount: { type: integer, format: int64, description: 尚未生成有效计划的尾程订单数，即未操作数 }
+        plannedArrivalAt: { type: string, format: date-time, nullable: true, description: 仅来源于装柜完成事件 estimatedWarehouseArrivalAt 冻结的 ll_order.estimated_warehouse_at }
+        allPlansReady: { type: boolean, description: 全柜每票均有入仓码且均存在有效独立计划时为 true }
+        blockingReason: { type: string, nullable: true }
+    ContainerPlanProgressDetail:
+      type: object
+      required: [summary, orders]
+      properties:
+        summary: { $ref: '#/components/schemas/ContainerPlanProgressSummary' }
+        orders:
+          type: array
+          items: { $ref: '#/components/schemas/ContainerPlanProgressItem' }
+    ContainerPlanProgressItem:
+      type: object
+      required: [orderId, customerId, orderStatus, planValid]
+      properties:
+        orderId: { type: string, pattern: '^[1-9][0-9]*$' }
+        customerId: { type: string }
+        orderNo: { type: string, nullable: true }
+        inboundCode: { type: string, nullable: true }
+        orderStatus: { type: string }
+        planId: { type: string, nullable: true, pattern: '^[1-9][0-9]*$' }
+        planNo: { type: string, nullable: true }
+        planStatus: { type: string, nullable: true }
+        planValid: { type: boolean }
+        plannedArrivalAt: { type: string, format: date-time, nullable: true, description: ll_order.estimated_warehouse_at }
    PdaWarehouseScan:
      type: object
      required: [code]
@@ -773,16 +867,25 @@ components:
        warehouseName: { type: string, description: 国内Warehouse Service主档维护的当前中文名称 }
    ReceivingCandidate:
      type: object
-      required: [containerNo, status, planCount, inboundCodeCount, destinationCodes, plannedPalletCount, totalPackages, receivedPackages, currentAccount]
+      required: [sourceContainerBookingId, containerNo, status, totalOrderCount, inboundCodeCount, missingInboundCodeCount, planCount, plannedInboundCodeCount, pendingPlanCount, destinationCodes, plannedPalletCount, totalPackages, receivedPackages, operable, allPlansReady, currentAccount]
      properties:
+        sourceContainerBookingId: { type: string, description: 头程与尾程共享的稳定柜身份 }
        containerNo: { type: string }
        status: { type: string, enum: [WAIT_SIGN, SIGNED, RECEIVING, COMPLETED] }
+        totalOrderCount: { type: integer, minimum: 1 }
+        missingInboundCodeCount: { type: integer, minimum: 0 }
        planCount: { type: integer }
        inboundCodeCount: { type: integer }
+        plannedInboundCodeCount: { type: integer, minimum: 0 }
+        pendingPlanCount: { type: integer, minimum: 0 }
        destinationCodes: { type: array, uniqueItems: true, items: { type: string } }
        plannedPalletCount: { type: integer }
        totalPackages: { type: integer }
        receivedPackages: { type: integer }
+        operable: { type: boolean }
+        allPlansReady: { type: boolean }
+        blockReason: { type: string, nullable: true }
+        plannedArrivalAt: { type: string, format: date-time, nullable: true }
        currentAccount: { type: boolean }
    ReceivingSession:
      type: object