From e815abcbd7a17d728bede91d01d336aedeb93cf0 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Tue, 25 Aug 2026 15:07:06 +0800 Subject: [PATCH] fix(firstleg): retain dropship carton label pool --- .../baiyue/firstleg/mapper/LoadingCompletedEventMapper.java | 2 +- .../firstleg/service/LoadingCompletedOutboxServiceTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java index f4e907a2a..84786775d 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java @@ -67,7 +67,7 @@ public interface LoadingCompletedEventMapper { AND a.allocation_status IN ('CONFIRMED','TRANSFERRED','RELEASED') AND a.picked_package_count > 0 LEFT JOIN fl_inbound_carton_label label - ON label.tenant_id = i.account_id AND label.inbound_id = i.inbound_id + ON label.tenant_id = i.account_id AND label.inbound_detail_id = i.inbound_detail_id AND label.batch_status = 'ACTIVE' WHERE i.loading_plan_id = #{planId} AND i.deleted = 0 ORDER BY i.account_id, i.inbound_id, a.allocation_no, diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java index 785252006..50ff2452d 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java @@ -157,6 +157,11 @@ class LoadingCompletedOutboxServiceTest { .doesNotContain("'PENDING'") .doesNotContain("'PICKING'"); } + assertThat(palletsSql) + .contains("label.tenant_id = i.account_id") + .contains("label.inbound_detail_id = i.inbound_detail_id") + .contains("label.batch_status = 'ACTIVE'") + .doesNotContain("label.inbound_id = i.inbound_id"); } @Test void publishesDropshipPalletSkuAndCartonSnapshots() throws Exception {