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

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

@@ -602,6 +602,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;
@@ -676,6 +684,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