From 7d42d8cf2e7c056b1ea92dd1ace490c6483004b1 Mon Sep 17 00:00:00 2001 From: "Tommy\\2Fi-Staff" Date: Tue, 10 Feb 2026 15:46:00 +0800 Subject: [PATCH] report update --- .../ffii/fpsms/modules/report/service/ReportService.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt index da15f76..0fc1793 100644 --- a/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt +++ b/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt @@ -693,7 +693,13 @@ fun searchMaterialStockOutTraceabilityReport( ): List> { val args = mutableMapOf() - val stockCategorySql = buildMultiValueExactClause(stockCategory, "it.type", "stockCategory", args) + + // If "All" is selected or contains "All", don't filter by stock category + val stockCategorySql = if (!stockCategory.isNullOrBlank() && stockCategory != "All" && !stockCategory.contains("All")) { + buildMultiValueExactClause(stockCategory, "it.type", "stockCategory", args) + } else { + "" + } val itemCodeSql = buildMultiValueLikeClause(itemCode, "it.code", "itemCode", args) val lastInDateStartSql = if (!lastInDateStart.isNullOrBlank()) {