|
|
|
@@ -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,这是过滤后的总数 |
|
|
|
|