From 471c1bec57196b7d56e011c2cc4985b51d7bb9b0 Mon Sep 17 00:00:00 2001 From: "vluk@2fi-solutions.com.hk" Date: Wed, 10 Dec 2025 23:30:59 +0800 Subject: [PATCH] try to use dDate to try syn the DO in server --- .../fpsms/m18/service/M18DeliveryOrderService.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt b/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt index fad9c3f..4532091 100644 --- a/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt +++ b/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt @@ -21,7 +21,9 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.stereotype.Service import java.time.LocalDateTime +import java.time.format.DateTimeFormatter import kotlin.reflect.full.memberProperties +import kotlin.text.substring @Service open class M18DeliveryOrderService( @@ -54,8 +56,16 @@ open class M18DeliveryOrderService( // Include shop po open fun getDeliveryOrdersWithType(request: M18CommonRequest): M18PurchaseOrderListResponseWithType? { val deliveryOrders = M18PurchaseOrderListResponseWithType(mutableListOf()) + val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss") + val dateFrom = request.modifiedDateFrom?.let { + LocalDateTime.parse(it, formatter).toLocalDate().toString() + } + val dateTo = request.modifiedDateTo?.let { + LocalDateTime.parse(it, formatter).toLocalDate().toString() + } val lastModifyDateConds = - "lastModifyDate=largerOrEqual=${request.modifiedDateFrom ?: lastModifyDateStart}=and=lastModifyDate=lessOrEqual=${request.modifiedDateTo ?: lastModifyDateEnd}" + //"lastModifyDate=largerOrEqual=${request.modifiedDateFrom ?: lastModifyDateStart}=and=lastModifyDate=lessOrEqual=${request.modifiedDateTo ?: lastModifyDateEnd}" + "dDate=largerOrEqual=${dateFrom ?: lastModifyDateStart}=and=dDate=lessOrEqual=${dateTo ?: lastModifyDateEnd}" // Shop PO val shopPoBuyers = commonUtils.listToString(listOf(m18Config.BEID_TOA), "beId=equal=", "=or=")