From bac46a0f54a58e9501a7ecf5835d77b4655f9aa4 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 12 Aug 2026 18:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPDA=E7=A8=B3=E5=AE=9A?=
 =?UTF-8?q?=E6=9F=9C=E6=AC=A1=E6=9F=A5=E8=AF=A2=E5=A5=91=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformLoadingPdaController.java         |  4 +-
 .../mapper/LoadingPickTaskMapper.java         | 10 +++++
 .../repository/LoadingPickRepository.java     |  6 +++
 .../firstleg/service/LoadingPickService.java  | 13 ++++++
 .../main/resources/openapi/firstleg-v1.yaml   |  7 +++
 ...tformLoadingPdaControllerContractTest.java |  2 +-
 ...ormSmartLoadingControllerContractTest.java |  9 +++-
 .../LoadingPickStableLookupContractTest.java  | 21 +++++++++
 .../service/LoadingPickServiceTest.java       | 44 +++++++++++++++++++
 9 files changed, 113 insertions(+), 3 deletions(-)
 create mode 100644 firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickStableLookupContractTest.java

diff --git a/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformLoadingPdaController.java b/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformLoadingPdaController.java
index 056b9a958..872bbfdf1 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformLoadingPdaController.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformLoadingPdaController.java
@@ -46,9 +46,11 @@ public class PlatformLoadingPdaController {
     @PreAuthorize("hasAuthority('platform:firstleg:pda:view')")
     public ApiResponse<Task> task(@AuthenticationPrincipal AuthenticatedUser user,
                                   @RequestParam(required = false) String containerNo,
+                                  @RequestParam(required = false) String cabinetNo,
+                                  @RequestParam(required = false) Long loadingPlanId,
                                   @RequestParam @Positive long warehouseId) {
         FirstlegScopeGuard.platform(user);
-        return ApiResponse.success(service.task(containerNo, warehouseId));
+        return ApiResponse.success(service.task(containerNo, cabinetNo, loadingPlanId, warehouseId));
     }
 
     @GetMapping("/tasks/pending")
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java
index 391715a89..d41367757 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java
@@ -31,6 +31,16 @@ public interface LoadingPickTaskMapper extends BaseMapper<LoadingPickTaskEntity>
     LoadingPickTaskEntity selectLoadingByContainerAndAccount(@Param("containerNo") String containerNo,
                                                              @Param("warehouseId") long warehouseId);
 
+    @Select("SELECT task.* FROM fl_loading_pick_task task JOIN fl_loading_plan plan ON plan.id=task.loading_plan_id "
+        + "JOIN fl_container_booking booking ON booking.id=plan.container_booking_id "
+        + "WHERE task.task_status='LOADING' AND booking.cabinet_no=#{cabinetNo} AND booking.warehouse_id=#{warehouseId} LIMIT 1")
+    LoadingPickTaskEntity selectLoadingByCabinet(@Param("cabinetNo") String cabinetNo, @Param("warehouseId") long warehouseId);
+
+    @Select("SELECT task.* FROM fl_loading_pick_task task JOIN fl_loading_plan plan ON plan.id=task.loading_plan_id "
+        + "JOIN fl_container_booking booking ON booking.id=plan.container_booking_id "
+        + "WHERE task.task_status='LOADING' AND task.loading_plan_id=#{loadingPlanId} AND booking.warehouse_id=#{warehouseId} LIMIT 1")
+    LoadingPickTaskEntity selectLoadingByPlan(@Param("loadingPlanId") long loadingPlanId, @Param("warehouseId") long warehouseId);
+
     @Select("""
         <script>
         SELECT task.id AS taskId, task.loading_plan_id AS loadingPlanId,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/repository/LoadingPickRepository.java b/firstleg/src/main/java/com/baiyue/firstleg/repository/LoadingPickRepository.java
index aa9d472ac..9cf569d79 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/repository/LoadingPickRepository.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/repository/LoadingPickRepository.java
@@ -67,6 +67,12 @@ public class LoadingPickRepository {
     public LoadingPickTaskEntity taskByContainer(String containerNo, long warehouseId) {
         return tasks.selectLoadingByContainerAndAccount(containerNo, warehouseId);
     }
+    public LoadingPickTaskEntity taskByCabinet(String cabinetNo, long warehouseId) {
+        return tasks.selectLoadingByCabinet(cabinetNo, warehouseId);
+    }
+    public LoadingPickTaskEntity taskByPlan(long loadingPlanId, long warehouseId) {
+        return tasks.selectLoadingByPlan(loadingPlanId, warehouseId);
+    }
 
     public List<PendingTaskRow> pendingTasks(long operatorId, String keyword) {
         return tasks.selectPendingForOperator(operatorId, keyword);
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java
index 06c021db8..90103a9f3 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java
@@ -125,6 +125,19 @@ public class LoadingPickService {
         return view(task, warehouseId);
     }
 
+    public Task task(String containerNo, String cabinetNo, Long loadingPlanId, long warehouseId) {
+        int selectors = (StringUtils.hasText(containerNo) ? 1 : 0) + (StringUtils.hasText(cabinetNo) ? 1 : 0)
+            + (loadingPlanId != null ? 1 : 0);
+        if (selectors != 1) throw new BizException(ResultCode.BAD_REQUEST,
+            "containerNo、cabinetNo、loadingPlanId必须且只能提供一个");
+        LoadingPickTaskEntity task = StringUtils.hasText(cabinetNo)
+            ? repository.taskByCabinet(cabinetNo.trim(), warehouseId)
+            : loadingPlanId != null ? repository.taskByPlan(loadingPlanId, warehouseId)
+            : repository.taskByContainer(containerNo.trim(), warehouseId);
+        if (task == null) throw new BizException(ResultCode.NOT_FOUND, "未找到装柜中的PDA拣货任务");
+        return view(task, warehouseId);
+    }
+
     public Task task(long taskId, long warehouseId) {
         return view(requiredTask(taskId), warehouseId);
     }
diff --git a/firstleg/src/main/resources/openapi/firstleg-v1.yaml b/firstleg/src/main/resources/openapi/firstleg-v1.yaml
index 5fc646f9a..835a4ff6c 100644
--- a/firstleg/src/main/resources/openapi/firstleg-v1.yaml
+++ b/firstleg/src/main/resources/openapi/firstleg-v1.yaml
@@ -252,6 +252,13 @@ paths:
       responses:
         '200': {description: 成功、草稿不存在或计划已进入预装流程}
         '403': {description: 无智能装柜查询权限}
+  /api/platform/v1/first-leg/smart-loading/candidates:
+    get:
+      summary: Query same-channel smart-loading candidates
+      parameters:
+        - {name: bookingId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: warehouseId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      responses: {'200': {description: Candidates filtered by the server to the booking channel}}
   /api/platform/v1/first-leg/smart-loading/plans/{planId}:
     get:
       summary: 查询智能装柜草稿详情
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformLoadingPdaControllerContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformLoadingPdaControllerContractTest.java
index 95a85c1e7..a173b51db 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformLoadingPdaControllerContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformLoadingPdaControllerContractTest.java
@@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 class PlatformLoadingPdaControllerContractTest {
     @Test
     void exposesAssignmentWorkAndReviewWithDedicatedAuthorities() throws Exception {
-        authority("task", "platform:firstleg:pda:view", AuthenticatedUser.class, String.class, long.class);
+        authority("task", "platform:firstleg:pda:view", AuthenticatedUser.class, String.class, String.class, Long.class, long.class);
         authority("pendingTasks", "platform:firstleg:pda:view", AuthenticatedUser.class, String.class);
         authority("inventorySnapshot", "platform:firstleg:pda:view", AuthenticatedUser.class, long.class, long.class);
         authority("claim", "platform:firstleg:pda:work", AuthenticatedUser.class, long.class, ClaimRequest.class);
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformSmartLoadingControllerContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformSmartLoadingControllerContractTest.java
index 36d5b5f01..8c46f1a37 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformSmartLoadingControllerContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformSmartLoadingControllerContractTest.java
@@ -10,7 +10,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 class PlatformSmartLoadingControllerContractTest {
  @Test void draftQueriesUseListPermission() throws Exception {
   authority("draftByBooking","platform:firstleg:smart-loading:list",AuthenticatedUser.class,long.class);
-  authority("detail","platform:firstleg:smart-loading:list",AuthenticatedUser.class,long.class);
+ authority("detail","platform:firstleg:smart-loading:list",AuthenticatedUser.class,long.class);
+  authority("candidates","platform:firstleg:smart-loading:list",AuthenticatedUser.class,long.class,long.class);
+ }
+ @Test void openApiRequiresBookingAndWarehouseForCandidates() throws Exception {
+  String yaml=java.nio.file.Files.readString(java.nio.file.Path.of("src/main/resources/openapi/firstleg-v1.yaml"));
+  assertThat(yaml).contains("/api/platform/v1/first-leg/smart-loading/candidates:")
+   .contains("name: bookingId, in: query, required: true")
+   .contains("name: warehouseId, in: query, required: true");
  }
  @Test void everyMutationDeclaresDedicatedPermission() throws Exception {
   authority("assign","platform:firstleg:smart-loading:assign",AuthenticatedUser.class,long.class,AssignRequest.class);
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickStableLookupContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickStableLookupContractTest.java
new file mode 100644
index 000000000..a9f9d7c47
--- /dev/null
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickStableLookupContractTest.java
@@ -0,0 +1,21 @@
+package com.baiyue.firstleg.repository;
+
+import com.baiyue.firstleg.mapper.LoadingPickTaskMapper;
+import org.apache.ibatis.annotations.Select;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class LoadingPickStableLookupContractTest {
+    @Test void stableLookupsUseCabinetOrPlanAndNotMutableContainerIdentity() throws Exception {
+        String cabinet = LoadingPickTaskMapper.class.getMethod("selectLoadingByCabinet", String.class, long.class)
+            .getAnnotation(Select.class).value()[0];
+        String plan = LoadingPickTaskMapper.class.getMethod("selectLoadingByPlan", long.class, long.class)
+            .getAnnotation(Select.class).value()[0];
+        String legacy = LoadingPickTaskMapper.class.getMethod("selectLoadingByContainerAndAccount", String.class, long.class)
+            .getAnnotation(Select.class).value()[0];
+        assertThat(cabinet).contains("booking.cabinet_no=#{cabinetNo}").doesNotContain("task.container_no");
+        assertThat(plan).contains("task.loading_plan_id=#{loadingPlanId}").doesNotContain("task.container_no");
+        assertThat(legacy).contains("booking.container_no = #{containerNo}").doesNotContain("task.container_no =");
+    }
+}
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java
index 700d349f6..083e30121 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java
@@ -36,6 +36,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.times;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringJUnitConfig(LoadingPickService.class)
 class LoadingPickServiceTest {
@@ -52,6 +53,49 @@ class LoadingPickServiceTest {
     @Resource
     private LoadingPickService service;
 
+    @Test
+    void stableCabinetAndPlanQueriesReturnSameTaskWithCurrentContainerNumber() {
+        LoadingPickTaskEntity task = task();
+        task.setContainerBookingId(40L); task.setCabinetNo("CAB-001");
+        var booking = new com.baiyue.firstleg.entity.ContainerBookingEntity();
+        booking.setId(40L); booking.setContainerNo("MSCU-NEW");
+        when(repository.taskByCabinet("CAB-001", 101L)).thenReturn(task);
+        when(repository.taskByPlan(10L, 101L)).thenReturn(task);
+        when(smartLoadingRepository.booking(40L)).thenReturn(booking);
+        when(repository.items(20L, 101L)).thenReturn(List.of());
+        when(repository.cartonLabels(20L)).thenReturn(List.of());
+
+        var byCabinet = service.task(null, "CAB-001", null, 101L);
+        var byPlan = service.task(null, null, 10L, 101L);
+
+        assertThat(byCabinet.id()).isEqualTo(20L);
+        assertThat(byPlan.id()).isEqualTo(20L);
+        assertThat(byCabinet.currentContainerNo()).isEqualTo("MSCU-NEW");
+    }
+
+    @Test
+    void rejectsMissingOrConflictingCompatibilitySelectors() {
+        assertThatThrownBy(() -> service.task(null, null, null, 101L))
+            .isInstanceOf(BizException.class).hasMessageContaining("必须且只能提供一个");
+        assertThatThrownBy(() -> service.task("MSCU", "CAB", null, 101L))
+            .isInstanceOf(BizException.class).hasMessageContaining("必须且只能提供一个");
+    }
+
+    @Test
+    void legacyContainerLookupReturnsCurrentTransportDisplayWithoutChangingIdentity() {
+        LoadingPickTaskEntity task = task(); task.setContainerBookingId(40L); task.setCabinetNo("CAB-001");
+        var booking = new com.baiyue.firstleg.entity.ContainerBookingEntity();
+        booking.setId(40L); booking.setContainerNo("MSCU-CURRENT");
+        when(repository.taskByContainer("MSCU-CURRENT", 101L)).thenReturn(task);
+        when(smartLoadingRepository.booking(40L)).thenReturn(booking);
+        when(repository.items(20L, 101L)).thenReturn(List.of());
+        when(repository.cartonLabels(20L)).thenReturn(List.of());
+        var result = service.task("MSCU-CURRENT", null, null, 101L);
+        assertThat(result.id()).isEqualTo(20L);
+        assertThat(result.loadingPlanId()).isEqualTo(10L);
+        assertThat(result.currentContainerNo()).isEqualTo("MSCU-CURRENT");
+    }
+
     @Test
     void keepsPlanLoadingWhenItemsRemain() {
         LoadingPickTaskEntity task = task();