优化

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

@@ -4,7 +4,7 @@ USE baiyue_firstleg;
 CREATE TABLE IF NOT EXISTS fl_ocean_booking (
   id BIGINT UNSIGNED NOT NULL COMMENT '海运订舱ID',
   booking_no VARCHAR(40) NOT NULL COMMENT '平台海运订舱编号',
-  status VARCHAR(24) NOT NULL DEFAULT 'DRAFT' COMMENT '订舱状态：DRAFT草稿、SUBMITTED已提交、CONFIRMED已确认、RELEASED已放舱、FAILED失败、CHANGE_PENDING船期待变更、CANCELLED已取消',
+  status VARCHAR(24) NOT NULL DEFAULT 'DRAFT' COMMENT '订舱状态：DRAFT仅限创建事务内部、CONFIRMED已确认、RELEASED已放舱、CHANGE_PENDING船期待变更、CANCELLED已取消',
   customer_id BIGINT UNSIGNED NULL COMMENT '可选客户ID快照',
   customer_name VARCHAR(128) NULL COMMENT '可选客户名称快照',
   channel_code VARCHAR(64) NOT NULL COMMENT '订舱渠道编码快照',
@@ -32,7 +32,6 @@ CREATE TABLE IF NOT EXISTS fl_ocean_booking (
   pending_estimated_sailing_at DATETIME(3) NULL COMMENT '待确认变更预计开船时间',
   pending_estimated_arrival_at DATETIME(3) NULL COMMENT '待确认变更预计到港时间',
   change_reason VARCHAR(1000) NULL COMMENT '船期变更原因',
-  failure_reason VARCHAR(1000) NULL COMMENT '订舱失败原因',
   cancellation_reason VARCHAR(1000) NULL COMMENT '取消订舱原因',
   remark VARCHAR(1000) NULL COMMENT '平台内部备注',
   created_by BIGINT UNSIGNED NOT NULL COMMENT '创建操作人ID',
@@ -48,7 +47,7 @@ CREATE TABLE IF NOT EXISTS fl_ocean_booking (
   KEY idx_ocean_booking_voyage (vessel_name,voyage_no,updated_at),
   CONSTRAINT chk_ocean_booking_customer CHECK (customer_id > 0),
   CONSTRAINT chk_ocean_booking_status CHECK (status IN
-    ('DRAFT','SUBMITTED','CONFIRMED','RELEASED','FAILED','CHANGE_PENDING','CANCELLED')),
+    ('DRAFT','CONFIRMED','RELEASED','CHANGE_PENDING','CANCELLED')),
   CONSTRAINT chk_ocean_booking_schedule CHECK
     (estimated_sailing_at IS NULL OR estimated_arrival_at IS NULL OR estimated_arrival_at >= estimated_sailing_at),
   CONSTRAINT chk_ocean_booking_pending_schedule CHECK
@@ -150,11 +149,9 @@ BEGIN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='已放舱或已取消订舱不可修改';
   END IF;
   IF OLD.status <> NEW.status AND NOT (
-       (OLD.status='DRAFT' AND NEW.status IN ('SUBMITTED','CANCELLED'))
-    OR (OLD.status='SUBMITTED' AND NEW.status IN ('CONFIRMED','FAILED','CANCELLED'))
+       (OLD.status='DRAFT' AND NEW.status='CONFIRMED')
     OR (OLD.status='CONFIRMED' AND NEW.status IN ('RELEASED','CHANGE_PENDING','CANCELLED'))
-    OR (OLD.status='CHANGE_PENDING' AND NEW.status IN ('CONFIRMED','FAILED','CANCELLED'))
-    OR (OLD.status='FAILED' AND NEW.status='CANCELLED')) THEN
+    OR (OLD.status='CHANGE_PENDING' AND NEW.status IN ('CONFIRMED','CANCELLED'))) THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='海运订舱状态迁移非法';
   END IF;
 END$$
@@ -192,7 +189,7 @@ BEGIN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='箱型需求不属于当前订舱';
   END IF;
   IF (SELECT status FROM fl_ocean_booking WHERE id=NEW.ocean_booking_id) NOT IN
-    ('SUBMITTED','CONFIRMED','CHANGE_PENDING') THEN
+    ('CONFIRMED','CHANGE_PENDING') THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='当前订舱状态不可分配柜次';
   END IF;
 END$$
@@ -219,9 +216,6 @@ BEGIN
               WHEN 5102140 THEN 'platform:firstleg:ocean-booking:list'
               WHEN 5102141 THEN 'platform:firstleg:ocean-booking:list'
               WHEN 5102142 THEN 'platform:firstleg:ocean-booking:create'
-              WHEN 5102143 THEN 'platform:firstleg:ocean-booking:edit'
-              WHEN 5102144 THEN 'platform:firstleg:ocean-booking:submit'
-              WHEN 5102145 THEN 'platform:firstleg:ocean-booking:confirm'
               WHEN 5102146 THEN 'platform:firstleg:ocean-booking:release'
               WHEN 5102147 THEN 'platform:firstleg:ocean-booking:cancel'
               WHEN 5102148 THEN 'platform:firstleg:ocean-booking:change'
@@ -244,9 +238,6 @@ INSERT INTO iam_permission
 VALUES
   (5102140,0,'PLATFORM','MENU',5102000,'platform:firstleg:ocean-booking:list','订舱管理','/first-leg/ocean-bookings','GET',80,'ACTIVE',1,0),
   (5102142,0,'PLATFORM','BUTTON',5102140,'platform:firstleg:ocean-booking:create','创建订舱',NULL,'POST',20,'ACTIVE',1,0),
-  (5102143,0,'PLATFORM','BUTTON',5102140,'platform:firstleg:ocean-booking:edit','编辑订舱',NULL,'PUT',30,'ACTIVE',1,0),
-  (5102144,0,'PLATFORM','BUTTON',5102140,'platform:firstleg:ocean-booking:submit','提交订舱',NULL,'POST',40,'ACTIVE',1,0),
-  (5102145,0,'PLATFORM','BUTTON',5102140,'platform:firstleg:ocean-booking:confirm','确认订舱',NULL,'POST',50,'ACTIVE',1,0),
   (5102146,0,'PLATFORM','BUTTON',5102140,'platform:firstleg:ocean-booking:release','确认放舱',NULL,'POST',60,'ACTIVE',1,0),
   (5102147,0,'PLATFORM','BUTTON',5102140,'platform:firstleg:ocean-booking:cancel','取消订舱',NULL,'POST',70,'ACTIVE',1,0),
   (5102148,0,'PLATFORM','BUTTON',5102140,'platform:firstleg:ocean-booking:change','变更船期',NULL,'POST',80,'ACTIVE',1,0),
@@ -263,5 +254,7 @@ WHERE role.tenant_id=0 AND role.role_code IN ('PLATFORM_ADMIN','ORDER_OPERATOR')
 DELETE rp FROM iam_role_permission rp JOIN iam_permission p ON p.tenant_id=rp.tenant_id AND p.id=rp.permission_id
 WHERE p.id=5102141;
 UPDATE iam_permission SET status='INACTIVE',deleted=1 WHERE id=5102141;
+DELETE rp FROM iam_role_permission rp WHERE rp.permission_id IN (5102143,5102144,5102145);
+DELETE FROM iam_permission WHERE id IN (5102143,5102144,5102145);
 
 USE baiyue_firstleg;

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

@@ -4,14 +4,14 @@ paths:
   /api/platform/v1/ocean-bookings/channels:
     get:
       summary: List logistics channels from the current ACTIVE price book for an origin warehouse
-      description: 'Requires platform:firstleg:ocean-booking:list. Returns only channels with an ACTIVE price row; the selected channel name is frozen server-side on draft save.'
+      description: 'Requires platform:firstleg:ocean-booking:list. Returns only channels with an ACTIVE price row; the selected channel name is frozen server-side when the offline-confirmed booking is registered.'
       parameters:
         - {name: originWarehouseId, in: query, required: true, schema: {type: integer, format: int64, minimum: 1}}
       responses: {'200': {description: Available channel options, content: {application/json: {schema: {type: array, items: {$ref: '#/components/schemas/ChannelOption'}}}}}}
   /api/platform/v1/ocean-bookings:
     get:
       summary: List only real confirmed booking records
-      description: 'Requires platform:firstleg:ocean-booking:list. The operational list exposes only CONFIRMED, CHANGE_PENDING, RELEASED and CANCELLED bookings; DRAFT, SUBMITTED and FAILED are excluded even when a status query is supplied.'
+      description: 'Requires platform:firstleg:ocean-booking:list. The operational list exposes only CONFIRMED, CHANGE_PENDING, RELEASED and CANCELLED bookings; DRAFT is internal to the create transaction and legacy SUBMITTED/FAILED values are invalid.'
       parameters:
         - {name: customerId, in: query, schema: {type: integer, format: int64, minimum: 1}}
         - {name: status, in: query, schema: {type: string, enum: [CONFIRMED, CHANGE_PENDING, RELEASED, CANCELLED]}}
@@ -20,20 +20,15 @@ paths:
         - {name: size, in: query, schema: {type: integer, minimum: 1, maximum: 200, default: 20}}
       responses: {'200': {description: Operational real booking page}}
     post:
-      summary: Create an ocean booking draft with immutable channel and warehouse snapshots
+      summary: Register an offline-confirmed ocean booking with complete transport snapshots
+      description: 'Requires platform:firstleg:ocean-booking:create. The booking has already been completed offline, so registration persists it directly as CONFIRMED. RELEASED remains a separate later action.'
       parameters: [{$ref: '#/components/parameters/IdempotencyKey'}]
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/CreateRequest'}}}}
-      responses: {'200': {description: Draft detail}}
-  /api/platform/v1/ocean-bookings/{oceanBookingId}/confirm:
-    post:
-      summary: Confirm a real booked container record without creating internal cabinets
-      parameters: [{$ref: '#/components/parameters/OceanBookingId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
-      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/ActionRequest'}}}}
-      responses: {'200': {description: CONFIRMED real booking detail; internal cabinets are linked explicitly from the container API}}
+      responses: {'200': {description: CONFIRMED real booking detail}}
   /api/platform/v1/ocean-bookings/{oceanBookingId}/release:
     post:
-      summary: Confirm released transport data and synchronize associated cabinet transport snapshots
-      description: Does not create cabinets, change channels, replace cabinetNo, or recreate loading plans.
+      summary: Release an already registered booking and synchronize associated cabinet transport snapshots
+      description: 'The transport fields were registered at create time. The request must repeat the same bill of lading, vessel, voyage, ETD and ETA values; mismatches are rejected. This action does not create cabinets, change channels, replace cabinetNo, or recreate loading plans.'
       parameters: [{$ref: '#/components/parameters/OceanBookingId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/ReleaseRequest'}}}}
       responses: {'200': {description: RELEASED detail}}
@@ -50,7 +45,7 @@ components:
         data: {$ref: '#/components/schemas/DraftData'}
     DraftData:
       type: object
-      required: [channelCode, warehouseId, warehouseName, serviceTerm, freightTerm, parties, containerRequirements]
+      required: [channelCode, warehouseId, warehouseName, billOfLadingNo, vesselName, voyageNo, serviceTerm, freightTerm, estimatedSailingAt, estimatedArrivalAt, parties, containerRequirements]
       properties:
         customerId: {type: integer, format: int64, minimum: 1, nullable: true, description: Optional customer snapshot; must be supplied together with customerName.}
         customerName: {type: string, maxLength: 128, nullable: true, description: Optional customer snapshot; must be supplied together with customerId.}
@@ -59,11 +54,11 @@ components:
         warehouseName: {type: string, maxLength: 128}
         serviceTerm: {type: string, maxLength: 32, description: Required free-text Service Term snapshot, for example CY-CY.}
         freightTerm: {type: string, maxLength: 32, description: Required free-text Freight Term snapshot, for example NINGBO.}
-        billOfLadingNo: {type: string, nullable: true, deprecated: true, description: Must be omitted until release}
-        vesselName: {type: string, nullable: true, deprecated: true, description: Must be omitted until release}
-        voyageNo: {type: string, nullable: true, deprecated: true, description: Must be omitted until release}
-        estimatedSailingAt: {type: string, format: date-time, nullable: true, deprecated: true, description: Must be omitted until release}
-        estimatedArrivalAt: {type: string, format: date-time, nullable: true, deprecated: true, description: Must be omitted until release}
+        billOfLadingNo: {type: string, maxLength: 128, description: Required offline-confirmed bill of lading snapshot.}
+        vesselName: {type: string, maxLength: 128, description: Required offline-confirmed vessel snapshot.}
+        voyageNo: {type: string, maxLength: 64, description: Required offline-confirmed voyage snapshot.}
+        estimatedSailingAt: {type: string, format: date-time, description: Required offline-confirmed ETD snapshot.}
+        estimatedArrivalAt: {type: string, format: date-time, description: Required offline-confirmed ETA snapshot; cannot be earlier than ETD.}
         parties: {type: array, minItems: 3, items: {type: object}}
         containerRequirements: {type: array, minItems: 1, maxItems: 20, items: {$ref: '#/components/schemas/ContainerRequirement'}}
     ContainerRequirement: