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 aaa3612..e3e255e 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
@@ -112,10 +112,10 @@ fun searchDoLite(
 fun searchDoLitePage(
     @Param("code") code: String?,
     @Param("shopName") shopName: String?,
-    @Param("status") status: DeliveryOrderStatus?,      // 直接用枚举最稳
+    @Param("status") status: DeliveryOrderStatus?,
     @Param("etaStart") etaStart: LocalDateTime?,
     @Param("etaEnd") etaEnd: LocalDateTime?,
     pageable: Pageable
-): Page<DeliveryOrderInfo>
+): Page<DeliveryOrderInfoLite> 
     
 }
diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/SuggestedPickLotService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/SuggestedPickLotService.kt
index b2b4ebe..276a6fb 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/service/SuggestedPickLotService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/service/SuggestedPickLotService.kt
@@ -318,7 +318,9 @@ open class SuggestedPickLotService(
                 if (doPreferredFloor != null && warehouseStoreId != doPreferredFloor) {
                     return@forEachIndexed
                 }
-    
+                if (doPreferredFloor != null && warehouseStoreId != "1F" && warehouseStoreId != doPreferredFloor) {
+                    return@forEachIndexed
+                }
                 val availableQtyInBaseUnits = calculateRemainingQtyForInfo(lotLine)
                 val holdQtyInBaseUnits = holdQtyMap[lotLine.id] ?: zero
                 val availableQtyInSalesUnits = availableQtyInBaseUnits