提交

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

@@ -19,6 +19,26 @@ import static org.mockito.Mockito.*;
 import static org.mockito.ArgumentMatchers.*;
 
 class DispatchLooseboardExecutionServiceTest {
+    /** 同一客户散板订单多托只显示一次，保存的照片逐托原子留证并精确计量。 */
+    @Test void oneOrderSharesPhotosAcrossPalletsWithoutCrossingCustomers() {
+        var f=new Fixture(false);var cargo=f.repository.cargo(1);
+        cargo.add(f.item(104,"A","ZY1"));cargo.add(f.item(105,"C","ZY3"));
+        when(f.sourceRepo.businessSources(anyList())).thenReturn(List.of(
+            new BusinessSource("A","ZY1","LB1",101L,"WAREHOUSE_PICKUP"),
+            new BusinessSource("A","ZY1","LB1",104L,"WAREHOUSE_PICKUP"),
+            new BusinessSource("B","ZY2","LB2",102L,"WAREHOUSE_PICKUP"),
+            new BusinessSource("C","ZY3","LB1",105L,"WAREHOUSE_PICKUP")));
+        var initial=f.service.get(f.actor,"PC1");
+        assertThat(initial.items()).hasSize(3);
+        assertThat(initial.items().get(0).packages()).isEqualTo(4);
+        var saved=f.save(101,Phase.PICKUP,1);
+        assertThat(saved.items().get(0).pickupPhotos()).hasSize(1);
+        assertThat(saved.items().get(2).pickupPhotos()).isEmpty();
+        assertThat(f.facts.current(f.row)).extracting(Evidence::itemId).containsExactlyInAnyOrder("101","104");
+        f.replace(104,Phase.PICKUP,1L,2L);
+        assertThat(f.service.get(f.actor,"PC1").items().get(0).pickupPhotos()).hasSize(2);
+        assertThatThrownBy(()->f.save(105,Phase.PICKUP,1)).hasMessageContaining("不能重复使用");
+    }
     /** 装车后仓内货可先送达，异地货独立取送，不要求仓内货重复上传取货凭证。 */
     @Test void warehouseArrivalDoesNotWaitForRemotePickupOrOwnPickupPhoto() {
         var f=new Fixture(true);f.repository.cargo(1).get(0).setWarehousePalletId(501L);

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

@@ -0,0 +1,53 @@
+package com.baiyue.lastleg.dispatch.service;
+
+import com.baiyue.lastleg.dispatch.entity.DispatchAggregate;
+import com.baiyue.lastleg.dispatch.repository.*;
+import com.baiyue.lastleg.dispatch.port.*;
+import com.baiyue.lastleg.dispatch.port.DispatchPlanningModels.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+import java.time.Instant;
+import java.util.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.*;
+
+/** 散板加货按完整订单分页，来源跨页和客户隔离不能丢失。 */
+class LooseboardCargoServiceTest {
+    /** 同单51托跨来源页仍为一行，另一客户同号订单独立分页。 */
+    @Test void orderPaginationIncludesEveryPalletAndKeepsCustomersSeparate() throws Exception {
+        var cargo=mock(LooseboardCargoRepository.class);var repository=mock(DispatchAggregateRepository.class);
+        var workflow=mock(DispatchAggregateService.class);var json=new ObjectMapper();
+        var service=new LooseboardCargoService(cargo,repository,workflow,new DispatchCommandHasher(json));
+        var root=new DispatchAggregate();root.setTaskType("DELIVERY");root.setStatus("ACTIVE");root.setPublishLooseboardDemand(true);root.setOverseasWarehouseId("9");
+        when(repository.find("PC1")).thenReturn(root);when(cargo.readyPlans("9")).thenReturn(List.of(1L));
+        var sources=new ArrayList<Candidate>();for(int i=1;i<=51;i++)sources.add(candidate(json,i,"A",i==51));
+        sources.add(candidate(json,52,"B",false));
+        when(workflow.candidates(any(),any())).thenAnswer(call->{
+            CandidateQuery query=call.getArgument(1);int offset=(query.page()-1)*50;
+            return new CandidateList(sources.subList(offset,Math.min(offset+50,sources.size())),Instant.now(),false,52,query.page(),50,2);
+        });
+        var actor=new DispatchContracts.Actor("operator",DispatchTypes.ActorMode.PLATFORM,null);
+        var first=service.candidates(actor,"PC1",1,1);
+        assertThat(first.total()).isEqualTo(2);assertThat(first.pages()).isEqualTo(2);
+        assertThat(first.candidates()).singleElement().satisfies(order->{
+            assertThat(order.availablePackages()).isEqualTo(102);
+            assertThat(order.selectionGroup().sources()).hasSize(51);
+            assertThat(order.selectionGroup().pallets()).hasSize(51);
+            assertThat(order.blockReasons()).containsExactly("最后一托被占用");
+        });
+        assertThat(service.candidates(actor,"PC1",2,1).candidates()).singleElement().satisfies(order->{
+            assertThat(order.customerId()).isEqualTo("B");assertThat(order.availablePackages()).isEqualTo(2);
+        });
+    }
+    /** 构造带权威选择版本、物理组成及阻断事实的来源。 */
+    private static Candidate candidate(ObjectMapper json,int id,String customer,boolean blocked) throws Exception {
+        return json.readValue("""
+            {"selection":{"sourceType":"INBOUND_PLAN","planPalletId":%d,"sourceVersion":"v%d"},"sourceKey":"K%d","sourceVersion":"v%d",
+             "customerId":"%s","orderNo":"LB1","warehouseId":"9","availablePackages":2,"appointmentBatches":[],"blockReasons":%s,
+             "selectionGroup":{"groupKey":"G%d","groupVersion":"g%d","complete":true,"blockReasons":[],
+              "sources":[{"sourceKey":"K%d","customerId":"%s","packages":2,"selection":{"sourceType":"INBOUND_PLAN","planPalletId":%d,"sourceVersion":"v%d"}}],
+              "pallets":[{"palletNo":"P%d","sourceKeys":["K%d"],"packageCount":2}]}}
+            """.formatted(id,id,id,id,customer,blocked?"[\"最后一托被占用\"]":"[]",id,id,id,customer,id,id,id,id),Candidate.class);
+    }
+}

lastleg-service/src/test/java/com/baiyue/lastleg/fleet/exception/FleetHandoverPdaQueryTest.java

@@ -13,6 +13,24 @@ import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 class FleetHandoverPdaQueryTest {
+    /** 混排整车109箱，仓内真实发运9箱时按原实载客户及目的地读取交接。 */
+    @Test void mixedDispatchUsesOriginalWarehouseLoadBeforeAndAfterRemotePickup() {
+        var binding=bindings.findByDispatchNo("PC-A");binding.setPackageCount(109);
+        var departed=new FleetTripHistory();departed.setSnapshotJson("""
+            {"trip":{"tripNo":"TR-ONE","warehouseId":"92","vehiclePlate":"ORIGINAL"},
+             "dispatches":[{"dispatchNo":"PC-A","packageCount":109}],
+             "confirmedLoad":{"cargo":[{"dispatchNo":"PC-A","customerId":"CUSTOMER-A","warehousePalletId":"501","destinationKey":"FBA:ONE","packages":9}]}}
+            """);
+        when(history.selectList(any())).thenReturn(List.of(departed));
+        var delivery=new FleetTransitEvidence.Delivery(new FleetHandoverPolicy.Delivery("CUSTOMER-A","PC-A","DL-9","FBA:ONE",9,Instant.now(),List.of()),"DELIVERED",1,new FleetTransitEvidence.Transport("ORIGINAL","原司机",null));
+        for(int shipped:List.of(9,109)){
+            when(dispatches.transitEvidence("PC-A",false)).thenReturn(new FleetTransitEvidence("PC-A","92",shipped,List.of(delivery)));
+            assertEquals(9,service.status(92,"PC-A").deliveries().get(0).packages());
+        }
+        var wrongCustomer=new FleetTransitEvidence.Delivery(new FleetHandoverPolicy.Delivery("OTHER","PC-A","DL-9","FBA:ONE",9,null,List.of()),"DELIVERING",1,delivery.transport());
+        when(dispatches.transitEvidence("PC-A",false)).thenReturn(new FleetTransitEvidence("PC-A","92",109,List.of(wrongCustomer)));
+        assertThrows(org.springframework.web.server.ResponseStatusException.class,()->service.status(92,"PC-A"));
+    }
     final FleetTripDispatchMapper bindings = mock(FleetTripDispatchMapper.class);
     final FleetTripMapper trips = mock(FleetTripMapper.class);
     final FleetTripHistoryMapper history = mock(FleetTripHistoryMapper.class);