Browse Source

update finish put away don't show in job order list

master
CANCERYS\kw093 1 day ago
parent
commit
1edebd3f00
2 changed files with 14 additions and 4 deletions
  1. +9
    -4
      src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
  2. +5
    -0
      src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt

+ 9
- 4
src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt View File

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


+ 5
- 0
src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt View File

@@ -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"
}
}



Loading…
Cancel
Save