Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test

deploy/sql/头程数据库统一增量-MySQL8.sql

@@ -5115,6 +5115,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;
@@ -13770,6 +13778,20 @@ DROP PROCEDURE IF EXISTS assert_unified_final_schema;
 CALL assert_loading_pick_task_shapes(1);
 DROP PROCEDURE IF EXISTS assert_loading_pick_task_shapes;
 
+-- 修复旧版本“推送预装即拣货中”的状态污染；从未实际拣货的计划回收到预装柜中。
+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
+   );
+
 -- 二、三期对外统一使用 INBOUNDED；历史 WAIT_SPLIT 仅由查询适配为 INBOUNDED，统一迁移不改写主表或历史状态。
 SELECT 'PASS' AS migration_status,
        '统一增量全部执行完成；父子订单、履约分片、装柜门禁、订舱拖车、报关船期、船司查询、仓库角色、费用、Finance人工财务、公共资源及可靠审计结构校验通过' AS message;