[FEAT/BE] Add restrict purchase chickin

Feat/delivery order purchase recordings

See merge request mbugroup/lti-api!315

.gitlab-ci.yml

@@ -1,15 +1,29 @@
 workflow:
   rules:
+    # MR pipeline
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: always
+
+    # Push pipeline hanya untuk env branch
     - if: '$CI_COMMIT_BRANCH == "development"'
+      when: always
     - if: '$CI_COMMIT_BRANCH == "staging"'
+      when: always
     - if: '$CI_COMMIT_BRANCH == "production"'
+      when: always
+
+    # Selain itu jangan buat pipeline
     - when: never
 
 include:
-  - local: "ci/development.yml"
+  # khusus MR (notif)
+  - local: "ci/merge_request.yml"
     rules:
       - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+
+  # khusus push ke branch env
+  - local: "ci/development.yml"
+    rules:
       - if: '$CI_COMMIT_BRANCH == "development"'
 
   - local: "ci/staging.yml"

ci/development.yml

@@ -4,9 +4,14 @@ stages:
 deploy-dev:
   stage: deploy
   image: alpine:3.20
+
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "development"'
+      when: on_success
+    - when: never
+
   variables:
     DEPLOY_APP: "LTI-MBUGROUP"
-    # Opsional: kalau pakai submodule, ini bikin clone submodule pakai SSH juga
     GIT_SUBMODULE_STRATEGY: recursive
     GIT_DEPTH: "1"
 
@@ -27,7 +32,6 @@ deploy-dev:
 
   script:
     - echo "🚀 Deploying latest code to $SERVER_USER@$SERVER_IP"
-
     - >
       if ssh -o StrictHostKeyChecking=no "$SERVER_USER@$SERVER_IP" "
         set -e
@@ -83,8 +87,5 @@ deploy-dev:
       curl -sS -H "Content-Type: application/json" \
         -d @payload.json "$DISCORD_WEBHOOK_URL";
 
-  only:
-    - development
-
   environment:
     name: development

ci/merge_request.yml

@@ -0,0 +1,48 @@
+stages:
+  - notify
+
+notify_discord_on_mr_request_main_dev:
+  stage: notify
+  image: alpine:3.20
+  rules:
+    # hanya MR yang target ke main atau development
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "development")'
+      when: on_success
+    - when: never
+
+  script:
+    - apk add --no-cache curl jq coreutils
+    - |
+      TIME_HUMAN="$(date '+%d/%m/%y, %H.%M')"
+      TIME_ISO="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+
+      TITLE="${CI_MERGE_REQUEST_TITLE}"
+      IID="!${CI_MERGE_REQUEST_IID}"
+      USER_LINE="${GITLAB_USER_NAME} (${GITLAB_USER_LOGIN})"
+      PROJECT_PATH="${CI_PROJECT_PATH}"
+      USERNAME="${GITLAB_USER_LOGIN}"
+      MR_URL="${CI_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}"
+
+      DESC="$(printf "**%s**\n\n%s opened merge request %s %s\n%s" \
+        "$USERNAME" "$USER_LINE" "$IID" "$TITLE" "$TIME_HUMAN")"
+
+      payload=$(jq -n \
+        --arg desc "$DESC" \
+        --arg project "$PROJECT_PATH" \
+        --arg timeiso "$TIME_ISO" \
+        --arg mrurl "$MR_URL" \
+        '{
+          "username": "Mock-api - Merge Requests",
+          "embeds": [
+            {
+              "description": ($desc + "\n" + $mrurl),
+              "color": 15105570,
+              "footer": { "text": $project },
+              "timestamp": $timeiso
+            }
+          ]
+        }')
+
+      curl -sS -H "Content-Type: application/json" \
+        -d "$payload" \
+        "$DISCORD_WEBHOOK_URL"

ci/production.yml

@@ -1,6 +1,6 @@
 stages:
   - build
-#  - migrate
+  - migrate
   - deploy
   - seed
 
@@ -8,12 +8,6 @@ default:
   tags:
     - self-hosted-prod
 
-workflow:
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-      when: always
-    - when: never
-
 variables:
   DOCKER_BUILDKIT: "1"
 
@@ -30,7 +24,9 @@ variables:
 build_production:
   stage: build
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+    - if: '$CI_COMMIT_BRANCH == "production"'
+      when: on_success
+    - when: never
   script: |
     set -e
     docker info
@@ -47,44 +43,72 @@ build_production:
     docker tag "$IMAGE_NAME" "$IMAGE_LATEST"
     docker push "$IMAGE_LATEST"
 
-
 # =========================
-# MIGRATE (PRODUCTION - MANUAL)
+# MIGRATE (PRODUCTION)
 # =========================
-#migrate_production:
-#  stage: migrate
-#  rules:
-#    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-#      when: manual
-#      allow_failure: false
-#  needs:
-#    - job: build_production
-#      artifacts: false
-#  script: |
-#    set -e
-#    cd /opt/deploy/lti
-#    test -f .env || (echo "❌ .env not found" && exit 1)
+migrate_production:
+  stage: migrate
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "production"'
+      when: on_success
+    - when: never
+  needs:
+    - job: build_production
+      artifacts: false
+  script: |
+    set -e
+    echo "✅ Running migrations (production) ..."
 
-#   set -a
-#    . ./.env
-#    set +a
+    cd "$DEPLOY_DIR"
+    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
+    test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
 
-    # Validasi env wajib
-#    : "${DB_HOST:?DB_HOST not set}"
-#    : "${DB_PORT:?DB_PORT not set}"
-#    : "${DB_USER:?DB_USER not set}"
-#    : "${DB_PASSWORD:?DB_PASSWORD not set}"
-#    : "${DB_NAME:?DB_NAME not set}"
+    set -a
+    . ./.env
+    set +a
 
-#    DB_SSLMODE="${DB_SSLMODE:-require}"
-#    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE}"
+    test -n "$DB_HOST" || (echo "❌ DB_HOST empty" && exit 1)
+    test -n "$DB_PORT" || (echo "❌ DB_PORT empty" && exit 1)
+    test -n "$DB_USER" || (echo "❌ DB_USER empty" && exit 1)
+    test -n "$DB_PASSWORD" || (echo "❌ DB_PASSWORD empty" && exit 1)
+    test -n "$DB_NAME" || (echo "❌ DB_NAME empty" && exit 1)
 
-#   echo "✅ Running migrations (production)..."
-#    docker run --rm \
-#      -v "$CI_PROJECT_DIR/internal/database/migrations:/migrations:ro" \
-#      migrate/migrate:v4.15.2 \
-#      -path=/migrations -database "$DATABASE_URL" up
+    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE:-disable}"
+    echo "✅ DATABASE_URL=$DATABASE_URL"
 
+    # NOTE: pastikan nama servicenya benar untuk production (ini sebelumnya masih stg-*)
+    docker compose -f "$COMPOSE_FILE" up -d stg-postgres-lti stg-redis-lti || true
+
+    COMPOSE_NETWORK_KEY="$(docker compose -f "$COMPOSE_FILE" config | awk '/networks:/ {getline; print $1}' | tr -d ':')"
+    NETWORK_NAME="$(docker network ls --format '{{.Name}}' | grep "_${COMPOSE_NETWORK_KEY}$" | head -n 1)"
+    test -n "$NETWORK_NAME" || (echo "❌ Cannot find docker network for compose ($COMPOSE_NETWORK_KEY)" && exit 1)
+
+    echo "✅ Checking migrations from repo..."
+    ls -lah "$CI_PROJECT_DIR/internal/database/migrations"
+
+    echo "✅ Running migrations via migrate/migrate container"
+    set +e
+    out=$(docker run --rm \
+      --network "$NETWORK_NAME" \
+      -v "$CI_PROJECT_DIR/internal/database/migrations:/migrations:ro" \
+      migrate/migrate:v4.15.2 \
+      -path=/migrations -database "$DATABASE_URL" up 2>&1)
+    code=$?
+    set -e
+
+    echo "$out"
+
+    if echo "$out" | grep -qi "no change"; then
+      echo "✅ No change (already up to date)"
+      exit 0
+    fi
+
+    if [ $code -ne 0 ]; then
+      echo "❌ Migration failed with exit code $code"
+      exit $code
+    fi
+
+    echo "✅ Migration applied successfully"
 
 # =========================
 # DEPLOY (AUTO)
@@ -92,10 +116,10 @@ build_production:
 deploy_production:
   stage: deploy
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+    - if: '$CI_COMMIT_BRANCH == "production"'
+      when: on_success
+    - when: never
   needs:
-#    - job: migrate_production
-#      artifacts: false
     - job: build_production
       artifacts: false
   script: |
@@ -111,7 +135,6 @@ deploy_production:
     docker compose -f "$COMPOSE_FILE" up -d --force-recreate
     docker image prune -f
 
-
 # =========================
 # SEED (MANUAL)
 # =========================
@@ -120,9 +143,10 @@ seed_production:
   rules:
     - if: '$CI_COMMIT_BRANCH == "production"'
       when: manual
+    - when: never
   script: |
     set -e
-    cd /opt/deploy/lti
+    cd "$DEPLOY_DIR"
     test -f .env || (echo "❌ .env not found" && exit 1)
 
     echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"

ci/staging.yml

@@ -8,12 +8,6 @@ default:
   tags:
     - self-hosted-stg
 
-workflow:
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
-      when: always
-    - when: never
-
 variables:
   DOCKER_BUILDKIT: "1"
 
@@ -30,7 +24,9 @@ variables:
 build_staging:
   stage: build
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_COMMIT_BRANCH == "staging"'
+      when: on_success
+    - when: never
   script: |
     set -e
     docker info
@@ -47,14 +43,15 @@ build_staging:
     docker tag "$IMAGE_NAME" "$IMAGE_LATEST"
     docker push "$IMAGE_LATEST"
 
-
 # =========================
 # MIGRATE (AUTO)
 # =========================
 migrate_staging:
   stage: migrate
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_COMMIT_BRANCH == "staging"'
+      when: on_success
+    - when: never
   needs:
     - job: build_staging
       artifacts: false
@@ -66,12 +63,10 @@ migrate_staging:
     test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
     test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
 
-    # ✅ load env dari server
     set -a
     . ./.env
     set +a
 
-    # ✅ validasi
     test -n "$DB_HOST" || (echo "❌ DB_HOST empty" && exit 1)
     test -n "$DB_PORT" || (echo "❌ DB_PORT empty" && exit 1)
     test -n "$DB_USER" || (echo "❌ DB_USER empty" && exit 1)
@@ -81,21 +76,17 @@ migrate_staging:
     export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE:-disable}"
     echo "✅ DATABASE_URL=$DATABASE_URL"
 
-    # ✅ Pastikan postgres & redis ON (sesuaikan nama service compose kamu!)
     echo "✅ Ensuring postgres & redis running ..."
     docker compose -f "$COMPOSE_FILE" up -d stg-postgres-lti stg-redis-lti || true
 
-    # ✅ Ambil network key dari compose
     COMPOSE_NETWORK_KEY="$(docker compose -f "$COMPOSE_FILE" config | awk '/networks:/ {getline; print $1}' | tr -d ':')"
     echo "✅ Compose network key: $COMPOSE_NETWORK_KEY"
 
-    # ✅ Cari network name yang dipakai docker
     NETWORK_NAME="$(docker network ls --format '{{.Name}}' | grep "_${COMPOSE_NETWORK_KEY}$" | head -n 1)"
     test -n "$NETWORK_NAME" || (echo "❌ Cannot find docker network for compose ($COMPOSE_NETWORK_KEY)" && exit 1)
 
     echo "✅ Docker network detected: $NETWORK_NAME"
 
-    # ✅ Migrations dari repo (CI workspace)
     echo "✅ Checking migrations from repo..."
     ls -lah "$CI_PROJECT_DIR/internal/database/migrations"
 
@@ -111,7 +102,6 @@ migrate_staging:
 
     echo "$out"
 
-    # ✅ Handle no change dengan benar (tidak false-success)
     if echo "$out" | grep -qi "no change"; then
       echo "✅ No change (already up to date)"
       exit 0
@@ -124,14 +114,15 @@ migrate_staging:
 
     echo "✅ Migration applied successfully"
 
-
 # =========================
 # DEPLOY (AUTO)
 # =========================
 deploy_staging:
   stage: deploy
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_COMMIT_BRANCH == "staging"'
+      when: on_success
+    - when: never
   needs:
     - job: migrate_staging
       artifacts: false
@@ -150,18 +141,18 @@ deploy_staging:
     docker compose -f "$COMPOSE_FILE" up -d --force-recreate
     docker image prune -f
 
-
 # =========================
 # SEED (MANUAL)
 # =========================
 seed_staging:
   stage: seed
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_COMMIT_BRANCH == "staging"'
+      when: manual
+    - when: never
   needs:
     - job: deploy_staging
       artifacts: false
-  when: manual
   allow_failure: false
   script: |
     set -e
@@ -170,4 +161,4 @@ seed_staging:
     test -f .env || (echo "❌ .env not found" && exit 1)
 
     docker compose -f "$COMPOSE_FILE" pull seed || true
-    docker compose -f "$COMPOSE_FILE" run --rm seed%
+    docker compose -f "$COMPOSE_FILE" run --rm seed

cmd/api/main.go

@@ -14,8 +14,8 @@ import (
 	"gitlab.com/mbugroup/lti-api.git/internal/database"
 	"gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/sso/session"
+	sso "gitlab.com/mbugroup/lti-api.git/internal/modules/sso/verifier"
 	"gitlab.com/mbugroup/lti-api.git/internal/route"
-	"gitlab.com/mbugroup/lti-api.git/internal/sso"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/gofiber/fiber/v2"

internal/common/repository/common.hpp.repository.go

@@ -196,10 +196,10 @@ func (r *HppRepositoryImpl) GetPulletCost(ctx context.Context, projectFlockKanda
 }
 
 func (r *HppRepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, float64, error) {
-	// if date == nil {
-	// 	now := time.Now()
-	// 	date = &now
-	// }
+	if date == nil {
+		now := time.Now()
+		date = &now
+	}
 
 	var totals struct {
 		TotalPieces   float64
@@ -253,7 +253,7 @@ func (r *HppRepositoryImpl) GetEggTerjualPiecesAndWeightKgByProjectFlockKandangI
 		Joins("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id").
 		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
 		Where("r.record_datetime <= ?", *endDate).
-		Where("mdp.delivery_date = ?", *startDate)
+		Where("mdp.delivery_date <= ?", *startDate)
 
 	var totals struct {
 		TotalPieces float64

internal/common/service/common.approval.service.go

@@ -15,7 +15,7 @@ type ApprovalService interface {
 	WorkflowSteps(workflow approvalutils.ApprovalWorkflowKey) map[approvalutils.ApprovalStep]string
 	WorkflowStepName(workflow approvalutils.ApprovalWorkflowKey, step approvalutils.ApprovalStep) (string, bool)
 	CreateApproval(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableID uint, step approvalutils.ApprovalStep, action *entity.ApprovalAction, actorID uint, note *string) (*entity.Approval, error)
-	List(ctx context.Context, module string, approvableID *uint, page, limit int, search string) ([]entity.Approval, int64, error)
+	List(ctx context.Context, module string, approvableID *uint, page, limit int, search string, orderByDate string) ([]entity.Approval, int64, error)
 	ListByTarget(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableID uint, modifier func(*gorm.DB) *gorm.DB) ([]entity.Approval, error)
 	LatestByTarget(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableID uint, modifier func(*gorm.DB) *gorm.DB) (*entity.Approval, error)
 	LatestByTargets(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableIDs []uint, modifier func(*gorm.DB) *gorm.DB) (map[uint]*entity.Approval, error)
@@ -70,9 +70,14 @@ func (s *approvalService) List(
 	approvableID *uint,
 	page, limit int,
 	search string,
+	orderByDate string,
 ) ([]entity.Approval, int64, error) {
 	module = strings.TrimSpace(strings.ToUpper(module))
 	search = strings.TrimSpace(search)
+	orderByDate = strings.TrimSpace(strings.ToUpper(orderByDate))
+	if orderByDate != "ASC" && orderByDate != "DESC" {
+		orderByDate = "DESC"
+	}
 
 	if limit <= 0 {
 		limit = 10
@@ -90,7 +95,7 @@ func (s *approvalService) List(
 		func(db *gorm.DB) *gorm.DB {
 			query := db.
 				Where("approvable_type = ?", module).
-				Order("action_at DESC").
+				Order("action_at " + orderByDate).
 				Preload("ActionUser")
 
 			if approvableID != nil {

internal/common/service/common.document.service.go

@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	defaultDocumentPathLimit = 50
+	defaultDocumentPathLimit = 255
 	defaultDocumentKeyPrefix = "docs"
 	maxDocumentNameLength    = 50
 )
@@ -363,13 +363,19 @@ func (s *documentService) generateObjectKey(ext string) (string, error) {
 	}
 
 	u := uuid.New().String()
-	key := fmt.Sprintf("%s/%s%s", strings.Trim(s.keyPrefix, "/"), u, normalizedExt)
-	if s.keyPrefix == "" {
-		key = fmt.Sprintf("%s%s", u, normalizedExt)
+	keyPrefix := strings.Trim(s.keyPrefix, "/")
+	key := fmt.Sprintf("%s%s", u, normalizedExt)
+	if keyPrefix != "" {
+		key = fmt.Sprintf("%s/%s%s", keyPrefix, u, normalizedExt)
 	}
 
 	if len(key) > s.maxPathLength {
-		key = fmt.Sprintf("%s%s", u, normalizedExt)
+		compact := strings.ReplaceAll(u, "-", "")
+		if keyPrefix != "" {
+			key = fmt.Sprintf("%s/%s%s", keyPrefix, compact, normalizedExt)
+		} else {
+			key = fmt.Sprintf("%s%s", compact, normalizedExt)
+		}
 	}
 
 	if len(key) > s.maxPathLength {

internal/common/service/common.fifo.service.go

@@ -26,6 +26,7 @@ type FifoService interface {
 	Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error)
 	ReleaseUsage(ctx context.Context, req StockReleaseRequest) error
 	AdjustStockableQuantity(ctx context.Context, req StockAdjustRequest) error
+	ResolvePending(ctx context.Context, req PendingResolveRequest) ([]PendingResolution, error)
 }
 
 type fifoService struct {
@@ -111,6 +112,11 @@ type PendingResolution struct {
 	Quantity  float64
 }
 
+type PendingResolveRequest struct {
+	ProductWarehouseID uint
+	Tx                 *gorm.DB
+}
+
 type StockReplenishResult struct {
 	AddedQuantity    float64
 	PendingResolved  []PendingResolution
@@ -147,6 +153,7 @@ type StockReleaseRequest struct {
 	Reason    *string
 	Tx        *gorm.DB
 }
+
 func (s *fifoService) AdjustStockableQuantity(ctx context.Context, req StockAdjustRequest) error {
 	if req.StockableID == 0 || strings.TrimSpace(req.StockableKey.String()) == "" {
 		return errors.New("stockable key and id are required")
@@ -226,6 +233,23 @@ func (s *fifoService) Replenish(ctx context.Context, req StockReplenishRequest)
 	return result, nil
 }
 
+func (s *fifoService) ResolvePending(ctx context.Context, req PendingResolveRequest) ([]PendingResolution, error) {
+	if req.ProductWarehouseID == 0 {
+		return nil, errors.New("product warehouse id is required")
+	}
+
+	var resolved []PendingResolution
+	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
+		var err error
+		resolved, err = s.resolvePendingForWarehouse(ctx, tx, req.ProductWarehouseID)
+		return err
+	})
+	if err != nil {
+		return nil, err
+	}
+	return resolved, nil
+}
+
 func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error) {
 	if req.UsableID == 0 || strings.TrimSpace(req.UsableKey.String()) == "" {
 		return nil, errors.New("usable key and id are required")
@@ -308,7 +332,7 @@ func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*St
 			}
 
 			if reductionTarget > 0 {
-				released, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, reductionTarget)
+				released, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, reductionTarget, productWarehouseID)
 				if err != nil {
 					return err
 				}
@@ -355,7 +379,7 @@ func (s *fifoService) ReleaseUsage(ctx context.Context, req StockReleaseRequest)
 		}
 		var usageDelta, pendingDelta float64
 		if ctxRow.UsageQty > 0 {
-			if _, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, ctxRow.UsageQty); err != nil {
+			if _, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, ctxRow.UsageQty, ctxRow.ProductWarehouseID); err != nil {
 				return err
 			}
 			usageDelta -= ctxRow.UsageQty
@@ -721,6 +745,7 @@ func (s *fifoService) releaseUsagePortion(
 	usableKey fifo.UsableKey,
 	usableID uint,
 	target float64,
+	expectedWarehouseID uint,
 ) (float64, error) {
 	if target <= 0 {
 		return 0, nil
@@ -736,6 +761,18 @@ func (s *fifoService) releaseUsagePortion(
 	if len(allocations) == 0 {
 		return 0, nil
 	}
+	for i := range allocations {
+		alloc := &allocations[i]
+		if expectedWarehouseID == 0 || alloc.ProductWarehouseId == expectedWarehouseID {
+			continue
+		}
+		if err := tx.Model(&entities.StockAllocation{}).
+			Where("id = ?", alloc.Id).
+			Update("product_warehouse_id", expectedWarehouseID).Error; err != nil {
+			return 0, err
+		}
+		alloc.ProductWarehouseId = expectedWarehouseID
+	}
 
 	var (
 		remaining            = target
@@ -832,30 +869,30 @@ func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, p
 			cfg.Columns.CreatedAt,
 		)
 
-		var rows []struct {
-			ID        uint
-			Pending   float64
-			CreatedAt time.Time
-		}
+		if cfg.Columns.CreatedAt == cfg.Columns.ID {
+			var rows []struct {
+				ID        uint
+				Pending   float64 `gorm:"column:pending_qty"`
+				CreatedAt int64   `gorm:"column:created_at"`
+			}
 
-		query := tx.Table(cfg.Table).
-			Select(selectStmt).
-			Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
-			Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
-			Limit(s.pendingBatchPerUsable)
+			query := tx.Table(cfg.Table).
+				Select(selectStmt).
+				Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
+				Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
+				Limit(s.pendingBatchPerUsable)
 
-		if cfg.Scope != nil {
-			query = cfg.Scope(query)
-		}
+			if cfg.Scope != nil {
+				query = cfg.Scope(query)
+			}
 
-		for _, order := range s.orderClauses(cfg.OrderBy) {
-			query = query.Order(order)
-		}
+			for _, order := range s.orderClauses(cfg.OrderBy) {
+				query = query.Order(order)
+			}
 
 		if err := query.Find(&rows).Error; err != nil {
 			return nil, err
 		}
-
 		for _, row := range rows {
 			if row.Pending <= 0 {
 				continue
@@ -865,9 +902,47 @@ func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, p
 				Config:    cfg,
 				UsableID:  row.ID,
 				Pending:   row.Pending,
-				CreatedAt: row.CreatedAt,
+				CreatedAt: time.Unix(0, row.CreatedAt),
 			})
 		}
+	} else {
+			var rows []struct {
+				ID        uint
+				Pending   float64   `gorm:"column:pending_qty"`
+				CreatedAt time.Time `gorm:"column:created_at"`
+			}
+
+			query := tx.Table(cfg.Table).
+				Select(selectStmt).
+				Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
+				Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
+				Limit(s.pendingBatchPerUsable)
+
+			if cfg.Scope != nil {
+				query = cfg.Scope(query)
+			}
+
+			for _, order := range s.orderClauses(cfg.OrderBy) {
+				query = query.Order(order)
+			}
+
+			if err := query.Find(&rows).Error; err != nil {
+				return nil, err
+			}
+
+			for _, row := range rows {
+				if row.Pending <= 0 {
+					continue
+				}
+				candidates = append(candidates, pendingCandidate{
+					UsableKey: key,
+					Config:    cfg,
+					UsableID:  row.ID,
+					Pending:   row.Pending,
+					CreatedAt: row.CreatedAt,
+				})
+			}
+		}
 	}
 
 	if len(candidates) == 0 {

internal/config/config.go

@@ -61,6 +61,7 @@ var (
 	SSOCookieDomain         string
 	SSOCookieSecure         bool
 	SSOCookieSameSite       string
+	SSOAccessTokenMaxBytes  int
 	SSOTokenBlacklistPrefix string
 	SSOPKCETTL              time.Duration
 	SSOUserSyncDrift        time.Duration
@@ -73,6 +74,7 @@ var (
 	S3SecretKey             string
 	S3ForcePathStyle        bool
 	S3PublicBaseURL         string
+	S3EnvPrefix             string
 	S3DocumentKeyPrefix     string
 )
 
@@ -123,7 +125,12 @@ func init() {
 	S3SecretKey = strings.TrimSpace(viper.GetString("S3_SECRET_KEY"))
 	S3ForcePathStyle = viper.GetBool("S3_FORCE_PATH_STYLE")
 	S3PublicBaseURL = strings.TrimSuffix(strings.TrimSpace(viper.GetString("S3_PUBLIC_BASE_URL")), "/")
-	S3DocumentKeyPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/"), "docs")
+	S3EnvPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_ENV_PREFIX")), "/"), "local")
+	docPrefix := strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/")
+	if docPrefix == "" {
+		docPrefix = "docs"
+	}
+	S3DocumentKeyPrefix = joinPath(S3EnvPrefix, docPrefix)
 
 	// SSO integration
 	SSOIssuer = viper.GetString("SSO_ISSUER")
@@ -138,6 +145,10 @@ func init() {
 	SSOCookieDomain = viper.GetString("SSO_COOKIE_DOMAIN")
 	SSOCookieSecure = viper.GetBool("SSO_COOKIE_SECURE")
 	SSOCookieSameSite = defaultString(viper.GetString("SSO_COOKIE_SAMESITE"), "Lax")
+	SSOAccessTokenMaxBytes = viper.GetInt("SSO_ACCESS_TOKEN_MAX_BYTES")
+	if SSOAccessTokenMaxBytes <= 0 {
+		SSOAccessTokenMaxBytes = 4096
+	}
 	SSOTokenBlacklistPrefix = defaultString(viper.GetString("SSO_TOKEN_BLACKLIST_PREFIX"), "sso:blacklist")
 	if ttl := viper.GetInt("SSO_PKCE_TTL_SECONDS"); ttl > 0 {
 		SSOPKCETTL = time.Duration(ttl) * time.Second
@@ -242,6 +253,17 @@ func defaultString(v, def string) string {
 	return v
 }
 
+func joinPath(parts ...string) string {
+	out := make([]string, 0, len(parts))
+	for _, part := range parts {
+		part = strings.Trim(part, "/")
+		if part != "" {
+			out = append(out, part)
+		}
+	}
+	return strings.Join(out, "/")
+}
+
 func ensureProdConfig() {
 	if SSOAuthorizeURL == "" || !strings.HasPrefix(SSOAuthorizeURL, "https://") {
 		panic("SSO_AUTHORIZE_URL must be https in production")

internal/database/migrations/20260127114036_change_type_data_column_id_daily_checklist.down.sql

@@ -0,0 +1,56 @@
+BEGIN;
+
+DO $$
+DECLARE
+  t text;
+  seq_name text;
+BEGIN
+  FOREACH t IN ARRAY ARRAY[
+    'daily_checklist_activity_task_assignments',
+    'daily_checklist_activity_tasks',
+    'daily_checklist_phases',
+    'daily_checklist_tasks',
+    'daily_checklists',
+    'employee_kandangs',
+    'employees',
+    'phase_activities',
+    'phases'
+  ]
+  LOOP
+    -- Sequence name convention
+    seq_name := format('public.%I_id_seq', t);
+
+    -- 1) Drop default nextval (bigserial behavior)
+    EXECUTE format(
+      'ALTER TABLE public.%I ALTER COLUMN id DROP DEFAULT',
+      t
+    );
+
+    -- 2) Add IDENTITY back (BY DEFAULT is safer for rollback)
+    EXECUTE format(
+      'ALTER TABLE public.%I ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY',
+      t
+    );
+
+    -- 3) Detach & optionally drop sequence (safe)
+    IF EXISTS (
+      SELECT 1 FROM pg_class
+      WHERE relkind = 'S'
+        AND relname = t || '_id_seq'
+    ) THEN
+      EXECUTE format(
+        'ALTER SEQUENCE %s OWNED BY NONE',
+        seq_name
+      );
+
+      -- Optional: drop sequence (comment if you want to keep it)
+      EXECUTE format(
+        'DROP SEQUENCE IF EXISTS %s',
+        seq_name
+      );
+    END IF;
+
+  END LOOP;
+END $$;
+
+COMMIT;

internal/database/migrations/20260127114036_change_type_data_column_id_daily_checklist.up.sql

@@ -0,0 +1,59 @@
+BEGIN;
+
+DO $$
+DECLARE
+  t text;
+  seq_name text;
+  max_id bigint;
+BEGIN
+  FOREACH t IN ARRAY ARRAY[
+    'daily_checklist_activity_task_assignments',
+    'daily_checklist_activity_tasks',
+    'daily_checklist_phases',
+    'daily_checklist_tasks',
+    'daily_checklists',
+    'employee_kandangs',
+    'employees',
+    'phase_activities',
+    'phases'
+  ]
+  LOOP
+    -- Sequence name convention: public.<table>_id_seq
+    seq_name := format('public.%I_id_seq', t);
+
+    -- Drop IDENTITY only if the column is identity (safe to re-run)
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name   = t
+        AND column_name  = 'id'
+        AND is_identity  = 'YES'
+    ) THEN
+      EXECUTE format('ALTER TABLE public.%I ALTER COLUMN id DROP IDENTITY', t);
+    END IF;
+
+    -- Ensure sequence exists
+    EXECUTE format('CREATE SEQUENCE IF NOT EXISTS %s', seq_name);
+
+    -- Set default like bigserial
+    EXECUTE format(
+      'ALTER TABLE public.%I ALTER COLUMN id SET DEFAULT nextval(''%s'')',
+      t, seq_name
+    );
+
+    -- Own the sequence by the column
+    EXECUTE format(
+      'ALTER SEQUENCE %s OWNED BY public.%I.id',
+      seq_name, t
+    );
+
+    -- Sync sequence to MAX(id) + 1 to avoid duplicate key
+    EXECUTE format('SELECT COALESCE(MAX(id), 0) FROM public.%I', t) INTO max_id;
+
+    EXECUTE format('SELECT setval(''%s'', $1, false)', seq_name)
+      USING (max_id + 1);
+  END LOOP;
+END $$;
+
+COMMIT;

internal/database/migrations/20260128034158_create_field_stock.up.sql

@@ -16,4 +16,3 @@ UPDATE stock_logs t
 SET stock = c.running_stock
 FROM calc c
 WHERE t.id = c.id;
-

internal/database/migrations/20260128035908_alter_documents_path_length.down.sql

@@ -0,0 +1,7 @@
+BEGIN;
+
+-- Migration: revert documents.path length
+ALTER TABLE documents
+    ALTER COLUMN path TYPE VARCHAR(50);
+
+COMMIT;

internal/database/migrations/20260128035908_alter_documents_path_length.up.sql

@@ -0,0 +1,7 @@
+BEGIN;
+
+-- Migration: extend documents.path length for environment prefixes
+ALTER TABLE documents
+    ALTER COLUMN path TYPE VARCHAR(255);
+
+COMMIT;

internal/database/migrations/20260129083458_create_transfer_laying_sequence.down.sql

@@ -0,0 +1,2 @@
+-- Drop transfer laying sequence
+DROP SEQUENCE IF EXISTS transfer_laying_seq;

internal/database/migrations/20260129083458_create_transfer_laying_sequence.up.sql

@@ -0,0 +1,33 @@
+-- Create sequence for transfer laying movement number
+CREATE SEQUENCE IF NOT EXISTS transfer_laying_seq START
+WITH
+    1 INCREMENT BY 1 MINVALUE 1 MAXVALUE 99999 NO CYCLE;
+
+-- Set sequence starting value based on existing data (if any)
+-- This prevents duplicate movement numbers if there's already data
+DO $$ DECLARE max_existing INTEGER;
+
+BEGIN
+-- Check if table exists and has data
+IF EXISTS (
+    SELECT 1
+    FROM information_schema.tables
+    WHERE
+        table_schema = 'public'
+        AND table_name = 'transfer_to_layings'
+) THEN
+-- Get max ID from existing records
+SELECT COALESCE(MAX(id), 0) INTO max_existing
+FROM transfer_to_layings;
+
+-- Set sequence to start after the highest existing ID
+IF max_existing > 0 THEN PERFORM setval (
+    'transfer_laying_seq',
+    max_existing
+);
+
+END IF;
+
+END IF;
+
+END $$;

internal/database/migrations/20260203034048_add_field_adj_number.down.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE adjustment_stocks
+DROP COLUMN adj_number;
+
+COMMIT;

internal/database/migrations/20260203034048_add_field_adj_number.up.sql

@@ -0,0 +1,10 @@
+BEGIN;
+
+ALTER TABLE adjustment_stocks
+ADD COLUMN adj_number VARCHAR(255);
+
+UPDATE adjustment_stocks
+SET adj_number = CONCAT('ADJ-', LPAD(id::text, 5, '0'))
+WHERE adj_number IS NULL;
+
+COMMIT;

internal/database/migrations/20260203054206_update_marketing_tables.down.sql

@@ -0,0 +1,8 @@
+-- Remove columns from marketing_products
+ALTER TABLE marketing_products
+DROP COLUMN IF EXISTS week,
+DROP COLUMN IF EXISTS weight_per_convertion,
+DROP COLUMN IF EXISTS convertion_unit;
+
+-- Remove column from marketings
+ALTER TABLE marketings DROP COLUMN IF EXISTS marketing_type;

internal/database/migrations/20260203054206_update_marketing_tables.up.sql

@@ -0,0 +1,9 @@
+-- Add marketing_type to marketings table
+ALTER TABLE marketings
+ADD COLUMN IF NOT EXISTS marketing_type VARCHAR(50);
+
+-- Add convertion fields to marketing_products table
+ALTER TABLE marketing_products
+ADD COLUMN IF NOT EXISTS convertion_unit VARCHAR(20),
+ADD COLUMN IF NOT EXISTS weight_per_convertion NUMERIC(15, 3),
+ADD COLUMN IF NOT EXISTS week INTEGER;

internal/database/migrations/20260203063959_remove_fcr_id_project_flock.down.sql

@@ -0,0 +1,47 @@
+BEGIN;
+
+DO $$
+DECLARE
+    fallback_fcr_id BIGINT;
+BEGIN
+    IF NOT EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name = 'project_flocks'
+          AND column_name = 'fcr_id'
+    ) THEN
+        ALTER TABLE project_flocks
+            ADD COLUMN fcr_id BIGINT;
+    END IF;
+
+    SELECT id INTO fallback_fcr_id
+    FROM fcrs
+    ORDER BY id ASC
+    LIMIT 1;
+
+    IF fallback_fcr_id IS NOT NULL THEN
+        UPDATE project_flocks
+        SET fcr_id = fallback_fcr_id
+        WHERE fcr_id IS NULL;
+
+        ALTER TABLE project_flocks
+            ALTER COLUMN fcr_id SET NOT NULL;
+    END IF;
+
+    IF EXISTS (
+        SELECT 1
+        FROM pg_constraint
+        WHERE conname = 'project_flocks_fcr_id_fkey'
+    ) THEN
+        ALTER TABLE project_flocks
+            DROP CONSTRAINT project_flocks_fcr_id_fkey;
+    END IF;
+
+    ALTER TABLE project_flocks
+        ADD CONSTRAINT project_flocks_fcr_id_fkey
+        FOREIGN KEY (fcr_id) REFERENCES fcrs(id)
+        ON DELETE RESTRICT ON UPDATE CASCADE;
+END $$;
+
+COMMIT;

internal/database/migrations/20260203063959_remove_fcr_id_project_flock.up.sql

@@ -0,0 +1,26 @@
+BEGIN;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name = 'project_flocks'
+          AND column_name = 'fcr_id'
+    ) THEN
+        IF EXISTS (
+            SELECT 1
+            FROM pg_constraint
+            WHERE conname = 'project_flocks_fcr_id_fkey'
+        ) THEN
+            ALTER TABLE project_flocks
+                DROP CONSTRAINT project_flocks_fcr_id_fkey;
+        END IF;
+
+        ALTER TABLE project_flocks
+            DROP COLUMN fcr_id;
+    END IF;
+END $$;
+
+COMMIT;

internal/database/seed/seeder.go

@@ -74,7 +74,7 @@ func seedUsers(tx *gorm.DB) (map[string]uint, error) {
 }
 
 func seedUoms(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
-	names := []string{"Kilogram", "Gram", "Liter", "Unit", "Ekor"}
+	names := []string{"Kilogram", "Gram", "Liter", "Unit", "Ekor", "Butir"}
 	result := make(map[string]uint, len(names))
 
 	for _, name := range names {
@@ -235,7 +235,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Utuh",
 			Brand:     "-",
 			Sku:       "4",
-			Uom:       "Gram",
+			Uom:       "Butir",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurUtuh},
@@ -245,7 +245,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Pecah",
 			Brand:     "-",
 			Sku:       "5",
-			Uom:       "Gram",
+			Uom:       "Butir",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurPecah},
@@ -255,7 +255,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Putih",
 			Brand:     "-",
 			Sku:       "6",
-			Uom:       "Gram",
+			Uom:       "Butir",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurPutih},
@@ -265,12 +265,32 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Retak",
 			Brand:     "-",
 			Sku:       "7",
-			Uom:       "Gram",
+			Uom:       "Butir",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurRetak},
 			IsVisible: false,
 		},
+		{
+			Name:      "Telur Papacal",
+			Brand:     "-",
+			Sku:       "8",
+			Uom:       "Butir",
+			Category:  "Telur",
+			Price:     1,
+			Flags:     []utils.FlagType{utils.FlagTelur},
+			IsVisible: false,
+		},
+		{
+			Name:      "Telur Jumbo",
+			Brand:     "-",
+			Sku:       "9",
+			Uom:       "Butir",
+			Category:  "Telur",
+			Price:     1,
+			Flags:     []utils.FlagType{utils.FlagTelur},
+			IsVisible: false,
+		},
 	}
 
 	for _, seed := range seeds {

internal/entities/adjustment_stock.go

@@ -11,6 +11,7 @@ type AdjustmentStock struct {
 	PendingQty         float64   `gorm:"column:pending_qty;default:0"`
 	CreatedAt          time.Time `gorm:"column:created_at;autoCreateTime"`
 	UpdatedAt          time.Time `gorm:"column:updated_at;autoUpdateTime"`
+	AdjNumber          string    `gorm:"column:adj_number;uniqueIndex;not null"`
 
 	ProductWarehouse *ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
 	StockLog         *StockLog         `gorm:"polymorphic:Loggable;polymorphicType:LoggableType;polymorphicId:LoggableId;polymorphicValue:ADJUSTMENT"`

internal/entities/document.go

@@ -7,7 +7,7 @@ type Document struct {
 	DocumentableType string    `gorm:"size:50;not null;index:documents_documentable_polymorphic,priority:1"`
 	DocumentableId   uint64    `gorm:"not null;index:documents_documentable_polymorphic,priority:2"`
 	Type             string    `gorm:"size:50;not null"`
-	Path             string    `gorm:"size:50;not null"`
+	Path             string    `gorm:"size:255;not null"`
 	Name             string    `gorm:"size:50;not null"`
 	Ext              string    `gorm:"size:50;not null"`
 	Size             float64   `gorm:"type:numeric(15,3);not null"`

internal/entities/marketing.go

@@ -14,6 +14,7 @@ type Marketing struct {
 	SoDate        time.Time      `gorm:"type:date;not null"`
 	SalesPersonId uint           `gorm:"not null"`
 	Notes         string         `gorm:"type:text"`
+	MarketingType string         `gorm:"type:varchar(50)"`
 	CreatedBy     uint           `gorm:"not null"`
 	CreatedAt     time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt     time.Time      `gorm:"autoUpdateTime"`

internal/entities/marketing_product.go

@@ -1,14 +1,17 @@
 package entities
 
 type MarketingProduct struct {
-	Id                 uint    `gorm:"primaryKey;autoIncrement"`
-	MarketingId        uint    `gorm:"not null"`
-	ProductWarehouseId uint    `gorm:"not null"`
-	Qty                float64 `gorm:"type:numeric(15,3);not null"`
-	UnitPrice          float64 `gorm:"type:numeric(15,3);not null"`
-	AvgWeight          float64 `gorm:"type:numeric(15,3);not null"`
-	TotalWeight        float64 `gorm:"type:numeric(15,3);not null"`
-	TotalPrice         float64 `gorm:"type:numeric(15,3);not null"`
+	Id                  uint     `gorm:"primaryKey;autoIncrement"`
+	MarketingId         uint     `gorm:"not null"`
+	ProductWarehouseId  uint     `gorm:"not null"`
+	Qty                 float64  `gorm:"type:numeric(15,3);not null"`
+	ConvertionUnit      *string  `gorm:"type:varchar(20)"`
+	WeightPerConvertion *float64 `gorm:"type:numeric(15,3)"`
+	Week                *int     `gorm:"type:integer"`
+	UnitPrice           float64  `gorm:"type:numeric(15,3);not null"`
+	AvgWeight           float64  `gorm:"type:numeric(15,3);not null"`
+	TotalWeight         float64  `gorm:"type:numeric(15,3);not null"`
+	TotalPrice          float64  `gorm:"type:numeric(15,3);not null"`
 
 	Marketing        Marketing                 `gorm:"foreignKey:MarketingId;references:Id"`
 	ProductWarehouse ProductWarehouse          `gorm:"foreignKey:ProductWarehouseId;references:Id"`

internal/entities/projectflock.go

@@ -11,7 +11,6 @@ type ProjectFlock struct {
 	FlockName  string         `gorm:"type:varchar(255);not null;uniqueIndex"`
 	AreaId     uint           `gorm:"not null"`
 	Category   string         `gorm:"type:varchar(20);not null"`
-	FcrId      uint           `gorm:"not null"`
 	ProductionStandardId uint `gorm:"column:production_standard_id"`
 	LocationId uint           `gorm:"not null"`
 	CreatedBy  uint           `gorm:"not null"`
@@ -20,7 +19,6 @@ type ProjectFlock struct {
 	DeletedAt  gorm.DeletedAt `gorm:"index" json:"-"`
 
 	Area           Area                  `gorm:"foreignKey:AreaId;references:Id"`
-	Fcr            Fcr                   `gorm:"foreignKey:FcrId;references:Id"`
 	ProductionStandard ProductionStandard `gorm:"foreignKey:ProductionStandardId;references:Id"`
 	Location       Location              `gorm:"foreignKey:LocationId;references:Id"`
 	CreatedUser    User                  `gorm:"foreignKey:CreatedBy;references:Id"`

internal/entities/purchase_item.go

@@ -21,6 +21,7 @@ type PurchaseItem struct {
 	Price                 float64 `gorm:"type:numeric(15,3);default:0"`
 	TotalPrice            float64 `gorm:"type:numeric(15,3);default:0"`
 	ExpenseNonstockId     *uint64
+	HasChickin            bool `gorm:"-" json:"-"`
 
 	// Relations
 	ExpenseNonstock  *ExpenseNonstock  `gorm:"foreignKey:ExpenseNonstockId;references:Id"`

internal/entities/recording.go

@@ -12,7 +12,9 @@ type Recording struct {
 	RecordDatetime        time.Time      `gorm:"column:record_datetime;not null"`
 	Day                   *int           `gorm:"column:day"`
 	TotalDepletionQty     *float64       `gorm:"column:total_depletion_qty"`
+	TotalDepletionCumQty  *float64       `gorm:"-"`
 	CumDepletionRate      *float64       `gorm:"column:cum_depletion_rate"`
+	DepletionRate         *float64       `gorm:"-"`
 	CumIntake             *int           `gorm:"column:cum_intake"`
 	FcrValue              *float64       `gorm:"column:fcr_value"`
 	TotalChickQty         *float64       `gorm:"column:total_chick_qty"`

internal/entities/stock_log.go

@@ -9,7 +9,7 @@ type StockLog struct {
 
 	Increase float64 `gorm:"column:increase;type:numeric(15,3);default:0"`
 	Decrease float64 `gorm:"column:decrease;type:numeric(15,3);default:0"`
-	Stock    float64   `gorm:"column:stock;type:numeric(15,3);not null;default:0"`
+	Stock    float64 `gorm:"column:stock;type:numeric(15,3);not null;default:0"`
 
 	LoggableType string `gorm:"column:loggable_type;type:varchar(50);not null"`
 	LoggableId   uint   `gorm:"column:loggable_id;not null"`

internal/entities/stock_transfer_delivery.go

@@ -6,7 +6,7 @@ import "time"
 type StockTransferDelivery struct {
 	Id                uint64 `gorm:"primaryKey;autoIncrement"`
 	StockTransferId   uint64
-	SupplierId        uint64
+	SupplierId        *uint64
 	VehiclePlate      string
 	DriverName        string
 	DocumentNumber    string

internal/middleware/auth.go

@@ -7,8 +7,8 @@ import (
 	"gitlab.com/mbugroup/lti-api.git/internal/config"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/sso/session"
+	sso "gitlab.com/mbugroup/lti-api.git/internal/modules/sso/verifier"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-	"gitlab.com/mbugroup/lti-api.git/internal/sso"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
@@ -24,6 +24,10 @@ type AuthContext struct {
 	User         *entity.User
 	Roles        []sso.Role
 	Permissions  map[string]struct{}
+	UserAreaIDs     []uint
+	UserLocationIDs []uint
+	UserAllArea     bool
+	UserAllLocation bool
 }
 
 // Auth validates the incoming request against the central SSO access token and
@@ -67,15 +71,19 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 
 		var roles []sso.Role
 		permissions := make(map[string]struct{})
+		var profile *sso.UserProfile
 		if verification.UserID != 0 {
-			if profile, err := sso.FetchProfile(c.Context(), token, verification); err != nil {
+			if p, err := sso.FetchProfile(c.Context(), token, verification); err != nil {
 				utils.Log.WithError(err).Warn("auth: failed to fetch sso profile")
-			} else if profile != nil {
-				roles = profile.Roles
-				for _, perm := range profile.PermissionNames() {
-					if perm != "" {
-						permissions[perm] = struct{}{}
-					}
+			} else {
+				profile = p
+			}
+		}
+		if profile != nil {
+			roles = profile.Roles
+			for _, perm := range profile.PermissionNames() {
+				if perm != "" {
+					permissions[perm] = struct{}{}
 				}
 			}
 		}
@@ -86,6 +94,16 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 			User:         user,
 			Roles:        roles,
 			Permissions:  permissions,
+			UserAreaIDs:     nil,
+			UserLocationIDs: nil,
+			UserAllArea:     false,
+			UserAllLocation: false,
+		}
+		if profile != nil {
+			ctx.UserAreaIDs = profile.AreaIDs
+			ctx.UserLocationIDs = profile.LocationIDs
+			ctx.UserAllArea = profile.AllArea
+			ctx.UserAllLocation = profile.AllLocation
 		}
 
 		c.Locals(authContextLocalsKey, ctx)

internal/middleware/role_scope.go

@@ -0,0 +1,636 @@
+package middleware
+
+import (
+	"errors"
+
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+)
+
+type ScopeFilter struct {
+	IDs      []uint
+	Restrict bool
+}
+
+type roleScope struct {
+	allArea      bool
+	allLocation  bool
+	areaIDs      []uint
+	locationIDs  []uint
+	hasAnyScopes bool
+}
+
+func ResolveAreaScope(c *fiber.Ctx, db *gorm.DB) (ScopeFilter, error) {
+	scope, err := collectRoleScope(c)
+	if err != nil || !scope.hasAnyScopes {
+		return ScopeFilter{}, err
+	}
+
+	if scope.allArea || scope.allLocation {
+		return ScopeFilter{}, nil
+	}
+
+	allowed := uniqueUint(scope.areaIDs)
+	if len(scope.locationIDs) > 0 {
+		derived, err := areaIDsByLocationIDs(db, scope.locationIDs)
+		if err != nil {
+			return ScopeFilter{}, err
+		}
+		allowed = uniqueUint(append(allowed, derived...))
+	}
+
+	if len(allowed) == 0 {
+		return ScopeFilter{Restrict: true}, nil
+	}
+	return ScopeFilter{IDs: allowed, Restrict: true}, nil
+}
+
+func ResolveLocationScope(c *fiber.Ctx, db *gorm.DB) (ScopeFilter, error) {
+	scope, err := collectRoleScope(c)
+	if err != nil || !scope.hasAnyScopes {
+		return ScopeFilter{}, err
+	}
+
+	if scope.allLocation || scope.allArea {
+		return ScopeFilter{}, nil
+	}
+
+	areaIDs := uniqueUint(scope.areaIDs)
+	locationIDs := uniqueUint(scope.locationIDs)
+
+	switch {
+	case len(locationIDs) > 0 && len(areaIDs) > 0:
+		filtered, err := filterLocationIDsByAreaIDs(db, locationIDs, areaIDs)
+		if err != nil {
+			return ScopeFilter{}, err
+		}
+		locationIDs = filtered
+	case len(locationIDs) == 0 && len(areaIDs) > 0:
+		derived, err := locationIDsByAreaIDs(db, areaIDs)
+		if err != nil {
+			return ScopeFilter{}, err
+		}
+		locationIDs = derived
+	}
+
+	locationIDs = uniqueUint(locationIDs)
+	if len(locationIDs) == 0 {
+		return ScopeFilter{Restrict: true}, nil
+	}
+	return ScopeFilter{IDs: locationIDs, Restrict: true}, nil
+}
+
+func ResolveLocationAreaScopes(c *fiber.Ctx, db *gorm.DB) (ScopeFilter, ScopeFilter, error) {
+	locationScope, err := ResolveLocationScope(c, db)
+	if err != nil {
+		return ScopeFilter{}, ScopeFilter{}, err
+	}
+	areaScope, err := ResolveAreaScope(c, db)
+	if err != nil {
+		return ScopeFilter{}, ScopeFilter{}, err
+	}
+	return locationScope, areaScope, nil
+}
+
+func collectRoleScope(c *fiber.Ctx) (roleScope, error) {
+	ctx, ok := AuthDetails(c)
+	if !ok || ctx == nil {
+		return roleScope{}, nil
+	}
+
+	userAreaIDs := uniqueUint(ctx.UserAreaIDs)
+	userLocationIDs := uniqueUint(ctx.UserLocationIDs)
+	userScope := roleScope{
+		allArea:      ctx.UserAllArea,
+		allLocation:  ctx.UserAllLocation,
+		areaIDs:      userAreaIDs,
+		locationIDs:  userLocationIDs,
+		hasAnyScopes: ctx.UserAllArea || ctx.UserAllLocation || len(userAreaIDs) > 0 || len(userLocationIDs) > 0,
+	}
+	if userScope.hasAnyScopes {
+		return userScope, nil
+	}
+
+	return roleScope{}, nil
+}
+
+func areaIDsByLocationIDs(db *gorm.DB, locationIDs []uint) ([]uint, error) {
+	if db == nil {
+		return nil, errors.New("database not configured")
+	}
+	if len(locationIDs) == 0 {
+		return nil, nil
+	}
+	var areaIDs []uint
+	if err := db.Model(&entity.Location{}).
+		Where("deleted_at IS NULL").
+		Where("id IN ?", locationIDs).
+		Distinct("area_id").
+		Pluck("area_id", &areaIDs).Error; err != nil {
+		return nil, err
+	}
+	return areaIDs, nil
+}
+
+func locationIDsByAreaIDs(db *gorm.DB, areaIDs []uint) ([]uint, error) {
+	if db == nil {
+		return nil, errors.New("database not configured")
+	}
+	if len(areaIDs) == 0 {
+		return nil, nil
+	}
+	var locationIDs []uint
+	if err := db.Model(&entity.Location{}).
+		Where("deleted_at IS NULL").
+		Where("area_id IN ?", areaIDs).
+		Distinct("id").
+		Pluck("id", &locationIDs).Error; err != nil {
+		return nil, err
+	}
+	return locationIDs, nil
+}
+
+func filterLocationIDsByAreaIDs(db *gorm.DB, locationIDs, areaIDs []uint) ([]uint, error) {
+	if db == nil {
+		return nil, errors.New("database not configured")
+	}
+	if len(locationIDs) == 0 || len(areaIDs) == 0 {
+		return nil, nil
+	}
+	var filtered []uint
+	if err := db.Model(&entity.Location{}).
+		Where("deleted_at IS NULL").
+		Where("id IN ?", locationIDs).
+		Where("area_id IN ?", areaIDs).
+		Distinct("id").
+		Pluck("id", &filtered).Error; err != nil {
+		return nil, err
+	}
+	return filtered, nil
+}
+
+func uniqueUint(ids []uint) []uint {
+	if len(ids) == 0 {
+		return nil
+	}
+	seen := make(map[uint]struct{}, len(ids))
+	result := make([]uint, 0, len(ids))
+	for _, id := range ids {
+		if id == 0 {
+			continue
+		}
+		if _, ok := seen[id]; ok {
+			continue
+		}
+		seen[id] = struct{}{}
+		result = append(result, id)
+	}
+	return result
+}
+
+func ApplyScopeFilter(db *gorm.DB, scope ScopeFilter, column string) *gorm.DB {
+	if db == nil || !scope.Restrict {
+		return db
+	}
+	if len(scope.IDs) == 0 {
+		return db.Where("1 = 0")
+	}
+	return db.Where(column+" IN ?", scope.IDs)
+}
+
+func ApplyLocationScope(c *fiber.Ctx, db *gorm.DB, column string) (*gorm.DB, error) {
+	scopeDB := db
+	if db != nil {
+		scopeDB = db.Session(&gorm.Session{NewDB: true})
+	}
+	scope, err := ResolveLocationScope(c, scopeDB)
+	if err != nil {
+		return db, err
+	}
+	return ApplyScopeFilter(db, scope, column), nil
+}
+
+func ApplyAreaScope(c *fiber.Ctx, db *gorm.DB, column string) (*gorm.DB, error) {
+	scopeDB := db
+	if db != nil {
+		scopeDB = db.Session(&gorm.Session{NewDB: true})
+	}
+	scope, err := ResolveAreaScope(c, scopeDB)
+	if err != nil {
+		return db, err
+	}
+	return ApplyScopeFilter(db, scope, column), nil
+}
+
+func ApplyLocationAreaScope(c *fiber.Ctx, db *gorm.DB, locationColumn, areaColumn string) (*gorm.DB, error) {
+	scopeDB := db
+	if db != nil {
+		scopeDB = db.Session(&gorm.Session{NewDB: true})
+	}
+
+	if locationColumn != "" {
+		locationScope, err := ResolveLocationScope(c, scopeDB)
+		if err != nil {
+			return db, err
+		}
+		db = ApplyScopeFilter(db, locationScope, locationColumn)
+	}
+
+	if areaColumn != "" {
+		areaScope, err := ResolveAreaScope(c, scopeDB)
+		if err != nil {
+			return db, err
+		}
+		db = ApplyScopeFilter(db, areaScope, areaColumn)
+	}
+
+	return db, nil
+}
+
+func EnsureWarehouseAccess(c *fiber.Ctx, db *gorm.DB, warehouseID uint) error {
+	if warehouseID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid warehouse id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.Warehouse{}).
+			Where("id = ?", warehouseID),
+		scope,
+		"warehouses.location_id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
+	}
+	return nil
+}
+
+func EnsureAreaAccess(c *fiber.Ctx, db *gorm.DB, areaID uint) error {
+	if areaID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid area id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveAreaScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Area not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.Area{}).
+			Where("id = ?", areaID),
+		scope,
+		"areas.id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Area not found")
+	}
+	return nil
+}
+
+func EnsureLocationAccess(c *fiber.Ctx, db *gorm.DB, locationID uint) error {
+	if locationID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid location id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Location not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.Location{}).
+			Where("id = ?", locationID),
+		scope,
+		"locations.id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Location not found")
+	}
+	return nil
+}
+
+func EnsureKandangAccess(c *fiber.Ctx, db *gorm.DB, kandangID uint) error {
+	if kandangID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid kandang id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Kandang not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.Kandang{}).
+			Where("id = ?", kandangID),
+		scope,
+		"kandangs.location_id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Kandang not found")
+	}
+	return nil
+}
+
+func EnsureProductWarehouseAccess(c *fiber.Ctx, db *gorm.DB, productWarehouseID uint) error {
+	if productWarehouseID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid product warehouse id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Product warehouse not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("product_warehouses pw").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+		Where("pw.id = ?", productWarehouseID)
+	q = ApplyScopeFilter(q, scope, "w.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Product warehouse not found")
+	}
+	return nil
+}
+
+func EnsureStockLogAccess(c *fiber.Ctx, db *gorm.DB, stockLogID uint) error {
+	if stockLogID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid stock log id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Stock log not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("stock_logs sl").
+		Joins("JOIN product_warehouses pw ON pw.id = sl.product_warehouse_id").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+		Where("sl.id = ?", stockLogID)
+	q = ApplyScopeFilter(q, scope, "w.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Stock log not found")
+	}
+	return nil
+}
+
+func EnsureMarketingAccess(c *fiber.Ctx, db *gorm.DB, marketingID uint) error {
+	if marketingID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid marketing id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Marketing not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("marketings m").
+		Joins("JOIN marketing_products mp ON mp.marketing_id = m.id").
+		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+		Where("m.id = ?", marketingID)
+	q = ApplyScopeFilter(q, scope, "w.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Marketing not found")
+	}
+	return nil
+}
+
+func EnsureRecordingAccess(c *fiber.Ctx, db *gorm.DB, recordingID uint) error {
+	if recordingID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid recording id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Recording not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("recordings r").
+		Joins("JOIN project_flock_kandangs pfk ON pfk.id = r.project_flock_kandangs_id").
+		Joins("JOIN project_flocks pf ON pf.id = pfk.project_flock_id").
+		Where("r.id = ?", recordingID)
+	q = ApplyScopeFilter(q, scope, "pf.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Recording not found")
+	}
+	return nil
+}
+
+func EnsureUniformityAccess(c *fiber.Ctx, db *gorm.DB, uniformityID uint) error {
+	if uniformityID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid uniformity id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Uniformity not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("project_flock_kandang_uniformity u").
+		Joins("JOIN project_flock_kandangs pfk ON pfk.id = u.project_flock_kandang_id").
+		Joins("JOIN project_flocks pf ON pf.id = pfk.project_flock_id").
+		Where("u.id = ?", uniformityID)
+	q = ApplyScopeFilter(q, scope, "pf.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Uniformity not found")
+	}
+	return nil
+}
+
+func EnsureLayingTransferAccess(c *fiber.Ctx, db *gorm.DB, transferID uint) error {
+	if transferID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid transfer id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Transfer not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("laying_transfers lt").
+		Joins("JOIN project_flocks pf_from ON pf_from.id = lt.from_project_flock_id").
+		Joins("JOIN project_flocks pf_to ON pf_to.id = lt.to_project_flock_id").
+		Where("lt.id = ?", transferID).
+		Where("(pf_from.location_id IN ? OR pf_to.location_id IN ?)", scope.IDs, scope.IDs)
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Transfer not found")
+	}
+	return nil
+}
+
+func EnsureProjectFlockAccess(c *fiber.Ctx, db *gorm.DB, projectFlockID uint) error {
+	if projectFlockID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Project Flock not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.ProjectFlock{}).
+			Where("id = ?", projectFlockID),
+		scope,
+		"project_flocks.location_id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Project Flock not found")
+	}
+	return nil
+}
+
+func EnsureProjectFlockKandangAccess(c *fiber.Ctx, db *gorm.DB, projectFlockID, projectFlockKandangID uint) error {
+	if projectFlockKandangID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project flock kandang id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Project Flock Kandang not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("project_flock_kandangs").
+		Joins("JOIN project_flocks ON project_flocks.id = project_flock_kandangs.project_flock_id").
+		Where("project_flock_kandangs.id = ?", projectFlockKandangID)
+	if projectFlockID > 0 {
+		q = q.Where("project_flock_kandangs.project_flock_id = ?", projectFlockID)
+	}
+	q = ApplyScopeFilter(q, scope, "project_flocks.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Project Flock Kandang not found")
+	}
+	return nil
+}

internal/modules/approvals/controllers/approval.controller.go

@@ -44,6 +44,15 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
 	page := c.QueryInt("page", 1)
 	limit := c.QueryInt("limit", 10)
 	search := strings.TrimSpace(c.Query("search", ""))
+	orderByDate := strings.TrimSpace(c.Query("order_by_date", ""))
+	if orderByDate == "" {
+		orderByDate = "DESC"
+	} else {
+		orderByDate = strings.ToUpper(orderByDate)
+		if orderByDate != "ASC" && orderByDate != "DESC" {
+			return fiber.NewError(fiber.StatusBadRequest, "order_by_date must be either ASC or DESC")
+		}
+	}
 
 	query := &validation.Query{
 		ModuleName:  moduleName,
@@ -52,6 +61,7 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
 		Page:        page,
 		Limit:       limit,
 		Search:      search,
+		OrderByDate: orderByDate,
 	}
 
 	records, totalResults, err := u.ApprovalService.List(
@@ -61,6 +71,7 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
 		query.Page,
 		query.Limit,
 		query.Search,
+		query.OrderByDate,
 	)
 	if err != nil {
 		return err

internal/modules/approvals/validations/approval.validation.go

@@ -7,4 +7,5 @@ type Query struct {
 	Page        int    `query:"page" validate:"omitempty,number,min=1"`
 	Limit       int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
 	Search      string `query:"search" validate:"omitempty,max=50"`
+	OrderByDate string `query:"order_by_date" validate:"omitempty,oneof=ASC DESC"`
 }

internal/modules/closings/dto/closingMarketing.dto.go

@@ -101,17 +101,44 @@ func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 	}
 }
 
-func ToSummaryDto(e []entity.MarketingDeliveryProduct) SummaryDTO {
+func ToSalesAgeDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 
+	productFlags := make([]string, len(e.MarketingProduct.ProductWarehouse.Product.Flags))
+	for i, f := range e.MarketingProduct.ProductWarehouse.Product.Flags {
+		productFlags[i] = f.Name
+	}
+
+	var category string
+	if e.MarketingProduct.ProductWarehouse.ProjectFlockKandang != nil {
+		category = e.MarketingProduct.ProductWarehouse.ProjectFlockKandang.ProjectFlock.Category
+	}
+
+	ageInDay, _ := calculateAgeFromChickin(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang, e.DeliveryDate, productFlags, category)
+
+	return SalesDTO{
+		Age: ageInDay,
+		Qty: e.UsageQty,
+	}
+}
+
+func ToSummaryDto(e []entity.MarketingDeliveryProduct) SummaryDTO {
 	var totalSalesPrice, totalActualPrice, sumSales, sumActual float64
 	count := len(e)
 
+	if count == 0 {
+		return SummaryDTO{
+			TotalSalesPrice:  0,
+			TotalActualPrice: 0,
+			AvgSalesPrice:    0,
+			AvgActualPrice:   0,
+		}
+	}
+
 	for _, item := range e {
 		totalSalesPrice += item.MarketingProduct.TotalPrice
 		totalActualPrice += item.TotalPrice
 		sumSales += item.MarketingProduct.UnitPrice
 		sumActual += item.UnitPrice
-
 	}
 
 	return SummaryDTO{

internal/modules/closings/dto/closingSapronak.dto.go

@@ -234,14 +234,14 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 						row.Notes = "TRANSFER STOCK"
 					}
 				}
-			case "pemakaian", "adjustment keluar":
+			case "pemakaian":
 				price := row.UnitPrice
 				if price == 0 {
 					price = item.Harga
 				}
 				row.QtyUsed += item.QtyKeluar
 				row.TotalAmount += item.QtyKeluar * price
-			case "mutasi keluar", "penjualan":
+			case "adjustment keluar", "mutasi keluar", "penjualan":
 				price := row.UnitPrice
 				if price == 0 {
 					price = item.Harga

internal/modules/closings/repositories/closing.repository.go

@@ -24,7 +24,6 @@ type ClosingRepository interface {
 	SumMarketingWeightAndQtyByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) (float64, float64, float64, error)
 	SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, float64, float64, error)
 	SumRecordingEggQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, error)
-	GetFcrStandardsByFcrID(ctx context.Context, fcrID uint) ([]entity.FcrStandard, error)
 	GetExpeditionHPP(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]ExpeditionHPPRow, error)
 	FetchSapronakIncoming(ctx context.Context, kandangID uint) ([]SapronakIncomingRow, error)
 	FetchSapronakIncomingDetails(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, error)
@@ -36,6 +35,7 @@ type ClosingRepository interface {
 	FetchSapronakAdjustments(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error)
 	FetchSapronakTransfers(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error)
 	FetchSapronakSales(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakSalesAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
 	GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error)
 }
 
@@ -101,12 +101,12 @@ func (r *ClosingRepositoryImpl) GetSapronak(ctx context.Context, params Sapronak
 		if len(params.WarehouseIDs) == 0 {
 			return []SapronakRow{}, 0, nil
 		}
-		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL)
-		args = append(args, params.WarehouseIDs, params.WarehouseIDs)
+		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
+		args = append(args, params.WarehouseIDs, params.WarehouseIDs, params.WarehouseIDs)
 	case validation.SapronakTypeOutgoing:
 		if len(params.WarehouseIDs) > 0 {
-			unionParts = append(unionParts, sapronakOutgoingTransfersSQL)
-			args = append(args, params.WarehouseIDs)
+			unionParts = append(unionParts, sapronakOutgoingTransfersSQL, sapronakOutgoingAdjustmentsSQL)
+			args = append(args, params.WarehouseIDs, params.WarehouseIDs)
 		}
 		if len(params.ProjectFlockKandangIDs) > 0 {
 			unionParts = append(unionParts, sapronakOutgoingMarketingsSQL)
@@ -173,12 +173,12 @@ func (r *ClosingRepositoryImpl) GetSapronakSummary(ctx context.Context, params S
 		if len(params.WarehouseIDs) == 0 {
 			return []SapronakSummaryRow{}, nil
 		}
-		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL)
-		args = append(args, params.WarehouseIDs, params.WarehouseIDs)
+		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
+		args = append(args, params.WarehouseIDs, params.WarehouseIDs, params.WarehouseIDs)
 	case validation.SapronakTypeOutgoing:
 		if len(params.WarehouseIDs) > 0 {
-			unionParts = append(unionParts, sapronakOutgoingTransfersSQL)
-			args = append(args, params.WarehouseIDs)
+			unionParts = append(unionParts, sapronakOutgoingTransfersSQL, sapronakOutgoingAdjustmentsSQL)
+			args = append(args, params.WarehouseIDs, params.WarehouseIDs)
 		}
 		if len(params.ProjectFlockKandangIDs) > 0 {
 			unionParts = append(unionParts, sapronakOutgoingMarketingsSQL)
@@ -355,9 +355,10 @@ func (r *ClosingRepositoryImpl) SumMarketingWeightAndQtyByProjectFlockKandangIDs
 		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
 		Joins("JOIN products prod ON prod.id = pw.product_id").
 		Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", "products").
+		Joins("JOIN marketing_delivery_products mdp ON mdp.marketing_product_id = mp.id").
 		Where("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
 		Where("f.name IN ?", flagNames).
-		Select("COALESCE(SUM(mp.total_weight), 0) AS total_weight, COALESCE(SUM(mp.qty), 0) AS total_qty, COALESCE(SUM(mp.total_price), 0) AS total_price").
+		Select("COALESCE(SUM(mdp.total_weight), 0) AS total_weight, COALESCE(SUM(mdp.usage_qty), 0) AS total_qty, COALESCE(SUM(mdp.total_price), 0) AS total_price").
 		Scan(&agg).Error
 	if err != nil {
 		return 0, 0, 0, err
@@ -391,22 +392,6 @@ func (r *ClosingRepositoryImpl) SumRecordingEggQtyByProjectFlockKandangIDsAndFla
 	return agg.TotalQty, nil
 }
 
-func (r *ClosingRepositoryImpl) GetFcrStandardsByFcrID(ctx context.Context, fcrID uint) ([]entity.FcrStandard, error) {
-	if fcrID == 0 {
-		return []entity.FcrStandard{}, nil
-	}
-
-	var standards []entity.FcrStandard
-	if err := r.DB().WithContext(ctx).
-		Where("fcr_id = ?", fcrID).
-		Order("weight ASC").
-		Find(&standards).Error; err != nil {
-		return nil, err
-	}
-
-	return standards, nil
-}
-
 func (r *ClosingRepositoryImpl) GetExpeditionHPP(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]ExpeditionHPPRow, error) {
 	db := r.DB().WithContext(ctx)
 
@@ -454,7 +439,7 @@ SELECT
 	COALESCE(pi.received_date, '1970-01-01') AS sort_date,
 	COALESCE(TO_CHAR(pi.received_date, 'DD-Mon-YYYY'), '') AS date_text,
 	COALESCE(p.po_number, '') AS reference_number,
-	'Purchase' AS transaction_type,
+	'Pembelian' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -503,7 +488,7 @@ SELECT
 	st.transfer_date AS sort_date,
 	TO_CHAR(st.transfer_date, 'DD-Mon-YYYY') AS date_text,
 	st.movement_number AS reference_number,
-	'Internal Transfer In' AS transaction_type,
+	'Mutasi' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -537,7 +522,7 @@ SELECT
 	std.usage_qty AS quantity,
 	u.id AS unit_id,
 	u.name AS unit,
-	'Stock Refill' AS notes
+	st.reason AS notes
 FROM stock_transfer_details std
 JOIN stock_transfers st ON st.id = std.stock_transfer_id
 LEFT JOIN warehouses fw ON fw.id = st.from_warehouse_id
@@ -547,13 +532,63 @@ JOIN uoms u ON u.id = prod.uom_id
 WHERE st.to_warehouse_id IN ?
 `
 
+	sapronakIncomingAdjustmentsSQL = `
+SELECT
+	CAST(ast.id AS BIGINT) AS id,
+	ast.created_at AS sort_date,
+	COALESCE(TO_CHAR(ast.created_at, 'DD-Mon-YYYY'), '') AS date_text,
+	COALESCE(ast.adj_number, '') AS reference_number,
+	'Adjustment stock' AS transaction_type,
+	prod.name AS product_name,
+	COALESCE((
+		SELECT string_agg(
+			f.name,
+			' ' ORDER BY
+				CASE
+					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
+					ELSE 1
+				END,
+				f.name
+		)
+		FROM flags f
+		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
+	), '') AS product_category,
+	COALESCE((
+		SELECT string_agg(
+			f.name,
+			' ' ORDER BY
+				CASE
+					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
+					ELSE 1
+				END,
+				f.name
+		)
+		FROM flags f
+		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
+	), '') AS product_sub_category,
+	'-' AS source_warehouse,
+	COALESCE(w.name, '')  AS destination_warehouse,
+	'' AS destination,
+	COALESCE(ast.total_qty, 0) AS quantity,
+	u.id AS unit_id,
+	u.name AS unit,
+	'-' AS notes
+FROM adjustment_stocks ast
+JOIN product_warehouses pw ON pw.id = ast.product_warehouse_id
+JOIN warehouses w ON w.id = pw.warehouse_id
+JOIN products prod ON prod.id = pw.product_id
+JOIN uoms u ON u.id = prod.uom_id
+WHERE pw.warehouse_id IN ?
+	AND COALESCE(ast.total_qty, 0) <> 0
+`
+
 	sapronakOutgoingTransfersSQL = `
 SELECT
 	CAST(st.id AS BIGINT) AS id,
 	st.transfer_date AS sort_date,
 	TO_CHAR(st.transfer_date, 'DD-Mon-YYYY') AS date_text,
 	st.movement_number AS reference_number,
-	'Internal Transfer Out' AS transaction_type,
+	'Mutasi' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -587,7 +622,7 @@ SELECT
 	std.usage_qty AS quantity,
 	u.id AS unit_id,
 	u.name AS unit,
-	'Transfer to other unit' AS notes
+	st.reason AS notes
 FROM stock_transfer_details std
 JOIN stock_transfers st ON st.id = std.stock_transfer_id
 LEFT JOIN warehouses fw ON fw.id = st.from_warehouse_id
@@ -597,13 +632,70 @@ JOIN uoms u ON u.id = prod.uom_id
 WHERE st.from_warehouse_id IN ?
 `
 
+	sapronakOutgoingAdjustmentsSQL = `
+SELECT
+	CAST(ast.id AS BIGINT) AS id,
+	ast.created_at AS sort_date,
+	COALESCE(TO_CHAR(ast.created_at, 'DD-Mon-YYYY'), '') AS date_text,
+	COALESCE(ast.adj_number, '') AS reference_number,
+	'Adjustment stock' AS transaction_type,
+	prod.name AS product_name,
+	COALESCE((
+		SELECT string_agg(
+			f.name,
+			' ' ORDER BY
+				CASE
+					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
+					ELSE 1
+				END,
+				f.name
+		)
+		FROM flags f
+		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
+	), '') AS product_category,
+	COALESCE((
+		SELECT string_agg(
+			f.name,
+			' ' ORDER BY
+				CASE
+					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
+					ELSE 1
+				END,
+				f.name
+		)
+		FROM flags f
+		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
+	), '') AS product_sub_category,
+	COALESCE(w.name, '') AS source_warehouse,
+	'-' AS destination_warehouse,
+	'' AS destination,
+	COALESCE(ast.usage_qty, 0) AS quantity,
+	u.id AS unit_id,
+	u.name AS unit,
+	'-' AS notes
+FROM adjustment_stocks ast
+JOIN product_warehouses pw ON pw.id = ast.product_warehouse_id
+JOIN warehouses w ON w.id = pw.warehouse_id
+JOIN products prod ON prod.id = pw.product_id
+JOIN uoms u ON u.id = prod.uom_id
+WHERE pw.warehouse_id IN ?
+	AND COALESCE(ast.usage_qty, 0) <> 0
+	AND EXISTS (
+		SELECT 1
+		FROM flags f
+		WHERE f.flagable_id = pw.product_id
+			AND f.flagable_type = 'products'
+			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET', 'AYAM-AFKIR', 'AYAM-MATI', 'AYAM-CULLING', 'TELUR-UTUH', 'TELUR-PECAH', 'TELUR-PUTIH', 'TELUR-RETAK')
+	)
+`
+
 	sapronakOutgoingMarketingsSQL = `
 SELECT
 	CAST(mp.id AS BIGINT) AS id,
 	m.so_date AS sort_date,
 	TO_CHAR(m.so_date, 'DD-Mon-YYYY') AS date_text,
 	m.so_number AS reference_number,
-	'Trading Sales' AS transaction_type,
+	'Penjualan' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -651,7 +743,7 @@ WHERE pw.project_flock_kandang_id IN ?
 		FROM flags f
 		WHERE f.flagable_id = pw.product_id
 			AND f.flagable_type = 'products'
-			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET')
+			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET', 'AYAM-AFKIR', 'AYAM-MATI', 'AYAM-CULLING', 'TELUR-UTUH', 'TELUR-PECAH', 'TELUR-PUTIH', 'TELUR-RETAK')
 	)
 `
 )
@@ -797,7 +889,7 @@ func (r *ClosingRepositoryImpl) detailQuery(
 ) *gorm.DB {
 	db := r.withCtx(ctx).
 		Table(table).
-		Joins("JOIN product_warehouses pw ON "+pwJoinCond).
+		Joins("JOIN product_warehouses pw ON " + pwJoinCond).
 		Joins("JOIN products p ON p.id = pw.product_id")
 
 	db = applyJoins(db, joins...)
@@ -906,7 +998,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 				pi.received_date,
 				st.transfer_date,
 				lt.transfer_date,
-				sl.created_at,
+				ast.created_at,
 				pc.chick_in_date,
 				r.record_datetime
 			) AS date,
@@ -935,10 +1027,10 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
 		Joins("LEFT JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id").
 		Joins("LEFT JOIN adjustment_stocks ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()).
-		Joins("LEFT JOIN stock_logs sl ON sl.id = ast.stock_log_id").
 		Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()).
 		Joins("LEFT JOIN project_chickins pc ON pc.id = pfp.project_chickin_id").
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
+		Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where(`
 			(sa.usable_type = ? AND r.project_flock_kandangs_id = ?)
@@ -951,7 +1043,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 	query = r.joinSapronakProductFlag(query, "p").
 		Group(`
 			pw.product_id, p.name, f.name,
-			pi.received_date, st.transfer_date, lt.transfer_date, sl.created_at, pc.chick_in_date, r.record_datetime,
+			pi.received_date, st.transfer_date, lt.transfer_date, ast.created_at, pc.chick_in_date, r.record_datetime,
 			po.po_number, st.movement_number, lt.transfer_number, ast.id, pc.id, r.id,
 			pi.price, p.product_price
 		`)
@@ -1035,7 +1127,7 @@ func (r *ClosingRepositoryImpl) fetchStockLogs(ctx context.Context, kandangID ui
 			COALESCE(sl.increase,0) AS increase,
 			COALESCE(sl.decrease,0) AS decrease,
 			COALESCE(p.product_price,0) AS price,
-			`+movementSelect+`
+			` + movementSelect + `
 		`).
 		Joins("JOIN product_warehouses pw ON pw.id = sl.product_warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
@@ -1085,12 +1177,75 @@ func splitStockLogs(rows []stockLogSapronakRow, refFn func(stockLogSapronakRow)
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakAdjustments(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
-	rows, err := r.fetchStockLogs(ctx, kandangID, string(utils.StockLogTypeAdjustment), false)
+	poByWarehouse := r.DB().
+		Table("purchase_items pi").
+		Select("DISTINCT ON (pi.product_warehouse_id) pi.product_warehouse_id, po.po_number, pi.received_date").
+		Joins("JOIN purchases po ON po.id = pi.purchase_id").
+		Where("pi.received_date IS NOT NULL").
+		Order("pi.product_warehouse_id, pi.received_date ASC")
+
+	incomingQuery := r.withCtx(ctx).
+		Table("adjustment_stocks AS ast").
+		Select(`
+			pw.product_id AS product_id,
+			p.name AS product_name,
+			f.name AS flag,
+			ast.created_at AS date,
+			CONCAT('ADJ-', ast.id) AS reference,
+			COALESCE(ast.total_qty, 0) AS qty_in,
+			0 AS qty_out,
+			COALESCE(p.product_price, 0) AS price
+		`).
+		Joins("JOIN product_warehouses pw ON pw.id = ast.product_warehouse_id").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Where("w.kandang_id = ?", kandangID).
+		Where("f.name IN ?", sapronakFlagsAll).
+		Where("COALESCE(ast.total_qty, 0) > 0")
+	incomingQuery = r.joinSapronakProductFlag(incomingQuery, "p")
+	incoming, err := scanAndGroupDetails(incomingQuery)
 	if err != nil {
 		return nil, nil, err
 	}
-	in, out := splitStockLogs(rows, func(row stockLogSapronakRow) string { return fmt.Sprintf("ADJ-%d", row.ID) })
-	return in, out, nil
+
+	outgoingQuery := r.withCtx(ctx).
+		Table("stock_allocations AS sa").
+		Select(`
+			pw.product_id AS product_id,
+			p.name AS product_name,
+			f.name AS flag,
+			COALESCE(pi.received_date, st.transfer_date, lt.transfer_date, pfp_po.received_date, pc.chick_in_date, ast_in.created_at, ast.created_at) AS date,
+			COALESCE(po.po_number, st.movement_number, lt.transfer_number, pfp_po.po_number, CONCAT('CHICKIN-', pc.id), CONCAT('ADJ-', ast_in.id), CONCAT('ADJ-', ast.id)) AS reference,
+			0 AS qty_in,
+			COALESCE(SUM(sa.qty), 0) AS qty_out,
+			COALESCE(p.product_price, 0) AS price
+		`).
+		Joins("JOIN adjustment_stocks ast ON ast.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyAdjustmentOut.String()).
+		Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
+		Joins("LEFT JOIN purchases po ON po.id = pi.purchase_id").
+		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
+		Joins("LEFT JOIN stock_transfers st ON st.id = std.stock_transfer_id").
+		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
+		Joins("LEFT JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id").
+		Joins("LEFT JOIN adjustment_stocks ast_in ON ast_in.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()).
+		Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()).
+		Joins("LEFT JOIN project_chickins pc ON pc.id = pfp.project_chickin_id").
+		Joins("LEFT JOIN (?) pfp_po ON pfp_po.product_warehouse_id = pfp.product_warehouse_id", poByWarehouse).
+		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Where("sa.status = ?", entity.StockAllocationStatusActive).
+		Where("w.kandang_id = ?", kandangID).
+		Where("f.name IN ?", sapronakFlagsAll).
+		Where("f.name NOT IN ?", sapronakFlags(utils.FlagDOC, utils.FlagPullet)).
+		Group("pw.product_id, p.name, f.name, pi.received_date, st.transfer_date, lt.transfer_date, pfp_po.received_date, pc.chick_in_date, ast_in.created_at, ast.created_at, po.po_number, st.movement_number, lt.transfer_number, pfp_po.po_number, pc.id, ast_in.id, ast.id, p.product_price")
+	outgoingQuery = r.joinSapronakProductFlag(outgoingQuery, "p")
+	outgoing, err := scanAndGroupDetails(outgoingQuery)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return incoming, outgoing, nil
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
@@ -1286,6 +1441,59 @@ func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectF
 	return sales, nil
 }
 
+func (r *ClosingRepositoryImpl) FetchSapronakSalesAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error) {
+	if projectFlockKandangID == 0 {
+		return map[uint][]SapronakDetailRow{}, nil
+	}
+
+	query := r.withCtx(ctx).
+		Table("stock_allocations AS sa").
+		Select(`
+			pw.product_id AS product_id,
+			p.name AS product_name,
+			f.name AS flag,
+			COALESCE(
+				pi.received_date,
+				st.transfer_date,
+				lt.transfer_date,
+				ast.created_at
+			) AS date,
+			COALESCE(
+				po.po_number,
+				st.movement_number,
+				lt.transfer_number,
+				CONCAT('ADJ-', ast.id),
+				''
+			) AS reference,
+			0 AS qty_in,
+			COALESCE(SUM(sa.qty), 0) AS qty_out,
+			COALESCE(pi.price, p.product_price, 0) AS price
+		`).
+		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyMarketingDelivery.String()).
+		Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
+		Joins("LEFT JOIN purchases po ON po.id = pi.purchase_id").
+		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
+		Joins("LEFT JOIN stock_transfers st ON st.id = std.stock_transfer_id").
+		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
+		Joins("LEFT JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id").
+		Joins("LEFT JOIN adjustment_stocks ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()).
+		Where("sa.status = ?", entity.StockAllocationStatusActive).
+		Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()).
+		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
+		Where("f.name IN ?", sapronakFlagsAll).
+		Group(`
+			pw.product_id, p.name, f.name,
+			pi.received_date, st.transfer_date, lt.transfer_date, ast.created_at,
+			po.po_number, st.movement_number, lt.transfer_number, ast.id,
+			pi.price, p.product_price
+		`)
+
+	query = r.joinSapronakProductFlag(query, "p")
+	return scanAndGroupDetails(query)
+}
+
 func (r *ClosingRepositoryImpl) GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error) {
 	if len(productIDs) == 0 {
 		return []entity.Product{}, nil

internal/modules/closings/services/closing.service.go

@@ -12,6 +12,7 @@ import (
 
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/closings/dto"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/validations"
@@ -98,6 +99,11 @@ func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.Cl
 		return nil, 0, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 	statusFilter := ""
 	if params.ProjectStatus != nil {
@@ -111,6 +117,12 @@ func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.Cl
 
 	closings, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withClosingRelations(db)
+		if scope.Restrict {
+			if len(scope.IDs) == 0 {
+				return db.Where("1 = 0")
+			}
+			db = m.ApplyScopeFilter(db, scope, "project_flocks.location_id")
+		}
 		if params.LocationID != nil {
 			db = db.Where("location_id = ?", *params.LocationID)
 		}
@@ -150,6 +162,10 @@ func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.Cl
 }
 
 func (s closingService) GetProjectFlockByID(c *fiber.Ctx, id uint) (*entity.ProjectFlock, error) {
+	if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), id); err != nil {
+		return nil, err
+	}
+
 	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Project Flock not found")
@@ -161,13 +177,15 @@ func (s closingService) GetProjectFlockByID(c *fiber.Ctx, id uint) (*entity.Proj
 }
 
 func (s closingService) GetPenjualan(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error) {
-
-	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), projectFlockID, nil)
-	if err != nil {
+	if projectFlockKandangID != nil {
+		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
+			return nil, err
+		}
+	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
 		return nil, err
 	}
 
-	realisasi, err := s.MarketingDeliveryProductRepo.GetClosingPenjualan(c.Context(), projectFlockID, projectFlockKandangID, projectFlock.Category)
+	realisasi, err := s.MarketingDeliveryProductRepo.GetClosingPenjualan(c.Context(), projectFlockID, projectFlockKandangID)
 	if err != nil {
 		return nil, err
 	}
@@ -179,8 +197,8 @@ func (s closingService) GetPenjualan(c *fiber.Ctx, projectFlockID uint, projectF
 }
 
 func (s closingService) GetClosingSummary(c *fiber.Ctx, projectFlockID uint, kandangID *uint) (any, error) {
-	if projectFlockID == 0 {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+		return nil, err
 	}
 
 	if kandangID != nil {
@@ -264,7 +282,7 @@ func (s closingService) getClosingSummaryByKandang(ctx context.Context, projectF
 	statusProject := "Belum Selesai"
 	var approvalDate string
 	if s.ApprovalSvc != nil {
-		records, _, err := s.ApprovalSvc.List(ctx, utils.ApprovalWorkflowProjectFlockKandang.String(), &kandang.Id, 1, 1000, "")
+		records, _, err := s.ApprovalSvc.List(ctx, utils.ApprovalWorkflowProjectFlockKandang.String(), &kandang.Id, 1, 1000, "", "")
 		if err != nil {
 			s.Log.Errorf("Failed to fetch approvals for project flock kandang %d: %+v", kandang.Id, err)
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch approval data")
@@ -326,8 +344,8 @@ func (s closingService) getClosingSummaryByKandang(ctx context.Context, projectF
 }
 
 func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, params *validation.ClosingSapronakQuery) ([]dto.ClosingSapronakItemDTO, int64, error) {
-	if projectFlockID == 0 {
-		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+		return nil, 0, err
 	}
 
 	if params == nil {
@@ -349,15 +367,7 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "type must be either incoming or outgoing")
 	}
 
-	if _, err := s.Repository.GetByID(c.Context(), projectFlockID, nil); err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, 0, fiber.NewError(fiber.StatusNotFound, "Project flock tidak ditemukan")
-		}
-		s.Log.Errorf("Failed get project flock %d for sapronak closing: %+v", projectFlockID, err)
-		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
-	}
-
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID)
+	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch warehouses for project flock %d: %+v", projectFlockID, err)
 		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouses for project flock")
@@ -441,7 +451,7 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
 	}
 
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID)
+	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch warehouses for project flock %d: %+v", projectFlockID, err)
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouses for project flock")
@@ -484,13 +494,16 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 	return items, nil
 }
 
-func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint) ([]uint, error) {
+func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint, kandangID *uint) ([]uint, error) {
 	var kandangIDs []uint
 	db := s.Repository.DB().WithContext(ctx)
 
-	if err := db.Model(&entity.ProjectFlockKandang{}).
-		Where("project_flock_id = ?", projectFlockID).
-		Pluck("kandang_id", &kandangIDs).Error; err != nil {
+	query := db.Model(&entity.ProjectFlockKandang{}).
+		Where("project_flock_id = ?", projectFlockID)
+	if kandangID != nil && *kandangID > 0 {
+		query = query.Where("id = ?", *kandangID)
+	}
+	if err := query.Pluck("kandang_id", &kandangIDs).Error; err != nil {
 		return nil, err
 	}
 
@@ -542,7 +555,7 @@ func (s closingService) getApprovalStatuses(ctx context.Context, projectFlockID
 		return "", "Belum Selesai", nil
 	}
 
-	records, _, err := s.ApprovalSvc.List(ctx, utils.ApprovalWorkflowProjectFlock.String(), &projectFlockID, 1, 1000, "")
+	records, _, err := s.ApprovalSvc.List(ctx, utils.ApprovalWorkflowProjectFlock.String(), &projectFlockID, 1, 1000, "", "")
 	if err != nil {
 		return "", "", err
 	}
@@ -585,6 +598,14 @@ func (s closingService) getApprovalStatuses(ctx context.Context, projectFlockID
 }
 
 func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.OverheadListDTO, error) {
+	if projectFlockKandangID != nil {
+		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
+			return nil, err
+		}
+	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+		return nil, err
+	}
+
 	budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlockID)
 	if err != nil {
 		return nil, err
@@ -673,8 +694,12 @@ func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFl
 }
 
 func (s closingService) GetExpeditionHPP(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error) {
-	if projectFlockID == 0 {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	if projectFlockKandangID != nil {
+		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
+			return nil, err
+		}
+	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+		return nil, err
 	}
 
 	rows, err := s.Repository.GetExpeditionHPP(c.Context(), projectFlockID, projectFlockKandangID)
@@ -811,15 +836,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 
 	finalPopulation := population - claimCulling
 
-	var standards []entity.FcrStandard
-	if project.FcrId > 0 {
-		standards, err = s.Repository.GetFcrStandardsByFcrID(c.Context(), project.FcrId)
-		if err != nil {
-			s.Log.Errorf("Failed to fetch FCR standards for project flock %d: %+v", projectFlockID, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch FCR standard data")
-		}
-	}
-	age, err := s.calculateAverageSalesAge(c.Context(), projectFlockID)
+	age, err := s.calculateAverageSalesAge(c.Context(), projectFlockID, kandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to calculate sales age for project flock %d: %+v", projectFlockID, err)
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch sales age data")
@@ -839,7 +856,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		// FeedUsedPerHead:   feedUsedPerHead,
 	}
 
-	chickenFlagNames := []string{string(utils.FlagPullet)}
+	chickenFlagNames := []string{string(utils.FlagPullet), string(utils.FlagAyamAfkir), string(utils.FlagAyamCulling), string(utils.FlagLayer)}
 	chickenSalesWeight, chickenSalesQty, chickenSalesPrice, err := s.Repository.SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(c.Context(), projectFlockKandangIDs, chickenFlagNames)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch chicken sales data for project flock %d: %+v", projectFlockID, err)
@@ -868,7 +885,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		chickenDepletion = 0
 	}
 
-	chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenSalesWeight, feedUsed, population, chickenDepletion, age, standards)
+chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenSalesWeight, feedUsed, population, chickenDepletion, age)
 	if fcrActFromRecording != nil {
 		chickenPerformance.FcrAct = *fcrActFromRecording
 	}
@@ -918,7 +935,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 			eggDepletion = 0
 		}
 
-		eggPerf := calculatePerformanceMetrics(averageEggWeight, eggSalesWeight, feedUsed, harvestEggQty, eggDepletion, age, standards)
+		eggPerf := calculatePerformanceMetrics(averageEggWeight, eggSalesWeight, feedUsed, harvestEggQty, eggDepletion, age)
 		if fcrActFromRecording != nil {
 			eggPerf.FcrAct = *fcrActFromRecording
 		}
@@ -976,10 +993,10 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 			performance.EggMass = eggMass
 		}
 	}
-	performance.DeffFcr = performance.FcrStd - performance.FcrAct
 	if productionStandardDetail != nil {
 		if productionStandardDetail.StandardFCR != nil {
 			performance.FcrStd = *productionStandardDetail.StandardFCR
+			performance.DeffFcr = performance.FcrStd - performance.FcrAct
 		}
 		if !isGrowing {
 			if productionStandardDetail.TargetHenDayProduction != nil {
@@ -1006,38 +1023,24 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 	return &result, nil
 }
 
-func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint) (float64, error) {
-	deliveryProducts, err := s.MarketingDeliveryProductRepo.GetDeliveryProductsByProjectFlockID(ctx, projectFlockID, func(db *gorm.DB) *gorm.DB {
-		return db.
-			Preload("MarketingProduct").
-			Preload("MarketingProduct.ProductWarehouse").
-			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
-			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins")
-	})
+func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) (float64, error) {
+	penjualan, err := s.MarketingDeliveryProductRepo.GetClosingPenjualanForAgeChickDataProduction(ctx, projectFlockID, projectFlockKandangID)
 	if err != nil {
 		return 0, err
 	}
-
-	var (
-		totalQty      float64
-		totalAgeWeeks float64
-	)
-
-	for _, product := range deliveryProducts {
-		if product.UsageQty == 0 {
-			continue
-		}
-		projectFlockKandang := product.MarketingProduct.ProductWarehouse.ProjectFlockKandang
-		ageWeeks := dto.CalculateAgeFromChickinDataProduksi(projectFlockKandang, product.DeliveryDate)
-		totalAgeWeeks += float64(ageWeeks) * product.UsageQty
-		totalQty += product.UsageQty
+	acumulateAgeQty := 0.0
+	totalQty := 0.0
+	for _, v := range penjualan {
+		sale := dto.ToSalesAgeDTO(v)
+		acumulateAgeQty += float64(sale.Age) * sale.Qty
+		totalQty += sale.Qty
+	}
+	if totalQty > 0 {
+		averageAge := acumulateAgeQty / totalQty
+		return averageAge, nil
 	}
 
-	if totalQty == 0 {
-		return 0, nil
-	}
-
-	return totalAgeWeeks / totalQty, nil
+	return 0, err
 }
 
 func (s closingService) determineProductionWeek(ctx context.Context, projectFlockKandangIDs []uint) (int, error) {
@@ -1080,8 +1083,8 @@ func (s closingService) determineProductionWeek(ctx context.Context, projectFloc
 	return week, nil
 }
 
-func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopulation, depletion, age float64, standards []entity.FcrStandard) dto.ClosingPerformanceDTO {
-	mortalityStd, fcrStd := closestFcrValues(standards, averageWeight)
+func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopulation, depletion, age float64) dto.ClosingPerformanceDTO {
+	mortalityStd, fcrStd := 0.0, 0.0
 
 	fcrAct := 0.0
 	if totalWeight > 0 {
@@ -1113,21 +1116,3 @@ func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopul
 		AwgAct:        awg,
 	}
 }
-
-func closestFcrValues(standards []entity.FcrStandard, averageWeight float64) (float64, float64) {
-	if len(standards) == 0 || averageWeight <= 0 {
-		return 0, 0
-	}
-
-	closest := standards[0]
-	minDiff := math.Abs(closest.Weight - averageWeight)
-	for _, std := range standards[1:] {
-		diff := math.Abs(std.Weight - averageWeight)
-		if diff < minDiff {
-			minDiff = diff
-			closest = std
-		}
-	}
-
-	return closest.Mortality, closest.FcrNumber
-}

internal/modules/closings/services/closingKeuangan.service.go

@@ -41,6 +41,7 @@ type ProductionData struct {
 	TotalWeightProduced float64
 	TotalEggWeightKg    float64
 	TotalWeightSold     float64
+	TotalBirdSold       float64
 	TotalSalesAmount    float64
 }
 
@@ -270,9 +271,9 @@ func (s closingKeuanganService) calculateProductionData(c *fiber.Ctx, projectFlo
 
 	var deliveryProducts []entity.MarketingDeliveryProduct
 	if projectFlockKandangID != nil {
-		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualan(c.Context(), projectFlock.Id, projectFlockKandangID, projectFlock.Category)
+		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualanByCategory(c.Context(), projectFlock.Id, projectFlockKandangID, projectFlock.Category)
 	} else {
-		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualan(c.Context(), projectFlock.Id, nil, projectFlock.Category)
+		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualanByCategory(c.Context(), projectFlock.Id, nil, projectFlock.Category)
 	}
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data penjualan")
@@ -283,6 +284,7 @@ func (s closingKeuanganService) calculateProductionData(c *fiber.Ctx, projectFlo
 			continue
 		}
 		data.TotalWeightSold += delivery.TotalWeight
+		data.TotalBirdSold += delivery.UsageQty
 		data.TotalSalesAmount += delivery.TotalPrice
 	}
 
@@ -383,46 +385,77 @@ func (s closingKeuanganService) buildHPPSection(c *fiber.Ctx, projectFlock *enti
 
 func (s closingKeuanganService) buildProfitLossSection(projectFlock *entity.ProjectFlock, costs *CostData, production *ProductionData) dto.ProfitLossSection {
 
-	totalPopulationIn := production.TotalPopulationIn
 	totalWeightProduced := production.TotalWeightProduced
 	totalEggWeightKg := production.TotalEggWeightKg
 	totalSalesAmount := production.TotalSalesAmount
 	totalWeightSold := production.TotalWeightSold
+	totalBirdSold := production.TotalBirdSold
+	actualPopulation := production.TotalPopulationIn - production.TotalDepletion
 
-	weightForSales := totalWeightSold
-	weightForCalculation := totalWeightProduced
-	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
-		weightForSales = totalWeightSold
-		weightForCalculation = totalEggWeightKg
-	}
+	isLaying := projectFlock.Category == string(utils.ProjectFlockCategoryLaying)
 
-	calculateProfitLossMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
-		if totalPopulationIn > 0 {
-			rpPerBird = amount / totalPopulationIn
-		}
-		if weightForSales > 0 {
-			rpPerKg = amount / weightForSales
+	// Fungsi untuk sales: LAYING = populasi aktual, GROWING = ekor terjual
+	calculateSalesMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+		if isLaying {
+			if actualPopulation > 0 {
+				rpPerBird = amount / actualPopulation
+			}
+			if totalWeightSold > 0 {
+				rpPerKg = amount / totalWeightSold
+			}
+		} else {
+			if totalBirdSold > 0 {
+				rpPerBird = amount / totalBirdSold
+			}
+			if totalWeightSold > 0 {
+				rpPerKg = amount / totalWeightSold
+			}
 		}
 		return
 	}
 
-	actualPopulation := production.TotalPopulationIn - production.TotalDepletion
-
-	calculateMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+	// Fungsi untuk cost: per ekor = populasi aktual, per kg = LAYING telur produksi / GROWING ayam produksi
+	calculateCostMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
 		if actualPopulation > 0 {
 			rpPerBird = amount / actualPopulation
 		}
-		if weightForCalculation > 0 {
-			rpPerKg = amount / weightForCalculation
+		if isLaying {
+			if totalEggWeightKg > 0 {
+				rpPerKg = amount / totalEggWeightKg
+			}
+		} else {
+			if totalWeightProduced > 0 {
+				rpPerKg = amount / totalWeightProduced
+			}
+		}
+		return
+	}
+
+	// Fungsi untuk overhead/ekspedisi: LAYING = populasi aktual, GROWING = ekor terjual
+	calculateOverheadMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+		if isLaying {
+			if actualPopulation > 0 {
+				rpPerBird = amount / actualPopulation
+			}
+			if totalWeightSold > 0 {
+				rpPerKg = amount / totalWeightSold
+			}
+		} else {
+			if totalBirdSold > 0 {
+				rpPerBird = amount / totalBirdSold
+			}
+			if totalWeightSold > 0 {
+				rpPerKg = amount / totalWeightSold
+			}
 		}
 		return
 	}
 
 	plItems := []dto.ProfitLossItem{}
 
-	salesRpPerBird, salesRpPerKg := calculateProfitLossMetrics(totalSalesAmount)
+	salesRpPerBird, salesRpPerKg := calculateSalesMetrics(totalSalesAmount)
 	salesLabel := "Penjualan Ayam"
-	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+	if isLaying {
 		salesLabel = "Penjualan Telur"
 	}
 	plItems = append(plItems, dto.ToProfitLossItem(
@@ -435,23 +468,23 @@ func (s closingKeuanganService) buildProfitLossSection(projectFlock *entity.Proj
 	))
 
 	totalSapronakAmount := costs.ChickenCost + costs.FeedCost + costs.OvkCost
-	_, sapronakRpPerKg := calculateMetrics(totalSapronakAmount)
 	sapronakRpPerBird := 0.0
+	sapronakRpPerKg := 0.0
 	for _, amount := range []float64{costs.ChickenCost, costs.FeedCost, costs.OvkCost} {
-		rpPerBird, _ := calculateMetrics(amount)
+		rpPerBird, rpPerKg := calculateCostMetrics(amount)
 		sapronakRpPerBird += rpPerBird
+		sapronakRpPerKg += rpPerKg
 	}
-	sapronakLabel := "Pengeluaran Sapronak"
 	plItems = append(plItems, dto.ToProfitLossItem(
 		string(dto.PLCodeSapronak),
-		sapronakLabel,
+		"Pengeluaran Sapronak",
 		"purchase",
 		sapronakRpPerBird,
 		sapronakRpPerKg,
 		totalSapronakAmount,
 	))
 
-	overheadRpPerBird, overheadRpPerKg := calculateProfitLossMetrics(costs.RealizationOperational)
+	overheadRpPerBird, overheadRpPerKg := calculateOverheadMetrics(costs.RealizationOperational)
 	plItems = append(plItems, dto.ToProfitLossItem(
 		string(dto.PLCodeOverhead),
 		"Overhead",
@@ -461,7 +494,7 @@ func (s closingKeuanganService) buildProfitLossSection(projectFlock *entity.Proj
 		costs.RealizationOperational,
 	))
 
-	ekspedisiRpPerBird, ekspedisiRpPerKg := calculateProfitLossMetrics(costs.ExpeditionCost)
+	ekspedisiRpPerBird, ekspedisiRpPerKg := calculateOverheadMetrics(costs.ExpeditionCost)
 	plItems = append(plItems, dto.ToProfitLossItem(
 		string(dto.PLCodeEkspedisi),
 		"Ekspedisi",

internal/modules/closings/services/sapronak.service.go

@@ -363,7 +363,7 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	salesOutRows, err := s.Repository.FetchSapronakSales(ctx, pfk.Id)
+	salesOutRows, err := s.Repository.FetchSapronakSalesAllocatedDetails(ctx, pfk.Id)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
@@ -570,13 +570,12 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 			if existing.ProductName == "" {
 				existing.ProductName = d.ProductName
 			}
-			existing.UsageQty += d.QtyKeluar
-			existing.UsageValue += d.Nilai
-			if existing.IncomingQty >= existing.UsageQty {
-				existing.RemainingQty = existing.IncomingQty - existing.UsageQty
-			} else {
-				existing.RemainingQty = 0
+			// Adjustment keluar should reduce stock without inflating usage-based HPP.
+			remaining := existing.IncomingQty - existing.UsageQty - d.QtyKeluar
+			if remaining < 0 {
+				remaining = 0
 			}
+			existing.RemainingQty = remaining
 			itemMap[productID] = existing
 		}
 	}

internal/modules/daily-checklists/controllers/daily-checklist.controller.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"math"
+	"mime/multipart"
 	"strconv"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/daily-checklists/dto"
@@ -362,6 +363,9 @@ func (u *DailyChecklistController) UpdateOne(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid multipart form")
 	}
 	req.Documents = form.File["documents"]
+	if err := validateDailyChecklistDocumentSizes(req.Documents); err != nil {
+		return err
+	}
 
 	if err := c.BodyParser(req); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
@@ -381,6 +385,16 @@ func (u *DailyChecklistController) UpdateOne(c *fiber.Ctx) error {
 		})
 }
 
+func validateDailyChecklistDocumentSizes(files []*multipart.FileHeader) error {
+	const maxDailyChecklistDocumentBytes = 5 * 1024 * 1024 // 5MB
+	for _, file := range files {
+		if file != nil && file.Size > maxDailyChecklistDocumentBytes {
+			return fiber.NewError(fiber.StatusRequestEntityTooLarge, "Document size must be <= 5MB")
+		}
+	}
+	return nil
+}
+
 func (u *DailyChecklistController) DeleteOne(c *fiber.Ctx) error {
 	param := c.Params("idDailyChecklist")
 

internal/modules/daily-checklists/services/daily-checklist.service.go

@@ -3,13 +3,14 @@ package service
 import (
 	"errors"
 	"math"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	middleware "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/daily-checklists/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/daily-checklists/validations"
 	phaseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/phasess/repositories"
@@ -134,6 +135,87 @@ func (s dailyChecklistService) withRelations(db *gorm.DB) *gorm.DB {
 	return db.Preload("Kandang")
 }
 
+func (s dailyChecklistService) ensureChecklistAccess(c *fiber.Ctx, checklistID uint) error {
+	if checklistID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid checklist id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("daily_checklists dc").
+		Joins("JOIN kandangs k ON k.id = dc.kandang_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("dc.id = ?", checklistID)
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "DailyChecklist not found")
+	}
+	return nil
+}
+
+func (s dailyChecklistService) ensureKandangAccess(c *fiber.Ctx, kandangID uint) error {
+	if kandangID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid kandang id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("kandangs k").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("k.id = ?", kandangID)
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Kandang not found")
+	}
+	return nil
+}
+
+func (s dailyChecklistService) ensureTaskAccess(c *fiber.Ctx, taskID uint) error {
+	if taskID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid task id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("daily_checklist_activity_tasks t").
+		Joins("JOIN daily_checklists dc ON dc.id = t.checklist_id").
+		Joins("JOIN kandangs k ON k.id = dc.kandang_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("t.id = ?", taskID)
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Task not found")
+	}
+	return nil
+}
+
 func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([]DailyChecklistListItem, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, err
@@ -143,7 +225,15 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 
 	db := s.Repository.DB().WithContext(c.Context()).
 		Table("daily_checklists dc").
-		Joins("JOIN kandangs k ON k.id = dc.kandang_id")
+		Joins("JOIN kandangs k ON k.id = dc.kandang_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id")
+
+	var scopeErr error
+	db, scopeErr = m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 
 	if params.DateFrom != "" {
 		dateFrom, err := time.Parse("2006-01-02", params.DateFrom)
@@ -170,8 +260,9 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 	}
 
 	if params.Search != "" {
-		like := "%" + params.Search + "%"
-		db = db.Where("(k.name ILIKE ? OR dc.category::text ILIKE ?)", like, like)
+		re := regexp.MustCompile("[^a-zA-Z0-9]")
+		like := re.ReplaceAll([]byte("%"+params.Search+"%"), []byte(""))
+		db = db.Where("(regexp_replace(k.name, '[^a-zA-Z0-9]', '', 'g') ILIKE ? OR regexp_replace(dc.category::text, '[^a-zA-Z0-9]', '', 'g') ILIKE ?)", string(like), string(like))
 	}
 
 	countDB := db.Session(&gorm.Session{})
@@ -294,6 +385,9 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 }
 
 func (s dailyChecklistService) GetOne(c *fiber.Ctx, id uint) (*entity.DailyChecklist, error) {
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return nil, err
+	}
 	dailyChecklist, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "DailyChecklist not found")
@@ -399,6 +493,9 @@ func (s *dailyChecklistService) CreateOne(c *fiber.Ctx, req *validation.Create)
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := s.ensureKandangAccess(c, req.KandangId); err != nil {
+		return nil, err
+	}
 
 	date, err := time.Parse("2006-01-02", req.Date)
 	if err != nil {
@@ -431,6 +528,9 @@ func (s dailyChecklistService) UpdateOne(c *fiber.Ctx, req *validation.Update, i
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return nil, err
+	}
 
 	deletedIDs := make([]uint, 0)
 	if req.DeletedDocumentIDs != nil {
@@ -456,7 +556,7 @@ func (s dailyChecklistService) UpdateOne(c *fiber.Ctx, req *validation.Update, i
 		updateBody["reject_reason"] = *req.RejectReason
 	}
 
-	actorID, err := middleware.ActorIDFromContext(c)
+	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return &entity.DailyChecklist{}, fiber.NewError(fiber.StatusUnauthorized, "Failed to get actor ID from context")
 	}
@@ -502,6 +602,9 @@ func (s dailyChecklistService) UpdateOne(c *fiber.Ctx, req *validation.Update, i
 }
 
 func (s dailyChecklistService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return err
+	}
 	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "DailyChecklist not found")
@@ -516,6 +619,9 @@ func (s dailyChecklistService) AssignPhases(c *fiber.Ctx, id uint, req *validati
 	if err := s.Validate.Struct(req); err != nil {
 		return err
 	}
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return err
+	}
 
 	if _, err := s.Repository.GetByID(c.Context(), id, nil); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -597,6 +703,9 @@ func (s dailyChecklistService) AssignPhases(c *fiber.Ctx, id uint, req *validati
 }
 
 func (s dailyChecklistService) RemoveAssignment(c *fiber.Ctx, id uint, employeeID uint) error {
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return err
+	}
 	if _, err := s.Repository.GetByID(c.Context(), id, nil); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "DailyChecklist not found")
@@ -634,6 +743,9 @@ func (s dailyChecklistService) GetTasks(c *fiber.Ctx, checklistID uint) ([]entit
 	if checklistID == 0 {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "checklist_id is required")
 	}
+	if err := s.ensureChecklistAccess(c, checklistID); err != nil {
+		return nil, err
+	}
 
 	if _, err := s.Repository.GetByID(c.Context(), checklistID, nil); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -658,6 +770,9 @@ func (s dailyChecklistService) GetChecklistPhaseIDs(c *fiber.Ctx, checklistID ui
 	if checklistID == 0 {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "checklist_id is required")
 	}
+	if err := s.ensureChecklistAccess(c, checklistID); err != nil {
+		return nil, err
+	}
 
 	if _, err := s.Repository.GetByID(c.Context(), checklistID, nil); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -687,6 +802,9 @@ func (s dailyChecklistService) UpdateAssignment(c *fiber.Ctx, req *validation.Up
 	if err := s.Validate.Struct(req); err != nil {
 		return err
 	}
+	if err := s.ensureTaskAccess(c, req.TaskID); err != nil {
+		return err
+	}
 
 	task := new(entity.DailyChecklistActivityTask)
 	if err := s.Repository.DB().WithContext(c.Context()).First(task, req.TaskID).Error; err != nil {
@@ -808,6 +926,9 @@ func (s dailyChecklistService) AssignTasks(c *fiber.Ctx, id uint, req *validatio
 	if err := s.Validate.Struct(req); err != nil {
 		return err
 	}
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return err
+	}
 
 	employeeIDs, err := parseIDs(req.EmployeeIDs)
 	if err != nil {
@@ -900,8 +1021,16 @@ func (s dailyChecklistService) GetSummary(c *fiber.Ctx, params *validation.Summa
 		Joins("JOIN daily_checklists d ON d.id = t.checklist_id").
 		Joins("JOIN kandangs k ON k.id = d.kandang_id").
 		Joins("JOIN employees e ON e.id = a.employee_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas ar ON ar.id = loc.area_id").
 		Where("d.date BETWEEN ? AND ? AND d.status = ?", dateFrom, dateTo, "APPROVED")
 
+	var scopeErr error
+	db, scopeErr = m.ApplyLocationAreaScope(c, db, "loc.id", "ar.id")
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
+
 	if params.Category != "" {
 		db = db.Where("d.category = ?", params.Category)
 	}
@@ -946,6 +1075,15 @@ func (s dailyChecklistService) GetReport(c *fiber.Ctx, params *validation.Report
 		return nil, 0, err
 	}
 
+	locationScope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+	areaScope, err := m.ResolveAreaScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	buildBase := func() *gorm.DB {
@@ -962,6 +1100,9 @@ func (s dailyChecklistService) GetReport(c *fiber.Ctx, params *validation.Report
 			Where("EXTRACT(YEAR FROM dc.date) = ?", params.Year).
 			Where("dc.status = ?", "APPROVED")
 
+		db = m.ApplyScopeFilter(db, locationScope, "loc.id")
+		db = m.ApplyScopeFilter(db, areaScope, "a.id")
+
 		if params.AreaID != nil {
 			db = db.Where("a.id = ?", *params.AreaID)
 		}

internal/modules/daily-checklists/validations/daily-checklist.validation.go

@@ -29,7 +29,7 @@ type Query struct {
 }
 
 type AssignPhases struct {
-	PhaseIDs string `json:"phase_ids" validate:"required"`
+	PhaseIDs string `json:"phase_ids" validate:"omitempty"`
 }
 
 type AssignTask struct {

internal/modules/dashboards/controllers/dashboard.controller.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/validations"
@@ -81,6 +82,20 @@ func (u *DashboardController) GetAll(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid include")
 	}
 
+	scope, err := m.ResolveLocationScope(c, u.DashboardService.DB())
+	if err != nil {
+		return err
+	}
+	if scope.Restrict {
+		if len(scope.IDs) == 0 {
+			lokasiIds = []uint{}
+		} else if len(lokasiIds) > 0 {
+			lokasiIds = intersectUint(lokasiIds, scope.IDs)
+		} else {
+			lokasiIds = scope.IDs
+		}
+	}
+
 	analysisMode := strings.ToUpper(strings.TrimSpace(c.Query("analysis_mode", validation.AnalysisModeOverview)))
 	metric := strings.ToLower(strings.TrimSpace(c.Query("metric", "")))
 
@@ -176,6 +191,23 @@ func defaultUintSlice(values []uint) []uint {
 	return values
 }
 
+func intersectUint(a, b []uint) []uint {
+	if len(a) == 0 || len(b) == 0 {
+		return nil
+	}
+	set := make(map[uint]struct{}, len(b))
+	for _, id := range b {
+		set[id] = struct{}{}
+	}
+	out := make([]uint, 0, len(a))
+	for _, id := range a {
+		if _, ok := set[id]; ok {
+			out = append(out, id)
+		}
+	}
+	return out
+}
+
 func parsePeriodDates(startDateRaw, endDateRaw string, location *time.Location) (time.Time, time.Time, time.Time, error) {
 	now := time.Now().In(location)
 	startDate := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, location)

internal/modules/dashboards/repositories/dashboard_stats.repository.go

@@ -107,16 +107,23 @@ func applyDashboardFilters(db *gorm.DB, filters *validation.DashboardFilter) *go
 func (r *DashboardRepositoryImpl) GetRecordingWeeklyMetrics(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]RecordingWeeklyMetric, error) {
 	var rows []RecordingWeeklyMetric
 
+	weekExpr := `CASE
+		WHEN r.day IS NULL OR r.day <= 0 THEN 1
+		WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17
+		ELSE ((r.day - 1) / 7 + 1)
+	END`
+
 	db := r.DB().WithContext(ctx).
 		Table("recordings AS r").
-		Select(`((r.day - 1) / 7 + 1) AS week,
+		Select(fmt.Sprintf(`%s AS week,
 			COALESCE(AVG(r.hen_day), 0) AS hen_day,
 			COALESCE(AVG(r.egg_weight), 0) AS egg_weight,
 			COALESCE(AVG(r.feed_intake), 0) AS feed_intake,
 			COALESCE(AVG(r.fcr_value), 0) AS fcr_value,
-			COALESCE(AVG(r.cum_depletion_rate), 0) AS cum_depletion_rate`).
+			COALESCE(AVG(r.cum_depletion_rate), 0) AS cum_depletion_rate`, weekExpr)).
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
+		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
 		Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
 		Where("r.deleted_at IS NULL").
 		Where("r.day IS NOT NULL AND r.day > 0")
@@ -188,92 +195,19 @@ func (r *DashboardRepositoryImpl) GetStandardFcrWeekly(ctx context.Context, week
 		return nil, nil
 	}
 
-	filterClause := ""
-	filterArgs := make([]interface{}, 0)
-	if filters != nil {
-		if len(filters.FlockIds) > 0 {
-			filterClause += " AND pf.id IN ?"
-			filterArgs = append(filterArgs, filters.FlockIds)
-		}
-		if len(filters.KandangIds) > 0 {
-			filterClause += " AND k.id IN ?"
-			filterArgs = append(filterArgs, filters.KandangIds)
-		}
-		if len(filters.LokasiIds) > 0 {
-			filterClause += " AND k.location_id IN ?"
-			filterArgs = append(filterArgs, filters.LokasiIds)
-		}
+	standardIDs := r.standardIDSubquery(filters)
+	if standardIDs == nil {
+		return nil, nil
 	}
 
-	query := fmt.Sprintf(`
-WITH src AS (
-	SELECT DISTINCT pf.production_standard_id, pf.fcr_id
-	FROM project_flocks pf
-	JOIN project_flock_kandangs pfk ON pfk.project_flock_id = pf.id
-	JOIN kandangs k ON k.id = pfk.kandang_id
-	WHERE pf.production_standard_id > 0 AND pf.fcr_id > 0
-	%s
-),
-actual AS (
-	SELECT u.week AS week,
-		pf.fcr_id AS fcr_id,
-		AVG((u.chart_data->'statistics'->>'average_weight')::numeric) AS avg_weight
-	FROM project_flock_kandang_uniformity u
-	JOIN project_flock_kandangs pfk ON pfk.id = u.project_flock_kandang_id
-	JOIN project_flocks pf ON pf.id = pfk.project_flock_id
-	JOIN kandangs k ON k.id = pfk.kandang_id
-	WHERE u.week IN ? AND u.uniform_date IS NOT NULL AND pf.fcr_id > 0
-	%s
-	GROUP BY u.week, pf.fcr_id
-),
-target AS (
-	SELECT sgd.week AS week,
-		src.fcr_id AS fcr_id,
-		AVG(sgd.target_mean_bw) AS target_mean_bw
-	FROM standard_growth_details sgd
-	JOIN src ON src.production_standard_id = sgd.production_standard_id
-	WHERE sgd.week IN ?
-	GROUP BY sgd.week, src.fcr_id
-),
-weights AS (
-	SELECT COALESCE(a.week, t.week) AS week,
-		COALESCE(a.fcr_id, t.fcr_id) AS fcr_id,
-		COALESCE(
-			CASE WHEN a.avg_weight > 10 THEN a.avg_weight / 1000 ELSE a.avg_weight END,
-			CASE WHEN t.target_mean_bw > 10 THEN t.target_mean_bw / 1000 ELSE t.target_mean_bw END
-		) AS weight
-	FROM actual a
-	FULL OUTER JOIN target t ON t.week = a.week AND t.fcr_id = a.fcr_id
-)
-SELECT w.week AS week,
-	COALESCE(AVG(
-		COALESCE(
-			(SELECT fs.fcr_number
-			 FROM fcr_standards fs
-			 WHERE fs.fcr_id = w.fcr_id
-			 AND fs.weight >= w.weight
-			 ORDER BY fs.weight ASC
-			 LIMIT 1),
-			(SELECT fs.fcr_number
-			 FROM fcr_standards fs
-			 WHERE fs.fcr_id = w.fcr_id
-			 ORDER BY fs.weight DESC
-			 LIMIT 1)
-		)
-	), 0) AS std_fcr
-FROM weights w
-GROUP BY w.week
-ORDER BY w.week ASC
-`, filterClause, filterClause)
-
-	args := make([]interface{}, 0, len(filterArgs)*2+2)
-	args = append(args, filterArgs...)
-	args = append(args, weeks)
-	args = append(args, filterArgs...)
-	args = append(args, weeks)
-
 	var rows []StandardWeeklyFcrMetric
-	if err := r.DB().WithContext(ctx).Raw(query, args...).Scan(&rows).Error; err != nil {
+	db := r.DB().WithContext(ctx).
+		Table("production_standard_details AS psd").
+		Select("psd.week AS week, COALESCE(AVG(psd.standard_fcr), 0) AS std_fcr").
+		Where("psd.week IN ?", weeks).
+		Where("psd.production_standard_id IN (?)", standardIDs)
+
+	if err := db.Group("psd.week").Order("psd.week ASC").Scan(&rows).Error; err != nil {
 		return nil, err
 	}
 
@@ -510,30 +444,6 @@ func (r *DashboardRepositoryImpl) standardIDSubquery(filters *validation.Dashboa
 	return db
 }
 
-func (r *DashboardRepositoryImpl) standardSourceSubquery(filters *validation.DashboardFilter) *gorm.DB {
-	db := r.DB().
-		Table("project_flocks AS pf").
-		Select("DISTINCT pf.production_standard_id, pf.fcr_id").
-		Joins("JOIN project_flock_kandangs AS pfk ON pfk.project_flock_id = pf.id").
-		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
-		Where("pf.production_standard_id > 0").
-		Where("pf.fcr_id > 0")
-
-	if filters != nil {
-		if len(filters.FlockIds) > 0 {
-			db = db.Where("pf.id IN ?", filters.FlockIds)
-		}
-		if len(filters.KandangIds) > 0 {
-			db = db.Where("k.id IN ?", filters.KandangIds)
-		}
-		if len(filters.LokasiIds) > 0 {
-			db = db.Where("k.location_id IN ?", filters.LokasiIds)
-		}
-	}
-
-	return db
-}
-
 func (r *DashboardRepositoryImpl) GetComparisonSeries(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter, comparisonType string) ([]ComparisonSeries, error) {
 	seriesExpr, labelExpr, groupExpr, orderExpr, err := comparisonSeriesColumns(comparisonType)
 	if err != nil {
@@ -572,11 +482,17 @@ func (r *DashboardRepositoryImpl) GetComparisonWeeklyMetrics(ctx context.Context
 	}
 
 	var rows []ComparisonWeeklyMetric
+	weekExpr := `CASE
+		WHEN r.day IS NULL OR r.day <= 0 THEN 1
+		WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17
+		ELSE ((r.day - 1) / 7 + 1)
+	END`
+
 	db := r.DB().WithContext(ctx).
 		Table("recordings AS r").
-		Select(fmt.Sprintf(`(CASE WHEN r.day IS NULL OR r.day <= 0 THEN 1 ELSE ((r.day - 1) / 7 + 1) END) AS week,
+		Select(fmt.Sprintf(`%s AS week,
 			%s AS series_id,
-			COALESCE(AVG(%s), 0) AS value`, seriesExpr, metricExpr)).
+			COALESCE(AVG(%s), 0) AS value`, weekExpr, seriesExpr, metricExpr)).
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
@@ -629,13 +545,19 @@ func (r *DashboardRepositoryImpl) GetComparisonWeeklyUniformityMetrics(ctx conte
 func (r *DashboardRepositoryImpl) GetEggQualityWeeklyMetrics(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]EggQualityWeeklyMetric, error) {
 	var rows []EggQualityWeeklyMetric
 
+	weekExpr := `CASE
+		WHEN r.day IS NULL OR r.day <= 0 THEN 1
+		WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17
+		ELSE ((r.day - 1) / 7 + 1)
+	END`
+
 	db := r.DB().WithContext(ctx).
 		Table("recording_eggs AS re").
-		Select(`
-			((r.day - 1) / 7 + 1) AS week,
+		Select(fmt.Sprintf(`
+			%s AS week,
 			COALESCE(SUM(CASE WHEN f.name = ? THEN re.qty ELSE 0 END), 0) AS normal_qty,
 			COALESCE(SUM(CASE WHEN f.name IN (?, ?, ?) THEN re.qty ELSE 0 END), 0) AS abnormal_qty,
-			COALESCE(SUM(re.qty), 0) AS total_qty`,
+			COALESCE(SUM(re.qty), 0) AS total_qty`, weekExpr),
 			utils.FlagTelurUtuh,
 			utils.FlagTelurPutih,
 			utils.FlagTelurRetak,
@@ -644,6 +566,7 @@ func (r *DashboardRepositoryImpl) GetEggQualityWeeklyMetrics(ctx context.Context
 		Joins("JOIN recordings AS r ON r.id = re.recording_id").
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
+		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
 		Joins("JOIN product_warehouses AS pw ON pw.id = re.product_warehouse_id").
 		Joins("JOIN products AS p ON p.id = pw.product_id").
 		Joins("JOIN flags AS f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
@@ -664,14 +587,21 @@ func (r *DashboardRepositoryImpl) GetEggQualityWeeklyMetrics(ctx context.Context
 func (r *DashboardRepositoryImpl) GetEggWeightWeeklyGrams(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]WeeklyEggWeightMetric, error) {
 	var rows []WeeklyEggWeightMetric
 
+	weekExpr := `CASE
+		WHEN r.day IS NULL OR r.day <= 0 THEN 1
+		WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17
+		ELSE ((r.day - 1) / 7 + 1)
+	END`
+
 	db := r.DB().WithContext(ctx).
 		Table("recording_eggs AS re").
-		Select(`
-			((r.day - 1) / 7 + 1) AS week,
-			COALESCE(SUM(re.weight * 1000), 0) AS egg_weight_grams`).
+		Select(fmt.Sprintf(`
+			%s AS week,
+			COALESCE(SUM(re.weight * 1000), 0) AS egg_weight_grams`, weekExpr)).
 		Joins("JOIN recordings AS r ON r.id = re.recording_id").
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
+		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
 		Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
 		Where("r.deleted_at IS NULL").
 		Where("r.day IS NOT NULL AND r.day > 0")
@@ -688,15 +618,22 @@ func (r *DashboardRepositoryImpl) GetEggWeightWeeklyGrams(ctx context.Context, s
 func (r *DashboardRepositoryImpl) GetFeedUsageWeeklyByUom(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]WeeklyFeedUsageMetric, error) {
 	var rows []WeeklyFeedUsageMetric
 
+	weekExpr := `CASE
+		WHEN r.day IS NULL OR r.day <= 0 THEN 1
+		WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17
+		ELSE ((r.day - 1) / 7 + 1)
+	END`
+
 	db := r.DB().WithContext(ctx).
 		Table("recording_stocks AS rs").
-		Select(`
-			((r.day - 1) / 7 + 1) AS week,
+		Select(fmt.Sprintf(`
+			%s AS week,
 			COALESCE(SUM(rs.usage_qty), 0) + COALESCE(SUM(rs.pending_qty), 0) AS total_qty,
-			LOWER(uoms.name) AS uom_name`).
+			LOWER(uoms.name) AS uom_name`, weekExpr)).
 		Joins("JOIN recordings AS r ON r.id = rs.recording_id").
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
+		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
 		Joins("JOIN product_warehouses AS pw ON pw.id = rs.product_warehouse_id").
 		Joins("JOIN products AS p ON p.id = pw.product_id").
 		Joins("JOIN uoms ON uoms.id = p.uom_id").

internal/modules/dashboards/services/dashboard.service.go

@@ -18,10 +18,12 @@ import (
 
 	"github.com/go-playground/validator/v10"
 	"github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 )
 
 type DashboardService interface {
 	GetAll(ctx context.Context, params *validation.Query) (dto.DashboardPerformanceOverviewDTO, int64, error)
+	DB() *gorm.DB
 }
 
 type dashboardService struct {
@@ -40,6 +42,10 @@ func NewDashboardService(repo repository.DashboardRepository, validate *validato
 	}
 }
 
+func (s dashboardService) DB() *gorm.DB {
+	return s.Repository.DB()
+}
+
 func (s dashboardService) GetAll(ctx context.Context, params *validation.Query) (dto.DashboardPerformanceOverviewDTO, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return dto.DashboardPerformanceOverviewDTO{}, 0, err

internal/modules/expenses/dto/expense.dto.go

@@ -328,6 +328,7 @@ func ToKandangGroupDTO(pengajuans []ExpenseNonstockDTO, realisasi []ExpenseReali
 			}
 			kandangMap[kandangId].Realisasi = append(kandangMap[kandangId].Realisasi, r)
 		} else {
+			directRealisasi = append(directRealisasi, r)
 		}
 	}
 

internal/modules/expenses/repositories/expense_realization.repository.go

@@ -139,9 +139,28 @@ func (r *ExpenseRealizationRepositoryImpl) GetAllWithFilters(ctx context.Context
 	locationID := filters.LocationId
 	areaID := filters.AreaId
 
-	if locationID > 0 || areaID > 0 {
+	if filters.AllowedLocationIDs != nil || filters.AllowedAreaIDs != nil || locationID > 0 || areaID > 0 {
 		db = db.Joins("JOIN kandangs ON kandangs.id = expense_nonstocks.kandang_id")
+	}
 
+	if filters.AllowedLocationIDs != nil {
+		if len(filters.AllowedLocationIDs) == 0 {
+			db = db.Where("1 = 0")
+		} else {
+			db = db.Where("kandangs.location_id IN ?", filters.AllowedLocationIDs)
+		}
+	}
+
+	if filters.AllowedAreaIDs != nil {
+		if len(filters.AllowedAreaIDs) == 0 {
+			db = db.Where("1 = 0")
+		} else {
+			db = db.Joins("JOIN locations ON locations.id = kandangs.location_id").
+				Where("locations.area_id IN ?", filters.AllowedAreaIDs)
+		}
+	}
+
+	if locationID > 0 || areaID > 0 {
 		if locationID > 0 {
 			db = db.Where("kandangs.location_id = ?", uint(locationID))
 		}

internal/modules/expenses/services/expense.service.go

@@ -87,16 +87,22 @@ func (s expenseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]expens
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	expenses, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db, scopeErr = middleware.ApplyLocationScope(c, db, "expenses.location_id")
 		if params.Search != "" {
 			return db.Where("category ILIKE ?", "%"+params.Search+"%")
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 
 		return nil, 0, err
@@ -117,7 +123,16 @@ func (s expenseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]expens
 }
 
 func (s expenseService) GetOne(c *fiber.Ctx, id uint) (*expenseDto.ExpenseDetailDTO, error) {
-	expense, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	expense, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = middleware.ApplyLocationScope(c, db, "expenses.location_id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 

internal/modules/finance/transactions/controllers/transaction.controller.go

@@ -24,46 +24,81 @@ func NewTransactionController(transactionService service.TransactionService) *Tr
 }
 
 func (u *TransactionController) GetAll(c *fiber.Ctx) error {
-	parseOptionalUint := func(key string) (*uint, error) {
+	parseUintListParam := func(key string) ([]uint, error) {
 		raw := strings.TrimSpace(c.Query(key, ""))
 		if raw == "" {
 			return nil, nil
 		}
-		parsed, err := strconv.ParseUint(raw, 10, 64)
-		if err != nil {
-			return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid "+key)
+		parts := strings.Split(raw, ",")
+		ids := make([]uint, 0, len(parts))
+		for _, part := range parts {
+			trimmed := strings.TrimSpace(part)
+			if trimmed == "" {
+				return nil, strconv.ErrSyntax
+			}
+			parsed, err := strconv.ParseUint(trimmed, 10, 64)
+			if err != nil {
+				return nil, err
+			}
+			if parsed == 0 {
+				continue
+			}
+			ids = append(ids, uint(parsed))
 		}
-		if parsed == 0 {
+		if len(ids) == 0 {
 			return nil, nil
 		}
-		value := uint(parsed)
-		return &value, nil
+		return ids, nil
 	}
 
-	bankId, err := parseOptionalUint("bank_id")
-	if err != nil {
-		return err
+	parseStringListParam := func(key string) ([]string, error) {
+		raw := strings.TrimSpace(c.Query(key, ""))
+		if raw == "" {
+			return nil, nil
+		}
+		parts := strings.Split(raw, ",")
+		values := make([]string, 0, len(parts))
+		for _, part := range parts {
+			trimmed := strings.TrimSpace(part)
+			if trimmed == "" {
+				return nil, strconv.ErrSyntax
+			}
+			values = append(values, trimmed)
+		}
+		if len(values) == 0 {
+			return nil, nil
+		}
+		return values, nil
 	}
-	customerId, err := parseOptionalUint("customer_id")
+
+	bankIDs, err := parseUintListParam("bank_ids")
 	if err != nil {
-		return err
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid bank_ids")
 	}
-	supplierId, err := parseOptionalUint("supplier_id")
+	customerIDs, err := parseUintListParam("customer_ids")
 	if err != nil {
-		return err
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid customer_ids")
+	}
+	supplierIDs, err := parseUintListParam("supplier_ids")
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid supplier_ids")
+	}
+	transactionTypes, err := parseStringListParam("transaction_types")
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid transaction_types")
 	}
 
 	query := &validation.Query{
-		Page:            c.QueryInt("page", 1),
-		Limit:           c.QueryInt("limit", 10),
-		Search:          c.Query("search", ""),
-		TransactionType: c.Query("transaction_type", ""),
-		BankId:          bankId,
-		CustomerId:      customerId,
-		SupplierId:      supplierId,
-		SortDate:        c.Query("sort_date", ""),
-		StartDate:       c.Query("start_date", ""),
-		EndDate:         c.Query("end_date", ""),
+		Page:             c.QueryInt("page", 1),
+		Limit:            c.QueryInt("limit", 10),
+		Search:           c.Query("search", ""),
+		TransactionTypes: transactionTypes,
+		BankIDs:          bankIDs,
+		CustomerIDs:      customerIDs,
+		SupplierIDs:      supplierIDs,
+		SortDate:         c.Query("sort_date", ""),
+		StartDate:        c.Query("start_date", ""),
+		EndDate:          c.Query("end_date", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

internal/modules/finance/transactions/services/transaction.service.go

@@ -74,33 +74,59 @@ func (s transactionService) GetAll(c *fiber.Ctx, params *validation.Query) ([]en
 
 		if params.Search != "" {
 			like := "%" + strings.ToLower(strings.TrimSpace(params.Search)) + "%"
+			db = db.Joins(
+				"LEFT JOIN customers ON customers.id = payments.party_id AND payments.party_type = ? AND customers.deleted_at IS NULL",
+				string(utils.PaymentPartyCustomer),
+			).Joins(
+				"LEFT JOIN suppliers ON suppliers.id = payments.party_id AND payments.party_type = ? AND suppliers.deleted_at IS NULL",
+				string(utils.PaymentPartySupplier),
+			).Joins(
+				"LEFT JOIN banks ON banks.id = payments.bank_id AND banks.deleted_at IS NULL",
+			)
 			db = db.Where(
 				`LOWER(payment_code) LIKE ? OR
 				LOWER(COALESCE(reference_number, '')) LIKE ? OR
+				LOWER(COALESCE(payment_method, '')) LIKE ? OR
 				LOWER(COALESCE(transaction_type, '')) LIKE ? OR
-				LOWER(COALESCE(notes, '')) LIKE ?`,
-				like, like, like, like,
+				LOWER(COALESCE(notes, '')) LIKE ? OR
+				LOWER(COALESCE(customers.name, '')) LIKE ? OR
+				LOWER(COALESCE(suppliers.name, '')) LIKE ? OR
+				LOWER(COALESCE(banks.name, '')) LIKE ?`,
+				like, like, like, like, like, like, like, like,
 			)
 		}
 
-		if strings.TrimSpace(params.TransactionType) != "" {
-			db = db.Where("transaction_type = ?", strings.ToUpper(strings.TrimSpace(params.TransactionType)))
+		if len(params.TransactionTypes) > 0 {
+			types := make([]string, 0, len(params.TransactionTypes))
+			for _, transactionType := range params.TransactionTypes {
+				normalized := strings.ToUpper(strings.TrimSpace(transactionType))
+				if normalized == "" {
+					continue
+				}
+				types = append(types, normalized)
+			}
+			if len(types) > 0 {
+				db = db.Where("transaction_type IN ?", types)
+			}
 		}
 
-		if params.BankId != nil {
-			db = db.Where("bank_id = ?", *params.BankId)
+		if len(params.BankIDs) > 0 {
+			db = db.Where("bank_id IN ?", params.BankIDs)
 		}
 
-		if params.CustomerId != nil && params.SupplierId != nil {
+		customerIDs := params.CustomerIDs
+		supplierIDs := params.SupplierIDs
+
+		if len(customerIDs) > 0 && len(supplierIDs) > 0 {
 			db = db.Where(
-				"(party_type = ? AND party_id = ?) OR (party_type = ? AND party_id = ?)",
-				string(utils.PaymentPartyCustomer), *params.CustomerId,
-				string(utils.PaymentPartySupplier), *params.SupplierId,
+				"(party_type = ? AND party_id IN ?) OR (party_type = ? AND party_id IN ?)",
+				string(utils.PaymentPartyCustomer), customerIDs,
+				string(utils.PaymentPartySupplier), supplierIDs,
 			)
-		} else if params.CustomerId != nil {
-			db = db.Where("party_type = ? AND party_id = ?", string(utils.PaymentPartyCustomer), *params.CustomerId)
-		} else if params.SupplierId != nil {
-			db = db.Where("party_type = ? AND party_id = ?", string(utils.PaymentPartySupplier), *params.SupplierId)
+		} else if len(customerIDs) > 0 {
+			db = db.Where("party_type = ? AND party_id IN ?", string(utils.PaymentPartyCustomer), customerIDs)
+		} else if len(supplierIDs) > 0 {
+			db = db.Where("party_type = ? AND party_id IN ?", string(utils.PaymentPartySupplier), supplierIDs)
 		}
 
 		if startDate != nil {

internal/modules/finance/transactions/validations/transaction.validation.go

@@ -1,22 +1,22 @@
 package validation
 
 type Create struct {
-	Name   string `json:"name" validate:"required_strict,min=3"`
+	Name string `json:"name" validate:"required_strict,min=3"`
 }
 
 type Update struct {
-	Name   *string `json:"name,omitempty" validate:"omitempty"`
+	Name *string `json:"name,omitempty" validate:"omitempty"`
 }
 
 type Query struct {
-	Page            int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit           int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
-	Search          string `query:"search" validate:"omitempty,max=50"`
-	TransactionType string `query:"transaction_type" validate:"omitempty,max=50"`
-	BankId          *uint  `query:"bank_id" validate:"omitempty,number,gt=0"`
-	CustomerId      *uint  `query:"customer_id" validate:"omitempty,number,gt=0"`
-	SupplierId      *uint  `query:"supplier_id" validate:"omitempty,number,gt=0"`
-	SortDate        string `query:"sort_date" validate:"omitempty,oneof=created_at payment_date"`
-	StartDate       string `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
-	EndDate         string `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
+	Page             int      `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Limit            int      `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Search           string   `query:"search" validate:"omitempty,max=50"`
+	TransactionTypes []string `query:"transaction_types" validate:"omitempty,dive,max=50"`
+	BankIDs          []uint   `query:"bank_ids" validate:"omitempty,dive,gt=0"`
+	CustomerIDs      []uint   `query:"customer_ids" validate:"omitempty,dive,gt=0"`
+	SupplierIDs      []uint   `query:"supplier_ids" validate:"omitempty,dive,gt=0"`
+	SortDate         string   `query:"sort_date" validate:"omitempty,oneof=created_at payment_date"`
+	StartDate        string   `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
+	EndDate          string   `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
 }

internal/modules/inventory/adjustments/repositories/adjustment_stock.repository.go

@@ -2,9 +2,13 @@ package repositories
 
 import (
 	"context"
+	"fmt"
+	"strconv"
+	"strings"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 )
 
 type AdjustmentStockRepository interface {
@@ -12,6 +16,7 @@ type AdjustmentStockRepository interface {
 	GetByID(ctx context.Context, id uint, modifier func(*gorm.DB) *gorm.DB) (*entity.AdjustmentStock, error)
 	WithTx(tx *gorm.DB) AdjustmentStockRepository
 	DB() *gorm.DB
+	GenerateSequentialNumber(ctx context.Context, prefix string) (string, error)
 }
 
 type adjustmentStockRepositoryImpl struct {
@@ -50,3 +55,71 @@ func (r *adjustmentStockRepositoryImpl) WithTx(tx *gorm.DB) AdjustmentStockRepos
 func (r *adjustmentStockRepositoryImpl) DB() *gorm.DB {
 	return r.db
 }
+
+func (r *adjustmentStockRepositoryImpl) GenerateSequentialNumber(ctx context.Context, prefix string) (string, error) {
+	var values []string
+	err := r.db.WithContext(ctx).
+		Model(&entity.AdjustmentStock{}).
+		Where(fmt.Sprintf("%s ILIKE ?", "adj_number"), prefix+"%").
+		Select("adj_number").
+		Order(fmt.Sprintf("%s DESC", "adj_number")).
+		Limit(20).
+		Clauses(clause.Locking{Strength: "UPDATE"}).
+		Pluck("adj_number", &values).Error
+	if err != nil {
+		return "", err
+	}
+
+	next := 1
+	for _, value := range values {
+		if number, ok := parseNumericSuffix(value, prefix); ok {
+			next = number + 1
+			break
+		}
+	}
+
+	const maxAttempts = 20
+	for attempt := 0; attempt < maxAttempts; attempt++ {
+		candidate := fmt.Sprintf("%s%0*d", prefix, 5, next)
+		exists, err := r.numberExists(ctx, r.db, candidate)
+		if err != nil {
+			return "", err
+		}
+		if !exists {
+			return candidate, nil
+		}
+		next++
+	}
+
+	return "", fmt.Errorf("unable to generate unique %s", "adj_number")
+}
+
+func (r *adjustmentStockRepositoryImpl) numberExists(ctx context.Context, db *gorm.DB, value string) (bool, error) {
+	var count int64
+	if err := db.WithContext(ctx).
+		Model(&entity.AdjustmentStock{}).
+		Where(fmt.Sprintf("%s = ?", "adj_number"), value).
+		Count(&count).Error; err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
+func parseNumericSuffix(value, prefix string) (int, bool) {
+	if !strings.HasPrefix(value, prefix) {
+		return 0, false
+	}
+	suffix := strings.TrimPrefix(value, prefix)
+	if suffix == "" {
+		return 0, false
+	}
+	trimmed := strings.TrimLeft(suffix, "0")
+	if trimmed == "" {
+		trimmed = "0"
+	}
+	number, err := strconv.Atoi(trimmed)
+	if err != nil {
+		return 0, false
+	}
+	return number, true
+}

internal/modules/inventory/adjustments/services/adjustment.service.go

@@ -74,6 +74,10 @@ func (s *adjustmentService) withRelations(db *gorm.DB) *gorm.DB {
 }
 
 func (s *adjustmentService) GetOne(c *fiber.Ctx, id uint) (*entity.AdjustmentStock, error) {
+	if err := m.EnsureStockLogAccess(c, s.StockLogsRepository.DB(), id); err != nil {
+		return nil, err
+	}
+
 	adjustmentStock, err := s.AdjustmentStockRepository.GetByID(c.Context(), id, s.withRelations)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -95,6 +99,9 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 	if err != nil {
 		return nil, err
 	}
+	if err := m.EnsureWarehouseAccess(c, s.WarehouseRepo.DB(), uint(req.WarehouseID)); err != nil {
+		return nil, err
+	}
 	if err := common.EnsureRelations(c.Context(),
 		common.RelationCheck{Name: "Product", ID: &req.ProductID, Exists: s.ProductRepo.IdExists},
 		common.RelationCheck{Name: "Warehouse", ID: &req.WarehouseID, Exists: s.WarehouseRepo.IdExists},
@@ -153,7 +160,6 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get product warehouse")
 		}
 
-		afterQuantity := productWarehouse.Quantity
 		newLog := &entity.StockLog{
 			LoggableType:       string(utils.StockLogTypeAdjustment),
 			LoggableId:         0,
@@ -176,25 +182,29 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 		}
 
 		if transactionType == string(utils.StockLogTransactionTypeIncrease) {
-			afterQuantity += req.Quantity
 			newLog.Increase = req.Quantity
 			newLog.Stock += newLog.Increase
 		} else {
 			if productWarehouse.Quantity < req.Quantity {
 				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk pengurangan. Stok saat ini: %.2f, Jumlah yang akan dikurangi: %.2f", productWarehouse.Quantity, req.Quantity))
 			}
-			afterQuantity -= req.Quantity
 			newLog.Decrease = req.Quantity
 			newLog.Stock -= newLog.Decrease
 		}
 
 		if err := s.StockLogsRepository.WithTx(tx).CreateOne(ctx, newLog, nil); err != nil {
+
 			return err
 		}
 
 		adjustmentStock := &entity.AdjustmentStock{
 			ProductWarehouseId: productWarehouse.Id,
 		}
+		code, err := s.AdjustmentStockRepository.GenerateSequentialNumber(ctx, utils.AdjustmentStockNumberPrefix)
+		if err != nil {
+			return err
+		}
+		adjustmentStock.AdjNumber = code
 		if err := s.AdjustmentStockRepository.WithTx(tx).CreateOne(ctx, adjustmentStock, nil); err != nil {
 
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to create adjustment stock record")
@@ -235,12 +245,6 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			}
 		}
 
-		productWarehouse.Quantity = afterQuantity
-		if err := s.ProductWarehouseRepo.WithTx(tx).UpdateOne(ctx, productWarehouse.Id, productWarehouse, nil); err != nil {
-			s.Log.Errorf("Failed to update product warehouse quantity: %+v", err)
-			return err
-		}
-
 		createdAdjustmentStockId = adjustmentStock.Id
 		return nil
 	})
@@ -318,6 +322,19 @@ func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Qu
 		Preload("ProductWarehouse.Warehouse").
 		Preload("StockLog.CreatedUser")
 
+	scope, scopeErr := m.ResolveLocationScope(c, s.AdjustmentStockRepository.DB())
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
+	if scope.Restrict {
+		if len(scope.IDs) == 0 {
+			return []*entity.AdjustmentStock{}, 0, nil
+		}
+		q = q.Joins("JOIN product_warehouses pw_scope ON pw_scope.id = adjustment_stocks.product_warehouse_id").
+			Joins("JOIN warehouses w_scope ON w_scope.id = pw_scope.warehouse_id")
+		q = m.ApplyScopeFilter(q, scope, "w_scope.location_id")
+	}
+
 	if query.ProductID > 0 {
 		q = q.Joins("JOIN product_warehouses ON product_warehouses.id = adjustment_stocks.product_warehouse_id").
 			Where("product_warehouses.product_id = ?", query.ProductID)

internal/modules/inventory/product-stocks/dto/product-stock.dto.go

@@ -62,6 +62,7 @@ type StockLogDetailDTO struct {
 	Id                 uint                     `json:"id"`
 	Increase           float64                  `json:"increase"`
 	Decrease           float64                  `json:"decrease"`
+	Stock              float64                  `json:"stock"`
 	LoggableType       string                   `json:"loggable_type"`
 	LoggableId         uint                     `json:"loggable_id"`
 	Notes              *string                  `json:"notes"`
@@ -195,6 +196,7 @@ func mapStockLogs(src []entity.StockLog) []StockLogDetailDTO {
 			Id:                 log.Id,
 			Increase:           log.Increase,
 			Decrease:           log.Decrease,
+			Stock:              log.Stock,
 			LoggableType:       log.LoggableType,
 			LoggableId:         log.LoggableId,
 			Notes:              notes,

internal/modules/inventory/product-stocks/services/product-stock.service.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/validations"
 	productRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -36,19 +37,49 @@ func NewProductStockService(
 	}
 }
 
-func (s productStockService) withRelations(db *gorm.DB) *gorm.DB {
+func (s productStockService) withRelations(db *gorm.DB, locationScope, areaScope m.ScopeFilter) *gorm.DB {
+	warehouseScope := func(db *gorm.DB) *gorm.DB {
+		if locationScope.Restrict {
+			db = db.Where("warehouses.location_id IN ?", locationScope.IDs)
+		}
+		if areaScope.Restrict {
+			db = db.Where("warehouses.area_id IN ?", areaScope.IDs)
+		}
+		return db
+	}
+	productWarehouseScope := func(db *gorm.DB) *gorm.DB {
+		db = db.Joins("JOIN warehouses w ON w.id = product_warehouses.warehouse_id")
+		if locationScope.Restrict {
+			db = db.Where("w.location_id IN ?", locationScope.IDs)
+		}
+		if areaScope.Restrict {
+			db = db.Where("w.area_id IN ?", areaScope.IDs)
+		}
+		return db
+	}
+	stockLogScope := func(db *gorm.DB) *gorm.DB {
+		db = db.
+			Joins("JOIN product_warehouses pw ON pw.id = stock_logs.product_warehouse_id").
+			Joins("JOIN warehouses w ON w.id = pw.warehouse_id")
+		if locationScope.Restrict {
+			db = db.Where("w.location_id IN ?", locationScope.IDs)
+		}
+		if areaScope.Restrict {
+			db = db.Where("w.area_id IN ?", areaScope.IDs)
+		}
+		return db.Order("stock_logs.created_at ASC")
+	}
+
 	return db.
 		Preload("CreatedUser").
 		Preload("Uom").
 		Preload("ProductCategory").
 		Preload("Flags").
-		Preload("ProductWarehouses").
-		Preload("ProductWarehouses.Warehouse").
+		Preload("ProductWarehouses", productWarehouseScope).
+		Preload("ProductWarehouses.Warehouse", warehouseScope).
 		Preload("ProductWarehouses.Warehouse.Location").
 		Preload("ProductWarehouses.Warehouse.Location.Area").
-		Preload("ProductWarehouses.StockLogs", func(db *gorm.DB) *gorm.DB {
-			return db.Order("created_at ASC")
-		}).
+		Preload("ProductWarehouses.StockLogs", stockLogScope).
 		Preload("ProductWarehouses.StockLogs.CreatedUser").
 		Preload("ProductSuppliers").
 		Preload("ProductSuppliers.Supplier", func(db *gorm.DB) *gorm.DB {
@@ -61,17 +92,40 @@ func (s productStockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 		return nil, 0, err
 	}
 
+	locationScope, areaScope, err := m.ResolveLocationAreaScopes(c, s.ProductRepository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	productStocks, total, err := s.ProductRepository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
-		db = db.Where(`EXISTS (
-			SELECT 1
-			FROM product_warehouses pw
-			WHERE pw.product_id = products.id
-				AND pw.qty > 0
-		)`)
+		if locationScope.Restrict || areaScope.Restrict {
+			if (locationScope.Restrict && len(locationScope.IDs) == 0) || (areaScope.Restrict && len(areaScope.IDs) == 0) {
+				return db.Where("1 = 0")
+			}
+			db = db.Where(`EXISTS (
+				SELECT 1
+				FROM product_warehouses pw
+				JOIN warehouses w ON w.id = pw.warehouse_id
+				WHERE pw.product_id = products.id
+					AND pw.qty > 0
+					AND (? OR w.location_id IN ?)
+					AND (? OR w.area_id IN ?)
+			)`,
+				!locationScope.Restrict, locationScope.IDs,
+				!areaScope.Restrict, areaScope.IDs,
+			)
+		} else {
+			db = db.Where(`EXISTS (
+				SELECT 1
+				FROM product_warehouses pw
+				WHERE pw.product_id = products.id
+					AND pw.qty > 0
+			)`)
+		}
 
-		db = s.withRelations(db)
+		db = s.withRelations(db, locationScope, areaScope)
 		if params.Search != "" {
 			db = db.Where("products.name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -86,7 +140,34 @@ func (s productStockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 }
 
 func (s productStockService) GetOne(c *fiber.Ctx, id uint) (*entity.Product, error) {
-	product, err := s.ProductRepository.GetByID(c.Context(), id, s.withRelations)
+	locationScope, areaScope, err := m.ResolveLocationAreaScopes(c, s.ProductRepository.DB())
+	if err != nil {
+		return nil, err
+	}
+
+	if locationScope.Restrict || areaScope.Restrict {
+		if (locationScope.Restrict && len(locationScope.IDs) == 0) || (areaScope.Restrict && len(areaScope.IDs) == 0) {
+			return nil, fiber.NewError(fiber.StatusNotFound, "Product not found")
+		}
+		var count int64
+		if err := s.ProductRepository.DB().WithContext(c.Context()).
+			Table("product_warehouses pw").
+			Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+			Where("pw.product_id = ?", id).
+			Where("pw.qty > 0").
+			Where("(? OR w.location_id IN ?)", !locationScope.Restrict, locationScope.IDs).
+			Where("(? OR w.area_id IN ?)", !areaScope.Restrict, areaScope.IDs).
+			Count(&count).Error; err != nil {
+			return nil, err
+		}
+		if count == 0 {
+			return nil, fiber.NewError(fiber.StatusNotFound, "Product not found")
+		}
+	}
+
+	product, err := s.ProductRepository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		return s.withRelations(db, locationScope, areaScope)
+	})
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Product not found")
 	}

internal/modules/inventory/product-warehouses/controllers/product_warehouse.controller.go

@@ -8,6 +8,7 @@ import (
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/response"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -24,12 +25,14 @@ func NewProductWarehouseController(productWarehouseService service.ProductWareho
 
 func (u *ProductWarehouseController) GetAll(c *fiber.Ctx) error {
 	query := &validation.Query{
-		Page:        c.QueryInt("page", 1),
-		Limit:       c.QueryInt("limit", 10),
-		ProductId:   uint(c.QueryInt("product_id", 0)),
-		WarehouseId: uint(c.QueryInt("warehouse_id", 0)),
-		Flags:       c.Query("flags", ""),
-		KandangId:   uint(c.QueryInt("kandang_id", 0)),
+		Page:            c.QueryInt("page", 1),
+		Limit:           c.QueryInt("limit", 10),
+		ProductId:       uint(c.QueryInt("product_id", 0)),
+		WarehouseId:     uint(c.QueryInt("warehouse_id", 0)),
+		Flags:           c.Query("flags", ""),
+		KandangId:       uint(c.QueryInt("kandang_id", 0)),
+		TransferContext: c.Query(utils.TransferContextKey, ""),
+		Type:            c.Query("type", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

internal/modules/inventory/product-warehouses/dto/product_warehouse.dto.go

@@ -6,6 +6,7 @@ import (
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	productDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/dto"
 	warehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
 // === DTO Structs ===
@@ -22,6 +23,7 @@ type ProductWarehouseListDTO struct {
 	Product             *productDTO.ProductRelationDTO     `json:"product,omitempty"`
 	Warehouse           *warehouseDTO.WarehouseRelationDTO `json:"warehouse,omitempty"`
 	ProjectFlockKandang *ProjectFlockKandangRelationDTO    `json:"project_flock_kandang,omitempty"`
+	Week                int                                `json:"week"`
 	CreatedUser         *UserRelationDTO                   `json:"created_user,omitempty"`
 	CreatedAt           time.Time                          `json:"created_at"`
 	UpdatedAt           time.Time                          `json:"updated_at"`
@@ -109,6 +111,22 @@ func ToProductWarehouseListDTO(e entity.ProductWarehouse) ProductWarehouseListDT
 		}
 
 		dto.ProjectFlockKandang = pfkDTO
+
+		// Calculate week for AYAM_PULLET/AYAM products
+		productFlags := make([]string, len(e.Product.Flags))
+		for i, f := range e.Product.Flags {
+			productFlags[i] = f.Name
+		}
+
+		var category string
+		if e.ProjectFlockKandang.ProjectFlock.Id != 0 {
+			category = e.ProjectFlockKandang.ProjectFlock.Category
+		}
+
+		now := time.Now()
+		_, ageInWeeks := calculateAgeFromChickin(e.ProjectFlockKandang, &now, productFlags, category)
+
+		dto.Week = ageInWeeks
 	}
 
 	return dto
@@ -138,3 +156,58 @@ func ToProductWarehouseNestedDTO(e entity.ProductWarehouse) ProductWarehousNeste
 		Warehouse: &warehouse,
 	}
 }
+
+// Helper function to calculate age from chickin (same logic as closingMarketing.dto.go)
+func calculateAgeFromChickin(projectFlockKandang *entity.ProjectFlockKandang, currentDate *time.Time, productFlags []string, category string) (int, int) {
+	if projectFlockKandang == nil || currentDate == nil || len(projectFlockKandang.Chickins) == 0 {
+		return 0, 0
+	}
+
+	// Return 0 for TRADING, TELUR, and AYAM flags (only AYAM_PULLET should have week)
+	for _, flag := range productFlags {
+		if flag == string(utils.FlagOVK) ||
+			flag == string(utils.FlagPakan) ||
+			flag == string(utils.FlagPreStarter) ||
+			flag == string(utils.FlagStarter) ||
+			flag == string(utils.FlagFinisher) ||
+			flag == string(utils.FlagObat) ||
+			flag == string(utils.FlagVitamin) ||
+			flag == string(utils.FlagKimia) ||
+			flag == string(utils.FlagEkspedisi) ||
+			flag == string(utils.FlagTelur) ||
+			flag == string(utils.FlagTelurUtuh) ||
+			flag == string(utils.FlagTelurPecah) ||
+			flag == string(utils.FlagTelurPutih) ||
+			flag == string(utils.FlagTelurRetak) ||
+			flag == string(utils.FlagAyamAfkir) ||
+			flag == string(utils.FlagAyamCulling) ||
+			flag == string(utils.FlagAyamMati) {
+			return 0, 0
+		}
+	}
+
+	// Find earliest chickin date
+	earliestChickinDate := projectFlockKandang.Chickins[0].ChickInDate
+	for _, chickin := range projectFlockKandang.Chickins {
+		if chickin.ChickInDate.Before(earliestChickinDate) {
+			earliestChickinDate = chickin.ChickInDate
+		}
+	}
+
+	diff := currentDate.Sub(earliestChickinDate)
+	ageInDays := int(diff.Hours() / 24)
+
+	var ageInWeeks int
+	if ageInDays <= 0 {
+		ageInWeeks = 0
+	} else {
+		if category == string(utils.ProjectFlockCategoryLaying) {
+			ageInDays = ageInDays + 119
+			ageInWeeks = ((ageInDays - 1) / 7) + 1
+		} else {
+			ageInWeeks = ((ageInDays - 1) / 7) + 1
+		}
+	}
+
+	return ageInDays, ageInWeeks
+}

internal/modules/inventory/product-warehouses/repositories/product_warehouse.repository.go

@@ -168,9 +168,10 @@ func (r *ProductWarehouseRepositoryImpl) ApplyFlagsFilter(db *gorm.DB, flags []s
 	}
 
 	return db.
-		Joins("JOIN products ON products.id = product_warehouses.product_id").
-		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = ?", "products").
-		Where("flags.name IN ?", flags)
+		Joins("JOIN products p_flag ON p_flag.id = product_warehouses.product_id").
+		Joins("JOIN flags f_flag ON f_flag.flagable_id = p_flag.id AND f_flag.flagable_type = ?", "products").
+		Where("f_flag.name IN ?", flags).
+		Distinct()
 }
 
 func (r *ProductWarehouseRepositoryImpl) AdjustQuantities(ctx context.Context, deltas map[uint]float64, modifier func(*gorm.DB) *gorm.DB) error {

internal/modules/inventory/product-warehouses/services/product_warehouse.service.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/sirupsen/logrus"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/validations"
 	kandangrepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/repositories"
@@ -45,7 +46,8 @@ func (s productWarehouseService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("Warehouse.Area").
 		Preload("Warehouse.Kandang").
 		Preload("ProjectFlockKandang").
-		Preload("ProjectFlockKandang.ProjectFlock")
+		Preload("ProjectFlockKandang.ProjectFlock").
+		Preload("ProjectFlockKandang.Chickins")
 }
 
 func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.ProductWarehouse, int64, error) {
@@ -53,6 +55,19 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 		return nil, 0, err
 	}
 
+	applyScope := true
+	if params.TransferContext == utils.TransferContextInventoryTransfer {
+		applyScope = !m.HasPermission(c, m.P_TransferCreateOne)
+	}
+	var scope m.ScopeFilter
+	var err error
+	if applyScope {
+		scope, err = m.ResolveLocationScope(c, s.Repository.DB())
+		if err != nil {
+			return nil, 0, err
+		}
+	}
+
 	if params.ProductId > 0 {
 		isProductExist, err := s.Repository.IsProductExist(c.Context(), params.ProductId)
 		if err != nil {
@@ -85,11 +100,28 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 
 	offset := (params.Page - 1) * params.Limit
 
+	if params.Type != "" {
+		if !utils.IsValidMarketingType(params.Type) {
+			return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid marketing type")
+		}
+	}
+
 	cleanFlags := utils.ParseFlags(params.Flags)
 
 	productWarehouses, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
 
+		db = db.Joins("JOIN warehouses w_scope ON product_warehouses.warehouse_id = w_scope.id").
+			Where("w_scope.deleted_at IS NULL")
+		if applyScope {
+			if scope.Restrict {
+				if len(scope.IDs) == 0 {
+					return db.Where("1 = 0")
+				}
+				db = db.Where("w_scope.location_id IN ?", scope.IDs)
+			}
+		}
+
 		if params.ProductId != 0 {
 			db = db.Where("product_id = ?", params.ProductId)
 		}
@@ -103,7 +135,22 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 			db = db.Where("warehouse_id = ?", params.WarehouseId)
 		}
 
-		db = s.Repository.ApplyFlagsFilter(db, cleanFlags)
+		if params.Type != "" {
+			switch params.Type {
+			case string(utils.MarketingTypeAyamPullet):
+				db = s.Repository.ApplyFlagsFilter(db, []string{string(utils.FlagDOC), string(utils.FlagPullet), string(utils.FlagLayer)})
+			case string(utils.MarketingTypeAyam):
+				db = s.Repository.ApplyFlagsFilter(db, []string{string(utils.FlagAyamAfkir), string(utils.FlagAyamCulling), string(utils.FlagAyamMati)})
+			case string(utils.MarketingTypeTelur):
+				db = s.Repository.ApplyFlagsFilter(db, []string{string(utils.FlagTelur), string(utils.FlagTelurUtuh), string(utils.FlagTelurPecah), string(utils.FlagTelurPutih), string(utils.FlagTelurRetak)})
+			case string(utils.MarketingTypeTrading):
+				db = s.Repository.ApplyFlagsFilter(db, []string{string(utils.FlagPakan), string(utils.FlagPreStarter), string(utils.FlagStarter), string(utils.FlagFinisher), string(utils.FlagOVK), string(utils.FlagObat), string(utils.FlagVitamin), string(utils.FlagKimia), string(utils.FlagEkspedisi)})
+			}
+		}
+
+		if len(cleanFlags) > 0 {
+			db = s.Repository.ApplyFlagsFilter(db, cleanFlags)
+		}
 
 		return db.Order("product_warehouses.id DESC")
 	})
@@ -116,7 +163,33 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 }
 
 func (s productWarehouseService) GetOne(c *fiber.Ctx, id uint) (*entity.ProductWarehouse, error) {
-	productWarehouse, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	applyScope := true
+	if c.Query(utils.TransferContextKey, "") == utils.TransferContextInventoryTransfer {
+		applyScope = !m.HasPermission(c, m.P_TransferCreateOne)
+	}
+	var scope m.ScopeFilter
+	var err error
+	if applyScope {
+		scope, err = m.ResolveLocationScope(c, s.Repository.DB())
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	productWarehouse, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db = db.Joins("JOIN warehouses w_scope ON product_warehouses.warehouse_id = w_scope.id").
+			Where("w_scope.deleted_at IS NULL")
+		if applyScope {
+			if scope.Restrict {
+				if len(scope.IDs) == 0 {
+					return db.Where("1 = 0")
+				}
+				db = db.Where("w_scope.location_id IN ?", scope.IDs)
+			}
+		}
+		return db
+	})
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "ProductWarehouse not found")
 	}

internal/modules/inventory/product-warehouses/validations/product_warehouse.validation.go

@@ -13,10 +13,12 @@ type Update struct {
 }
 
 type Query struct {
-	Page        int    `query:"page" validate:"omitempty,number,min=1"`
-	Limit       int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
-	ProductId   uint   `query:"product_id" validate:"omitempty,number,min=1"`
-	WarehouseId uint   `query:"warehouse_id" validate:"omitempty,number,min=1"`
-	Flags       string `query:"flags" validate:"omitempty"`
-	KandangId   uint   `query:"kandang_id" validate:"omitempty,number,min=1"`
+	Page            int    `query:"page" validate:"omitempty,number,min=1"`
+	Limit           int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
+	ProductId       uint   `query:"product_id" validate:"omitempty,number,min=1"`
+	WarehouseId     uint   `query:"warehouse_id" validate:"omitempty,number,min=1"`
+	Flags           string `query:"flags" validate:"omitempty"`
+	KandangId       uint   `query:"kandang_id" validate:"omitempty,number,min=1"`
+	TransferContext string `query:"transfer_context" validate:"omitempty,oneof=inventory_transfer"`
+	Type            string `query:"type" validate:"omitempty,oneof=AYAM TELUR TRADING AYAM_PULLET"`
 }

internal/modules/inventory/transfers/dto/transfer.dto.go

@@ -9,12 +9,12 @@ import (
 )
 
 type TransferRelationDTO struct {
-	Id                   uint64                                `json:"id"`
-	MovementNumber       string                                `json:"movement_number"`
-	TransferReason       string                                `json:"transfer_reason"`
-	TransferDate         string                                `json:"transfer_date"`
-	SourceWarehouse      *warehouseDTO.WarehouseRelationDTO    `json:"source_warehouse,omitempty"`
-	DestinationWarehouse *warehouseDTO.WarehouseRelationDTO    `json:"destination_warehouse,omitempty"`
+	Id                   uint64                             `json:"id"`
+	MovementNumber       string                             `json:"movement_number"`
+	TransferReason       string                             `json:"transfer_reason"`
+	TransferDate         string                             `json:"transfer_date"`
+	SourceWarehouse      *warehouseDTO.WarehouseRelationDTO `json:"source_warehouse,omitempty"`
+	DestinationWarehouse *warehouseDTO.WarehouseRelationDTO `json:"destination_warehouse,omitempty"`
 }
 
 type ProductSimpleDTO struct {
@@ -51,16 +51,16 @@ type TransferDetailDTO struct {
 }
 
 type TransferDetailItemDTO struct {
-	Id                uint64           `json:"id"`
-	Product           ProductSimpleDTO `json:"product"`
-	Quantity          float64          `json:"quantity"`
-	TransportPerItem  *float64         `json:"transport_per_item,omitempty"`  // Biaya ekspedisi per item
-	ExpeditionVendor  *SupplierSimpleDTO `json:"expedition_vendor,omitempty"` // Vendor ekspedisi
+	Id               uint64             `json:"id"`
+	Product          ProductSimpleDTO   `json:"product"`
+	Quantity         float64            `json:"quantity"`
+	TransportPerItem *float64           `json:"transport_per_item,omitempty"` // Biaya ekspedisi per item
+	ExpeditionVendor *SupplierSimpleDTO `json:"expedition_vendor,omitempty"`  // Vendor ekspedisi
 }
 
 type TransferDeliveryDTO struct {
 	Id                uint64                    `json:"id"`
-	Supplier          SupplierSimpleDTO         `json:"supplier"`
+	Supplier          *SupplierSimpleDTO        `json:"supplier,omitempty"`
 	VehiclePlate      string                    `json:"vehicle_plate"`
 	DriverName        string                    `json:"driver_name"`
 	DocumentNumber    string                    `json:"document_number"`
@@ -115,7 +115,6 @@ func ToTransferListDTO(e entity.StockTransfer) TransferListDTO {
 			Quantity: d.UsageQty + d.PendingQty, // Total actual quantity allocated
 		}
 
-		
 		if d.ExpenseNonstock != nil {
 			priceCopy := d.ExpenseNonstock.Price
 			detailDTO.TransportPerItem = &priceCopy
@@ -155,12 +154,17 @@ func ToTransferListDTO(e entity.StockTransfer) TransferListDTO {
 			}
 		}
 
-		deliveries = append(deliveries, TransferDeliveryDTO{
-			Id: del.Id,
-			Supplier: SupplierSimpleDTO{
+		var supplier *SupplierSimpleDTO
+		if del.Supplier != nil {
+			supplier = &SupplierSimpleDTO{
 				Id:   del.Supplier.Id,
 				Name: del.Supplier.Name,
-			},
+			}
+		}
+
+		deliveries = append(deliveries, TransferDeliveryDTO{
+			Id:                del.Id,
+			Supplier:          supplier,
 			VehiclePlate:      del.VehiclePlate,
 			DriverName:        del.DriverName,
 			DocumentNumber:    del.DocumentNumber,
@@ -201,7 +205,6 @@ func ToTransferDetailDTO(e entity.StockTransfer) TransferDetailDTO {
 			Quantity: d.UsageQty + d.PendingQty, // Total actual quantity allocated
 		}
 
-		
 		if d.ExpenseNonstock != nil {
 			priceCopy := d.ExpenseNonstock.Price
 			detailDTO.TransportPerItem = &priceCopy
@@ -241,12 +244,17 @@ func ToTransferDetailDTO(e entity.StockTransfer) TransferDetailDTO {
 			}
 		}
 
-		deliveries = append(deliveries, TransferDeliveryDTO{
-			Id: del.Id,
-			Supplier: SupplierSimpleDTO{
+		var supplier *SupplierSimpleDTO
+		if del.Supplier != nil {
+			supplier = &SupplierSimpleDTO{
 				Id:   del.Supplier.Id,
 				Name: del.Supplier.Name,
-			},
+			}
+		}
+
+		deliveries = append(deliveries, TransferDeliveryDTO{
+			Id:                del.Id,
+			Supplier:          supplier,
 			VehiclePlate:      del.VehiclePlate,
 			DriverName:        del.DriverName,
 			DocumentNumber:    del.DocumentNumber,

internal/modules/inventory/transfers/services/transfer.service.go

@@ -94,10 +94,24 @@ func (s transferService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 		return nil, 0, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.StockTransferRepo.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	transfers, total, err := s.StockTransferRepo.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		if scope.Restrict {
+			if len(scope.IDs) == 0 {
+				return db.Where("1 = 0")
+			}
+			db = db.
+				Joins("JOIN warehouses w_from ON w_from.id = stock_transfers.from_warehouse_id").
+				Joins("JOIN warehouses w_to ON w_to.id = stock_transfers.to_warehouse_id").
+				Where("w_from.location_id IN ? OR w_to.location_id IN ?", scope.IDs, scope.IDs)
+		}
 		if params.Search != "" {
 			searchTerm := "%" + strings.TrimSpace(params.Search) + "%"
 			db = db.Joins("LEFT JOIN warehouses AS from_warehouses ON from_warehouses.id = stock_transfers.from_warehouse_id").
@@ -116,6 +130,28 @@ func (s transferService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 }
 
 func (s transferService) GetOne(c *fiber.Ctx, id uint) (*entity.StockTransfer, error) {
+	scope, err := m.ResolveLocationScope(c, s.StockTransferRepo.DB())
+	if err != nil {
+		return nil, err
+	}
+	if scope.Restrict {
+		if len(scope.IDs) == 0 {
+			return nil, fiber.NewError(fiber.StatusNotFound, "Transfer not found")
+		}
+		var count int64
+		if err := s.StockTransferRepo.DB().WithContext(c.Context()).
+			Table("stock_transfers").
+			Joins("JOIN warehouses w_from ON w_from.id = stock_transfers.from_warehouse_id").
+			Joins("JOIN warehouses w_to ON w_to.id = stock_transfers.to_warehouse_id").
+			Where("stock_transfers.id = ?", id).
+			Where("w_from.location_id IN ? OR w_to.location_id IN ?", scope.IDs, scope.IDs).
+			Count(&count).Error; err != nil {
+			return nil, err
+		}
+		if count == 0 {
+			return nil, fiber.NewError(fiber.StatusNotFound, "Transfer not found")
+		}
+	}
 
 	transferPtr, err := s.StockTransferRepo.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
 		return s.withRelations(db)
@@ -196,6 +232,24 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 	}
 
 	for _, delivery := range req.Deliveries {
+
+		if delivery.SupplierID == 0 {
+			continue
+		}
+
+		if delivery.VehiclePlate == "" {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Vehicle plate wajib diisi ketika supplier dipilih")
+		}
+		if delivery.DriverName == "" {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Driver name wajib diisi ketika supplier dipilih")
+		}
+		if delivery.DeliveryCost <= 0 {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Delivery cost harus lebih dari 0 ketika supplier dipilih")
+		}
+		if delivery.DeliveryCostPerItem <= 0 {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Delivery cost per item harus lebih dari 0 ketika supplier dipilih")
+		}
+
 		supplier, err := s.SupplierRepo.GetByID(c.Context(), uint(delivery.SupplierID), nil)
 		if err != nil {
 			if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -310,9 +364,16 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 
 		var deliveries []*entity.StockTransferDelivery
 		for _, delivery := range req.Deliveries {
+			supplierId := func() *uint64 {
+				if delivery.SupplierID > 0 {
+					id := uint64(delivery.SupplierID)
+					return &id
+				}
+				return nil
+			}()
 			deliveries = append(deliveries, &entity.StockTransferDelivery{
 				StockTransferId:   entityTransfer.Id,
-				SupplierId:        uint64(delivery.SupplierID),
+				SupplierId:        supplierId,
 				VehiclePlate:      delivery.VehiclePlate,
 				DriverName:        delivery.DriverName,
 				ShippingCostItem:  delivery.DeliveryCostPerItem,
@@ -415,6 +476,18 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				LoggableId:         uint(detail.Id),
 				Notes:              "",
 			}
+			stockLogs, err := s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.SourceProductWarehouseID), 1)
+			if err != nil {
+				s.Log.Errorf("Failed to get stock logs: %+v", err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				stockLogDecrease.Stock -= latestStockLog.Stock - stockLogDecrease.Decrease
+			} else {
+				stockLogDecrease.Stock -= stockLogDecrease.Decrease
+			}
+
 			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogDecrease, nil); err != nil {
 				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok keluar")
 			}
@@ -451,6 +524,17 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				LoggableId:         uint(detail.Id),
 				Notes:              "",
 			}
+			stockLogs, err = s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.DestProductWarehouseID), 1)
+			if err != nil {
+				s.Log.Errorf("Failed to get stock logs: %+v", err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				stockLogIncrease.Stock = latestStockLog.Stock + stockLogIncrease.Increase
+			} else {
+				stockLogIncrease.Stock += stockLogIncrease.Increase
+			}
 			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogIncrease, nil); err != nil {
 				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok masuk")
 			}
@@ -458,6 +542,11 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 
 		if len(req.Deliveries) > 0 {
 			for _, delivery := range req.Deliveries {
+				// Skip adding to expensePayloads if SupplierID is 0 (optional)
+				if delivery.SupplierID == 0 {
+					continue
+				}
+
 				for _, prod := range delivery.Products {
 					detail := detailMap[uint64(prod.ProductID)]
 					if detail == nil {

internal/modules/inventory/transfers/validations/transfer.validation.go

@@ -21,12 +21,12 @@ type TransferDeliveryProduct struct {
 }
 
 type TransferDelivery struct {
-	DeliveryCost        float64                   `json:"delivery_cost" validate:"required"`
-	DeliveryCostPerItem float64                   `json:"delivery_cost_per_item" validate:"required"`
+	DeliveryCost        float64                   `json:"delivery_cost"`
+	DeliveryCostPerItem float64                   `json:"delivery_cost_per_item"`
 	DocumentIndex       int                       `json:"document_index" validate:"omitempty,min=-1" default:"-1"`
-	DriverName          string                    `json:"driver_name" validate:"required"`
-	VehiclePlate        string                    `json:"vehicle_plate" validate:"required"`
-	SupplierID          uint                      `json:"supplier_id" validate:"required"`
+	DriverName          string                    `json:"driver_name"`
+	VehiclePlate        string                    `json:"vehicle_plate"`
+	SupplierID          uint                      `json:"supplier_id" `
 	Products            []TransferDeliveryProduct `json:"products" validate:"required,dive"`
 }
 

internal/modules/marketing/controllers/deliveryorder.controller.go

@@ -3,6 +3,7 @@ package controller
 import (
 	"math"
 	"strconv"
+	"strings"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/services"
@@ -23,9 +24,38 @@ func NewDeliveryOrdersController(deliveryOrdersService service.DeliveryOrdersSer
 }
 
 func (u *DeliveryOrdersController) GetAll(c *fiber.Ctx) error {
+	parseUintListParam := func(param string) ([]uint, error) {
+		if param == "" {
+			return nil, nil
+		}
+		parts := strings.Split(param, ",")
+		ids := make([]uint, 0, len(parts))
+		for _, part := range parts {
+			trimmed := strings.TrimSpace(part)
+			if trimmed == "" {
+				return nil, strconv.ErrSyntax
+			}
+			parsed, err := strconv.ParseUint(trimmed, 10, 64)
+			if err != nil {
+				return nil, err
+			}
+			ids = append(ids, uint(parsed))
+		}
+		return ids, nil
+	}
+
+	productIDs, err := parseUintListParam(c.Query("product_ids", ""))
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid product_ids")
+	}
+
 	query := &validation.DeliveryOrderQuery{
 		Page:        c.QueryInt("page", 1),
 		Limit:       c.QueryInt("limit", 10),
+		Search:      strings.TrimSpace(c.Query("search", "")),
+		ProductIDs:  productIDs,
+		Status:      strings.ReplaceAll(strings.TrimSpace(c.Query("status", "")), "_", " "),
+		CustomerId:  uint(c.QueryInt("customer_id", 0)),
 		MarketingId: uint(c.QueryInt("marketing_id", 0)),
 	}
 

internal/modules/marketing/dto/deliveryorder.dto.go

@@ -2,7 +2,9 @@ package dto
 
 import (
 	"fmt"
+	"math"
 	"sort"
+	"strings"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -16,6 +18,7 @@ import (
 type MarketingRelationDTO struct {
 	Id       uint      `json:"id"`
 	SoNumber string    `json:"so_number"`
+	DoNumber *string   `json:"do_number"`
 	SoDate   time.Time `json:"so_date"`
 	Notes    string    `json:"notes,omitempty"`
 }
@@ -76,45 +79,69 @@ type DeliveryGroupDTO struct {
 }
 
 type DeliveryMarketingProductDTO struct {
-	Id                 uint                                          `json:"id"`
-	MarketingId        uint                                          `json:"marketing_id"`
-	ProductWarehouseId uint                                          `json:"product_warehouse_id"`
-	Qty                float64                                       `json:"qty"`
-	UnitPrice          float64                                       `json:"unit_price"`
-	AvgWeight          float64                                       `json:"avg_weight"`
-	TotalWeight        float64                                       `json:"total_weight"`
-	TotalPrice         float64                                       `json:"total_price"`
-	ProductWarehouse   *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
-	VehicleNumber      string                                        `json:"vehicle_number,omitempty"`
+	Id                  uint                                          `json:"id"`
+	MarketingId         uint                                          `json:"marketing_id"`
+	ProductWarehouseId  uint                                          `json:"product_warehouse_id"`
+	MarketingType       string                                        `json:"marketing_type"`
+	Qty                 float64                                       `json:"qty"`
+	UnitPrice           float64                                       `json:"unit_price"`
+	AvgWeight           float64                                       `json:"avg_weight"`
+	TotalWeight         float64                                       `json:"total_weight"`
+	TotalPrice          float64                                       `json:"total_price"`
+	ConvertionUnit      *string                                       `json:"convertion_unit,omitempty"`
+	WeightPerConvertion *float64                                      `json:"weight_per_convertion,omitempty"`
+	TotalPeti           *float64                                      `json:"total_peti,omitempty"`
+	Week                *int                                          `json:"week,omitempty"`
+	ProductWarehouse    *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
+	VehicleNumber       string                                        `json:"vehicle_number,omitempty"`
 }
 
 func ToMarketingRelationDTO(marketing *entity.Marketing) MarketingRelationDTO {
+	var doNumber *string
+	if doNumbers := collectDoNumbers(marketing); len(doNumbers) > 0 {
+		value := doNumbers[0]
+		doNumber = &value
+	}
+
 	return MarketingRelationDTO{
 		Id:       marketing.Id,
 		SoNumber: marketing.SoNumber,
+		DoNumber: doNumber,
 		SoDate:   marketing.SoDate,
 		Notes:    marketing.Notes,
 	}
 }
 
-func ToDeliveryMarketingProductDTO(e entity.MarketingProduct) DeliveryMarketingProductDTO {
+func ToDeliveryMarketingProductDTO(e entity.MarketingProduct, marketingType string) DeliveryMarketingProductDTO {
 	var productWarehouse *productwarehouseDTO.ProductWarehousNestedDTO
 	if e.ProductWarehouse.Id != 0 {
 		mapped := productwarehouseDTO.ToProductWarehouseNestedDTO(e.ProductWarehouse)
 		productWarehouse = &mapped
 	}
 
+	// Calculate total_peti only for TELUR marketing type
+	var totalPeti *float64
+	if marketingType == "TELUR" && e.ConvertionUnit != nil && *e.ConvertionUnit == "PETI" && e.WeightPerConvertion != nil && *e.WeightPerConvertion > 0 {
+		calculated := math.Floor(e.TotalWeight / *e.WeightPerConvertion)
+		totalPeti = &calculated
+	}
+
 	return DeliveryMarketingProductDTO{
-		Id:                 e.Id,
-		MarketingId:        e.MarketingId,
-		ProductWarehouseId: e.ProductWarehouseId,
-		Qty:                e.Qty,
-		UnitPrice:          e.UnitPrice,
-		AvgWeight:          e.AvgWeight,
-		TotalWeight:        e.TotalWeight,
-		TotalPrice:         e.TotalPrice,
-		ProductWarehouse:   productWarehouse,
-		VehicleNumber:      getVehicleNumber(e),
+		Id:                  e.Id,
+		MarketingId:         e.MarketingId,
+		ProductWarehouseId:  e.ProductWarehouseId,
+		MarketingType:       marketingType,
+		Qty:                 e.Qty,
+		UnitPrice:           e.UnitPrice,
+		AvgWeight:           e.AvgWeight,
+		TotalWeight:         e.TotalWeight,
+		TotalPrice:          e.TotalPrice,
+		ConvertionUnit:      e.ConvertionUnit,
+		WeightPerConvertion: e.WeightPerConvertion,
+		TotalPeti:           totalPeti,
+		Week:                e.Week,
+		ProductWarehouse:    productWarehouse,
+		VehicleNumber:       getVehicleNumber(e),
 	}
 }
 
@@ -161,10 +188,9 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M
 	if len(marketing.Products) > 0 {
 		salesOrderProducts = make([]DeliveryMarketingProductDTO, len(marketing.Products))
 		for i, product := range marketing.Products {
-			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product)
+			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product, marketing.MarketingType)
 		}
 	}
-
 	return MarketingListDTO{
 		MarketingRelationDTO: ToMarketingRelationDTO(marketing),
 		Customer:             customer,
@@ -201,7 +227,7 @@ func ToMarketingDetailDTO(marketing *entity.Marketing, deliveryProducts []entity
 	if len(marketing.Products) > 0 {
 		salesOrderProducts = make([]DeliveryMarketingProductDTO, len(marketing.Products))
 		for i, product := range marketing.Products {
-			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product)
+			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product, marketing.MarketingType)
 		}
 	}
 
@@ -221,7 +247,6 @@ func ToMarketingDetailDTO(marketing *entity.Marketing, deliveryProducts []entity
 		mapped := approvalDTO.ToApprovalDTO(*marketing.LatestApproval)
 		latestApproval = mapped
 	}
-
 	return MarketingDetailDTO{
 		MarketingRelationDTO: ToMarketingRelationDTO(marketing),
 		SoDocs:               marketing.SoDocs,
@@ -328,11 +353,46 @@ func groupDeliveryProducts(products []MarketingDeliveryProductDTO, soNumber stri
 }
 
 func GenerateDeliveryOrderNumber(soNumber string, deliveryDate *time.Time, warehouseId uint) string {
-	dateStr := ""
-	if deliveryDate != nil {
-		dateStr = deliveryDate.Format("20060102")
+	numberPrefix := soNumber
+	if strings.HasPrefix(strings.ToUpper(strings.TrimSpace(soNumber)), "SO-") {
+		numberPrefix = "DO-" + soNumber[3:]
 	}
-	return fmt.Sprintf("%s-%s-%d", soNumber, dateStr, warehouseId)
+	return numberPrefix
+}
+
+func collectDoNumbers(marketing *entity.Marketing) []string {
+	if marketing == nil || len(marketing.Products) == 0 {
+		return nil
+	}
+
+	seen := make(map[string]struct{})
+	for _, product := range marketing.Products {
+		if product.DeliveryProduct == nil || product.DeliveryProduct.DeliveryDate == nil {
+			continue
+		}
+		warehouseID := product.ProductWarehouse.WarehouseId
+		if warehouseID == 0 && product.ProductWarehouse.Warehouse.Id != 0 {
+			warehouseID = product.ProductWarehouse.Warehouse.Id
+		}
+		if warehouseID == 0 {
+			continue
+		}
+
+		doNumber := GenerateDeliveryOrderNumber(marketing.SoNumber, product.DeliveryProduct.DeliveryDate, warehouseID)
+		if doNumber != "" {
+			seen[doNumber] = struct{}{}
+		}
+	}
+
+	if len(seen) == 0 {
+		return nil
+	}
+	result := make([]string, 0, len(seen))
+	for value := range seen {
+		result = append(result, value)
+	}
+	sort.Strings(result)
+	return result
 }
 
 func getVehicleNumber(e entity.MarketingProduct) string {

internal/modules/marketing/dto/salesorder.dto.go

@@ -1,6 +1,7 @@
 package dto
 
 import (
+	"math"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -10,13 +11,18 @@ import (
 // === DTO Structs ===
 
 type MarketingProductDTO struct {
-	Id               uint                                          `json:"id"`
-	Qty              float64                                       `json:"qty"`
-	UnitPrice        float64                                       `json:"unit_price"`
-	AvgWeight        float64                                       `json:"avg_weight"`
-	TotalWeight      float64                                       `json:"total_weight"`
-	TotalPrice       float64                                       `json:"total_price"`
-	ProductWarehouse *productWarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
+	Id                  uint                                          `json:"id"`
+	MarketingType       string                                        `json:"marketing_type"`
+	Qty                 float64                                       `json:"qty"`
+	UnitPrice           float64                                       `json:"unit_price"`
+	AvgWeight           float64                                       `json:"avg_weight"`
+	TotalWeight         float64                                       `json:"total_weight"`
+	TotalPrice          float64                                       `json:"total_price"`
+	ConvertionUnit      *string                                       `json:"convertion_unit,omitempty"`
+	WeightPerConvertion *float64                                      `json:"weight_per_convertion,omitempty"`
+	TotalPeti           *float64                                      `json:"total_peti,omitempty"`
+	Week                *int                                          `json:"week,omitempty"`
+	ProductWarehouse    *productWarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
 }
 
 type SalesOrdersListDTO struct {
@@ -29,7 +35,7 @@ type SalesOrdersListDTO struct {
 
 // === Mapper Functions ===
 
-func ToMarketingProductDTO(e entity.MarketingProduct) MarketingProductDTO {
+func ToMarketingProductDTO(e entity.MarketingProduct, marketingType string) MarketingProductDTO {
 	var productWarehouse *productWarehouseDTO.ProductWarehousNestedDTO
 
 	if e.ProductWarehouse.Id != 0 {
@@ -37,21 +43,33 @@ func ToMarketingProductDTO(e entity.MarketingProduct) MarketingProductDTO {
 		productWarehouse = &mapped
 	}
 
+	// Calculate total_peti only for TELUR marketing type
+	var totalPeti *float64
+	if marketingType == "TELUR" && e.ConvertionUnit != nil && *e.ConvertionUnit == "PETI" && e.WeightPerConvertion != nil && *e.WeightPerConvertion > 0 {
+		calculated := math.Floor(e.TotalWeight / *e.WeightPerConvertion)
+		totalPeti = &calculated
+	}
+
 	return MarketingProductDTO{
-		Id:               e.Id,
-		Qty:              e.Qty,
-		UnitPrice:        e.UnitPrice,
-		AvgWeight:        e.AvgWeight,
-		TotalWeight:      e.TotalWeight,
-		TotalPrice:       e.TotalPrice,
-		ProductWarehouse: productWarehouse,
+		Id:                  e.Id,
+		MarketingType:       marketingType,
+		Qty:                 e.Qty,
+		UnitPrice:           e.UnitPrice,
+		AvgWeight:           e.AvgWeight,
+		TotalWeight:         e.TotalWeight,
+		TotalPrice:          e.TotalPrice,
+		ConvertionUnit:      e.ConvertionUnit,
+		WeightPerConvertion: e.WeightPerConvertion,
+		TotalPeti:           totalPeti,
+		Week:                e.Week,
+		ProductWarehouse:    productWarehouse,
 	}
 }
 
 func ToSalesOrdersListDTO(e entity.Marketing) SalesOrdersListDTO {
 	products := make([]MarketingProductDTO, len(e.Products))
 	for i, p := range e.Products {
-		products[i] = ToMarketingProductDTO(p)
+		products[i] = ToMarketingProductDTO(p, e.MarketingType)
 	}
 
 	return SalesOrdersListDTO{
@@ -68,7 +86,7 @@ func ToSalesOrdersListDTOFromMarketing(e entity.Marketing) SalesOrdersListDTO {
 	if len(e.Products) > 0 {
 		salesOrder = make([]MarketingProductDTO, len(e.Products))
 		for i, product := range e.Products {
-			salesOrder[i] = ToMarketingProductDTO(product)
+			salesOrder[i] = ToMarketingProductDTO(product, e.MarketingType)
 		}
 	}
 

internal/modules/marketing/module.go

@@ -64,7 +64,7 @@ func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	warehouseRepo := rWarehouse.NewWarehouseRepository(db)
 	projectFlockKandangRepo := rProjectFlockKandang.NewProjectFlockKandangRepository(db)
 
-	salesOrdersService := service.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, warehouseRepo, projectFlockKandangRepo, validate)
+	salesOrdersService := service.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, fifoService, warehouseRepo, projectFlockKandangRepo, validate)
 	deliveryOrdersService := service.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, stockLogRepo, approvalSvc, fifoService, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 

internal/modules/marketing/repositories/salesorder_delivery_product.repository.go

@@ -14,13 +14,15 @@ import (
 type MarketingDeliveryProductRepository interface {
 	repository.BaseRepository[entity.MarketingDeliveryProduct]
 	GetDeliveryProductsByProjectFlockID(ctx context.Context, projectFlockID uint, callback func(*gorm.DB) *gorm.DB) ([]entity.MarketingDeliveryProduct, error)
-	GetClosingPenjualan(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, category string) ([]entity.MarketingDeliveryProduct, error)
+	GetClosingPenjualan(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error)
+	GetClosingPenjualanByCategory(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, category string) ([]entity.MarketingDeliveryProduct, error)
 	GetByMarketingId(ctx context.Context, marketingId uint) ([]entity.MarketingDeliveryProduct, error)
 	GetByMarketingProductID(ctx context.Context, marketingProductID uint) (*entity.MarketingDeliveryProduct, error)
 	GetAllWithFilters(ctx context.Context, offset, limit int, filters *validation.MarketingQuery) ([]entity.MarketingDeliveryProduct, int64, error)
 	UpdateFifoFields(ctx context.Context, id uint, usageQty, pendingQty float64) error
 	GetUsageQty(ctx context.Context, id uint) (float64, error)
 	ResetFifoFields(ctx context.Context, id uint) error
+	GetClosingPenjualanForAgeChickDataProduction(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error)
 }
 
 type MarketingDeliveryProductRepositoryImpl struct {
@@ -54,7 +56,85 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetDeliveryProductsByProjectFlo
 	return deliveryProducts, nil
 }
 
-func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualan(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, category string) ([]entity.MarketingDeliveryProduct, error) {
+func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualan(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error) {
+	var deliveryProducts []entity.MarketingDeliveryProduct
+
+	db := r.DB().WithContext(ctx).
+		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
+		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
+		Where("marketing_delivery_products.delivery_date IS NOT NULL").
+		Distinct("marketing_delivery_products.*")
+
+	if projectFlockKandangID != nil {
+		db = db.Where("product_warehouses.project_flock_kandang_id = ?", *projectFlockKandangID)
+	}
+
+	db = db.
+		Preload("MarketingProduct").
+		Preload("MarketingProduct.ProductWarehouse").
+		Preload("MarketingProduct.ProductWarehouse.Product").
+		Preload("MarketingProduct.ProductWarehouse.Product.ProductCategory").
+		Preload("MarketingProduct.ProductWarehouse.Product.Uom").
+		Preload("MarketingProduct.ProductWarehouse.Product.Flags").
+		Preload("MarketingProduct.ProductWarehouse.Warehouse").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins").
+		Preload("MarketingProduct.Marketing").
+		Preload("MarketingProduct.Marketing.Customer").
+		Order("marketing_delivery_products.delivery_date DESC")
+
+	if err := db.Find(&deliveryProducts).Error; err != nil {
+		return nil, err
+	}
+
+	return deliveryProducts, nil
+}
+
+func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanForAgeChickDataProduction(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error) {
+	var deliveryProducts []entity.MarketingDeliveryProduct
+
+	db := r.DB().WithContext(ctx).
+		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
+		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
+		Where("flags.name IN (?)", []string{
+			string(utils.FlagAyamAfkir),
+			string(utils.FlagAyamCulling),
+			string(utils.FlagPullet),
+			string(utils.FlagLayer),
+		}).
+		Where("marketing_delivery_products.delivery_date IS NOT NULL").
+		Distinct("marketing_delivery_products.*")
+
+	if projectFlockKandangID != nil {
+		db = db.Where("product_warehouses.project_flock_kandang_id = ?", *projectFlockKandangID)
+	}
+
+	db = db.
+		Preload("MarketingProduct").
+		Preload("MarketingProduct.ProductWarehouse").
+		Preload("MarketingProduct.ProductWarehouse.Product").
+		Preload("MarketingProduct.ProductWarehouse.Product.ProductCategory").
+		Preload("MarketingProduct.ProductWarehouse.Product.Flags").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins").
+		Order("marketing_delivery_products.delivery_date DESC")
+
+	if err := db.Find(&deliveryProducts).Error; err != nil {
+		return nil, err
+	}
+
+	return deliveryProducts, nil
+}
+
+func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanByCategory(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, category string) ([]entity.MarketingDeliveryProduct, error) {
 	var deliveryProducts []entity.MarketingDeliveryProduct
 
 	db := r.DB().WithContext(ctx).
@@ -161,7 +241,7 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		Joins("JOIN marketings ON marketings.id = marketing_products.marketing_id").
 		Where("marketing_delivery_products.delivery_date IS NOT NULL")
 
-	if filters.ProductId > 0 || filters.WarehouseId > 0 || filters.AreaId > 0 || filters.LocationId > 0 || filters.Search != "" || filters.MarketingType != "" {
+	if filters.ProductId > 0 || filters.WarehouseId > 0 || filters.AreaId > 0 || filters.LocationId > 0 || filters.AllowedAreaIDs != nil || filters.AllowedLocationIDs != nil || filters.Search != "" || filters.MarketingType != "" {
 		db = db.Joins("LEFT JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id")
 	}
 
@@ -211,7 +291,7 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		db = db.Where("product_warehouses.warehouse_id = ?", filters.WarehouseId)
 	}
 
-	if filters.AreaId > 0 || filters.LocationId > 0 {
+	if filters.AreaId > 0 || filters.LocationId > 0 || filters.AllowedAreaIDs != nil || filters.AllowedLocationIDs != nil {
 		db = db.Joins("LEFT JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
 			Joins("LEFT JOIN project_flocks ON project_flocks.id = project_flock_kandangs.project_flock_id")
 
@@ -222,6 +302,22 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		if filters.LocationId > 0 {
 			db = db.Where("project_flocks.location_id = ?", filters.LocationId)
 		}
+
+		if filters.AllowedAreaIDs != nil {
+			if len(filters.AllowedAreaIDs) == 0 {
+				db = db.Where("1 = 0")
+			} else {
+				db = db.Where("project_flocks.area_id IN ?", filters.AllowedAreaIDs)
+			}
+		}
+
+		if filters.AllowedLocationIDs != nil {
+			if len(filters.AllowedLocationIDs) == 0 {
+				db = db.Where("1 = 0")
+			} else {
+				db = db.Where("project_flocks.location_id IN ?", filters.AllowedLocationIDs)
+			}
+		}
 	}
 
 	if filters.MarketingType != "" {

internal/modules/marketing/services/deliveryorder.service.go

@@ -10,7 +10,6 @@ import (
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
-	productWarehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/dto"
 	marketingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/validations"
@@ -66,11 +65,16 @@ func (s deliveryOrdersService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("Customer").
 		Preload("SalesPerson").
 		Preload("Products.ProductWarehouse.Product").
+		Preload("Products.ProductWarehouse.Product.Uom").
 		Preload("Products.ProductWarehouse.Warehouse").
 		Preload("Products.DeliveryProduct")
 }
 
 func (s deliveryOrdersService) getMarketingWithDeliveries(c *fiber.Ctx, marketingId uint) (*dto.MarketingDetailDTO, error) {
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), marketingId); err != nil {
+		return nil, err
+	}
+
 	marketing, err := s.MarketingRepo.GetByID(c.Context(), marketingId, s.withRelations)
 	if err != nil {
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
@@ -95,6 +99,11 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
 		return nil, 0, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.MarketingRepo.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	marketings, total, err := s.MarketingRepo.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
@@ -103,9 +112,92 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
 			Preload("Customer").
 			Preload("SalesPerson").
 			Preload("Products.ProductWarehouse.Product").
+			Preload("Products.ProductWarehouse.Product.Uom").
 			Preload("Products.ProductWarehouse.Warehouse").
 			Preload("Products.DeliveryProduct")
 
+		if params.Status != "" {
+			latestApprovalSubQuery := s.MarketingRepo.DB().
+				WithContext(c.Context()).
+				Table("approvals").
+				Select("DISTINCT ON (approvable_id) approvable_id, step_name").
+				Where("approvable_type = ?", utils.ApprovalWorkflowMarketing.String()).
+				Order("approvable_id, id DESC")
+			db = db.Where(`EXISTS (
+				SELECT 1
+				FROM (?) AS latest_approval
+				WHERE latest_approval.approvable_id = marketings.id
+					AND LOWER(latest_approval.step_name) = LOWER(?)
+			)`, latestApprovalSubQuery, params.Status)
+		}
+
+		if params.Search != "" {
+			searchPattern := "%" + params.Search + "%"
+			db = db.Where(`(
+				marketings.so_number ILIKE ? OR
+				EXISTS (
+					SELECT 1
+					FROM customers c
+					WHERE c.id = marketings.customer_id
+						AND c.name ILIKE ?
+				) OR
+				EXISTS (
+					SELECT 1
+					FROM users su
+					WHERE su.id = marketings.sales_person_id
+						AND su.name ILIKE ?
+				) OR
+				EXISTS (
+					SELECT 1
+					FROM marketing_products mp
+					JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id
+					JOIN products p ON p.id = pw.product_id
+					WHERE mp.marketing_id = marketings.id
+						AND p.name ILIKE ?
+				) OR
+				EXISTS (
+					SELECT 1
+					FROM marketing_products mp
+					JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id
+					JOIN warehouses w ON w.id = pw.warehouse_id
+					WHERE mp.marketing_id = marketings.id
+						AND w.name ILIKE ?
+				)
+			)`, searchPattern, searchPattern, searchPattern, searchPattern, searchPattern)
+		}
+
+		if len(params.ProductIDs) > 0 {
+			db = db.Where(`EXISTS (
+				SELECT 1
+				FROM marketing_products mp
+				JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id
+				JOIN products p ON p.id = pw.product_id
+				WHERE mp.marketing_id = marketings.id
+					AND p.id IN ?
+			)`, params.ProductIDs)
+		}
+
+		if params.CustomerId != 0 {
+			db = db.Where("marketings.customer_id = ?", params.CustomerId)
+		}
+
+		if scope.Restrict {
+			if len(scope.IDs) == 0 {
+				return db.Where("1 = 0")
+			}
+			db = db.Where(
+				`EXISTS (
+					SELECT 1
+					FROM marketing_products mp
+					JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id
+					JOIN warehouses w ON w.id = pw.warehouse_id
+					WHERE mp.marketing_id = marketings.id
+						AND w.location_id IN ?
+				)`,
+				scope.IDs,
+			)
+		}
+
 		if params.MarketingId != 0 {
 			return db.Where("id = ?", params.MarketingId)
 		}
@@ -134,6 +226,9 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
 }
 
 func (s deliveryOrdersService) GetOne(c *fiber.Ctx, id uint) (*dto.MarketingDetailDTO, error) {
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return nil, err
+	}
 
 	marketing, err := s.MarketingRepo.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -173,6 +268,10 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 		return nil, err
 	}
 
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), req.MarketingId); err != nil {
+		return nil, err
+	}
+
 	if err := commonSvc.EnsureRelations(c.Context(),
 		commonSvc.RelationCheck{Name: "Marketing", ID: &req.MarketingId, Exists: s.MarketingRepo.IdExists},
 	); err != nil {
@@ -205,6 +304,12 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
 		marketingDeliveryProductRepositoryTx := marketingRepo.NewMarketingDeliveryProductRepository(dbTransaction)
 		approvalSvcTx := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(dbTransaction))
+		marketingRepoTx := marketingRepo.NewMarketingRepository(dbTransaction)
+
+		marketing, err := marketingRepoTx.GetByID(c.Context(), req.MarketingId, nil)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
+		}
 
 		allMarketingProducts, err := marketingProductRepositoryTx.GetByMarketingID(c.Context(), req.MarketingId)
 		if err != nil {
@@ -251,25 +356,7 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 				itemDeliveryDate = &parsedDate
 			}
 
-			isPakanOrOVK := false
-			if foundMarketingProduct.ProductWarehouse.Product.Id != 0 && len(foundMarketingProduct.ProductWarehouse.Product.Flags) > 0 {
-				for _, flag := range foundMarketingProduct.ProductWarehouse.Product.Flags {
-					if flag.Name == string(utils.FlagPakan) || flag.Name == string(utils.FlagOVK) {
-						isPakanOrOVK = true
-						break
-					}
-				}
-			}
-
-			totalWeight := requestedProduct.Qty * requestedProduct.AvgWeight
-			var totalPrice float64
-			if isPakanOrOVK {
-
-				totalPrice = requestedProduct.Qty * requestedProduct.UnitPrice
-			} else {
-
-				totalPrice = totalWeight * requestedProduct.UnitPrice
-			}
+			totalWeight, totalPrice := s.calculatePriceByMarketingType(marketing.MarketingType, requestedProduct.Qty, requestedProduct.AvgWeight, requestedProduct.UnitPrice, foundMarketingProduct.Week)
 
 			deliveryProduct.ProductWarehouseId = foundMarketingProduct.ProductWarehouseId
 			deliveryProduct.UnitPrice = requestedProduct.UnitPrice
@@ -323,6 +410,10 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 		return nil, err
 	}
 
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return nil, err
+	}
+
 	if err := commonSvc.EnsureRelations(c.Context(),
 		commonSvc.RelationCheck{Name: "Marketing", ID: &id, Exists: s.MarketingRepo.IdExists},
 	); err != nil {
@@ -338,6 +429,12 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 
 		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
 		marketingDeliveryProductRepositoryTx := marketingRepo.NewMarketingDeliveryProductRepository(dbTransaction)
+		marketingRepoTx := marketingRepo.NewMarketingRepository(dbTransaction)
+
+		marketing, err := marketingRepoTx.GetByID(c.Context(), id, nil)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
+		}
 
 		allMarketingProducts, err := marketingProductRepositoryTx.GetByMarketingID(c.Context(), id)
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
@@ -373,6 +470,7 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 					return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery product")
 				}
 
+				oldRequestedQty := deliveryProduct.UsageQty + deliveryProduct.PendingQty
 				var itemDeliveryDate *time.Time
 				if requestedProduct.DeliveryDate != "" {
 					parsedDate, err := utils.ParseDateString(requestedProduct.DeliveryDate)
@@ -384,28 +482,7 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 					itemDeliveryDate = deliveryProduct.DeliveryDate
 				}
 
-				oldRequestedQty := deliveryProduct.UsageQty + deliveryProduct.PendingQty
-
-				// Cek apakah product punya flag PAKAN atau OVK
-				isPakanOrOVK := false
-				if foundMarketingProduct.ProductWarehouse.Product.Id != 0 && len(foundMarketingProduct.ProductWarehouse.Product.Flags) > 0 {
-					for _, flag := range foundMarketingProduct.ProductWarehouse.Product.Flags {
-						if flag.Name == string(utils.FlagPakan) || flag.Name == string(utils.FlagOVK) {
-							isPakanOrOVK = true
-							break
-						}
-					}
-				}
-
-				totalWeight := requestedProduct.Qty * requestedProduct.AvgWeight
-				var totalPrice float64
-				if isPakanOrOVK {
-
-					totalPrice = requestedProduct.Qty * requestedProduct.UnitPrice
-				} else {
-
-					totalPrice = totalWeight * requestedProduct.UnitPrice
-				}
+				totalWeight, totalPrice := s.calculatePriceByMarketingType(marketing.MarketingType, requestedProduct.Qty, requestedProduct.AvgWeight, requestedProduct.UnitPrice, foundMarketingProduct.Week)
 
 				deliveryProduct.ProductWarehouseId = foundMarketingProduct.ProductWarehouseId
 				deliveryProduct.UnitPrice = requestedProduct.UnitPrice
@@ -449,6 +526,20 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 	return s.getMarketingWithDeliveries(c, id)
 }
 
+func (s *deliveryOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int) (totalWeight, totalPrice float64) {
+	if marketingType == string(utils.MarketingTypeTrading) {
+		totalWeight = 0
+		totalPrice = qty * unitPrice
+	} else if marketingType == string(utils.MarketingTypeAyamPullet) && week != nil && *week > 0 {
+		totalWeight = qty * avgWeight
+		totalPrice = unitPrice * float64(*week) * qty
+	} else {
+		totalWeight = qty * avgWeight
+		totalPrice = totalWeight * unitPrice
+	}
+	return totalWeight, totalPrice
+}
+
 func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gorm.DB, deliveryProduct *entity.MarketingDeliveryProduct, marketingProduct *entity.MarketingProduct, requestedQty float64, actorID uint) error {
 	if marketingProduct == nil || marketingProduct.ProductWarehouseId == 0 {
 		return fiber.NewError(fiber.StatusInternalServerError, "Product warehouse not found")
@@ -467,84 +558,39 @@ func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gor
 		Tx:                 tx,
 	})
 
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock for product warehouse %d: %v", marketingProduct.ProductWarehouseId, err))
+	}
+
 	deliveryProductRepo := marketingRepo.NewMarketingDeliveryProductRepository(tx)
 
-	if err == nil && result.UsageQuantity > 0 {
-		if actorID > 0 {
-			decreaseLog := &entity.StockLog{
-				Decrease:           result.UsageQuantity,
-				LoggableType:       string(utils.StockLogTypeMarketing),
-				LoggableId:         deliveryProduct.Id,
-				ProductWarehouseId: marketingProduct.ProductWarehouseId,
-				CreatedBy:          actorID,
-				Notes:              "",
-			}
-			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
-			if err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
-			}
-			if len(stockLogs) > 0 {
-				latestStockLog := stockLogs[0]
-				decreaseLog.Stock = latestStockLog.Stock
-				decreaseLog.Stock -= decreaseLog.Decrease
-			} else {
-				decreaseLog.Stock = 0
-			}
-			s.StockLogRepo.WithTx(tx).CreateOne(ctx, decreaseLog, nil)
-		}
-	}
-
-	if err != nil {
-		pwRepo := productWarehouseRepo.NewProductWarehouseRepository(tx)
-		pw, err2 := pwRepo.GetByID(ctx, marketingProduct.ProductWarehouseId, nil)
-		if err2 != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to check product warehouse stock")
-		}
-
-		if pw == nil || pw.Quantity < requestedQty {
-			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock. Available: %.2f, Requested: %.2f", func() float64 {
-				if pw != nil {
-					return pw.Quantity
-				} else {
-					return 0
-				}
-			}(), requestedQty))
-		}
-
-		if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, requestedQty, 0); err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
-		}
-
-		if actorID > 0 {
-			decreaseLog := &entity.StockLog{
-				Decrease:           requestedQty,
-				LoggableType:       string(utils.StockLogTypeMarketing),
-				LoggableId:         deliveryProduct.Id,
-				ProductWarehouseId: marketingProduct.ProductWarehouseId,
-				CreatedBy:          actorID,
-				Notes:              "",
-			}
-			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
-			if err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
-			}
-			if len(stockLogs) > 0 {
-				latestStockLog := stockLogs[0]
-				decreaseLog.Stock = latestStockLog.Stock
-				decreaseLog.Stock -= decreaseLog.Decrease
-			} else {
-				decreaseLog.Stock = 0
-			}
-			s.StockLogRepo.WithTx(tx).CreateOne(ctx, decreaseLog, nil)
-		}
-
-		return nil
-	}
-
-	if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, result.UsageQuantity, result.PendingQuantity); err != nil {
+	if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, result.UsageQuantity, 0); err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
 	}
 
+	if actorID > 0 && result.UsageQuantity > 0 {
+		decreaseLog := &entity.StockLog{
+			Decrease:           result.UsageQuantity,
+			LoggableType:       string(utils.StockLogTypeMarketing),
+			LoggableId:         deliveryProduct.Id,
+			ProductWarehouseId: marketingProduct.ProductWarehouseId,
+			CreatedBy:          actorID,
+			Notes:              fmt.Sprintf("FIFO consume (%.2f)", result.UsageQuantity),
+		}
+
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			decreaseLog.Stock = latestStockLog.Stock - decreaseLog.Decrease
+		} else {
+			decreaseLog.Stock -= decreaseLog.Decrease
+		}
+		s.StockLogRepo.WithTx(tx).CreateOne(ctx, decreaseLog, nil)
+	}
+
 	return nil
 }
 
@@ -575,6 +621,10 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 		return err
 	}
 
+	if err := deliveryProductRepo.ResetFifoFields(ctx, deliveryProduct.Id); err != nil {
+		return err
+	}
+
 	if actorID > 0 && currentUsage > 0 {
 		increaseLog := &entity.StockLog{
 			Increase:           currentUsage,
@@ -582,7 +632,7 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 			LoggableId:         deliveryProduct.Id,
 			ProductWarehouseId: marketingProduct.ProductWarehouseId,
 			CreatedBy:          actorID,
-			Notes:              "",
+			Notes:              fmt.Sprintf("Release delivery stock (%.2f)", currentUsage),
 		}
 		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
 		if err != nil {
@@ -590,16 +640,12 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 		}
 		if len(stockLogs) > 0 {
 			latestStockLog := stockLogs[0]
-			increaseLog.Stock = latestStockLog.Stock
-			increaseLog.Stock += increaseLog.Increase
+			increaseLog.Stock = latestStockLog.Stock + increaseLog.Increase
 		} else {
-			increaseLog.Stock = 0
+			increaseLog.Stock += increaseLog.Increase
 		}
-		s.StockLogRepo.WithTx(tx).CreateOne(ctx, increaseLog, nil)
-	}
 
-	if err := deliveryProductRepo.ResetFifoFields(ctx, deliveryProduct.Id); err != nil {
-		return err
+		s.StockLogRepo.WithTx(tx).CreateOne(ctx, increaseLog, nil)
 	}
 
 	return nil

internal/modules/marketing/services/salesorder.service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
 	"strings"
 
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
@@ -19,6 +20,7 @@ import (
 	userRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/users/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"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -41,11 +43,12 @@ type salesOrdersService struct {
 	ProductWarehouseRepo    productWarehouseRepo.ProductWarehouseRepository
 	UserRepo                userRepo.UserRepository
 	ApprovalSvc             commonSvc.ApprovalService
+	FifoSvc                 commonSvc.FifoService
 	WarehouseRepo           warehouseRepo.WarehouseRepository
 	ProjectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository
 }
 
-func NewSalesOrdersService(marketingRepo repository.MarketingRepository, customerRepo customerRepo.CustomerRepository, productWarehouseRepo productWarehouseRepo.ProductWarehouseRepository, userRepo userRepo.UserRepository, approvalSvc commonSvc.ApprovalService, warehouseRepo warehouseRepo.WarehouseRepository,
+func NewSalesOrdersService(marketingRepo repository.MarketingRepository, customerRepo customerRepo.CustomerRepository, productWarehouseRepo productWarehouseRepo.ProductWarehouseRepository, userRepo userRepo.UserRepository, approvalSvc commonSvc.ApprovalService, fifoSvc commonSvc.FifoService, warehouseRepo warehouseRepo.WarehouseRepository,
 	projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, validate *validator.Validate) SalesOrdersService {
 	return &salesOrdersService{
 		Log:                     utils.Log,
@@ -55,6 +58,7 @@ func NewSalesOrdersService(marketingRepo repository.MarketingRepository, custome
 		ProductWarehouseRepo:    productWarehouseRepo,
 		UserRepo:                userRepo,
 		ApprovalSvc:             approvalSvc,
+		FifoSvc:                 fifoSvc,
 		WarehouseRepo:           warehouseRepo,
 		ProjectFlockKandangRepo: projectFlockKandangRepo,
 	}
@@ -66,10 +70,15 @@ func (s salesOrdersService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("Customer").
 		Preload("SalesPerson").
 		Preload("Products.ProductWarehouse.Product.Flags").
+		Preload("Products.ProductWarehouse.Product.Uom").
 		Preload("Products.ProductWarehouse.Warehouse")
 }
 
 func (s salesOrdersService) getOne(c *fiber.Ctx, id uint) (*entity.Marketing, error) {
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return nil, err
+	}
+
 	marketing, err := s.MarketingRepo.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "SalesOrders not found")
@@ -96,6 +105,25 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 		return nil, err
 	}
 
+	// Validasi semua product harus punya marketing_type yang sama
+	if len(req.MarketingProducts) == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "marketing_products is required")
+	}
+
+	firstMarketingType := req.MarketingProducts[0].MarketingType
+	if !utils.IsValidMarketingType(firstMarketingType) {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Tipe penjualan tidak valid")
+	}
+
+	for i, item := range req.MarketingProducts {
+		if !utils.IsValidMarketingType(item.MarketingType) {
+			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Tipe penjualan tidak valid pada produk ke-%d", i+1))
+		}
+		if item.MarketingType != firstMarketingType {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Semua produk harus memiliki tipe penjualan yang sama")
+		}
+	}
+
 	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
@@ -108,6 +136,15 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 	}
 
 	for _, item := range req.MarketingProducts {
+		if item.MarketingType != string(utils.MarketingTypeTrading) && item.AvgWeight == 0 {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Berat rata-rata harus diisi")
+		}
+		if item.ConvertionUnit != nil && !utils.IsValidConvertionUnit(*item.ConvertionUnit) {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Unit konversi tidak valid")
+		}
+		if err := m.EnsureProductWarehouseAccess(c, s.MarketingRepo.DB(), item.ProductWarehouseId); err != nil {
+			return nil, err
+		}
 		if err := commonSvc.EnsureRelations(c.Context(),
 			commonSvc.RelationCheck{Name: "ProductWarehouse", ID: &item.ProductWarehouseId, Exists: s.ProductWarehouseRepo.IdExists},
 		); err != nil {
@@ -139,6 +176,7 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 			SoDate:        soDate,
 			SalesPersonId: req.SalesPersonId,
 			Notes:         req.Notes,
+			MarketingType: firstMarketingType,
 			CreatedBy:     actorID,
 		}
 		if err := marketingRepoTx.CreateOne(c.Context(), marketing, nil); err != nil {
@@ -151,10 +189,9 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 				if product.ProductWarehouseId != 0 {
 					pwIDs = append(pwIDs, product.ProductWarehouseId)
 				}
-				if err := s.createMarketingProductWithDelivery(c.Context(), marketing.Id, product, marketingProductRepoTx, invDeliveryRepoTx); err != nil {
+				if err := s.createMarketingProductWithDelivery(c.Context(), marketing.Id, product.MarketingType, product, marketingProductRepoTx, invDeliveryRepoTx); err != nil {
 					return fiber.NewError(fiber.StatusInternalServerError, "Failed to create marketing product")
 				}
-
 			}
 			if err := commonSvc.EnsureProjectFlockNotClosedForProductWarehouses(c.Context(), s.MarketingRepo.DB(), pwIDs); err != nil {
 				return err
@@ -197,6 +234,27 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 		return nil, err
 	}
 
+	// Validasi semua product harus punya marketing_type yang sama
+	if len(req.MarketingProducts) > 0 {
+		firstMarketingType := req.MarketingProducts[0].MarketingType
+		if !utils.IsValidMarketingType(firstMarketingType) {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Tipe penjualan tidak valid")
+		}
+
+		for i, item := range req.MarketingProducts {
+			if !utils.IsValidMarketingType(item.MarketingType) {
+				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Tipe penjualan tidak valid pada produk ke-%d", i+1))
+			}
+			if item.MarketingType != firstMarketingType {
+				return nil, fiber.NewError(fiber.StatusBadRequest, "Semua produk harus memiliki tipe penjualan yang sama")
+			}
+		}
+	}
+
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return nil, err
+	}
+
 	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
@@ -220,6 +278,15 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 
 	if len(req.MarketingProducts) > 0 {
 		for _, item := range req.MarketingProducts {
+			if item.MarketingType != string(utils.MarketingTypeTrading) && item.AvgWeight == 0 {
+				return nil, fiber.NewError(fiber.StatusBadRequest, "Berat rata-rata harus diisi")
+			}
+			if item.ConvertionUnit != nil && !utils.IsValidConvertionUnit(*item.ConvertionUnit) {
+				return nil, fiber.NewError(fiber.StatusBadRequest, "Unit konversi tidak valid")
+			}
+			if err := m.EnsureProductWarehouseAccess(c, s.MarketingRepo.DB(), item.ProductWarehouseId); err != nil {
+				return nil, err
+			}
 			if err := commonSvc.EnsureRelations(c.Context(),
 				commonSvc.RelationCheck{Name: "ProductWarehouse", ID: &item.ProductWarehouseId, Exists: s.ProductWarehouseRepo.IdExists},
 			); err != nil {
@@ -264,6 +331,9 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 		if req.Notes != "" {
 			updateBody["notes"] = req.Notes
 		}
+		if len(req.MarketingProducts) > 0 {
+			updateBody["marketing_type"] = req.MarketingProducts[0].MarketingType
+		}
 
 		if len(updateBody) > 0 {
 			if err := marketingRepoTx.PatchOne(c.Context(), id, updateBody, nil); err != nil {
@@ -292,68 +362,66 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 			for _, rp := range req.MarketingProducts {
 				if old, ok := oldByPW[rp.ProductWarehouseId]; ok {
 
-					// Get product untuk cek flag PAKAN atau OVK
-					productWarehouse, err := s.ProductWarehouseRepo.GetByID(c.Context(), rp.ProductWarehouseId, func(db *gorm.DB) *gorm.DB {
-						return db.Preload("Product.Flags")
-					})
-					if err != nil {
-						return err
-					}
+					totalWeight, totalPrice := s.calculatePriceByMarketingType(rp.MarketingType, rp.Qty, rp.AvgWeight, rp.UnitPrice, rp.Week)
 
-					// Cek apakah product punya flag PAKAN atau OVK
-					isPakanOrOVK := false
-					if productWarehouse.Product.Id != 0 && len(productWarehouse.Product.Flags) > 0 {
-						for _, flag := range productWarehouse.Product.Flags {
-							if flag.Name == string(utils.FlagPakan) || flag.Name == string(utils.FlagOVK) {
-								isPakanOrOVK = true
-								break
+					deliveryProduct, err := invDeliveryRepoTx.GetByMarketingProductID(c.Context(), old.Id)
+					if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+						return fiber.NewError(fiber.StatusInternalServerError, "Failed to check delivery product")
+					}
+					if err == nil && deliveryProduct.Id != 0 {
+						oldQty := old.Qty
+						newQty := rp.Qty
+						qtyDiff := newQty - oldQty
+
+						if qtyDiff < 0 {
+							return fiber.NewError(fiber.StatusBadRequest, "Cannot decrease quantity after stock has been allocated. Please delete and create new product.")
+						} else if qtyDiff > 0 {
+							_, err := s.FifoSvc.Consume(c.Context(), commonSvc.StockConsumeRequest{
+								UsableKey:          fifo.UsableKeyMarketingDelivery,
+								UsableID:           deliveryProduct.Id,
+								ProductWarehouseID: rp.ProductWarehouseId,
+								Quantity:           qtyDiff,
+								Tx:                 dbTransaction,
+							})
+							if err != nil {
+								return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Insufficient stock for additional quantity: %v", err))
 							}
 						}
 					}
 
-					totalWeight := rp.Qty * rp.AvgWeight
-					var totalPrice float64
-					if isPakanOrOVK {
-						totalPrice = rp.Qty * rp.UnitPrice
-					} else {
-						totalPrice = totalWeight * rp.UnitPrice
-					}
-
 					updateBody := map[string]any{
-						"product_warehouse_id": rp.ProductWarehouseId,
-						"qty":                  rp.Qty,
-						"unit_price":           rp.UnitPrice,
-						"avg_weight":           rp.AvgWeight,
-						"total_weight":         totalWeight,
-						"total_price":          totalPrice,
+						"product_warehouse_id":  rp.ProductWarehouseId,
+						"qty":                   rp.Qty,
+						"unit_price":            rp.UnitPrice,
+						"avg_weight":            rp.AvgWeight,
+						"total_weight":          totalWeight,
+						"total_price":           totalPrice,
+						"convertion_unit":       rp.ConvertionUnit,
+						"weight_per_convertion": rp.WeightPerConvertion,
+						"week":                  rp.Week,
 					}
 					if err := marketingProductRepoTx.PatchOne(c.Context(), old.Id, updateBody, nil); err != nil {
 						return fiber.NewError(fiber.StatusInternalServerError, "Failed to update marketing product")
 					}
 
-					if _, err := invDeliveryRepoTx.GetByMarketingProductID(c.Context(), old.Id); err != nil {
-						if errors.Is(err, gorm.ErrRecordNotFound) {
-
-							mdp := &entity.MarketingDeliveryProduct{
-								MarketingProductId: old.Id,
-								UnitPrice:          0,
-								TotalWeight:        0,
-								AvgWeight:          0,
-								TotalPrice:         0,
-								DeliveryDate:       nil,
-								VehicleNumber:      rp.VehicleNumber,
-								UsageQty:           0,
-								PendingQty:         0,
-							}
-							if err := invDeliveryRepoTx.CreateOne(c.Context(), mdp, nil); err != nil {
-								return fiber.NewError(fiber.StatusInternalServerError, "Failed to create marketing delivery product")
-							}
-						} else {
-							return fiber.NewError(fiber.StatusInternalServerError, "Failed to check delivery product")
+					if deliveryProduct.Id == 0 {
+						mdp := &entity.MarketingDeliveryProduct{
+							MarketingProductId: old.Id,
+							UnitPrice:          0,
+							TotalWeight:        0,
+							AvgWeight:          0,
+							TotalPrice:         0,
+							DeliveryDate:       nil,
+							VehicleNumber:      rp.VehicleNumber,
+							UsageQty:           0,
+							PendingQty:         0,
+						}
+						if err := invDeliveryRepoTx.CreateOne(c.Context(), mdp, nil); err != nil {
+							return fiber.NewError(fiber.StatusInternalServerError, "Failed to create marketing delivery product")
 						}
 					}
 				} else {
-					if err := s.createMarketingProductWithDelivery(c.Context(), id, rp, marketingProductRepoTx, invDeliveryRepoTx); err != nil {
+					if err := s.createMarketingProductWithDelivery(c.Context(), id, rp.MarketingType, rp, marketingProductRepoTx, invDeliveryRepoTx); err != nil {
 						return fiber.NewError(fiber.StatusInternalServerError, "Failed to create marketing product")
 					}
 				}
@@ -361,15 +429,22 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 
 			for _, old := range oldProducts {
 				if _, ok := reqByPW[old.ProductWarehouseId]; !ok {
-
 					deliveryProduct, err := invDeliveryRepoTx.GetByMarketingProductID(c.Context(), old.Id)
 					if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 						return fiber.NewError(fiber.StatusInternalServerError, "Failed to check existing delivery product")
 					}
-					if err == nil {
+					if err == nil && deliveryProduct.Id != 0 {
 
-						if deliveryProduct.DeliveryDate != nil || deliveryProduct.UsageQty > 0 || deliveryProduct.PendingQty > 0 {
-							return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Cannot delete marketing product %d because it has delivery records", old.Id))
+						if deliveryProduct.DeliveryDate != nil {
+							return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Cannot delete marketing product %d because it has been delivered", old.Id))
+						}
+
+						if err := s.FifoSvc.ReleaseUsage(c.Context(), commonSvc.StockReleaseRequest{
+							UsableKey: fifo.UsableKeyMarketingDelivery,
+							UsableID:  deliveryProduct.Id,
+							Tx:        dbTransaction,
+						}); err != nil {
+							return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to release stock: %v", err))
 						}
 
 						if err := invDeliveryRepoTx.DeleteOne(c.Context(), deliveryProduct.Id); err != nil {
@@ -414,6 +489,10 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 }
 
 func (s salesOrdersService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return err
+	}
+
 	marketing, err := s.MarketingRepo.GetByID(c.Context(), id, s.withRelations)
 
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -441,6 +520,19 @@ func (s salesOrdersService) DeleteOne(c *fiber.Ctx, id uint) error {
 		marketingRepoTx := repository.NewMarketingRepository(dbTransaction)
 
 		if len(marketing.Products) > 0 {
+			deliveryProducts, err := marketingDeliveryProductRepoTx.GetByMarketingId(c.Context(), marketing.Id)
+			if err == nil && len(deliveryProducts) > 0 {
+				for _, dp := range deliveryProducts {
+					if err := s.FifoSvc.ReleaseUsage(c.Context(), commonSvc.StockReleaseRequest{
+						UsableKey: fifo.UsableKeyMarketingDelivery,
+						UsableID:  dp.Id,
+						Tx:        dbTransaction,
+					}); err != nil {
+						return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to release stock for delivery product %d: %v", dp.Id, err))
+					}
+				}
+			}
+
 			for _, product := range marketing.Products {
 				if err := marketingDeliveryProductRepoTx.DeleteMany(c.Context(), func(db *gorm.DB) *gorm.DB {
 					return db.Where("marketing_product_id = ?", product.Id).Unscoped()
@@ -478,6 +570,12 @@ func (s salesOrdersService) Approval(c *fiber.Ctx, req *validation.Approve) ([]e
 		return nil, err
 	}
 
+	for _, id := range req.ApprovableIds {
+		if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+			return nil, err
+		}
+	}
+
 	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
@@ -613,45 +711,21 @@ func (s salesOrdersService) Approval(c *fiber.Ctx, req *validation.Approve) ([]e
 	return updated, nil
 }
 
-func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Context, marketingId uint, rp validation.CreateMarketingProduct, marketingProductRepo repository.MarketingProductRepository, invDeliveryRepo repository.MarketingDeliveryProductRepository) error {
+func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Context, marketingId uint, marketingType string, rp validation.CreateMarketingProduct, marketingProductRepo repository.MarketingProductRepository, invDeliveryRepo repository.MarketingDeliveryProductRepository) error {
 
-	// Get product untuk cek flag PAKAN atau OVK
-	productWarehouse, err := s.ProductWarehouseRepo.GetByID(ctx, rp.ProductWarehouseId, func(db *gorm.DB) *gorm.DB {
-		return db.Preload("Product.Flags")
-	})
-	if err != nil {
-		return err
-	}
-
-	// Cek apakah product punya flag PAKAN atau OVK
-	isPakanOrOVK := false
-	if productWarehouse.Product.Id != 0 && len(productWarehouse.Product.Flags) > 0 {
-		for _, flag := range productWarehouse.Product.Flags {
-			if flag.Name == string(utils.FlagPakan) || flag.Name == string(utils.FlagOVK) {
-				isPakanOrOVK = true
-				break
-			}
-		}
-	}
-
-	totalWeight := rp.Qty * rp.AvgWeight
-	var totalPrice float64
-	if isPakanOrOVK {
-		// PAKAN atau OVK: qty × unit_price
-		totalPrice = rp.Qty * rp.UnitPrice
-	} else {
-		// Produk lain: total_weight × unit_price
-		totalPrice = totalWeight * rp.UnitPrice
-	}
+	totalWeight, totalPrice := s.calculatePriceByMarketingType(marketingType, rp.Qty, rp.AvgWeight, rp.UnitPrice, rp.Week)
 
 	marketingProduct := &entity.MarketingProduct{
-		MarketingId:        marketingId,
-		ProductWarehouseId: rp.ProductWarehouseId,
-		Qty:                rp.Qty,
-		UnitPrice:          rp.UnitPrice,
-		AvgWeight:          rp.AvgWeight,
-		TotalWeight:        totalWeight,
-		TotalPrice:         totalPrice,
+		MarketingId:         marketingId,
+		ProductWarehouseId:  rp.ProductWarehouseId,
+		Qty:                 rp.Qty,
+		UnitPrice:           rp.UnitPrice,
+		AvgWeight:           rp.AvgWeight,
+		TotalWeight:         totalWeight,
+		TotalPrice:          totalPrice,
+		ConvertionUnit:      rp.ConvertionUnit,
+		WeightPerConvertion: rp.WeightPerConvertion,
+		Week:                rp.Week,
 	}
 	if err := marketingProductRepo.CreateOne(ctx, marketingProduct, nil); err != nil {
 		return err
@@ -675,3 +749,17 @@ func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Cont
 
 	return nil
 }
+
+func (s *salesOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int) (totalWeight, totalPrice float64) {
+	if marketingType == string(utils.MarketingTypeTrading) {
+		totalWeight = 0
+		totalPrice = math.Round(qty*unitPrice*100) / 100
+	} else if marketingType == string(utils.MarketingTypeAyamPullet) && week != nil && *week > 0 {
+		totalWeight = math.Round(qty*avgWeight*100) / 100
+		totalPrice = math.Round(unitPrice*float64(*week)*qty*100) / 100
+	} else {
+		totalWeight = math.Round(qty*avgWeight*100) / 100
+		totalPrice = math.Round(totalWeight*unitPrice*100) / 100
+	}
+	return totalWeight, totalPrice
+}

internal/modules/marketing/validations/deliveryorder.validation.go

@@ -19,9 +19,13 @@ type DeliveryOrderUpdate struct {
 }
 
 type DeliveryOrderQuery struct {
-	Page        int  `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit       int  `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
-	MarketingId uint `query:"marketing_id" validate:"omitempty,gt=0"`
+	Page        int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Limit       int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Search      string `query:"search" validate:"omitempty,max=100"`
+	ProductIDs  []uint `query:"product_ids" validate:"omitempty,dive,gt=0"`
+	Status      string `query:"status" validate:"omitempty,max=50"`
+	CustomerId  uint   `query:"customer_id" validate:"omitempty,gt=0"`
+	MarketingId uint   `query:"marketing_id" validate:"omitempty,gt=0"`
 }
 
 type DeliveryOrderApprove struct {

internal/modules/marketing/validations/salesorder.validation.go

@@ -9,11 +9,15 @@ type Create struct {
 }
 
 type CreateMarketingProduct struct {
-	VehicleNumber      string  `json:"vehicle_number" validate:"required,min=1,max=50"`
-	ProductWarehouseId uint    `json:"product_warehouse_id" validate:"required,gt=0"`
-	UnitPrice          float64 `json:"unit_price" validate:"required,gt=0"`
-	Qty                float64 `json:"qty" validate:"required,gt=0"`
-	AvgWeight          float64 `json:"avg_weight" validate:"required,gt=0"`
+	MarketingType       string   `json:"marketing_type" validate:"required,min=1,max=50"`
+	VehicleNumber       string   `json:"vehicle_number" validate:"required,min=1,max=50"`
+	ConvertionUnit      *string  `json:"convertion_unit" validate:"omitempty,min=1,max=20"`
+	WeightPerConvertion *float64 `json:"weight_per_convertion" validate:"omitempty,gt=0"`
+	Week                *int     `json:"week" validate:"omitempty,gt=0"`
+	ProductWarehouseId  uint     `json:"product_warehouse_id" validate:"required,gt=0"`
+	UnitPrice           float64  `json:"unit_price" validate:"required,gt=0"`
+	Qty                 float64  `json:"qty" validate:"required,gt=0"`
+	AvgWeight           float64  `json:"avg_weight" validate:"omitempty,gt=0"`
 }
 
 type Update struct {

internal/modules/master/areas/services/area.service.go

@@ -47,16 +47,22 @@ func (s areaService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Ar
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	areas, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db, scopeErr = m.ApplyAreaScope(c, db, "id")
 		if params.Search != "" {
 			return db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 		s.Log.Errorf("Failed to get areas: %+v", err)
 		return nil, 0, err
@@ -65,7 +71,16 @@ func (s areaService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Ar
 }
 
 func (s areaService) GetOne(c *fiber.Ctx, id uint) (*entity.Area, error) {
-	area, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	area, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = m.ApplyAreaScope(c, db, "id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Area not found")
 	}

internal/modules/master/employees/services/employees.service.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/employees/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/employees/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -43,6 +44,61 @@ func (s employeesService) withRelations(db *gorm.DB) *gorm.DB {
 		Where("employees.deleted_at IS NULL")
 }
 
+func (s employeesService) ensureEmployeeAccess(c *fiber.Ctx, employeeID uint) error {
+	if employeeID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid employee id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("employees e").
+		Joins("JOIN employee_kandangs ek ON ek.employee_id = e.id").
+		Joins("JOIN kandangs k ON k.id = ek.kandang_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("e.id = ?", employeeID).
+		Where("e.deleted_at IS NULL")
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Employees not found")
+	}
+	return nil
+}
+
+func (s employeesService) ensureKandangIDsAccess(c *fiber.Ctx, kandangIDs []uint) error {
+	if len(kandangIDs) == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "kandang_ids must contain at least one valid id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("kandangs k").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("k.id IN ?", kandangIDs)
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count != int64(len(kandangIDs)) {
+		return fiber.NewError(fiber.StatusNotFound, "Kandang not found")
+	}
+	return nil
+}
+
 func (s employeesService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Employees, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, err
@@ -52,17 +108,29 @@ func (s employeesService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 
 	employeess, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db = db.Joins("JOIN employee_kandangs ek ON ek.employee_id = employees.id").
+			Joins("JOIN kandangs k ON k.id = ek.kandang_id").
+			Joins("JOIN locations loc ON loc.id = k.location_id").
+			Joins("JOIN areas a ON a.id = loc.area_id")
+		var scopeErr error
+		db, scopeErr = m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+		if scopeErr != nil {
+			return db.Where("1 = 0")
+		}
 		if params.Search != "" {
 			db = db.Where("employees.name ILIKE ?", "%"+params.Search+"%")
 		}
 		if params.KandangId != nil {
-			db = db.Joins("JOIN employee_kandangs ek ON ek.employee_id = employees.id").
-				Where("ek.kandang_id = ?", *params.KandangId)
+			db = db.Where("ek.kandang_id = ?", *params.KandangId)
 		}
 		if params.IsActive != nil {
 			db = db.Where("employees.is_active = ?", *params.IsActive)
 		}
-		return db.Order("employees.created_at DESC").Order("employees.updated_at DESC")
+		return db.
+			Select("employees.id, employees.name, employees.is_active, employees.created_at, employees.updated_at").
+			Group("employees.id, employees.name, employees.is_active, employees.created_at, employees.updated_at").
+			Order("employees.created_at DESC").
+			Order("employees.updated_at DESC")
 	})
 
 	if err != nil {
@@ -73,6 +141,9 @@ func (s employeesService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 }
 
 func (s employeesService) GetOne(c *fiber.Ctx, id uint) (*entity.Employees, error) {
+	if err := s.ensureEmployeeAccess(c, id); err != nil {
+		return nil, err
+	}
 	employees, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Employees not found")
@@ -98,6 +169,9 @@ func (s *employeesService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 	if len(kandangIDs) == 0 {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "kandang_ids must contain at least one valid id")
 	}
+	if err := s.ensureKandangIDsAccess(c, kandangIDs); err != nil {
+		return nil, err
+	}
 
 	if _, err := s.Repository.First(c.Context(), func(db *gorm.DB) *gorm.DB {
 		return db.Where("LOWER(name) = ?", strings.ToLower(name))
@@ -147,6 +221,9 @@ func (s employeesService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := s.ensureEmployeeAccess(c, id); err != nil {
+		return nil, err
+	}
 
 	updateBody := make(map[string]any)
 	var (
@@ -181,6 +258,9 @@ func (s employeesService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 		if len(ids) == 0 {
 			return nil, fiber.NewError(fiber.StatusBadRequest, "kandang_ids must contain at least one valid id")
 		}
+		if err := s.ensureKandangIDsAccess(c, ids); err != nil {
+			return nil, err
+		}
 
 		kandangIDs = ids
 		needKandangUpdate = true
@@ -234,6 +314,9 @@ func (s employeesService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 }
 
 func (s employeesService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := s.ensureEmployeeAccess(c, id); err != nil {
+		return err
+	}
 	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "Employees not found")

internal/modules/master/kandangs/services/kandang.service.go

@@ -49,10 +49,13 @@ func (s kandangService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	kandangs, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationScope(c, db, "kandangs.location_id")
 		if params.Search != "" {
 			return db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -65,6 +68,9 @@ func (s kandangService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 		s.Log.Errorf("Failed to get kandangs: %+v", err)
 		return nil, 0, err
@@ -73,7 +79,16 @@ func (s kandangService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity
 }
 
 func (s kandangService) GetOne(c *fiber.Ctx, id uint) (*entity.Kandang, error) {
-	kandang, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	kandang, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationScope(c, db, "kandangs.location_id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Kandang not found")
 	}
@@ -88,6 +103,9 @@ func (s *kandangService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := m.EnsureLocationAccess(c, s.Repository.DB(), req.LocationId); err != nil {
+		return nil, err
+	}
 
 	if exists, err := s.Repository.NameExists(c.Context(), req.Name, nil); err != nil {
 		s.Log.Errorf("Failed to check kandang name: %+v", err)
@@ -162,6 +180,14 @@ func (s kandangService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := m.EnsureKandangAccess(c, s.Repository.DB(), id); err != nil {
+		return nil, err
+	}
+	if req.LocationId != nil {
+		if err := m.EnsureLocationAccess(c, s.Repository.DB(), *req.LocationId); err != nil {
+			return nil, err
+		}
+	}
 
 	existing, err := s.Repository.GetByID(c.Context(), id, nil)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -253,6 +279,10 @@ func (s kandangService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 }
 
 func (s kandangService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := m.EnsureKandangAccess(c, s.Repository.DB(), id); err != nil {
+		return err
+	}
+
 	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "Kandang not found")

internal/modules/master/locations/services/location.service.go

@@ -47,10 +47,13 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	locations, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationScope(c, db, "locations.id")
 		if params.Search != "" {
 			db = db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -60,6 +63,9 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 		s.Log.Errorf("Failed to get locations: %+v", err)
 		return nil, 0, err
@@ -68,7 +74,16 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 }
 
 func (s locationService) GetOne(c *fiber.Ctx, id uint) (*entity.Location, error) {
-	location, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	location, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationScope(c, db, "locations.id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Location not found")
 	}

internal/modules/master/phase-activities/validations/phase-activity.validation.go

@@ -15,7 +15,7 @@ type Update struct {
 
 type Query struct {
 	Page     int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit    int    `query:"limit" validate:"omitempty,number,min=1,gt=0"`
+	Limit    int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
 	Search   string `query:"search" validate:"omitempty,max=50"`
 	PhaseIDs string `query:"phase_ids" validate:"omitempty"`
 }

internal/modules/master/product-categories/services/product-category.service.go

@@ -52,7 +52,22 @@ func (s productCategoryService) GetAll(c *fiber.Ctx, params *validation.Query) (
 	productCategories, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
 		if params.Search != "" {
-			return db.Where("name ILIKE ?", "%"+params.Search+"%")
+			terms := splitSearchTerms(params.Search)
+			if len(terms) == 0 {
+				return db
+			}
+			if len(terms) == 1 {
+				return db.Where("name ILIKE ?", "%"+terms[0]+"%")
+			}
+			for i, term := range terms {
+				like := "%" + term + "%"
+				if i == 0 {
+					db = db.Where("name ILIKE ?", like)
+				} else {
+					db = db.Or("name ILIKE ?", like)
+				}
+			}
+			return db
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
@@ -64,6 +79,20 @@ func (s productCategoryService) GetAll(c *fiber.Ctx, params *validation.Query) (
 	return productCategories, total, nil
 }
 
+func splitSearchTerms(raw string) []string {
+	parts := strings.FieldsFunc(raw, func(r rune) bool {
+		return r == ',' || r == ';' || r == '|'
+	})
+	terms := make([]string, 0, len(parts))
+	for _, part := range parts {
+		trimmed := strings.TrimSpace(part)
+		if trimmed != "" {
+			terms = append(terms, trimmed)
+		}
+	}
+	return terms
+}
+
 func (s productCategoryService) GetOne(c *fiber.Ctx, id uint) (*entity.ProductCategory, error) {
 	productCategory, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {

internal/modules/master/production-standards/services/production-standard.service.go

@@ -152,6 +152,23 @@ func (s *productionStandardService) CreateOne(c *fiber.Ctx, req *validation.Crea
 				if err := productionStandardDetailRepoTx.CreateOne(c.Context(), productionStandardDetail, nil); err != nil {
 					return fmt.Errorf("failed to create production standard detail for week %d: %w", detailReq.Week, err)
 				}
+			} else if req.ProjectCategory == string(utils.ProjectFlockCategoryGrowing) {
+				if detailReq.ProductionStandardDetails != nil && detailReq.ProductionStandardDetails.StandardFCR != nil {
+					var zero float64 = 0
+					productionStandardDetail := &entity.ProductionStandardDetail{
+						ProductionStandardId:     newStandard.Id,
+						Week:                     detailReq.Week,
+						TargetHenDayProduction:   &zero,
+						TargetHenHouseProduction: &zero,
+						TargetEggWeight:          &zero,
+						TargetEggMass:            &zero,
+						StandardFCR:              detailReq.ProductionStandardDetails.StandardFCR,
+					}
+
+					if err := productionStandardDetailRepoTx.CreateOne(c.Context(), productionStandardDetail, nil); err != nil {
+						return fmt.Errorf("failed to create production standard detail for week %d: %w", detailReq.Week, err)
+					}
+				}
 			}
 
 			standardGrowthDetail := &entity.StandardGrowthDetail{
@@ -265,6 +282,23 @@ func (s productionStandardService) UpdateOne(c *fiber.Ctx, req *validation.Updat
 					if err := productionStandardDetailRepoTx.CreateOne(c.Context(), productionStandardDetail, nil); err != nil {
 						return fmt.Errorf("failed to create production standard detail for week %d: %w", detailReq.Week, err)
 					}
+				} else if projectCategory == "GROWING" {
+					if detailReq.ProductionStandardDetails != nil && detailReq.ProductionStandardDetails.StandardFCR != nil {
+						var zero float64 = 0
+						productionStandardDetail := &entity.ProductionStandardDetail{
+							ProductionStandardId:     id,
+							Week:                     detailReq.Week,
+							TargetHenDayProduction:   &zero,
+							TargetHenHouseProduction: &zero,
+							TargetEggWeight:          &zero,
+							TargetEggMass:            &zero,
+							StandardFCR:              detailReq.ProductionStandardDetails.StandardFCR,
+						}
+
+						if err := productionStandardDetailRepoTx.CreateOne(c.Context(), productionStandardDetail, nil); err != nil {
+							return fmt.Errorf("failed to create production standard detail for week %d: %w", detailReq.Week, err)
+						}
+					}
 				}
 
 				standardGrowthDetail := &entity.StandardGrowthDetail{

internal/modules/master/warehouses/controllers/warehouse.controller.go

@@ -3,11 +3,13 @@ package controller
 import (
 	"math"
 	"strconv"
+	"strings"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/response"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -23,6 +25,11 @@ func NewWarehouseController(warehouseService service.WarehouseService) *Warehous
 }
 
 func (u *WarehouseController) GetAll(c *fiber.Ctx) error {
+	excludeIDs, err := parseCommaSeparatedUint(c.Query("exclude_id", ""))
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, err.Error())
+	}
+
 	query := &validation.Query{
 		Page:                   c.QueryInt("page", 1),
 		Limit:                  c.QueryInt("limit", 10),
@@ -30,6 +37,8 @@ func (u *WarehouseController) GetAll(c *fiber.Ctx) error {
 		AreaId:                 c.QueryInt("area_id", 0),
 		LocationId:             c.QueryInt("location_id", 0),
 		ActiveProjectFlockOnly: c.QueryBool("active_project_flock", false),
+		TransferContext:        c.Query(utils.TransferContextKey, ""),
+		ExcludeIDs:             excludeIDs,
 	}
 
 	if query.Page < 1 || query.Limit < 1 {
@@ -56,6 +65,28 @@ func (u *WarehouseController) GetAll(c *fiber.Ctx) error {
 		})
 }
 
+func parseCommaSeparatedUint(raw string) ([]uint, error) {
+	raw = strings.TrimSpace(raw)
+	if raw == "" {
+		return nil, nil
+	}
+
+	parts := strings.Split(raw, ",")
+	out := make([]uint, 0, len(parts))
+	for _, part := range parts {
+		part = strings.TrimSpace(part)
+		if part == "" {
+			continue
+		}
+		value, err := strconv.ParseUint(part, 10, 64)
+		if err != nil {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "invalid exclude_id")
+		}
+		out = append(out, uint(value))
+	}
+	return out, nil
+}
+
 func (u *WarehouseController) GetOne(c *fiber.Ctx) error {
 	param := c.Params("id")
 

internal/modules/master/warehouses/services/warehouse.service.go

@@ -48,10 +48,20 @@ func (s warehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	warehouses, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		applyScope := true
+		if params.TransferContext == utils.TransferContextInventoryTransfer {
+			applyScope = !m.HasPermission(c, m.P_TransferCreateOne)
+		}
+
+		if applyScope {
+			db, scopeErr = m.ApplyLocationAreaScope(c, db, "warehouses.location_id", "warehouses.area_id")
+		}
 		if params.Search != "" {
 			db = db.Where("warehouses.name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -78,9 +88,15 @@ func (s warehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 				)
 			`, "Aktif")
 		}
+		if len(params.ExcludeIDs) > 0 {
+			db = db.Where("warehouses.id NOT IN ?", params.ExcludeIDs)
+		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 		s.Log.Errorf("Failed to get warehouses: %+v", err)
 		return nil, 0, err
@@ -89,7 +105,16 @@ func (s warehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 }
 
 func (s warehouseService) GetOne(c *fiber.Ctx, id uint) (*entity.Warehouse, error) {
-	warehouse, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	warehouse, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationAreaScope(c, db, "warehouses.location_id", "warehouses.area_id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
 	}
@@ -120,6 +145,19 @@ func (s *warehouseService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 	if err := validateWarehouseTypeRequirements(typ, &req.AreaId, &req.LocationId, &req.KandangId, createValidationOpts); err != nil {
 		return nil, err
 	}
+	if err := m.EnsureAreaAccess(c, s.Repository.DB(), req.AreaId); err != nil {
+		return nil, err
+	}
+	if req.LocationId != nil {
+		if err := m.EnsureLocationAccess(c, s.Repository.DB(), *req.LocationId); err != nil {
+			return nil, err
+		}
+	}
+	if req.KandangId != nil {
+		if err := m.EnsureKandangAccess(c, s.Repository.DB(), *req.KandangId); err != nil {
+			return nil, err
+		}
+	}
 
 	//? Check relation area, location, and kandang
 	if err := common.EnsureRelations(c.Context(),
@@ -158,6 +196,21 @@ func (s warehouseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if req.AreaId != nil {
+		if err := m.EnsureAreaAccess(c, s.Repository.DB(), *req.AreaId); err != nil {
+			return nil, err
+		}
+	}
+	if req.LocationId != nil {
+		if err := m.EnsureLocationAccess(c, s.Repository.DB(), *req.LocationId); err != nil {
+			return nil, err
+		}
+	}
+	if req.KandangId != nil {
+		if err := m.EnsureKandangAccess(c, s.Repository.DB(), *req.KandangId); err != nil {
+			return nil, err
+		}
+	}
 
 	existing, err := s.GetOne(c, id)
 	if err != nil {
@@ -248,6 +301,10 @@ func (s warehouseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 }
 
 func (s warehouseService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := m.EnsureWarehouseAccess(c, s.Repository.DB(), id); err != nil {
+		return err
+	}
+
 	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "Warehouse not found")

internal/modules/master/warehouses/validations/warehouse.validation.go

@@ -23,4 +23,6 @@ type Query struct {
 	AreaId                 int    `query:"area_id" validate:"omitempty,number,gt=0"`
 	LocationId             int    `query:"location_id" validate:"omitempty,number,gt=0"`
 	ActiveProjectFlockOnly bool   `query:"active_project_flock"`
+	ExcludeIDs             []uint `query:"-" validate:"omitempty,dive,gt=0"`
+	TransferContext        string `query:"transfer_context" validate:"omitempty,oneof=inventory_transfer"`
 }

internal/modules/production/chickins/dto/chickin.dto.go

@@ -5,7 +5,6 @@ import (
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	areaRelationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/areas/dto"
-	fcrRelationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/fcrs/dto"
 	flockRelationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/flocks/dto"
 	kandangRelationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	locationRelationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
@@ -13,6 +12,7 @@ import (
 	warehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
 	pfutils "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/utils"
 	userRelationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
 // === DTO Structs (ordered) ===
@@ -40,7 +40,7 @@ type ProjectFlockDTO struct {
 	Category string                                   `json:"category"`
 	Flock    *flockRelationDTO.FlockRelationDTO       `json:"flock"`
 	Area     *areaRelationDTO.AreaRelationDTO         `json:"area"`
-	Fcr      *fcrRelationDTO.FcrRelationDTO           `json:"fcr"`
+	StandardFcr *float64                              `json:"standard_fcr"`
 	Location *locationRelationDTO.LocationRelationDTO `json:"location"`
 }
 
@@ -97,10 +97,6 @@ func ToAreaDTO(e entity.Area) areaRelationDTO.AreaRelationDTO {
 	return areaRelationDTO.ToAreaRelationDTO(e)
 }
 
-func ToFcrDTO(e entity.Fcr) fcrRelationDTO.FcrRelationDTO {
-	return fcrRelationDTO.ToFcrRelationDTO(e)
-}
-
 func ToLocationDTO(e entity.Location) locationRelationDTO.LocationRelationDTO {
 	return locationRelationDTO.ToLocationRelationDTO(e)
 }
@@ -121,11 +117,6 @@ func ToProjectFlockDTO(pfk entity.ProjectFlockKandang) ProjectFlockDTO {
 		mapped := areaRelationDTO.ToAreaRelationDTO(e.Area)
 		area = &mapped
 	}
-	var fcr *fcrRelationDTO.FcrRelationDTO
-	if e.Fcr.Id != 0 {
-		mapped := fcrRelationDTO.ToFcrRelationDTO(e.Fcr)
-		fcr = &mapped
-	}
 	var location *locationRelationDTO.LocationRelationDTO
 	if e.Location.Id != 0 {
 		mapped := locationRelationDTO.ToLocationRelationDTO(e.Location)
@@ -137,7 +128,7 @@ func ToProjectFlockDTO(pfk entity.ProjectFlockKandang) ProjectFlockDTO {
 		Category: e.Category,
 		Flock:    flock,
 		Area:     area,
-		Fcr:      fcr,
+		StandardFcr: resolveProjectFlockStandardFcr(e),
 		Location: location,
 	}
 }
@@ -222,6 +213,22 @@ func ToChickinListDTOs(e []entity.ProjectChickin) []ChickinListDTO {
 	return result
 }
 
+func resolveProjectFlockStandardFcr(e entity.ProjectFlock) *float64 {
+	if e.ProductionStandard.Id == 0 || len(e.ProductionStandard.ProductionStandardDetails) == 0 {
+		return nil
+	}
+	week := 1
+	if e.Category == string(utils.ProjectFlockCategoryLaying) {
+		week = 18
+	}
+	for _, detail := range e.ProductionStandard.ProductionStandardDetails {
+		if detail.Week == week && detail.StandardFCR != nil {
+			return detail.StandardFCR
+		}
+	}
+	return nil
+}
+
 func ToChickinSimpleDTOs(e []entity.ProjectChickin) []ChickinSimpleDTO {
 	result := make([]ChickinSimpleDTO, len(e))
 	for i, r := range e {

internal/modules/production/chickins/services/chickin.service.go

@@ -81,7 +81,7 @@ func (s chickinService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("ProjectFlockKandang.Kandang.Pic").
 		Preload("ProjectFlockKandang.ProjectFlock").
 		Preload("ProjectFlockKandang.ProjectFlock.Area").
-		Preload("ProjectFlockKandang.ProjectFlock.Fcr").
+		Preload("ProjectFlockKandang.ProjectFlock.ProductionStandard.ProductionStandardDetails").
 		Preload("ProjectFlockKandang.ProjectFlock.Location").
 		Preload("ProjectFlockKandang.ProjectFlock.Location.Area")
 
@@ -654,8 +654,9 @@ func (s *chickinService) ConsumeChickinStocks(ctx context.Context, tx *gorm.DB,
 			decreaseLog.Stock = latestStockLog.Stock
 			decreaseLog.Stock -= decreaseLog.Decrease
 		} else {
-			decreaseLog.Stock = 0
+			decreaseLog.Stock -= decreaseLog.Decrease
 		}
+
 		s.StockLogRepo.CreateOne(ctx, decreaseLog, nil)
 	}
 
@@ -721,8 +722,9 @@ func (s *chickinService) ReleaseChickinStocks(ctx context.Context, tx *gorm.DB,
 			increaseLog.Stock = latestStockLog.Stock
 			increaseLog.Stock += increaseLog.Increase
 		} else {
-			increaseLog.Stock = 0
+			increaseLog.Stock += increaseLog.Increase
 		}
+
 		s.StockLogRepo.CreateOne(ctx, increaseLog, nil)
 	}
 

internal/modules/production/project-flock-kandangs/dto/project_flock_kandang.dto.go

@@ -8,7 +8,6 @@ import (
 	approvalDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/approvals/dto"
 	productWarehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/dto"
 	areaDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/areas/dto"
-	fcrDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/fcrs/dto"
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
 	productionStandardDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/production-standards/dto"
@@ -31,7 +30,7 @@ type ProjectFlockDTO struct {
 	projectFlockDTO.ProjectFlockRelationDTO
 	Area               *areaDTO.AreaRelationDTO                             `json:"area,omitempty"`
 	Category           string                                               `json:"category"`
-	Fcr                *fcrDTO.FcrRelationDTO                               `json:"fcr,omitempty"`
+	StandardFcr        *float64                                             `json:"standard_fcr,omitempty"`
 	ProductionStandard *productionStandardDTO.ProductionStandardRelationDTO `json:"production_standard,omitempty"`
 	Location           *locationDTO.LocationRelationDTO                     `json:"location,omitempty"`
 	CreatedUser        *userDTO.UserRelationDTO                             `json:"created_user,omitempty"`
@@ -86,7 +85,7 @@ func toProjectFlockDTO(pf *projectFlockDTO.ProjectFlockListDTO) *ProjectFlockDTO
 		ProjectFlockRelationDTO: pf.ProjectFlockRelationDTO,
 		Area:                    pf.Area,
 		Category:                pf.Category,
-		Fcr:                     pf.Fcr,
+		StandardFcr:             pf.StandardFcr,
 		ProductionStandard:      pf.ProductionStandard,
 		Location:                pf.Location,
 		CreatedUser:             pf.CreatedUser,

internal/modules/production/project-flock-kandangs/services/project_flock_kandang.service.go

@@ -88,9 +88,14 @@ func (s projectFlockKandangService) GetAll(c *fiber.Ctx, params *validation.Quer
 		return nil, 0, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
-	projectFlockKandangs, total, err := s.Repository.GetAllWithFilters(c.Context(), offset, params.Limit, params)
+	projectFlockKandangs, total, err := s.Repository.GetAllWithFiltersScoped(c.Context(), offset, params.Limit, params, scope.IDs, scope.Restrict)
 
 	if err != nil {
 		s.Log.Errorf("Failed to get projectFlockKandangs: %+v", err)
@@ -106,6 +111,28 @@ func (s projectFlockKandangService) GetAll(c *fiber.Ctx, params *validation.Quer
 }
 
 func (s projectFlockKandangService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlockKandang, map[uint]float64, []entity.ProductWarehouse, error) {
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	if scope.Restrict {
+		if len(scope.IDs) == 0 {
+			return nil, nil, nil, fiber.NewError(fiber.StatusNotFound, "ProjectFlockKandang not found")
+		}
+		var count int64
+		if err := s.Repository.DB().WithContext(c.Context()).
+			Table("project_flock_kandangs").
+			Joins("JOIN project_flocks ON project_flocks.id = project_flock_kandangs.project_flock_id").
+			Where("project_flock_kandangs.id = ?", id).
+			Where("project_flocks.location_id IN ?", scope.IDs).
+			Count(&count).Error; err != nil {
+			return nil, nil, nil, err
+		}
+		if count == 0 {
+			return nil, nil, nil, fiber.NewError(fiber.StatusNotFound, "ProjectFlockKandang not found")
+		}
+	}
+
 	projectFlockKandang, err := s.Repository.GetByID(c.Context(), id)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, nil, nil, fiber.NewError(fiber.StatusNotFound, "ProjectFlockKandang not found")

internal/modules/production/project_flocks/controllers/projectflock.controller.go

@@ -12,6 +12,7 @@ import (
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/response"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -76,6 +77,7 @@ func (u *ProjectflockController) GetAll(c *fiber.Ctx) error {
 		query.Category = category
 
 	}
+	query.TransferContext = c.Query(utils.TransferContextKey, "")
 
 	if kandangRaw := c.Query("kandang_id", c.Query("kandang_ids", "")); kandangRaw != "" {
 		ids, err := parseUintList(kandangRaw)

internal/modules/production/project_flocks/dto/projectflock.dto.go

@@ -6,7 +6,6 @@ import (
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	approvalDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/approvals/dto"
 	areaDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/areas/dto"
-	fcrDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/fcrs/dto"
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
 	nonstockDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/nonstocks/dto"
@@ -28,7 +27,7 @@ type ProjectFlockListDTO struct {
 	ProjectFlockRelationDTO
 	Area           *areaDTO.AreaRelationDTO         `json:"area,omitempty"`
 	Category       string                           `json:"category"`
-	Fcr            *fcrDTO.FcrRelationDTO           `json:"fcr,omitempty"`
+	StandardFcr    *float64                         `json:"standard_fcr,omitempty"`
 	ProductionStandard *productionStandardDTO.ProductionStandardRelationDTO `json:"production_standard,omitempty"`
 	Location       *locationDTO.LocationRelationDTO `json:"location,omitempty"`
 	Kandangs       []KandangWithProjectFlockIdDTO   `json:"kandangs,omitempty"`
@@ -99,12 +98,6 @@ func ToProjectFlockListDTOWithPeriod(e entity.ProjectFlock, period int) ProjectF
 		areaSummary = &mapped
 	}
 
-	var fcrSummary *fcrDTO.FcrRelationDTO
-	if e.Fcr.Id != 0 {
-		mapped := fcrDTO.ToFcrRelationDTO(e.Fcr)
-		fcrSummary = &mapped
-	}
-
 	var productionStandardSummary *productionStandardDTO.ProductionStandardRelationDTO
 	if e.ProductionStandard.Id != 0 {
 		mapped := productionStandardDTO.ToProductionStandardRelationDTO(e.ProductionStandard)
@@ -129,7 +122,7 @@ func ToProjectFlockListDTOWithPeriod(e entity.ProjectFlock, period int) ProjectF
 		Kandangs:                kandangSummaries,
 		ProjectBudgets:          ToProjectBudgetDTOs(e.Budgets),
 		Category:                e.Category,
-		Fcr:                     fcrSummary,
+		StandardFcr:             resolveProjectFlockStandardFcr(e),
 		ProductionStandard:      productionStandardSummary,
 		Location:                locationSummary,
 		CreatedAt:               e.CreatedAt,
@@ -204,6 +197,22 @@ func createProjectFlockRelationDTO(e entity.ProjectFlock, period int) ProjectFlo
 	}
 }
 
+func resolveProjectFlockStandardFcr(e entity.ProjectFlock) *float64 {
+	if e.ProductionStandard.Id == 0 || len(e.ProductionStandard.ProductionStandardDetails) == 0 {
+		return nil
+	}
+	week := 1
+	if e.Category == string(utils.ProjectFlockCategoryLaying) {
+		week = 18
+	}
+	for _, detail := range e.ProductionStandard.ProductionStandardDetails {
+		if detail.Week == week && detail.StandardFCR != nil {
+			return detail.StandardFCR
+		}
+	}
+	return nil
+}
+
 func ToProjectBudgetDTO(e entity.ProjectBudget) ProjectBudgetDTO {
 	var nonstockRef *nonstockDTO.NonstockRelationDTO
 	if e.Nonstock != nil && e.Nonstock.Id != 0 {

internal/modules/production/project_flocks/dto/projectflock_kandang.dto.go

@@ -5,7 +5,6 @@ import (
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	areaDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/areas/dto"
-	fcrDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/fcrs/dto"
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
 	productionStandardDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/production-standards/dto"
@@ -22,7 +21,7 @@ type ProjectFlockWithPivotDTO struct {
 	ProjectFlockRelationDTO
 	Area                 *areaDTO.AreaRelationDTO                             `json:"area,omitempty"`
 	Category             string                                               `json:"category"`
-	Fcr                  *fcrDTO.FcrRelationDTO                               `json:"fcr,omitempty"`
+	StandardFcr          *float64                                             `json:"standard_fcr,omitempty"`
 	ProductionStandard   *productionStandardDTO.ProductionStandardRelationDTO `json:"production_standard,omitempty"`
 	ProductionStandardId uint                                                 `json:"production_standard_id"`
 	Location             *locationDTO.LocationRelationDTO                     `json:"location,omitempty"`
@@ -67,10 +66,6 @@ func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangD
 			mapped := areaDTO.ToAreaRelationDTO(e.ProjectFlock.Area)
 			pfLocal.Area = &mapped
 		}
-		if e.ProjectFlock.Fcr.Id != 0 {
-			mapped := fcrDTO.ToFcrRelationDTO(e.ProjectFlock.Fcr)
-			pfLocal.Fcr = &mapped
-		}
 		if e.ProjectFlock.ProductionStandard.Id != 0 {
 			mapped := productionStandardDTO.ToProductionStandardRelationDTO(e.ProjectFlock.ProductionStandard)
 			pfLocal.ProductionStandard = &mapped
@@ -83,6 +78,7 @@ func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangD
 			mapped := userDTO.ToUserRelationDTO(e.ProjectFlock.CreatedUser)
 			pfLocal.CreatedUser = &mapped
 		}
+		pfLocal.StandardFcr = resolveProjectFlockStandardFcr(e.ProjectFlock)
 
 		for _, k := range e.ProjectFlock.Kandangs {
 			kb := kandangDTO.ToKandangRelationDTO(k)

internal/modules/production/project_flocks/repositories/projectflock.repository.go

@@ -14,6 +14,7 @@ import (
 type ProjectflockRepository interface {
 	repository.BaseRepository[entity.ProjectFlock]
 	GetAllWithFilters(ctx context.Context, offset, limit int, params *validation.Query) ([]entity.ProjectFlock, int64, error)
+	GetAllWithFiltersScoped(ctx context.Context, offset, limit int, params *validation.Query, locationIDs []uint, restrict bool) ([]entity.ProjectFlock, int64, error)
 	WithDefaultRelations() func(*gorm.DB) *gorm.DB
 	ExistsByFlockName(ctx context.Context, flockName string, excludeID *uint) (bool, error)
 	GetNextPeriodsForKandangs(ctx context.Context, kandangIDs []uint) (map[uint]int, error)
@@ -22,7 +23,6 @@ type ProjectflockRepository interface {
 	GetActiveByLocationID(ctx context.Context, locationID uint64) ([]entity.ProjectFlock, error)
 	IdExists(ctx context.Context, id uint) (bool, error)
 	AreaExists(ctx context.Context, id uint) (bool, error)
-	FcrExists(ctx context.Context, id uint) (bool, error)
 	ProductionStandardExists(ctx context.Context, id uint) (bool, error)
 	LocationExists(ctx context.Context, id uint) (bool, error)
 }
@@ -48,13 +48,26 @@ func (r *ProjectflockRepositoryImpl) GetAllWithFilters(ctx context.Context, offs
 	})
 }
 
+func (r *ProjectflockRepositoryImpl) GetAllWithFiltersScoped(ctx context.Context, offset, limit int, params *validation.Query, locationIDs []uint, restrict bool) ([]entity.ProjectFlock, int64, error) {
+	return r.GetAll(ctx, offset, limit, func(db *gorm.DB) *gorm.DB {
+		db = r.applyQueryFilters(r.WithDefaultRelations()(db), params)
+		if restrict {
+			if len(locationIDs) == 0 {
+				return db.Where("1 = 0")
+			}
+			db = db.Where("project_flocks.location_id IN ?", locationIDs)
+		}
+		return db
+	})
+}
+
 func (r *ProjectflockRepositoryImpl) WithDefaultRelations() func(*gorm.DB) *gorm.DB {
 	return func(db *gorm.DB) *gorm.DB {
 		return db.
 			Preload("CreatedUser").
 			Preload("Area").
-			Preload("Fcr").
 			Preload("ProductionStandard").
+			Preload("ProductionStandard.ProductionStandardDetails").
 			Preload("Location").
 			Preload("Kandangs").
 			Preload("KandangHistory").
@@ -120,14 +133,12 @@ func (r *ProjectflockRepositoryImpl) applySearchFilters(db *gorm.DB, rawSearch s
 	likeQuery := "%" + normalized + "%"
 	return db.
 		Joins("LEFT JOIN areas ON areas.id = project_flocks.area_id").
-		Joins("LEFT JOIN fcrs ON fcrs.id = project_flocks.fcr_id").
 		Joins("LEFT JOIN production_standards ON production_standards.id = project_flocks.production_standard_id").
 		Joins("LEFT JOIN locations ON locations.id = project_flocks.location_id").
 		Joins("LEFT JOIN users AS created_users ON created_users.id = project_flocks.created_by").
 		Where(`
 			LOWER(areas.name) LIKE ?
             OR LOWER(project_flocks.category) LIKE ?
-			OR LOWER(fcrs.name) LIKE ?
 			OR LOWER(production_standards.name) LIKE ?
 			OR LOWER(locations.name) LIKE ?
 			OR LOWER(locations.address) LIKE ?
@@ -158,7 +169,6 @@ func (r *ProjectflockRepositoryImpl) applySearchFilters(db *gorm.DB, rawSearch s
 			likeQuery,
 			likeQuery,
 			likeQuery,
-			likeQuery,
 		)
 }
 
@@ -170,10 +180,6 @@ func (r *ProjectflockRepositoryImpl) AreaExists(ctx context.Context, id uint) (b
 	return repository.Exists[entity.Area](ctx, r.DB(), id)
 }
 
-func (r *ProjectflockRepositoryImpl) FcrExists(ctx context.Context, id uint) (bool, error) {
-	return repository.Exists[entity.Fcr](ctx, r.DB(), id)
-}
-
 func (r *ProjectflockRepositoryImpl) ProductionStandardExists(ctx context.Context, id uint) (bool, error) {
 	return repository.Exists[entity.ProductionStandard](ctx, r.DB(), id)
 }

internal/modules/production/project_flocks/repositories/projectflock_kandang.repository.go

@@ -20,6 +20,7 @@ type ProjectFlockKandangRepository interface {
 	DeleteMany(ctx context.Context, projectFlockID uint, kandangIDs []uint) error
 	GetAll(ctx context.Context, offset int, limit int, modifier func(*gorm.DB) *gorm.DB) ([]entity.ProjectFlockKandang, int64, error)
 	GetAllWithFilters(ctx context.Context, offset int, limit int, params interface{}) ([]entity.ProjectFlockKandang, int64, error)
+	GetAllWithFiltersScoped(ctx context.Context, offset int, limit int, params interface{}, locationIDs []uint, restrict bool) ([]entity.ProjectFlockKandang, int64, error)
 	GetByProjectFlockID(ctx context.Context, projectFlockID uint) ([]entity.ProjectFlockKandang, error)
 	ListExistingKandangIDs(ctx context.Context, projectFlockID uint, kandangIDs []uint) ([]uint, error)
 	HasKandangsLinkedToOtherProject(ctx context.Context, kandangIDs []uint, exceptProjectID *uint) (bool, error)
@@ -116,10 +117,10 @@ func (r *projectFlockKandangRepositoryImpl) GetAllWithFilters(ctx context.Contex
 		Joins("JOIN \"kandangs\" ON \"project_flock_kandangs\".\"kandang_id\" = \"kandangs\".\"id\"").
 		Joins("JOIN \"project_flocks\" ON \"project_flock_kandangs\".\"project_flock_id\" = \"project_flocks\".\"id\"").
 		Preload("ProjectFlock").
-		Preload("ProjectFlock.Fcr").
 		Preload("ProjectFlock.Area").
 		Preload("ProjectFlock.Location").
 		Preload("ProjectFlock.CreatedUser").
+		Preload("ProjectFlock.ProductionStandard.ProductionStandardDetails").
 		Preload("ProjectFlock.Kandangs").
 		Preload("ProjectFlock.KandangHistory").
 		Preload("Kandang").
@@ -197,6 +198,104 @@ func (r *projectFlockKandangRepositoryImpl) GetAllWithFilters(ctx context.Contex
 	return records, total, nil
 }
 
+func (r *projectFlockKandangRepositoryImpl) GetAllWithFiltersScoped(ctx context.Context, offset int, limit int, params interface{}, locationIDs []uint, restrict bool) ([]entity.ProjectFlockKandang, int64, error) {
+	var records []entity.ProjectFlockKandang
+	var total int64
+
+	query, ok := params.(*validation.Query)
+
+	q := r.db.WithContext(ctx).
+		Joins("JOIN \"kandangs\" ON \"project_flock_kandangs\".\"kandang_id\" = \"kandangs\".\"id\"").
+		Joins("JOIN \"project_flocks\" ON \"project_flock_kandangs\".\"project_flock_id\" = \"project_flocks\".\"id\"").
+		Preload("ProjectFlock").
+		Preload("ProjectFlock.Area").
+		Preload("ProjectFlock.Location").
+		Preload("ProjectFlock.CreatedUser").
+		Preload("ProjectFlock.ProductionStandard.ProductionStandardDetails").
+		Preload("ProjectFlock.Kandangs").
+		Preload("ProjectFlock.KandangHistory").
+		Preload("Kandang").
+		Preload("Chickins").
+		Preload("Chickins.CreatedUser").
+		Preload("Chickins.ProductWarehouse")
+
+	if restrict {
+		if len(locationIDs) == 0 {
+			return []entity.ProjectFlockKandang{}, 0, nil
+		}
+		q = q.Where("\"project_flocks\".\"location_id\" IN ?", locationIDs)
+	}
+
+	if ok && query != nil && query.StepName != "" {
+		q = q.Where(`
+			EXISTS (
+				SELECT 1 FROM "approvals"
+				WHERE "approvals"."approvable_id" = "project_flock_kandangs"."id"
+				AND "approvals"."approvable_type" = ?
+				AND LOWER("approvals"."step_name") = LOWER(?)
+				AND "approvals"."id" IN (
+					SELECT "approvals"."id" FROM "approvals"
+					WHERE "approvals"."approvable_id" = "project_flock_kandangs"."id"
+					AND "approvals"."approvable_type" = ?
+					ORDER BY "approvals"."id" DESC
+					LIMIT 1
+				)
+			)
+		`, "PROJECT_FLOCK_KANDANGS", query.StepName, "PROJECT_FLOCK_KANDANGS")
+	}
+
+	if ok && query != nil {
+		if query.Search != "" {
+			escapedSearch := strings.NewReplacer("\\", "\\\\", "%", "\\%", "_", "\\_").Replace(query.Search)
+			q = q.Where(
+				r.db.Where("LOWER(\"kandangs\".\"name\") LIKE LOWER(?) ESCAPE '\\'", "%"+escapedSearch+"%").
+					Or("LOWER(\"project_flocks\".\"flock_name\") LIKE LOWER(?) ESCAPE '\\'", "%"+escapedSearch+"%"),
+			)
+		}
+
+		if query.ProjectFlockId > 0 {
+			q = q.Where("\"project_flock_kandangs\".\"project_flock_id\" = ?", query.ProjectFlockId)
+		}
+
+		if query.KandangId > 0 {
+			q = q.Where("\"project_flock_kandangs\".\"kandang_id\" = ?", query.KandangId)
+		}
+
+		if query.Category != "" {
+			q = q.Where("\"project_flocks\".\"category\" = ?", query.Category)
+		}
+
+		if query.AreaId > 0 {
+			q = q.Where("\"project_flocks\".\"area_id\" = ?", query.AreaId)
+		}
+	}
+
+	if err := q.Model(&entity.ProjectFlockKandang{}).Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	sortBy := "\"project_flock_kandangs\".\"created_at\" DESC"
+	if ok && query != nil && query.SortBy != "" {
+		sortOrder := "DESC"
+		if query.SortOrder == "ASC" {
+			sortOrder = "ASC"
+		}
+
+		switch query.SortBy {
+		case "created_at":
+			sortBy = "\"project_flock_kandangs\".\"created_at\" " + sortOrder
+		case "period":
+			sortBy = "\"project_flocks\".\"period\" " + sortOrder
+		}
+	}
+
+	if err := q.Order(sortBy).Offset(offset).Limit(limit).Find(&records).Error; err != nil {
+		return nil, 0, err
+	}
+
+	return records, total, nil
+}
+
 func (r *projectFlockKandangRepositoryImpl) WithTx(tx *gorm.DB) ProjectFlockKandangRepository {
 	return &projectFlockKandangRepositoryImpl{db: tx}
 }
@@ -225,10 +324,10 @@ func (r *projectFlockKandangRepositoryImpl) GetByID(ctx context.Context, id uint
 	record := new(entity.ProjectFlockKandang)
 	if err := r.db.WithContext(ctx).
 		Preload("ProjectFlock").
-		Preload("ProjectFlock.Fcr").
 		Preload("ProjectFlock.Area").
 		Preload("ProjectFlock.Location").
 		Preload("ProjectFlock.CreatedUser").
+		Preload("ProjectFlock.ProductionStandard.ProductionStandardDetails").
 		Preload("ProjectFlock.Kandangs").
 		Preload("ProjectFlock.KandangHistory").
 		Preload("Kandang").
@@ -248,10 +347,10 @@ func (r *projectFlockKandangRepositoryImpl) GetByProjectFlockAndKandang(ctx cont
 	if err := r.db.WithContext(ctx).
 		Where("project_flock_id = ? AND kandang_id = ?", projectFlockID, kandangID).
 		Preload("ProjectFlock").
-		Preload("ProjectFlock.Fcr").
 		Preload("ProjectFlock.Area").
 		Preload("ProjectFlock.Location").
 		Preload("ProjectFlock.CreatedUser").
+		Preload("ProjectFlock.ProductionStandard.ProductionStandardDetails").
 		Preload("ProjectFlock.Kandangs").
 		Preload("ProjectFlock.KandangHistory").
 		Preload("Kandang").

internal/modules/production/project_flocks/services/projectflock.service.go

@@ -117,9 +117,20 @@ func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 		return nil, 0, nil, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, nil, err
+	}
+	if params.TransferContext == utils.TransferContextTransferToLaying {
+		if m.HasPermission(c, m.P_TransferToLaying_CreateOne) || m.HasPermission(c, m.P_TransferToLaying_UpdateOne) {
+			scope.Restrict = false
+			scope.IDs = nil
+		}
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
-	projectflocks, total, err := s.Repository.GetAllWithFilters(c.Context(), offset, params.Limit, params)
+	projectflocks, total, err := s.Repository.GetAllWithFiltersScoped(c.Context(), offset, params.Limit, params, scope.IDs, scope.Restrict)
 
 	if err != nil {
 		s.Log.Errorf("Failed to get projectflocks: %+v", err)
@@ -193,7 +204,16 @@ func (s projectflockService) getOneEntityOnly(c *fiber.Ctx, id uint) (*entity.Pr
 }
 
 func (s projectflockService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock, *flockDTO.FlockRelationDTO, error) {
-	projectflock, err := s.Repository.GetByID(c.Context(), id, s.Repository.WithDefaultRelations())
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, nil, err
+	}
+
+	projectflock, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.Repository.WithDefaultRelations()(db)
+		db = m.ApplyScopeFilter(db, scope, "project_flocks.location_id")
+		return db
+	})
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, nil, fiber.NewError(fiber.StatusNotFound, "Projectflock not found")
 	}
@@ -262,7 +282,6 @@ func (s *projectflockService) CreateOne(c *fiber.Ctx, req *validation.Create) (*
 
 	if err := commonSvc.EnsureRelations(c.Context(),
 		commonSvc.RelationCheck{Name: "Area", ID: &req.AreaId, Exists: s.Repository.AreaExists},
-		commonSvc.RelationCheck{Name: "FCR", ID: &req.FcrId, Exists: s.Repository.FcrExists},
 		commonSvc.RelationCheck{Name: "Production Standard", ID: &req.ProductionStandardId, Exists: s.Repository.ProductionStandardExists},
 		commonSvc.RelationCheck{Name: "Location", ID: &req.LocationId, Exists: s.Repository.LocationExists},
 	); err != nil {
@@ -314,7 +333,6 @@ func (s *projectflockService) CreateOne(c *fiber.Ctx, req *validation.Create) (*
 	createBody := &entity.ProjectFlock{
 		AreaId:               req.AreaId,
 		Category:             cat,
-		FcrId:                req.FcrId,
 		ProductionStandardId: req.ProductionStandardId,
 		LocationId:           req.LocationId,
 		CreatedBy:            actorID,

internal/modules/production/project_flocks/validations/projectflock.validation.go

@@ -4,7 +4,6 @@ type Create struct {
 	FlockName            string          `json:"flock_name" validate:"required_strict"`
 	AreaId               uint            `json:"area_id" validate:"required_strict,number,gt=0"`
 	Category             string          `json:"category" validate:"required_strict"`
-	FcrId                uint            `json:"fcr_id" validate:"required_strict,number,gt=0"`
 	ProductionStandardId uint            `json:"production_standard_id" validate:"required_strict,number,gt=0"`
 	LocationId           uint            `json:"location_id" validate:"required_strict,number,gt=0"`
 	KandangIds           []uint          `json:"kandang_ids" validate:"required,min=1,dive,gt=0"`
@@ -12,16 +11,17 @@ type Create struct {
 }
 
 type Query struct {
-	Page       int    `query:"page" validate:"omitempty,number,min=1"`
-	Limit      int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
-	Search     string `query:"search" validate:"omitempty,max=50"`
-	SortBy     string `query:"sort_by" validate:"omitempty"`
-	SortOrder  string `query:"sort_order" validate:"omitempty,oneof=asc desc"`
-	AreaId     uint   `query:"area_id" validate:"omitempty,number,gt=0"`
-	LocationId uint   `query:"location_id" validate:"omitempty,number,gt=0"`
-	Period     int    `query:"period" validate:"omitempty,number,gt=0"`
-	Category   string `query:"category" validate:"omitempty"`
-	KandangIds []uint `query:"kandang_id" validate:"omitempty,dive,gt=0"`
+	Page            int    `query:"page" validate:"omitempty,number,min=1"`
+	Limit           int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
+	Search          string `query:"search" validate:"omitempty,max=50"`
+	SortBy          string `query:"sort_by" validate:"omitempty"`
+	SortOrder       string `query:"sort_order" validate:"omitempty,oneof=asc desc"`
+	AreaId          uint   `query:"area_id" validate:"omitempty,number,gt=0"`
+	LocationId      uint   `query:"location_id" validate:"omitempty,number,gt=0"`
+	Period          int    `query:"period" validate:"omitempty,number,gt=0"`
+	Category        string `query:"category" validate:"omitempty"`
+	KandangIds      []uint `query:"kandang_id" validate:"omitempty,dive,gt=0"`
+	TransferContext string `query:"transfer_context" validate:"omitempty,oneof=transfer_to_laying"`
 }
 
 type Approve struct {

internal/modules/production/recordings/dto/recording.dto.go

@@ -1,6 +1,7 @@
 package dto
 
 import (
+	"math"
 	"strings"
 	"time"
 
@@ -73,7 +74,9 @@ type RecordingRelationDTO struct {
 	RecordDatetime    time.Time                       `json:"record_datetime"`
 	Day               int                             `json:"day"`
 	TotalDepletionQty float64                         `json:"total_depletion_qty"`
+	TotalDepletionCumQty float64                      `json:"total_depletion_cum_qty"`
 	CumDepletionRate  float64                         `json:"cum_depletion_rate"`
+	DepletionRate     float64                         `json:"depletion_rate"`
 	CumIntake         int                             `json:"cum_intake"`
 	FcrValue          float64                         `json:"fcr_value"`
 	HenDay            float64                         `json:"hen_day"`
@@ -230,7 +233,9 @@ func toRecordingRelationDTO(e entity.Recording) RecordingRelationDTO {
 		RecordDatetime:    e.RecordDatetime,
 		Day:               intValue(e.Day),
 		TotalDepletionQty: floatValue(e.TotalDepletionQty),
-		CumDepletionRate:  floatValue(e.CumDepletionRate),
+		TotalDepletionCumQty: floatValue(e.TotalDepletionCumQty),
+		CumDepletionRate:  roundFloatValue(e.CumDepletionRate, 2),
+		DepletionRate:     roundFloatValue(e.DepletionRate, 2),
 		CumIntake:         intValue(e.CumIntake),
 		FcrValue:          floatValue(e.FcrValue),
 		HenDay:            floatValue(e.HenDay),
@@ -275,10 +280,10 @@ func toRecordingProjectFlockDTO(e entity.Recording) RecordingProjectFlockDTO {
 		}
 	}
 
-	if pfk.ProjectFlock.Fcr.Id != 0 || e.StandardFcr != nil {
+	if pfk.ProjectFlock.ProductionStandard.Id != 0 || e.StandardFcr != nil {
 		result.Fcr = &RecordingFcrDTO{
-			Id:     pfk.ProjectFlock.Fcr.Id,
-			Name:   pfk.ProjectFlock.Fcr.Name,
+			Id:     pfk.ProjectFlock.ProductionStandard.Id,
+			Name:   pfk.ProjectFlock.ProductionStandard.Name,
 			FcrStd: floatValue(e.StandardFcr),
 		}
 	}
@@ -426,6 +431,17 @@ func floatValue(value *float64) float64 {
 	return *value
 }
 
+func roundFloatValue(value *float64, places int) float64 {
+	if value == nil {
+		return 0
+	}
+	if places <= 0 {
+		return math.Round(*value)
+	}
+	factor := math.Pow(10, float64(places))
+	return math.Round(*value*factor) / factor
+}
+
 func intValue(value *int) int {
 	if value == nil {
 		return 0