diff --git a/internal/modules/production/recordings/controllers/recording.controller.go b/internal/modules/production/recordings/controllers/recording.controller.go
index 7edb7b9a..51e3100d 100644
--- a/internal/modules/production/recordings/controllers/recording.controller.go
+++ b/internal/modules/production/recordings/controllers/recording.controller.go
@@ -3,6 +3,8 @@ package controller
 import (
 	"math"
 	"strconv"
+	"strings"
+	"time"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/services"
@@ -82,7 +84,16 @@ func (u *RecordingController) GetNextDay(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id is required")
 	}
 
-	nextDay, err := u.RecordingService.GetNextDay(c, uint(projectFlockID))
+	recordTime := time.Now().UTC()
+	if recordDate := strings.TrimSpace(c.Query("record_date")); recordDate != "" {
+		parsed, err := time.Parse("2006-01-02", recordDate)
+		if err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, "record_date must be in YYYY-MM-DD format")
+		}
+		recordTime = parsed.UTC()
+	}
+
+	nextDay, err := u.RecordingService.GetNextDay(c, uint(projectFlockID), recordTime)
 	if err != nil {
 		return err
 	}
diff --git a/internal/modules/production/recordings/services/recording.service.go b/internal/modules/production/recordings/services/recording.service.go
index b408995f..d490185d 100644
--- a/internal/modules/production/recordings/services/recording.service.go
+++ b/internal/modules/production/recordings/services/recording.service.go
@@ -13,8 +13,8 @@ import (
 	sProductionStandard "gitlab.com/mbugroup/lti-api.git/internal/modules/master/production-standards/services"
 	rProjectFlock "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
-	rStockLogs "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/validations"
+	rStockLogs "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
@@ -32,7 +32,7 @@ import (
 type RecordingService interface {
 	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.Recording, int64, error)
 	GetOne(ctx *fiber.Ctx, id uint) (*entity.Recording, error)
-	GetNextDay(ctx *fiber.Ctx, projectFlockKandangId uint) (int, error)
+	GetNextDay(ctx *fiber.Ctx, projectFlockKandangId uint, recordTime time.Time) (int, error)
 	CreateOne(ctx *fiber.Ctx, req *validation.Create) (*entity.Recording, error)
 	UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*entity.Recording, error)
 	DeleteOne(ctx *fiber.Ctx, id uint) error
@@ -160,12 +160,15 @@ func (s recordingService) GetOne(c *fiber.Ctx, id uint) (*entity.Recording, erro
 	return recording, nil
 }
 
-func (s recordingService) GetNextDay(c *fiber.Ctx, projectFlockKandangId uint) (int, error) {
+func (s recordingService) GetNextDay(c *fiber.Ctx, projectFlockKandangId uint, recordTime time.Time) (int, error) {
 	if projectFlockKandangId == 0 {
 		return 0, fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id is required")
 	}
 
-	day, err := s.computeRecordingDay(c.Context(), projectFlockKandangId, time.Now().UTC())
+	if recordTime.IsZero() {
+		recordTime = time.Now().UTC()
+	}
+	day, err := s.computeRecordingDay(c.Context(), projectFlockKandangId, recordTime)
 	if err != nil {
 		s.Log.Errorf("Failed to compute recording day for project_flock_kandang_id=%d: %+v", projectFlockKandangId, err)
 		return 0, err