Merge remote-tracking branch 'origin/master'

src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderRepository.kt

@@ -20,4 +20,5 @@ interface DoPickOrderRepository : JpaRepository<DoPickOrder, Long> {
     ): List<DoPickOrder>
     fun findByPickOrderId(pickOrderId: Long): List<DoPickOrder>
 
+    fun findByTicketStatusIn(statuses: List<DoPickOrderStatus>): List<DoPickOrder>
 }

src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt

@@ -40,7 +40,12 @@ class DoPickOrderService(
     private val doPickOrderRepository: DoPickOrderRepository,
     private val doPickOrderRecordRepository: DoPickOrderRecordRepository
 ) {
-    
+    fun findReleasedDoPickOrders(): List<DoPickOrder> {
+        return doPickOrderRepository.findByTicketStatusIn(
+            listOf(DoPickOrderStatus.released, DoPickOrderStatus.pending)
+        )
+    }
+
     fun getNextTicketNumber(datePrefix: String, storeId: String): String {
         println("🔍 DEBUG: Getting next ticket number for date prefix: $datePrefix, store: $storeId")
         try {

src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/DoPickOrderController.kt

@@ -3,6 +3,7 @@ package com.ffii.fpsms.modules.deliveryOrder.web
 import com.ffii.core.response.RecordsRes
 import com.ffii.core.utils.CriteriaArgsBuilder
 import com.ffii.core.utils.PagingUtils
+import com.ffii.fpsms.modules.deliveryOrder.entity.DoPickOrder
 import com.ffii.fpsms.modules.master.web.models.MessageResponse
 import com.ffii.fpsms.modules.pickOrder.entity.PickOrderRepository
 import com.ffii.fpsms.modules.pickOrder.entity.projection.PickOrderInfo
@@ -50,4 +51,9 @@ class DoPickOrderController(
     fun releaseAssignedPickOrderByStore(@RequestBody request: AssignByStoreRequest): MessageResponse {
         return doPickOrderService.releaseAssignedByStore(request)
     }
+
+    @GetMapping("/released")
+    fun getReleasedDoPickOrders(): List<DoPickOrder> {
+        return doPickOrderService.findReleasedDoPickOrders()
+    }
 }