优化

2026-08-13 09:49:55 +08:00
parent f3366cb2fa
commit 95849f248f
69 changed files with 1224 additions and 221 deletions
@@ -1,4 +1,4 @@
-- 二、三期对外统一使用 INBOUNDED。历史 WAIT_SPLIT 仅由查询适配为 INBOUNDED，
+-- 新完成入库记录使用 WAIT_SPLIT，存量 INBOUNDED 继续作为可分柜兼容状态。
 -- 本脚本不改写业务主表或历史状态，避免影响既有审计记录。
 USE baiyue_firstleg;

@@ -13,7 +13,7 @@ BEGIN
          WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_inbound_status_history'
            AND column_name IN ('from_status', 'to_status')) <> 2 THEN
    SIGNAL SQLSTATE '45000'
-      SET MESSAGE_TEXT = 'INBOUNDED 兼容校验失败：入库状态字段不完整';
+      SET MESSAGE_TEXT = 'WAIT_SPLIT/INBOUNDED 兼容校验失败：入库状态字段不完整';
  END IF;
 END$$
 DELIMITER ;
@@ -28,6 +28,43 @@ PREPARE statement FROM @ddl; EXECUTE statement; DEALLOCATE PREPARE statement;
 ALTER TABLE fl_container_document ADD CONSTRAINT chk_container_document_type
  CHECK (document_type IN ('DESTINATION_CLEARANCE', 'CUSTOMS_DECLARATION', 'DELIVERY_ORDER', 'PICKUP_ORDER'));

+-- Keep the container master immutable after loading; only the two document rows remain operable.
+DROP TRIGGER IF EXISTS trg_container_booking_before_update;
+DELIMITER $$
+CREATE TRIGGER trg_container_booking_before_update BEFORE UPDATE ON fl_container_booking FOR EACH ROW
+BEGIN
+  DECLARE current_plan_status VARCHAR(24);
+  SELECT MAX(plan_status) INTO current_plan_status FROM fl_loading_plan WHERE container_booking_id=OLD.id;
+  IF current_plan_status='COMPLETED' THEN
+    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='装柜完成后货柜全部只读，不允许修改';
+  END IF;
+  IF current_plan_status='LOADING' AND (
+       NOT (OLD.id <=> NEW.id) OR NOT (OLD.booking_no <=> NEW.booking_no)
+    OR NOT (OLD.cabinet_no <=> NEW.cabinet_no) OR NOT (OLD.channel_code <=> NEW.channel_code)
+    OR NOT (OLD.channel_name <=> NEW.channel_name) OR NOT (OLD.ocean_booking_id <=> NEW.ocean_booking_id)
+    OR NOT (OLD.ocean_booking_requirement_id <=> NEW.ocean_booking_requirement_id)
+    OR NOT (OLD.warehouse_id <=> NEW.warehouse_id) OR NOT (OLD.warehouse_name <=> NEW.warehouse_name)
+    OR NOT (OLD.bill_of_lading_no <=> NEW.bill_of_lading_no) OR NOT (OLD.vessel_name <=> NEW.vessel_name)
+    OR NOT (OLD.container_type <=> NEW.container_type) OR NOT (OLD.shipping_company_id <=> NEW.shipping_company_id)
+    OR NOT (OLD.shipping_company_name <=> NEW.shipping_company_name)
+    OR NOT (OLD.departure_port_code <=> NEW.departure_port_code) OR NOT (OLD.departure_port_name <=> NEW.departure_port_name)
+    OR NOT (OLD.destination_port_code <=> NEW.destination_port_code) OR NOT (OLD.destination_port_name <=> NEW.destination_port_name)
+    OR NOT (OLD.destination_warehouse_code <=> NEW.destination_warehouse_code)
+    OR NOT (OLD.destination_warehouse_name <=> NEW.destination_warehouse_name)
+    OR NOT (OLD.capacity_cbm <=> NEW.capacity_cbm) OR NOT (OLD.max_weight_kg <=> NEW.max_weight_kg)
+    OR NOT (OLD.terminal_trucking_company <=> NEW.terminal_trucking_company) OR NOT (OLD.loading_at <=> NEW.loading_at)
+    OR NOT (OLD.estimated_sailing_at <=> NEW.estimated_sailing_at) OR NOT (OLD.actual_sailing_at <=> NEW.actual_sailing_at)
+    OR NOT (OLD.estimated_port_arrival_at <=> NEW.estimated_port_arrival_at)
+    OR NOT (OLD.actual_port_arrival_at <=> NEW.actual_port_arrival_at)
+    OR NOT (OLD.estimated_warehouse_arrival_at <=> NEW.estimated_warehouse_arrival_at)
+    OR NOT (OLD.actual_warehouse_arrival_at <=> NEW.actual_warehouse_arrival_at)
+    OR NOT (OLD.created_by <=> NEW.created_by) OR NOT (OLD.created_by_name <=> NEW.created_by_name)
+    OR NOT (OLD.created_at <=> NEW.created_at)) THEN
+    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='装柜中仅允许修改集装箱号与航次';
+  END IF;
+END$$
+DELIMITER ;
+
 DROP TRIGGER IF EXISTS trg_container_document_before_insert;
 DELIMITER $$
 CREATE TRIGGER trg_container_document_before_insert BEFORE INSERT ON fl_container_document FOR EACH ROW
@@ -562,8 +562,7 @@ BEGIN
  DECLARE current_plan_status VARCHAR(24);
  SELECT MAX(plan_status) INTO current_plan_status
    FROM fl_loading_plan WHERE container_booking_id = OLD.id;
-  IF current_plan_status = 'COMPLETED'
-     AND NEW.document_type NOT IN ('DESTINATION_CLEARANCE', 'CUSTOMS_DECLARATION') THEN
+  IF current_plan_status = 'COMPLETED' THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '装柜完成后货柜全部只读，不允许修改';
  END IF;
  IF current_plan_status = 'LOADING' AND (
@@ -927,7 +926,7 @@ BEGIN
  SELECT MAX(plan_status) INTO current_plan_status FROM fl_loading_plan
   WHERE container_booking_id = NEW.container_booking_id;
  IF current_plan_status = 'COMPLETED'
-     AND OLD.document_type NOT IN ('DESTINATION_CLEARANCE', 'CUSTOMS_DECLARATION') THEN
+     AND NEW.document_type NOT IN ('DESTINATION_CLEARANCE', 'CUSTOMS_DECLARATION') THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '装柜完成后货柜文件不可新增';
  END IF;
 END$$
@@ -942,7 +941,8 @@ BEGIN
  DECLARE current_plan_status VARCHAR(24);
  SELECT MAX(plan_status) INTO current_plan_status FROM fl_loading_plan
   WHERE container_booking_id = OLD.container_booking_id;
-  IF current_plan_status = 'COMPLETED' THEN
+  IF current_plan_status = 'COMPLETED'
+     AND OLD.document_type NOT IN ('DESTINATION_CLEARANCE', 'CUSTOMS_DECLARATION') THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '装柜完成后货柜文件不可修改';
  END IF;
 END$$
@@ -68,8 +68,8 @@ paths:
    post:
      summary: 按统一订单条件分页查询履约摘要（Order 内部）
      description: >-
-        mainStatus 接受六态产品状态；历史 WAIT_SPLIT 仅作为兼容筛选值，按 INBOUNDED 范围查询。
-        所有响应 mainStatus 均归并为六态产品状态，不返回 WAIT_SPLIT。
+        mainStatus 接受七态产品状态；WAIT_SPLIT 为正式待分柜状态，INBOUNDED 仅兼容存量已入库记录。
+        计费与入库处理中状态在完成前仍归并为 WAIT_MEASURE，不提前开放分柜。
      security:
        - internalServiceToken: []
      requestBody:
@@ -102,7 +102,7 @@ paths:
  /internal/firstleg/v1/inbounds/unified-orders/detail:
    post:
      summary: 按订单 ID 查询统一履约详情（Order 内部）
-      description: 时间线保留 Firstleg 内部 fromStatus/toStatus；summary.mainStatus 始终使用六态产品状态。
+      description: 时间线保留 Firstleg 内部 fromStatus/toStatus；summary.mainStatus 使用七态产品状态。
      security:
        - internalServiceToken: []
      requestBody:
@@ -258,6 +258,17 @@ paths:
        required: true
        content: {application/json: {schema: {$ref: '#/components/schemas/ContainerDocumentAttachRequest'}}}
      responses: {'200': {description: 成功、文件归属不匹配或版本冲突}}
+  /api/platform/v1/containers/{id}/clearance/document/upload:
+    post:
+      summary: 直接选择文件上传或替换货柜目的港清关资料
+      description: Firstleg 使用内部服务令牌上传 File，浏览器不得传递 fileId 或内部令牌；旧 JSON document 接口仅兼容存量调用。
+      parameters: [{$ref: '#/components/parameters/ContainerBookingId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema: {$ref: '#/components/schemas/ContainerDocumentUploadRequest'}
+      responses: {'200': {description: 成功、文件上传失败或版本冲突}}
  /api/platform/v1/containers/{id}/clearance/complete:
    post:
      summary: 点击完成目的港清关
@@ -645,8 +656,8 @@ components:
  schemas:
    UnifiedMainStatus:
      type: string
-      enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, LOADING, LOADED, DELIVERED]
-      description: 产品主状态；历史内部状态 WAIT_SPLIT 在响应中统一归并为 INBOUNDED
+      enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, WAIT_SPLIT, LOADING, LOADED, DELIVERED]
+      description: 七态产品主状态；WAIT_SPLIT 为正式待分柜状态，INBOUNDED 仅兼容存量已入库记录
    UnifiedInboundQuery:
      type: object
      properties:
@@ -657,7 +668,7 @@ components:
          type: string
          enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, LOADING, LOADED, DELIVERED, WAIT_SPLIT]
          nullable: true
-          description: WAIT_SPLIT 仅为历史兼容筛选值，等价于 INBOUNDED
+          description: WAIT_SPLIT 与 INBOUNDED 为独立筛选值
        customerId: {type: integer, format: int64, nullable: true}
        receivingWarehouseId: {type: integer, format: int64, nullable: true}
        destinationWarehouseId: {type: integer, format: int64, nullable: true}
@@ -756,7 +767,7 @@ components:
        orderId: {type: integer, format: int64, nullable: true}
        orderNo: {type: string, nullable: true}
        inboundCode: {type: string, nullable: true}
-        processStatus: {type: string, nullable: true, description: Firstleg 内部状态，历史数据可能为 WAIT_SPLIT}
+        processStatus: {type: string, nullable: true, description: Firstleg 内部状态；新入库完成记录进入 WAIT_SPLIT，历史记录可能为 INBOUNDED}
        orderStatusSnapshot: {type: string, nullable: true}
        measureReviewStatus: {type: string, nullable: true}
        feeStatus: {type: string, nullable: true}
@@ -1054,7 +1065,7 @@ components:
      type: object
      required: [version, reason]
      properties:
-        containerNo: {type: string, maxLength: 64, nullable: true}
+        containerNo: {type: string, maxLength: 64, nullable: true, description: 真实集装箱号；PDA任务创建前可空，任务创建后允许替换但禁止清空}
        voyageNo: {type: string, maxLength: 64, nullable: true}
        version: {type: integer, minimum: 0}
        reason: {type: string, maxLength: 500}
@@ -1071,6 +1082,14 @@ components:
      properties:
        expectedVersion: {type: integer, minimum: 0}
        operationReason: {type: string, maxLength: 500, nullable: true}
+    ContainerDocumentUploadRequest:
+      type: object
+      required: [file, expectedVersion]
+      additionalProperties: false
+      properties:
+        file: {type: string, format: binary, description: 用户直接选择的清关资料}
+        expectedVersion: {type: integer, minimum: 0, description: 当前文档乐观锁版本，首次上传为 0}
+        operationReason: {type: string, maxLength: 500, nullable: true}
    MerchantInboundBillingEnvelope:
      type: object
      properties:
@@ -85,6 +85,19 @@ paths:
        content: {application/json: {schema: {$ref: '#/components/schemas/DocumentAttachRequest'}}}
      responses:
        '200': {$ref: '#/components/responses/BusinessDocumentResponse'}
+  /api/platform/v1/first-leg/loading-lists/{planId}/customs/document/upload:
+    post:
+      summary: 直接选择文件上传或替换装柜清单出口报关文档
+      description: Firstleg 使用内部服务令牌上传 File，浏览器不得传递 fileId 或内部令牌；旧 JSON document 接口仅兼容存量调用。
+      x-permission: platform:firstleg:customs:manage
+      parameters: [{$ref: '#/components/parameters/PlanId'}, {$ref: '#/components/parameters/WarehouseId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema: {$ref: '#/components/schemas/DocumentUploadRequest'}
+      responses:
+        '200': {$ref: '#/components/responses/BusinessDocumentResponse'}
  /api/platform/v1/first-leg/loading-lists/{planId}/customs/complete:
    post:
      summary: 点击完成出口报关
@@ -353,7 +366,7 @@ components:
      required: [expectedVersion]
      additionalProperties: false
      properties:
-        containerNo: {type: string, maxLength: 64, nullable: true, description: 集装箱号}
+        containerNo: {type: string, maxLength: 64, nullable: true, description: 真实集装箱号；PDA任务创建前可空，任务创建后允许替换但禁止清空}
        voyageNo: {type: string, maxLength: 64, nullable: true, description: 航次}
        expectedVersion: {type: integer, format: int32, minimum: 0, description: 当前乐观锁版本}
        operationReason: {type: string, maxLength: 500, nullable: true, description: 操作原因}
@@ -372,6 +385,14 @@ components:
      properties:
        expectedVersion: {type: integer, format: int32, minimum: 0}
        operationReason: {type: string, maxLength: 500, nullable: true}
+    DocumentUploadRequest:
+      type: object
+      required: [file, expectedVersion]
+      additionalProperties: false
+      properties:
+        file: {type: string, format: binary, description: 用户直接选择的报关文档}
+        expectedVersion: {type: integer, format: int32, minimum: 0, description: 当前文档乐观锁版本，首次上传为 0}
+        operationReason: {type: string, maxLength: 500, nullable: true}
    BusinessDocument:
      type: object
      required: [id, documentType, fileId, fileName, fileHash, uploadedBy, uploadedAt, version]