优化

2026-08-17 16:17:20 +08:00
parent 75580c3585
commit 592da4d7e2
9 changed files with 97 additions and 8 deletions
@@ -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