From 6b22797788db094d53320600c55e056d0eaaeeee Mon Sep 17 00:00:00 2001
From: "PC-20260115JRSN\\Administrator" <vinluk95@gmail.com>
Date: Sat, 24 Jan 2026 22:57:15 +0800
Subject: [PATCH] need to find the deleted do to syn, not creating a new one

---
 .../java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt  | 2 +-
 .../modules/deliveryOrder/entity/DeliveryOrderRepository.kt     | 2 ++
 .../fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

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 0ab7a8a..34e96cc 100644
--- a/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt
@@ -234,7 +234,7 @@ open class M18DeliveryOrderService(
                                     m18DataLogId = saveM18DeliveryOrderLog.id,
                                     handlerId = null,
                                     m18BeId = mainpo.beId,
-                                    deleted = (mainpo.udfIsVoid == "true") ?: false
+                                    deleted = mainpo.udfIsVoid == "true"
                                 )
 
                                 val saveDeliveryOrderResponse =
diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderRepository.kt
index e3e255e..8cdd395 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderRepository.kt
@@ -39,6 +39,8 @@ interface DeliveryOrderRepository : AbstractRepository<DeliveryOrder, Long> {
 
     fun findTopByM18DataLogIdAndDeletedIsFalseOrderByModifiedDesc(m18datalogId: Serializable): DeliveryOrder?
 
+    fun findTopByM18DataLogIdOrderByModifiedDesc(m18datalogId: Serializable): DeliveryOrder?
+
     fun findDeliveryOrderInfoByDeletedIsFalse(): List<DeliveryOrderInfo>
 
     fun findByIdAndDeletedIsFalse(id: Serializable): DeliveryOrder?
diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt
index 70bf171..dad91f9 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt
@@ -158,7 +158,7 @@ open class DeliveryOrderService(
 
 
     open fun findByM18DataLogId(m18DataLogId: Long): DeliveryOrder? {
-        return deliveryOrderRepository.findTopByM18DataLogIdAndDeletedIsFalseOrderByModifiedDesc(m18DataLogId)
+        return deliveryOrderRepository.findTopByM18DataLogIdOrderByModifiedDesc(m18DataLogId)
     }
 
     open fun getDoList(): List<DeliveryOrderInfo> {