diff --git a/src/main/java/com/ffii/fpsms/modules/report/web/StockTakeVarianceReportController.kt b/src/main/java/com/ffii/fpsms/modules/report/web/StockTakeVarianceReportController.kt index f499f9d..1a694ab 100644 --- a/src/main/java/com/ffii/fpsms/modules/report/web/StockTakeVarianceReportController.kt +++ b/src/main/java/com/ffii/fpsms/modules/report/web/StockTakeVarianceReportController.kt @@ -35,8 +35,8 @@ class StockTakeVarianceReportController( @RequestParam(required = false) stockCategory: String?, @RequestParam(required = false) itemCode: String?, @RequestParam(required = false) storeLocation: String?, - @RequestParam(name = "startDateStart", required = false) lastInDateStart: String?, - @RequestParam(name = "startDateEnd", required = false) lastInDateEnd: String?, + @RequestParam(required = false) lastInDateStart: String?, + @RequestParam(required = false) lastInDateEnd: String?, ): ResponseEntity { val parameters = mutableMapOf() @@ -56,6 +56,8 @@ class StockTakeVarianceReportController( parameters["lastOutDateStart"] = "" parameters["lastOutDateEnd"] = "" + + val dbData = stockTakeVarianceReportService.searchStockTakeVarianceReport( stockCategory = stockCategory, itemCode = itemCode, @@ -63,6 +65,13 @@ class StockTakeVarianceReportController( lastInDateStart = lastInDateStart, lastInDateEnd = lastInDateEnd, ) + val stockTakeDateDisplay = dbData + .mapNotNull { it["stockTakeDate"] as? String } + .filter { it.isNotBlank() } + .maxOrNull() + ?: "" + + parameters["stockTakeDate"] = stockTakeDateDisplay val pdfBytes = reportService.createPdfResponse( "/jasper/StockTakeVarianceReport.jrxml", diff --git a/src/main/resources/jasper/StockTakeVarianceReport.jrxml b/src/main/resources/jasper/StockTakeVarianceReport.jrxml index 053bd37..8ad9452 100644 --- a/src/main/resources/jasper/StockTakeVarianceReport.jrxml +++ b/src/main/resources/jasper/StockTakeVarianceReport.jrxml @@ -13,6 +13,7 @@ + @@ -57,13 +58,14 @@ + - + @@ -156,14 +158,14 @@ - + - + @@ -191,7 +193,7 @@ - +