From 988d1bee7c78fe786baccc29c81ac2e3513ec8f8 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Sat, 22 Aug 2026 09:51:01 +0800 Subject: [PATCH] 1 --- .../SmartDispatchControllerTest.java | 16 +++++++++------- .../dispatch/service/DispatchServiceTest.java | 18 ++++++++++++------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/SmartDispatchControllerTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/SmartDispatchControllerTest.java index 8ff9b10d8..aef9e536f 100644 --- a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/SmartDispatchControllerTest.java +++ b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/SmartDispatchControllerTest.java @@ -33,20 +33,21 @@ class SmartDispatchControllerTest { @Test void candidatesResolveCustomerScopeFromSelectedPlans() { when(service.resolveCustomerScopeForPlans(List.of(1L, 2L))).thenReturn("100"); - when(service.candidates("100", List.of(1L, 2L), "LMO-1", "ONT8", "PLAN")).thenReturn(List.of()); + when(service.candidates("100", List.of(1L, 2L), "LMO-1", "ONT8", "PLAN", "draft-1")) + .thenReturn(List.of()); - controller.candidates(platform(), List.of(1L, 2L), "LMO-1", "ONT8", "PLAN"); + controller.candidates(platform(), List.of(1L, 2L), "LMO-1", "ONT8", "PLAN", "draft-1"); - verify(service).candidates("100", List.of(1L, 2L), "LMO-1", "ONT8", "PLAN"); + verify(service).candidates("100", List.of(1L, 2L), "LMO-1", "ONT8", "PLAN", "draft-1"); } @Test void candidatesWithoutSelectedPlansUsePlatformScope() { - when(service.platformCandidates(null, null, "RECEIVED")).thenReturn(List.of()); + when(service.platformCandidates(null, null, "RECEIVED", "draft-2")).thenReturn(List.of()); - controller.candidates(platform(), null, null, null, "RECEIVED"); + controller.candidates(platform(), null, null, null, "RECEIVED", "draft-2"); - verify(service).platformCandidates(null, null, "RECEIVED"); + verify(service).platformCandidates(null, null, "RECEIVED", "draft-2"); } @Test @@ -63,7 +64,8 @@ class SmartDispatchControllerTest { @Test void endpointsUseInboundOrderListAndDedicatedSmartDispatchAuthorities() throws Exception { PreAuthorize candidates = SmartDispatchController.class - .getMethod("candidates", AuthenticatedUser.class, List.class, String.class, String.class, String.class) + .getMethod("candidates", AuthenticatedUser.class, List.class, String.class, String.class, String.class, + String.class) .getAnnotation(PreAuthorize.class); PreAuthorize preArrange = SmartDispatchController.class .getMethod("preArrange", AuthenticatedUser.class, DispatchRequests.PreArrange.class) diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java index 5d1c53af2..95e14f0e3 100644 --- a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java +++ b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java @@ -7,6 +7,8 @@ import com.baiyue.lastleg.dispatch.entity.DispatchItem; import com.baiyue.lastleg.dispatch.entity.DispatchOrder; import com.baiyue.lastleg.dispatch.entity.DispatchPalletLock; import com.baiyue.lastleg.dispatch.mapper.DispatchCandidateMapper; +import com.baiyue.lastleg.dispatch.mapper.DispatchDraftContainerMapper; +import com.baiyue.lastleg.dispatch.mapper.DispatchDraftMapper; import com.baiyue.lastleg.dispatch.mapper.DispatchItemMapper; import com.baiyue.lastleg.dispatch.mapper.DispatchOrderMapper; import com.baiyue.lastleg.dispatch.mapper.DispatchPalletLockMapper; @@ -41,6 +43,8 @@ class DispatchServiceTest { @Mock DispatchItemMapper items; @Mock DispatchPalletLockMapper locks; @Mock DispatchCandidateMapper candidates; + @Mock DispatchDraftMapper drafts; + @Mock DispatchDraftContainerMapper draftContainers; private DispatchService service; @BeforeEach @@ -50,6 +54,8 @@ class DispatchServiceTest { ReflectionTestUtils.setField(service, "items", items); ReflectionTestUtils.setField(service, "locks", locks); ReflectionTestUtils.setField(service, "candidates", candidates); + ReflectionTestUtils.setField(service, "drafts", drafts); + ReflectionTestUtils.setField(service, "draftContainers", draftContainers); lenient().when(items.findByDispatchOrder(any(), any())).thenReturn(List.of()); } @@ -154,16 +160,16 @@ class DispatchServiceTest { void invalidCandidateStageIsRejected() { assertThrows(ResponseStatusException.class, () -> service.candidates("100", List.of(1L), null, null, "INVALID")); - verify(candidates, never()).available(any(), any(), any(), any(), any()); + verify(candidates, never()).available(any(), any(), any(), any(), any(), any()); } @Test void platformCandidatesQueryAcrossCustomersWithoutPlanScope() { - when(candidates.available(null, null, null, null, "RECEIVED")).thenReturn(List.of()); + when(candidates.available(null, null, null, null, "RECEIVED", "draft-1")).thenReturn(List.of()); - service.platformCandidates(null, null, "RECEIVED"); + service.platformCandidates(null, null, "RECEIVED", "draft-1"); - verify(candidates).available(null, null, null, null, "RECEIVED"); + verify(candidates).available(null, null, null, null, "RECEIVED", "draft-1"); } @Test @@ -187,8 +193,8 @@ class DispatchServiceTest { @Test void emptyCustomerScopeProducesEmptyCandidatesAndRejectsPreArrange() { - assertEquals(List.of(), service.candidates(null, null, null, null, null)); - verify(candidates, never()).available(any(), any(), any(), any(), any()); + assertEquals(List.of(), service.candidates(null, null, null, null, null, "draft-1")); + verify(candidates, never()).available(any(), any(), any(), any(), any(), any()); ResponseStatusException exception = assertThrows(ResponseStatusException.class, () -> service.preArrange(null, "7",