From b92e66659e911ee89abfa9bf22ab6c8f880bfb35 Mon Sep 17 00:00:00 2001 From: "vluk@2fi-solutions.com.hk" Date: Mon, 9 Mar 2026 23:59:48 +0800 Subject: [PATCH] no message --- .../modules/master/service/ProductionScheduleService.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt index 3f79375..0975d9b 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt @@ -638,6 +638,10 @@ open class ProductionScheduleService( } open fun getNeedQty(): List { + val fromDate = java.time.LocalDate.now().minusMonths(1) + val toDate = java.time.LocalDate.now() + val args = mapOf("fromDate" to fromDate.toString(), "toDate" to toDate.toString()) + val sql = """ SELECT i.outputQty, @@ -672,8 +676,7 @@ open class ProductionScheduleService( WHERE do.deleted = 0 and dol.itemId = items.id - -- AND MONTH(do.estimatedArrivalDate) = MONTH(DATE_SUB(NOW(), INTERVAL 1 MONTH)) - AND do.estimatedArrivalDate >= '2026-02-07' AND do.estimatedArrivalDate < '2026-03-07' + AND do.estimatedArrivalDate >= :fromDate AND do.estimatedArrivalDate <= :toDate GROUP BY do.estimatedArrivalDate) AS d) AS avgQtyLastMonth, (select sum(reqQty) from job_order where bomId = bom.id and status != 'completed') AS pendingJobQty, @@ -741,7 +744,7 @@ open class ProductionScheduleService( """.trimIndent() - val rows: List> = jdbcDao.queryForList(sql) + val rows: List> = jdbcDao.queryForList(sql, args) return rows.map { row -> NeedQtyRecord().apply {