From c3a6519ce4aa268b4ecee015a36a9389b6dd1019 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Wed, 4 Nov 2026 10:24:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Lastleg=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=AE=B1=E5=94=9B=E5=AD=97=E6=AE=B5=E7=9A=84=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=BD=92=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/sql/头程数据库统一增量-MySQL8.sql | 7 ------- deploy/sql/海外区域统一增量-MySQL8.sql | 1 + .../schema/Phase5OverseasUpgradeSqlContractTest.java | 9 +++++++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/deploy/sql/头程数据库统一增量-MySQL8.sql b/deploy/sql/头程数据库统一增量-MySQL8.sql index 17eb40168..205a14395 100644 --- a/deploy/sql/头程数据库统一增量-MySQL8.sql +++ b/deploy/sql/头程数据库统一增量-MySQL8.sql @@ -8468,13 +8468,6 @@ USE baiyue_iam; INSERT INTO iam_permission (id,tenant_id,app_code,permission_type,parent_id,permission_code,permission_name,route_path,http_method,sort_no,status,built_in,created_at,updated_at,deleted) VALUES (5117200,0,'PLATFORM','MENU',5105000,'platform:overseas-fee:list','海外费用明细','/overseas-business/fees','GET',60,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0); INSERT INTO iam_role_permission (role_id,permission_id,tenant_id,created_at) VALUES (4000001,5117200,0,CURRENT_TIMESTAMP(3)); SELECT 'PASS' AS initialization_status, 'CN' AS region, 229 AS initialized_tables; -USE baiyue_lastleg; --- 现场扫描清单独立于客户选箱快照；重复执行不改现有业务数据。 -SET @discard_actual_marks_ddl = IF(EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_cargo_discard_item' AND column_name='actual_carton_marks_json'), 'SELECT 1', 'ALTER TABLE ll_cargo_discard_item ADD COLUMN actual_carton_marks_json JSON NULL COMMENT ''PDA现场实际废弃箱唛清单，与客户选箱快照独立保存'''); -PREPARE discard_actual_marks_stmt FROM @discard_actual_marks_ddl; -EXECUTE discard_actual_marks_stmt; -DEALLOCATE PREPARE discard_actual_marks_stmt; - USE baiyue_iam; -- 散板需求沿用既有菜单权限，补全当前名称和添加货物独立按钮。 INSERT INTO iam_permission (id,tenant_id,app_code,permission_type,parent_id,permission_code,permission_name,route_path,http_method,sort_no,status,built_in,created_at,updated_at,deleted) diff --git a/deploy/sql/海外区域统一增量-MySQL8.sql b/deploy/sql/海外区域统一增量-MySQL8.sql index 9da931fd5..ac21876a6 100644 --- a/deploy/sql/海外区域统一增量-MySQL8.sql +++ b/deploy/sql/海外区域统一增量-MySQL8.sql @@ -73,6 +73,7 @@ CREATE TABLE ll_cargo_discard_item ( inventory_position_id BIGINT NULL COMMENT '废弃来源库存仓位ID', carton_marks_json TEXT NULL COMMENT '本次废弃所选真实箱唛快照JSON数组', carton_scan_required TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否需要逐箱核对本次所选箱子', + actual_carton_marks_json JSON NULL COMMENT 'PDA现场实际废弃箱唛清单，与客户选箱快照独立保存', available_packages_snapshot int NOT NULL COMMENT '可用箱数快照', discard_packages int NOT NULL COMMENT '申请废弃箱数', completion_photo_file_ids text COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'PDA完工照片文件ID JSON数组', diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/schema/Phase5OverseasUpgradeSqlContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/schema/Phase5OverseasUpgradeSqlContractTest.java index 1c1237bdf..1d5be20b3 100644 --- a/lastleg-service/src/test/java/com/baiyue/lastleg/schema/Phase5OverseasUpgradeSqlContractTest.java +++ b/lastleg-service/src/test/java/com/baiyue/lastleg/schema/Phase5OverseasUpgradeSqlContractTest.java @@ -117,6 +117,15 @@ class Phase5OverseasUpgradeSqlContractTest { "ALTER TABLE ll_"); } + @Test + void cargoDiscardActualMarksAreDefinedInOverseasBaselines() throws Exception { + String field = "actual_carton_marks_json JSON NULL"; + assertThat(createStatement(repositoryFile("lastleg-service/src/main/resources/db/lastleg.sql"), + "ll_cargo_discard_item")).contains(field); + assertThat(createStatement(repositoryFile("deploy/sql/海外区域统一增量-MySQL8.sql"), + "ll_cargo_discard_item")).contains(field); + } + private static String createStatement(String sql, String table) { String token = "CREATE TABLE IF NOT EXISTS " + table + " ("; int start = sql.indexOf(token);