From 789666aad82eb930e0e5f49cecfdf329ed2859ad Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Tue, 23 Jun 2026 18:25:19 +0800
Subject: [PATCH] do pdf fix do detail fix

---
 .../deliveryOrder/entity/models/DeliveryOrderLineInfo.kt  | 2 ++
 .../modules/deliveryOrder/service/DeliveryOrderService.kt | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/models/DeliveryOrderLineInfo.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/models/DeliveryOrderLineInfo.kt
index 702f9d9..1fd8a3e 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/models/DeliveryOrderLineInfo.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/models/DeliveryOrderLineInfo.kt
@@ -17,4 +17,6 @@ interface DeliveryOrderLineInfo {
 
     @get:Value("#{target.item?.id}")
     val itemId: Long?
+    @get:Value("#{target.deleted}")
+    val deleted: Boolean?
 }
\ No newline at end of file
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 d695fb0..cee583c 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
@@ -603,11 +603,11 @@ open class DeliveryOrderService(
                 null
             }
 
-            val itemIds = deliveryOrder.deliveryOrderLines.mapNotNull { it.item?.id }.distinct()
+            val itemIds = deliveryOrder.deliveryOrderLines.filter { it.deleted != true }.mapNotNull { it.item?.id }.distinct()
             val stockQtyByItemId = itemIds.associateWith { itemId ->
                 computeAvailableStockQtyForItem(itemId)
             }
-            val fallbackQtyByItemId = deliveryOrder.deliveryOrderLines.mapNotNull { line ->
+            val fallbackQtyByItemId = deliveryOrder.deliveryOrderLines.filter { it.deleted != true }.mapNotNull { line ->
                 val itemId = line.item?.id ?: return@mapNotNull null
                 itemId to (line.qty ?: BigDecimal.ZERO)
             }.toMap()
@@ -632,7 +632,7 @@ open class DeliveryOrderService(
                 isExtra = deliveryOrder.isExtra,
                 handlerName = handlerName,
                 truckLaneCode = truckLaneCode,
-                deliveryOrderLines = deliveryOrder.deliveryOrderLines.map { line ->
+                deliveryOrderLines = deliveryOrder.deliveryOrderLines.filter { it.deleted != true }.map { line ->
                     val itemId = line.item?.id
                     val stockQty = itemId?.let { stockQtyByItemId[it] } ?: BigDecimal.ZERO
                     val requiredQty = line.qty ?: BigDecimal.ZERO
@@ -1554,7 +1554,7 @@ open class DeliveryOrderService(
 
     fun deliveryNoteExportLines(deliveryNoteInfo: List<DeliveryOrderInfo>): List<DeliveryNoteExportLine> =
         deliveryNoteInfo.flatMap { info ->
-            info.deliveryOrderLines.map { line -> DeliveryNoteExportLine(info.id, line) }
+            info.deliveryOrderLines.filter { it.deleted != true }.map { line -> DeliveryNoteExportLine(info.id, line) }
         }
 
     fun resolvePickOrderLineIdForDeliveryNoteLine(