优化

firstleg/src/main/resources/db/phase3-carrier-schedule-query-schema.sql

@@ -8,11 +8,11 @@ CREATE TABLE IF NOT EXISTS fl_carrier_schedule_query (
   ocean_booking_id BIGINT UNSIGNED NOT NULL COMMENT '关联海运订舱ID',
   container_booking_id BIGINT UNSIGNED NULL COMMENT '指定查询的柜次ID；整票订舱查询时为空',
   container_scope_id BIGINT UNSIGNED GENERATED ALWAYS AS (COALESCE(container_booking_id,0)) STORED COMMENT '柜次唯一作用域计算值；整票订舱查询固定为0',
-  carrier_code VARCHAR(16) NOT NULL COMMENT '船公司编码：MATSON美森、SML森罗、ZIM以星、COSCO中远海运、EMC长荣、HEDE合德',
+  carrier_code VARCHAR(16) NOT NULL COMMENT '船公司标准编码；OTHER表示人工跟踪',
   tracking_type VARCHAR(32) NOT NULL COMMENT '官网跟踪类型：BOOKING_NO订舱号、BILL_OF_LADING提单号、CONTAINER_NO箱号',
   tracking_no VARCHAR(128) NOT NULL COMMENT '提交至船公司官网的跟踪号码',
   official_url VARCHAR(500) NOT NULL COMMENT '船公司官网查询入口地址快照',
-  access_mode VARCHAR(32) NOT NULL COMMENT '船司访问方式：PUBLIC_FORM、PUBLIC_WEB_PROXY、PUBLIC_HTML、HCAPTCHA、OFFICIAL_API',
+  access_mode VARCHAR(32) NOT NULL COMMENT '船司访问方式；MANUAL表示仅人工补录节点',
   status VARCHAR(24) NOT NULL COMMENT '任务操作状态：READY、MANUAL_REQUIRED、STOPPED',
   trigger_source VARCHAR(32) NOT NULL DEFAULT 'MANUAL' COMMENT '任务触发来源：OUTBOUND_CONFIRM或MANUAL',
   latest_standard_node VARCHAR(32) NULL COMMENT '最近实际标准船节点；预计事实不推进',
@@ -54,11 +54,11 @@ CREATE TABLE IF NOT EXISTS fl_carrier_schedule_query (
   CONSTRAINT fk_carrier_schedule_query_result FOREIGN KEY (result_port_schedule_id) REFERENCES fl_port_schedule(id),
   CONSTRAINT chk_carrier_schedule_query_customer CHECK (customer_id > 0),
   CONSTRAINT chk_carrier_schedule_query_carrier CHECK
-    (carrier_code IN ('MATSON','SML','ZIM','COSCO','EMC','HEDE')),
+    (carrier_code IN ('MATSON','SML','ZIM','COSCO','EMC','HEDE','OTHER')),
   CONSTRAINT chk_carrier_schedule_query_tracking CHECK
     (tracking_type IN ('BOOKING_NO','BILL_OF_LADING','CONTAINER_NO')),
   CONSTRAINT chk_carrier_schedule_query_access CHECK
-    (access_mode IN ('PUBLIC_FORM','PUBLIC_WEB_PROXY','PUBLIC_HTML','HCAPTCHA','OFFICIAL_API')),
+    (access_mode IN ('PUBLIC_FORM','PUBLIC_WEB_PROXY','PUBLIC_HTML','HCAPTCHA','OFFICIAL_API','MANUAL')),
   CONSTRAINT chk_carrier_schedule_query_status CHECK
     (status IN ('READY','MANUAL_REQUIRED','STOPPED')),
   CONSTRAINT chk_carrier_schedule_query_node CHECK

firstleg/src/main/resources/db/phase3-ocean-booking-schema.sql

@@ -14,6 +14,7 @@ CREATE TABLE IF NOT EXISTS fl_ocean_booking (
   bill_of_lading_no VARCHAR(128) NULL COMMENT '提单号',
   shipping_company_id BIGINT UNSIGNED NULL COMMENT '船公司逻辑ID快照',
   shipping_company_name VARCHAR(128) NULL COMMENT '船公司名称快照',
+  carrier_code VARCHAR(16) NULL COMMENT '船司标准编码：MATSON/SML/ZIM/COSCO/EMC/HEDE/OTHER；发布前必填',
   booking_agent_id BIGINT UNSIGNED NULL COMMENT '订舱代理逻辑ID快照',
   booking_agent_name VARCHAR(128) NULL COMMENT '订舱代理名称快照',
   vessel_name VARCHAR(128) NULL COMMENT '当前确认船名快照',
@@ -42,6 +43,8 @@ CREATE TABLE IF NOT EXISTS fl_ocean_booking (
   CONSTRAINT chk_ocean_booking_customer CHECK (customer_id > 0),
   CONSTRAINT chk_ocean_booking_status CHECK (status IN
     ('DRAFT','RELEASED')),
+  CONSTRAINT chk_ocean_booking_carrier_code CHECK
+    (carrier_code IS NULL OR carrier_code IN ('MATSON','SML','ZIM','COSCO','EMC','HEDE','OTHER')),
   CONSTRAINT chk_ocean_booking_schedule CHECK
     (estimated_sailing_at IS NULL OR estimated_arrival_at IS NULL OR estimated_arrival_at >= estimated_sailing_at)
 ) ENGINE=InnoDB COMMENT='独立海运订舱聚合；柜次仍由fl_container_booking承载';

firstleg/src/main/resources/openapi/carrier-schedule-query-v1.yaml

@@ -90,6 +90,10 @@ components:
     IdempotencyKey: {name: Idempotency-Key, in: header, required: true, schema: {type: string, minLength: 1, maxLength: 128}}
   schemas:
     CarrierCode: {type: string, enum: [MATSON, SML, ZIM, COSCO, EMC, HEDE]}
+    TaskCarrierCode:
+      type: string
+      enum: [MATSON, SML, ZIM, COSCO, EMC, HEDE, OTHER]
+      description: OTHER is frozen on the ocean booking and creates a manual-only task after outbound confirmation.
     TrackingType: {type: string, enum: [BOOKING_NO, BILL_OF_LADING, CONTAINER_NO]}
     QueryStatus: {type: string, enum: [READY, MANUAL_REQUIRED, STOPPED]}
     StandardNode:
@@ -137,11 +141,15 @@ components:
         customerId: {type: integer, format: int64}
         oceanBookingId: {type: integer, format: int64}
         containerBookingId: {type: integer, format: int64, nullable: true}
-        carrierCode: {$ref: '#/components/schemas/CarrierCode'}
+        carrierCode: {$ref: '#/components/schemas/TaskCarrierCode'}
         trackingType: {$ref: '#/components/schemas/TrackingType'}
         trackingNo: {type: string}
         officialUrl: {type: string, nullable: true}
-        accessMode: {type: string, nullable: true}
+        accessMode:
+          type: string
+          enum: [PUBLIC_FORM, PUBLIC_WEB_PROXY, PUBLIC_HTML, HCAPTCHA, OFFICIAL_API, MANUAL]
+          nullable: true
+          description: MANUAL tasks preserve physical outbound confirmation and accept platform manual node facts without scheduler/provider calls.
         status: {$ref: '#/components/schemas/QueryStatus'}
         triggerSource: {type: string}
         latestActualNode: {allOf: [{$ref: '#/components/schemas/StandardNode'}], nullable: true}
@@ -150,7 +158,10 @@ components:
         sourceUpdatedAt: {type: string, format: date-time, nullable: true}
         expiresAt: {type: string, format: date-time, nullable: true}
         resultPortScheduleId: {type: integer, format: int64, nullable: true}
-        manualReason: {type: string, nullable: true}
+        manualReason:
+          type: string
+          nullable: true
+          description: Explicit provider-disabled or unsupported-carrier reason; unsupported outbound carriers retain the booking shippingCompanyId/name here and through oceanBookingId.
         lastErrorCode: {type: string, nullable: true}
         lastErrorMessage: {type: string, nullable: true}
         stoppedAt: {type: string, format: date-time, nullable: true}

firstleg/src/main/resources/openapi/ocean-bookings-v1.yaml

@@ -80,6 +80,11 @@ components:
         billOfLadingNo: {type: string, nullable: true}
         shippingCompanyId: {type: integer, format: int64, nullable: true}
         shippingCompanyName: {type: string, nullable: true}
+        carrierCode:
+          type: string
+          enum: [MATSON, SML, ZIM, COSCO, EMC, HEDE, OTHER]
+          nullable: true
+          description: Frozen standard carrier code. Required before RELEASE; OTHER means manual carrier-node tracking.
         bookingAgentId:
           type: integer
           format: int64