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 25a3873..d750d61 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
@@ -593,7 +593,7 @@ open class ProductionScheduleService(
         );
 
         if (args.containsKey("selectedDate")) {
-            sql.append(" AND DATE(ps.scheduleAt) LIKE DATE(:selectedDate) ");
+            sql.append(" AND DATE(ps.scheduleAt) LIKE DATE(:selectedDate) AND ps.id = (select max(ps1.id) from production_schedule ps1 where DATE(ps1.scheduleAt) LIKE DATE(:selectedDate))");
         }
         if (args.containsKey("name")) {
             sql.append(" AND i.name LIKE :name ");