优化

2026-08-27 17:16:33 +08:00
parent 61a97cd057
commit 76c24867a4
19 changed files with 474 additions and 107 deletions
@@ -100,7 +100,8 @@ CREATE TABLE IF NOT EXISTS ll_order (
  UNIQUE KEY uk_ll_order_source (customer_id,source_region,source_inbound_id),
  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_list(customer_id,current_status,created_at),
+  KEY idx_ll_order_pending_container(source_container_booking_id,current_status,created_at)
 ) ENGINE=InnoDB COMMENT='尾程订单主表';

 CREATE TABLE IF NOT EXISTS ll_order_detail (
@@ -198,6 +199,8 @@ 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)'));
+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.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'));
@@ -156,6 +156,36 @@ paths:
        - { name: createdFrom, in: query, schema: { type: string, format: date-time } }
        - { name: createdTo, in: query, schema: { type: string, format: date-time } }
      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 表示柜内状态或柜号不一致，禁止转换。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: page, in: query, schema: { type: integer, minimum: 1, default: 1 } }
+        - { name: size, in: query, schema: { type: integer, minimum: 1, maximum: 200, default: 20 } }
+        - { name: containerNo, in: query, schema: { type: string } }
+        - { name: createdFrom, in: query, schema: { type: string, format: date-time } }
+        - { name: createdTo, in: query, schema: { type: string, format: date-time } }
+      responses:
+        '200':
+          description: 统一 ApiResponse 包装的柜级摘要分页
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code: { type: string, enum: ['200'] }
+                  data:
+                    type: object
+                    properties:
+                      page: { type: integer, format: int64 }
+                      size: { type: integer, format: int64 }
+                      total: { type: integer, format: int64 }
+                      pages: { type: integer, format: int64 }
+                      records:
+                        type: array
+                        items: { $ref: '#/components/schemas/PendingContainerSummary' }
  /api/platform/v1/last-leg/inbound-plans/convert:
    post:
      summary: 平台生成入库计划
@@ -562,6 +592,20 @@ paths:
      responses: { '200': { description: 统一 ApiResponse 包装的换标单详情 }, '409': { description: 非法状态迁移或关联尾程单缺失 } }
 components:
  schemas:
+    PendingContainerSummary:
+      type: object
+      required: [sourceContainerBookingId, orderCount, inboundCodeCount, customerCount, totalPackageCount, totalPalletCount, totalVolumeCbm, eligible]
+      properties:
+        sourceContainerBookingId: { type: string }
+        containerNo: { type: string, nullable: true }
+        orderCount: { 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 }
    PdaWarehouseScan:
      type: object
      required: [code]