装柜修改

firstleg/src/main/resources/db/phase3-smart-loading-schema.sql

@@ -610,6 +610,14 @@ BEGIN
        (OLD.plan_status = 'EDITING' AND NEW.plan_status IN ('EDITING', 'LOADING'))
     OR (OLD.plan_status = 'LOADING'
         AND NEW.plan_status IN ('LOADING', 'COMPLETED'))
+    OR (OLD.plan_status = 'LOADING' AND NEW.plan_status = 'EDITING'
+        AND NOT EXISTS (
+          SELECT 1
+            FROM fl_loading_pick_item pick_item
+            JOIN fl_loading_pick_task pick_task ON pick_task.id = pick_item.pick_task_id
+           WHERE pick_task.loading_plan_id = OLD.id
+             AND pick_item.picked_package_count > 0
+        ))
   ) THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '装柜状态只允许单向推进';
   END IF;
@@ -684,6 +692,20 @@ BEGIN
 END$$
 DELIMITER ;
 
+-- 旧版本在推送预装时即写入 LOADING。仅回收从未发生实际拣货的计划；有实际拣货记录的数据不回退。
+UPDATE fl_loading_plan plan
+   SET plan_status = 'EDITING',
+       updated_at = CURRENT_TIMESTAMP(3),
+       version = version + 1
+ WHERE plan.plan_status = 'LOADING'
+   AND NOT EXISTS (
+       SELECT 1
+         FROM fl_loading_pick_item pick_item
+         JOIN fl_loading_pick_task pick_task ON pick_task.id = pick_item.pick_task_id
+        WHERE pick_task.loading_plan_id = plan.id
+          AND pick_item.picked_package_count > 0
+   );
+
 DROP TRIGGER IF EXISTS trg_loading_item_before_insert;
 DELIMITER $$
 CREATE TRIGGER trg_loading_item_before_insert

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

@@ -136,7 +136,7 @@ paths:
         - {name: containerNo, in: query, schema: {type: string, maxLength: 64}}
         - {name: cabinetNo, in: query, schema: {type: string, maxLength: 64}}
         - {name: warehouseId, in: query, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
-        - {name: status, in: query, schema: {type: string, enum: [EDITING, LOADING, COMPLETED]}}
+        - {name: status, in: query, schema: {type: string, enum: [WAIT_LOADING, EDITING, LOADING, COMPLETED]}}
       responses:
         '200':
           description: 成功或业务失败，按响应体 code 判断
@@ -146,7 +146,7 @@ paths:
         '403': {description: 无货柜查询权限}
     post:
       summary: 新增平台货柜
-      description: 需要 platform:firstleg:container:create 权限；新增后聚合状态为 EDITING
+      description: 需要 platform:firstleg:container:create 权限；新增后聚合状态为 WAIT_LOADING（待装柜）
       requestBody:
         required: true
         content:
@@ -166,7 +166,7 @@ paths:
         '403': {description: 无货柜查询权限}
     put:
       summary: 草稿阶段完整编辑货柜
-      description: 需要 platform:firstleg:container:edit 权限；仅无装柜计划或计划为 EDITING 时允许
+      description: 需要 platform:firstleg:container:edit 权限；仅待装柜或计划为 EDITING（预装柜中）时允许
       parameters:
         - {$ref: '#/components/parameters/ContainerBookingId'}
       requestBody:
@@ -701,7 +701,7 @@ components:
         actualPortArrivalAt: {type: string, format: date-time, nullable: true}
         estimatedWarehouseArrivalAt: {type: string, format: date-time, nullable: true}
         actualWarehouseArrivalAt: {type: string, format: date-time, nullable: true}
-        planStatus: {type: string, enum: [EDITING, LOADING, COMPLETED]}
+        planStatus: {type: string, enum: [WAIT_LOADING, EDITING, LOADING, COMPLETED]}
         version: {type: integer, minimum: 0}
     ContainerSaveRequest:
       type: object