diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
index 3ebc36c..6a5b4ec 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
@@ -182,10 +182,15 @@ open class JobOrderService(
             }
             .filter { info ->
                 // Filter by jobTypeName if provided
-                request.jobTypeName == null || 
-                request.jobTypeName.isBlank() || 
-                info.jobTypeName?.equals(request.jobTypeName, ignoreCase = true) == true ||
-                info.jobTypeName?.contains(request.jobTypeName, ignoreCase = true) == true
+                val jobTypeNameMatch = request.jobTypeName == null || 
+                    request.jobTypeName.isBlank() || 
+                    info.jobTypeName?.equals(request.jobTypeName, ignoreCase = true) == true ||
+                    info.jobTypeName?.contains(request.jobTypeName, ignoreCase = true) == true
+                
+                
+                val notCompletedPutaway = info.stockInLineStatus != "completed"
+                
+                jobTypeNameMatch && notCompletedPutaway
             }
 
         // 修复：使用 response.totalElements，这是过滤后的总数
diff --git a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
index 2f8f392..0b52880 100644
--- a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
@@ -1132,6 +1132,11 @@ open class ProductProcessService(
                         )
                     }
             )
+        }.filter { response ->
+            // 过滤掉已完成上架的 job order
+            val jobOrder = jobOrderRepository.findById(response.jobOrderId ?: 0L).orElse(null)
+            val stockInLineStatus = jobOrder?.stockInLines?.firstOrNull()?.status
+            stockInLineStatus != "completed"
         }
     }