diff --git a/deploy/sql/头程数据库统一增量-MySQL8.sql b/deploy/sql/头程数据库统一增量-MySQL8.sql index 808530f7a..f992df6c7 100644 --- a/deploy/sql/头程数据库统一增量-MySQL8.sql +++ b/deploy/sql/头程数据库统一增量-MySQL8.sql @@ -17632,6 +17632,18 @@ BEGIN ADD CONSTRAINT chk_dropship_task_cartons CHECK (allocated_cartons<=counted_cartons AND counted_cartons<=total_cartons); + IF EXISTS (SELECT 1 FROM information_schema.table_constraints + WHERE constraint_schema='baiyue_firstleg' AND table_name='fl_dropship_pallet' + AND constraint_name='chk_dropship_pallet_status') THEN + ALTER TABLE fl_dropship_pallet DROP CHECK chk_dropship_pallet_status; + END IF; + UPDATE fl_dropship_pallet + SET pallet_status='SEALED' + WHERE pallet_status='COMPLETED'; + ALTER TABLE fl_dropship_pallet + ADD CONSTRAINT chk_dropship_pallet_status + CHECK (pallet_status IN ('OPEN','SEALED')); + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='baiyue_firstleg' AND table_name='fl_dropship_pallet_carton' AND column_name='operation_id') diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/DropshipPalletizationSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/DropshipPalletizationSqlContractTest.java index ed3c1118b..e247cc0aa 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/repository/DropshipPalletizationSqlContractTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/DropshipPalletizationSqlContractTest.java @@ -41,6 +41,9 @@ class DropshipPalletizationSqlContractTest { assertThat(unified) .contains("CREATE PROCEDURE converge_loading_assignment_schema()") .contains("CREATE PROCEDURE converge_dropship_palletization_schema()") + .contains("ALTER TABLE fl_dropship_pallet DROP CHECK chk_dropship_pallet_status") + .contains("ALTER TABLE fl_dropship_pallet DROP CHECK chk_dropship_pallet_status;\n END IF;\n UPDATE fl_dropship_pallet") + .contains("CHECK (pallet_status IN ('OPEN','SEALED'))") .contains("CHANGE COLUMN operation_id count_operation_id") .contains("DROP INDEX uk_loading_item_plan_detail") .contains("ADD UNIQUE KEY uk_loading_item_plan_assignment (loading_plan_id,active_assignment_key)"); diff --git a/scripts/admin-test-env-modules/inbound-measurement.mjs b/scripts/admin-test-env-modules/inbound-measurement.mjs index 45363ca0a..8be4a3830 100644 --- a/scripts/admin-test-env-modules/inbound-measurement.mjs +++ b/scripts/admin-test-env-modules/inbound-measurement.mjs @@ -169,11 +169,12 @@ async function completeDropshipPalletization(context, { inboundId, inboundCode, const counted = context.apiSuccess(MODULE, `清点第${index + 1}箱并冻结实收SKU数`, countResponse, `boxCode=${boxCode}`, OPTIONS) context.assert(MODULE, `第${index + 1}箱清点结果与冻结箱唛一致`, countResponse, - asId(counted?.carton?.cartonId) === asId(resolved?.cartonId) + counted?.carton?.boxCode === resolved?.boxCode + && Number(counted?.carton?.expectedSkuQuantity) === Number(resolved?.expectedSkuQuantity) && Number(counted?.carton?.actualSkuQuantity) === Number(resolved?.expectedSkuQuantity) - && counted?.carton?.discrepancyStatus === 'MATCHED', + && counted?.carton?.discrepancyStatus === 'MATCH', `cartonId=${asId(counted?.carton?.cartonId) || 'missing'}, discrepancy=${counted?.carton?.discrepancyStatus ?? 'missing'}`, OPTIONS) - if (asId(counted?.carton?.cartonId) === asId(resolved?.cartonId)) countedCartons += 1 + if (counted?.carton?.boxCode === resolved?.boxCode) countedCartons += 1 if (index === 0) { context.assert(MODULE, '先扫箱模式将已清点箱暂存为待组托', countResponse,