From c7061b8a74e7ae0c831750fe2836b0f6befabc54 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Thu, 27 Aug 2026 18:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/sql/头程数据库统一增量-MySQL8.sql | 1 - .../main/resources/db/phase3-smart-loading-schema.sql | 1 - .../firstleg/repository/SmartLoadingSqlContractTest.java | 9 +++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/deploy/sql/头程数据库统一增量-MySQL8.sql b/deploy/sql/头程数据库统一增量-MySQL8.sql index 38bf980aa..d1abd3ecd 100644 --- a/deploy/sql/头程数据库统一增量-MySQL8.sql +++ b/deploy/sql/头程数据库统一增量-MySQL8.sql @@ -5618,7 +5618,6 @@ BEGIN JOIN fl_loading_pick_task pick_task ON pick_task.id = pick_item.pick_task_id WHERE pick_item.loading_plan_item_id = item.id AND pick_task.loading_plan_id = OLD.id - AND pick_task.task_status = 'LOADING' AND ( (pick_item.item_status = 'PICKED' AND pick_item.picked_package_count = item.package_count) diff --git a/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql b/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql index 9fcc58c13..96979710b 100644 --- a/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql +++ b/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql @@ -862,7 +862,6 @@ BEGIN JOIN fl_loading_pick_task pick_task ON pick_task.id = pick_item.pick_task_id WHERE pick_item.loading_plan_item_id = item.id AND pick_task.loading_plan_id = OLD.id - AND pick_task.task_status = 'LOADING' AND ( (pick_item.item_status = 'PICKED' AND pick_item.picked_package_count = item.package_count) diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingSqlContractTest.java index c7cb7aa7b..ce8e6c27e 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingSqlContractTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingSqlContractTest.java @@ -229,10 +229,15 @@ class SmartLoadingSqlContractTest { } private static void assertLoadingCompletionTrigger(String sql) { - assertThat(sql) + int triggerStart = sql.indexOf("CREATE TRIGGER trg_loading_plan_before_update"); + int triggerEnd = sql.indexOf("DROP TRIGGER IF EXISTS trg_loading_plan_after_update", triggerStart); + assertThat(triggerStart).isGreaterThanOrEqualTo(0); + assertThat(triggerEnd).isGreaterThan(triggerStart); + String beforeUpdateTrigger = sql.substring(triggerStart, triggerEnd); + assertThat(beforeUpdateTrigger) .contains("AND NOT EXISTS (") .contains("pick_task.loading_plan_id = OLD.id") - .contains("pick_task.task_status = 'LOADING'") + .doesNotContain("pick_task.task_status") .contains("pick_item.item_status = 'PICKED'") .contains("pick_item.item_status = 'PARTIAL'") .contains("pick_item.picked_package_count > 0")