Integrate verified owned dispatch operations and keep unfinished numbering out of TEST

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/repository/DispatchNumberSequenceTest.java

@@ -1,59 +0,0 @@
-package com.baiyue.lastleg.dispatch.repository;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.*;
-import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
-import org.springframework.transaction.interceptor.TransactionInterceptor;
-import org.springframework.transaction.support.TransactionTemplate;
-import java.time.LocalDate;
-import java.util.*;
-import java.util.concurrent.*;
-import static org.assertj.core.api.Assertions.*;
-
-/** 使用真实SQL、连接内流水与Spring事务代理核对唯一性和事务边界。 */
-class DispatchNumberSequenceTest {
-    private static class Fixture {
-        final JdbcTemplate jdbc;
-        final DataSourceTransactionManager transactions;
-        final DispatchNumberSequence sequence;
-        Fixture() {
-            var data=new DriverManagerDataSource("jdbc:h2:mem:"+UUID.randomUUID()+";MODE=MySQL;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000","sa","");
-            jdbc=new JdbcTemplate(data);transactions=new DataSourceTransactionManager(data);
-            jdbc.execute("CREATE TABLE ll_dispatch_daily_sequence(business_date DATE PRIMARY KEY,last_sequence BIGINT NOT NULL)");
-            var proxy=new ProxyFactory(new DispatchNumberSequence(jdbc));proxy.setProxyTargetClass(true);
-            proxy.addAdvice(new TransactionInterceptor(transactions,new AnnotationTransactionAttributeSource()));
-            sequence=(DispatchNumberSequence)proxy.getProxy();
-        }
-    }
-    @Test void startsAtOneEachDayAndContinuesAcrossGeneratorInstances() {
-        var f=new Fixture();var today=LocalDate.of(2026,10,20);
-        assertThat(f.sequence.next(today)).isEqualTo(1);
-        assertThat(f.sequence.next(today)).isEqualTo(2);
-        assertThat(f.sequence.next(today.plusDays(1))).isEqualTo(1);
-        assertThat(f.sequence.next(today)).isEqualTo(3);
-    }
-    @Test void concurrentConnectionsAllocateEveryNumberOnce() throws Exception {
-        var f=new Fixture();var date=LocalDate.of(2026,10,20);var pool=Executors.newFixedThreadPool(2);
-        try {
-            var work=new ArrayList<Callable<Long>>();for(int i=0;i<64;i++)work.add(()->f.sequence.next(date));
-            var values=new TreeSet<Long>();for(var future:pool.invokeAll(work))values.add(future.get());
-            assertThat(values).hasSize(64).first().isEqualTo(1L);
-            assertThat(values.last()).isEqualTo(64L);
-        } finally {pool.shutdownNow();}
-    }
-    @Test void outerBusinessRollbackDoesNotReuseAnAlreadyAllocatedNumber() {
-        var f=new Fixture();var date=LocalDate.of(2026,10,20);
-        assertThatThrownBy(()->new TransactionTemplate(f.transactions).execute(status->{
-            assertThat(f.sequence.next(date)).isEqualTo(1);throw new IllegalStateException("business rollback");
-        })).isInstanceOf(IllegalStateException.class);
-        assertThat(f.sequence.next(date)).isEqualTo(2);
-    }
-    @Test void fourDigitExhaustionDoesNotWrapOrIncrementTheStoredCounter() {
-        var f=new Fixture();var date=LocalDate.of(2026,10,20);
-        f.jdbc.update("INSERT INTO ll_dispatch_daily_sequence VALUES(?,9999)",date);
-        assertThatThrownBy(()->f.sequence.next(date)).hasMessageContaining("四位流水号已用满");
-        assertThat(f.jdbc.queryForObject("SELECT last_sequence FROM ll_dispatch_daily_sequence WHERE business_date=?",Long.class,date)).isEqualTo(9999L);
-    }
-}

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchAggregatePersistenceTest.java

@@ -536,9 +536,6 @@ public class DispatchAggregatePersistenceTest {
             service=new DispatchAggregateService(repository,
                 new DispatchSourceRepository(session.getMapper(DispatchCandidateMapper.class),session.getMapper(ReturnDispatchCandidateMapper.class),session.getMapper(DispatchSourceMapper.class)),rules,fleet,
                 new DispatchCommandLedger(new DispatchCommandRepository(session.getMapper(DispatchCommandMapper.class)),new DispatchCommandCodec(json)),new DispatchCommandHasher(json),json);
-            var numbers=mock(DispatchNumberGenerator.class);var dailySequence=new java.util.concurrent.atomic.AtomicInteger();
-            when(numbers.next()).thenAnswer(invocation->"PC20261020"+String.format(java.util.Locale.ROOT,"%04d",dailySequence.incrementAndGet()));
-            org.springframework.test.util.ReflectionTestUtils.setField(service,"numbers",numbers);
             org.springframework.test.util.ReflectionTestUtils.setField(service,"evidence",mock(com.baiyue.lastleg.dispatch.gateway.DispatchEvidenceGateway.class));
             org.springframework.test.util.ReflectionTestUtils.setField(service,"ownedBusinessOwnership",ownedBusinessOwnership);
             org.springframework.test.util.ReflectionTestUtils.setField(gateway,"workflow",service);

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchMergedRelabelPersistenceTest.java

@@ -148,6 +148,33 @@ class DispatchMergedRelabelPersistenceTest {
         var created=f.create("actual-plan",group.sources().stream().map(s->s.selection()).toList());assertThat(created.counts().palletCount()).isEqualTo(1);assertThat(created.counts().packageCount()).isEqualTo(4);
     }
 
+    /** 无效实托不成为候选或跨申请扩组锚点；同申请缺失的组成仍明确阻断建单。 */
+    @ParameterizedTest @ValueSource(longs={0,-1})
+    void invalidPalletIdentityDoesNotCrashOrConnectUnrelatedApplications(Long invalidPallet) throws Exception {
+        var f=new Merged(false);
+        for(long id:List.of(102L,103L))f.insert("ll_inventory_position","id",id,"customer_id","101","balance_id",601,
+            "overseas_warehouse_id","9","pallet_id",invalidPallet,"pallet_no","","batch_no","MISSING-"+id,
+            "warehouse_location_code","LOC-1","hold_packages",1);
+        f.insert("ll_relabel_item","id",303,"application_id",201,"customer_id","101","product_name_zh","待核对来源",
+            "total_package_count",1,"notified_package_count",1,"carton_mark","OLD-MISSING","fba_carton_mark","NEW-MISSING",
+            "operation_type","CARTON_LABEL","source_inventory_balance_id",601,"source_inventory_position_id",102,
+            "source_inbound_order_id",7201,"source_inbound_order_no","ORIGIN-MISSING","source_inbound_code","CODE-MISSING",
+            "destination_fba_warehouse_code","ONT8");
+        f.application(203,"RL-UNRELATED","101",9003,304,103,1,"UNRELATED");
+        var candidates=f.rules.wholeCandidates("platform",new DispatchPlanningModels.CandidateQuery("9",null,null,null,"RELABEL",null));
+        var groups=f.rules.selectionGroups(candidates);
+        assertThat(candidates).hasSize(2).allSatisfy(row->assertThat(row.warehousePalletId()).isEqualTo(501L));
+        var group=groups.get("RELABEL:RL-A:501");
+        assertThat(group.complete()).isFalse();
+        assertThat(group.blockReasons()).anyMatch(reason->reason.contains("RL-A")&&reason.contains("明细当前位置缺失"));
+        assertThat(group.sources()).extracting(DispatchPlanningModels.SelectionGroupSource::sourceBusinessNo)
+            .containsExactlyInAnyOrder("RL-A","RL-B");
+        assertThat(group.pallets()).hasSize(1);
+        assertThatThrownBy(()->f.create("invalid-pallet",group.sources().stream().map(s->s.selection()).toList()))
+            .isInstanceOf(org.springframework.web.server.ResponseStatusException.class);
+        assertThat(f.count("ll_dispatch_order")).isZero();assertThat(f.count("ll_dispatch_pallet_lock")).isZero();
+    }
+
     /** 只隔离测量和车队外部目录；来源提供者、候选、库存与所有排车Mapper均为实际实现。 */
     private static final class Merged {
         final DispatchAggregatePersistenceTest.Fixture f=new DispatchAggregatePersistenceTest.Fixture();

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchNumberGeneratorTest.java

@@ -1,31 +0,0 @@
-package com.baiyue.lastleg.dispatch.service;
-
-import com.baiyue.lastleg.dispatch.repository.DispatchNumberSequence;
-import org.junit.jupiter.api.Test;
-import java.time.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-class DispatchNumberGeneratorTest {
-    @Test void usesBusinessDateAndFourDigitsWithoutWarehouseOrCustomerSuffix() {
-        var sequences=mock(DispatchNumberSequence.class);
-        when(sequences.next(LocalDate.of(2026,10,20))).thenReturn(1L,42L,9999L);
-        var numbers=new DispatchNumberGenerator(sequences,Clock.fixed(Instant.parse("2026-10-20T08:00:00Z"),ZoneOffset.UTC));
-        assertThat(numbers.next()).isEqualTo("PC202610200001");
-        assertThat(numbers.next()).isEqualTo("PC202610200042");
-        assertThat(numbers.next()).isEqualTo("PC202610209999");
-    }
-    @Test void switchesToTheNewDailySequenceAtShanghaiMidnight() {
-        var sequences=mock(DispatchNumberSequence.class);
-        when(sequences.next(LocalDate.of(2026,10,19))).thenReturn(238L);
-        when(sequences.next(LocalDate.of(2026,10,20))).thenReturn(1L);
-        assertThat(new DispatchNumberGenerator(sequences,Clock.fixed(Instant.parse("2026-10-19T15:59:59Z"),ZoneOffset.UTC)).next()).isEqualTo("PC202610190238");
-        assertThat(new DispatchNumberGenerator(sequences,Clock.fixed(Instant.parse("2026-10-19T16:00:00Z"),ZoneOffset.UTC)).next()).isEqualTo("PC202610200001");
-    }
-    @Test void rejectsExhaustedOrInvalidSequenceInsteadOfWrappingOrReusingNumbers() {
-        for(long value:new long[]{0,10000}) {
-            var sequences=mock(DispatchNumberSequence.class);when(sequences.next(any())).thenReturn(value);
-            assertThatThrownBy(()->new DispatchNumberGenerator(sequences).next()).isInstanceOf(IllegalStateException.class);
-        }
-    }
-}