update

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

@@ -76,5 +76,5 @@ interface DeliveryOrderRepository : AbstractRepository<DeliveryOrder, Long> {
     //SEARCH WITHOUT DATE
     fun findAllByCodeContainsAndShopNameContainsAndStatusAndDeletedIsFalse(code: String?, shopName: String?, staus: DeliveryOrderStatus?) : List<DeliveryOrderInfo>;
 
-
+    fun findDeliveryOrderInfoByCodeContainsAndShopNameContainsAndDeletedIsFalseOrderByIdDesc(code: String, shopName: String, pageable: Pageable): Page<DeliveryOrderInfo>
 }

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

@@ -30,4 +30,3 @@ interface DeliveryOrderInfo{
 
 
 }
-

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

@@ -48,7 +48,9 @@ import com.ffii.fpsms.modules.deliveryOrder.entity.DoPickOrderLineRecord
 import org.springframework.context.annotation.Lazy
 import com.ffii.fpsms.modules.pickOrder.entity.PickOrderLineRepository
 import com.ffii.fpsms.modules.deliveryOrder.web.models.TicketReleaseTableResponse
-
+import com.ffii.fpsms.modules.deliveryOrder.web.models.SearchDeliveryOrderInfoRequest
+import com.ffii.core.response.RecordsRes
+import org.springframework.data.domain.PageRequest
 @Service
 open class DoPickOrderService(
     private val doPickOrderRepository: DoPickOrderRepository,
@@ -67,7 +69,27 @@ open class DoPickOrderService(
             listOf(DoPickOrderStatus.released, DoPickOrderStatus.pending)
         )
     }
-
+    open fun allDeliveryOrdersByPage(request: SearchDeliveryOrderInfoRequest): RecordsRes<DeliveryOrderInfo> {
+        val pageable = PageRequest.of(request.pageNum ?: 0, request.pageSize ?: 10);
+        println("allDeliveryOrdersByPage")
+        println(request)
+        val response = deliveryOrderRepository.findDeliveryOrderInfoByCodeContainsAndShopNameContainsAndDeletedIsFalseOrderByIdDesc(
+            code = request.code ?: "",
+            shopName = request.shopName ?: "",
+            pageable = pageable
+        )   
+        val estArrStartDate = request.estArrStartDate
+        val estArrEndDate = request.estArrEndDate
+        val status = request.status
+        val records = response.content
+            .filter {
+                (estArrStartDate == null || (it.estimatedArrivalDate != null && (estArrStartDate.isEqual(it.estimatedArrivalDate) || estArrStartDate.isBefore(it.estimatedArrivalDate)))) &&
+                (estArrEndDate == null || (it.estimatedArrivalDate != null && (estArrEndDate.isEqual(it.estimatedArrivalDate) || estArrEndDate.isAfter(it.estimatedArrivalDate)))) &&
+                (status == null || it.status == status)
+            }
+        val total = response.totalElements
+        return RecordsRes<DeliveryOrderInfo>(records, total.toInt());
+    }
     open 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/DeliveryOrderController.kt

@@ -33,11 +33,14 @@ import java.io.OutputStream
 import java.io.UnsupportedEncodingException
 import java.text.ParseException
 import java.time.LocalDateTime
-
+import com.ffii.fpsms.modules.deliveryOrder.web.models.SearchDeliveryOrderInfoRequest
+import com.ffii.fpsms.modules.deliveryOrder.service.DoPickOrderService
+import com.ffii.core.response.RecordsRes
 @RequestMapping("/do")
 @RestController
 class DeliveryOrderController(
     private val deliveryOrderService: DeliveryOrderService,
+    private val doPickOrderService: DoPickOrderService
 ) {
     @GetMapping("/list")
     fun getDoList(): List<DeliveryOrderInfo> {
@@ -71,7 +74,10 @@ class DeliveryOrderController(
     ): List<DeliveryOrderInfo> {
         return deliveryOrderService.searchBetweenOrderDate(start, end);
     }
-
+    @PostMapping("/getRecordByPage")
+    fun searchDO(@RequestBody request: SearchDeliveryOrderInfoRequest): RecordsRes<DeliveryOrderInfo> {  // 修改返回类型从 List<DeliveryOrderInfo> 改为 RecordsRes<DeliveryOrderInfo>
+        return doPickOrderService.allDeliveryOrdersByPage(request);
+    }
     @GetMapping("/search-DO/{code}&{shopName}&{status}&{orderStartDate}&{orderEndDate}&{estArrStartDate}&{estArrEndDate}")
     fun searchDO(
         @PathVariable code: String?,

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

@@ -1,7 +1,7 @@
 package com.ffii.fpsms.modules.deliveryOrder.web.models
 import java.time.LocalDate  
 import java.time.LocalTime
-
+import java.time.LocalDateTime
 data class ReleaseDoRequest(
     val id: Long,
     val userId: Long
@@ -20,4 +20,15 @@ data class ReleaseDoResult(
     val truckDepartureTime: LocalTime?,
     val truckLanceCode: String?,
     val loadingSequence: Int?
-)
+)
+data class SearchDeliveryOrderInfoRequest(
+    val code: String?,
+    val shopName: String?,
+    val status: String?,
+    val orderStartDate: LocalDateTime?,
+    val orderEndDate: LocalDateTime?,
+    val estArrStartDate: LocalDateTime?,
+    val estArrEndDate: LocalDateTime?,
+    val pageSize: Int?,
+    val pageNum: Int?,
+)