From 44646254f69649fb6c2d1ef137d9e3e706d214ef Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Tue, 16 Jun 2026 21:08:05 +0800
Subject: [PATCH] do skip isfee item

---
 .../service/DeliveryOrderService.kt           | 46 ++++++++-----------
 1 file changed, 19 insertions(+), 27 deletions(-)

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 65fe0ee..9d01c52 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
@@ -143,6 +143,22 @@ open class DeliveryOrderService(
         suppliers2F: List<String>,
         suppliers4F: List<String>,
     ): String = doFloorSupplierSettingsService.preferredStoreFloorForSupplier(supplierCode, suppliers2F, suppliers4F)
+
+    private fun mapDeliveryOrderLinesForPickOrderRelease(
+        deliveryOrder: DeliveryOrder,
+    ): List<SavePickOrderLineRequest> {
+        return deliveryOrder.deliveryOrderLines
+            .filter { it.deleted != true }
+            .filter { it.item?.isFee != true }
+            .map {
+                SavePickOrderLineRequest(
+                    itemId = it.item?.id,
+                    qty = it.qty ?: BigDecimal.ZERO,
+                    uomId = it.uom?.id,
+                )
+            }
+    }
+
     open fun searchDoLiteByPage(
     code: String?,
     shopName: String?,
@@ -979,15 +995,7 @@ open class DeliveryOrderService(
         }
         deliveryOrderRepository.save(deliveryOrder)
 
-        val pols = deliveryOrder.deliveryOrderLines
-            .filter { it.deleted != true }   // 只跳过 deleted=true（deleted 为空时也当作未删）
-            .map {
-                SavePickOrderLineRequest(
-                    itemId = it.item?.id,
-                    qty = it.qty ?: BigDecimal.ZERO,
-                    uomId = it.uom?.id,
-                )
-            }
+        val pols = mapDeliveryOrderLinesForPickOrderRelease(deliveryOrder)
         val po = SavePickOrderRequest(
             doId = deliveryOrder.id,
             type = PickOrderType.DELIVERY_ORDER,
@@ -2112,15 +2120,7 @@ open class DeliveryOrderService(
         deliveryOrderRepository.save(deliveryOrder)
 
         // 创建 pick order
-        val pols = deliveryOrder.deliveryOrderLines
-        .filter { it.deleted != true }   // 只跳过 deleted=true（deleted 为空时也当作未删）
-        .map {
-            SavePickOrderLineRequest(
-                itemId = it.item?.id,
-                qty = it.qty ?: BigDecimal.ZERO,
-                uomId = it.uom?.id,
-            )
-        }
+        val pols = mapDeliveryOrderLinesForPickOrderRelease(deliveryOrder)
         val po = SavePickOrderRequest(
             doId = deliveryOrder.id,
             type = PickOrderType.DELIVERY_ORDER,
@@ -2343,15 +2343,7 @@ val inventoryLotLine = illId?.let { inventoryLotLineMap[it] }
         deliveryOrderRepository.save(deliveryOrder)
 
         // Create pick order (same as normal release)
-        val pols = deliveryOrder.deliveryOrderLines
-            .filter { it.deleted != true }
-            .map {
-                SavePickOrderLineRequest(
-                    itemId = it.item?.id,
-                    qty = it.qty ?: BigDecimal.ZERO,
-                    uomId = it.uom?.id,
-                )
-            }
+        val pols = mapDeliveryOrderLinesForPickOrderRelease(deliveryOrder)
         val po = SavePickOrderRequest(
             doId = deliveryOrder.id,
             type = PickOrderType.DELIVERY_ORDER,