diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt
index cea2874..7eb572d 100644
--- a/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt
@@ -5,6 +5,7 @@ import com.ffii.fpsms.modules.pickOrder.entity.projection.PickOrderInfo
 import com.ffii.fpsms.modules.pickOrder.enums.PickOrderStatus
 import com.ffii.fpsms.modules.pickOrder.enums.PickOrderType
 import com.ffii.fpsms.modules.pickOrder.web.models.SearchPickOrderRequest
+import com.ffii.fpsms.modules.jobOrder.enums.JobOrderStatus
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.Query
@@ -196,4 +197,23 @@ fun findByJobOrderPlanStartOnDayAndOptionalStatus(
     @Param("toExclusive") toExclusive: LocalDateTime,
     @Param("status") status: PickOrderStatus?,
 ): List<PickOrder>
+
+@Query(
+    """
+    SELECT DISTINCT po
+    FROM PickOrder po
+    JOIN FETCH po.jobOrder jo
+    LEFT JOIN FETCH jo.bom bom
+    LEFT JOIN FETCH bom.item item
+    WHERE po.status = :status
+      AND po.deleted = false
+      AND po.jobOrder IS NOT NULL
+      AND (jo.isHidden = false OR jo.isHidden IS NULL)
+      AND jo.status <> :completedStatus
+    """
+)
+fun findAllReleasedJoWorkbenchPickOrders(
+    @Param("status") status: PickOrderStatus,
+    @Param("completedStatus") completedStatus: JobOrderStatus,
+): List<PickOrder>
 }
\ No newline at end of file