优化

firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java

@@ -59,7 +59,11 @@ public interface LoadingPickTaskMapper extends BaseMapper<LoadingPickTaskEntity>
                booking.source_type AS sourceType, booking.record_status AS recordStatus,
                booking.merged_into_container_booking_id AS mergedIntoContainerBookingId,
                booking.warehouse_name AS warehouseName, task.task_status AS taskStatus,
-               CASE WHEN assignment.pick_task_id IS NULL THEN 'UNASSIGNED' ELSE 'IN_PROGRESS' END AS workflowStatus,
+               CASE WHEN task.task_status = 'COMPLETED' THEN 'COMPLETED'
+                    WHEN assignment.pick_task_id IS NULL THEN 'UNASSIGNED'
+                    WHEN SUM(CASE WHEN pick_item.item_status IN ('PENDING', 'PICKING') THEN 1 ELSE 0 END) = 0
+                      THEN 'AWAITING_REVIEW'
+                    ELSE 'IN_PROGRESS' END AS workflowStatus,
                task.version AS version, COALESCE(assignment.version, 0) AS assignmentVersion,
                COUNT(pick_item.id) AS itemCount,
                SUM(CASE WHEN pick_item.item_status IN ('PENDING', 'PICKING') THEN 1 ELSE 0 END) AS pendingItemCount

firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml

@@ -21,7 +21,7 @@ paths:
         - {name: keyword, in: query, required: false, schema: {type: string, maxLength: 64}}
       responses:
         '200':
-          description: Unassigned tasks and tasks assigned to the current operator; no customer selector required
+          description: Unassigned tasks and tasks assigned to the current operator, including AWAITING_REVIEW tasks with zero unresolved items so PDA can enter evidence and final completion; no customer selector required
           content:
             application/json:
               schema:
@@ -182,7 +182,7 @@ components:
         warehouseId: {type: integer, format: int64}
         warehouseName: {type: string, nullable: true}
         taskStatus: {type: string, enum: [LOADING]}
-        workflowStatus: {type: string, enum: [UNASSIGNED, IN_PROGRESS]}
+        workflowStatus: {type: string, enum: [UNASSIGNED, IN_PROGRESS, AWAITING_REVIEW], description: Server projection aligned with task detail; assigned LOADING tasks with pendingItemCount=0 remain visible as AWAITING_REVIEW}
         version: {type: integer, minimum: 0}
         assignmentVersion: {type: integer, minimum: 0}
         itemCount: {type: integer, minimum: 1}

firstleg/src/test/java/com/baiyue/firstleg/controller/PdaConvergenceOpenApiContractTest.java

@@ -39,6 +39,7 @@ class PdaConvergenceOpenApiContractTest {
             .contains("sourceType", "recordStatus", "mergedIntoContainerBookingId")
             .contains("Task detail is served only from the ACTIVE container booking")
             .contains("Enforced by the server-side pending-task query")
+            .contains("assigned LOADING tasks with pendingItemCount=0 remain visible as AWAITING_REVIEW")
             .contains("CompleteLoadingRequest");
 
         String taskLookup = yaml.substring(

firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickPdaTaskSqlContractTest.java

@@ -32,6 +32,11 @@ class LoadingPickPdaTaskSqlContractTest {
             .contains("booking.source_type AS sourceType")
             .contains("booking.record_status AS recordStatus")
             .contains("booking.merged_into_container_booking_id AS mergedIntoContainerBookingId")
+            .contains("WHEN task.task_status = 'COMPLETED' THEN 'COMPLETED'")
+            .contains("WHEN assignment.pick_task_id IS NULL THEN 'UNASSIGNED'")
+            .contains("pick_item.item_status IN ('PENDING', 'PICKING')")
+            .contains("THEN 'AWAITING_REVIEW'")
+            .contains("ELSE 'IN_PROGRESS' END AS workflowStatus")
             .contains("assignment.pick_task_id IS NULL OR assignment.assignee_id = #{operatorId}")
             .contains("booking.warehouse_id AS warehouseId")
             .doesNotContain("tenantId");

firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java

@@ -264,11 +264,11 @@ class LoadingPickServiceTest {
         row.setMergedIntoContainerBookingId(null);
         row.setWarehouseId(101L);
         row.setTaskStatus("LOADING");
-        row.setWorkflowStatus("UNASSIGNED");
+        row.setWorkflowStatus("AWAITING_REVIEW");
         row.setVersion(0);
         row.setAssignmentVersion(0);
         row.setItemCount(1);
-        row.setPendingItemCount(1);
+        row.setPendingItemCount(0);
         when(repository.pendingTasks(9L, null)).thenReturn(List.of(row));
 
         var result = service.pendingTasks(9L, null).get(0);
@@ -276,6 +276,8 @@ class LoadingPickServiceTest {
         assertThat(result.sourceType()).isEqualTo("SIMULATION");
         assertThat(result.recordStatus()).isEqualTo("ACTIVE");
         assertThat(result.mergedIntoContainerBookingId()).isNull();
+        assertThat(result.workflowStatus()).isEqualTo("AWAITING_REVIEW");
+        assertThat(result.pendingItemCount()).isZero();
     }
 
     @Test