fix: error checking id exists

[FIX/BE] Change from true to false, in database.go

See merge request mbugroup/lti-api!369

.gitlab-ci.yml

@@ -1,35 +1,186 @@
+stages:
+  - build
+  - gitops
+
+variables:
+  AWS_REGION: ap-southeast-3
+  ECR_REGISTRY: 886436954922.dkr.ecr.ap-southeast-3.amazonaws.com
+  ECR_REPO_NAME: mbugroup/lti-api
+  ECR_REPOSITORY: ${ECR_REGISTRY}/${ECR_REPO_NAME}
+  TARGET_PLATFORM: linux/amd64
+
+  DOCKER_HOST: unix:///var/run/docker.sock
+  DOCKER_TLS_CERTDIR: ""
+  DOCKER_BUILDKIT: "1"
+
 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
+    # run untuk branch utama & MR
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "development"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
     - when: never
 
-include:
-  # khusus MR (notif)
-  - local: "ci/merge_request.yml"
-    rules:
-      - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+# =========================
+# Helper: login ECR
+# =========================
+.ecr_login: &ecr_login |
+  AWS_CLI_ENV_ARGS=""
+  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_REGION=$AWS_REGION"
+  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}"
+  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-}"
+  if [ -n "${AWS_SESSION_TOKEN:-}" ]; then
+    AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN"
+  fi
 
-  # khusus push ke branch env
-  - local: "ci/development.yml"
-    rules:
-      - if: '$CI_COMMIT_BRANCH == "development"'
+  PASS="$(docker run --rm $AWS_CLI_ENV_ARGS public.ecr.aws/aws-cli/aws-cli:latest \
+    ecr get-login-password --region "$AWS_REGION" || true)"
+  if [ -z "$PASS" ]; then
+    echo "ERROR: Failed to get ECR login password."
+    exit 1
+  fi
+  echo "$PASS" | docker login --username AWS --password-stdin "$ECR_REGISTRY"
 
-  - local: "ci/staging.yml"
-    rules:
-      - if: '$CI_COMMIT_BRANCH == "staging"'
+# =========================
+# MR
+# =========================
+build_mr:
+  stage: build
+  image: public.ecr.aws/docker/library/docker:27
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
+  variables:
+    IMAGE_TAG: "prod-${CI_COMMIT_SHORT_SHA}"
+  before_script:
+    - set -eu
+    - docker version
+    - docker info
+    - *ecr_login
+  script: |
+    set -eu
+    # force base image pulls via AWS ECR Public to avoid Docker Hub TLS timeout
+    sed -i 's|^FROM golang:1.23-alpine AS builder$|FROM public.ecr.aws/docker/library/golang:1.23-alpine AS builder|' Dockerfile
+    sed -i 's|^FROM alpine:3.20$|FROM public.ecr.aws/docker/library/alpine:3.20|' Dockerfile
+    echo "Build (MR) : $ECR_REPOSITORY:$IMAGE_TAG"
+    docker build --platform "$TARGET_PLATFORM" -f Dockerfile -t "$ECR_REPOSITORY:$IMAGE_TAG" .
+    echo "Pushing image for MR..."
+    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
 
-  - local: "ci/production.yml"
-    rules:
-      - if: '$CI_COMMIT_BRANCH == "production"'
+# =========================
+# DEVELOPMENT (push branch development)
+# =========================
+build_push_dev:
+  stage: build
+  image: public.ecr.aws/docker/library/docker:27
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "development"'
+  variables:
+    IMAGE_TAG: "dev-${CI_COMMIT_SHORT_SHA}"
+  before_script:
+    - set -eu
+    - docker version
+    - docker info
+    - *ecr_login
+  script: |
+    set -eu
+    # force base image pulls via AWS ECR Public to avoid Docker Hub TLS timeout
+    sed -i 's|^FROM golang:1.23-alpine AS builder$|FROM public.ecr.aws/docker/library/golang:1.23-alpine AS builder|' Dockerfile
+    sed -i 's|^FROM alpine:3.20$|FROM public.ecr.aws/docker/library/alpine:3.20|' Dockerfile
+    echo "Build & push (dev): $ECR_REPOSITORY:$IMAGE_TAG"
+    docker build --platform "$TARGET_PLATFORM" -f Dockerfile -t "$ECR_REPOSITORY:$IMAGE_TAG" .
+    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
+
+update_gitops_dev_lti:
+  stage: gitops
+  image: public.ecr.aws/docker/library/alpine:3.20
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "development"'
+  needs: ["build_push_dev"]
+  variables:
+    IMAGE_TAG: "dev-${CI_COMMIT_SHORT_SHA}"
+    GITOPS_BRANCH: main
+    VALUES_FILE: environments/lti/dev/lti-values-dev.yaml
+    GITOPS_REPO_URL: https://oauth2:${GITOPS_TOKEN}@gitlab.com/cristian.anggita.parjaman/gitops.git
+  before_script:
+    - set -eu
+    - apk add --no-cache git yq
+    - git config --global user.email "ci@gitlab"
+    - git config --global user.name "gitlab-ci"
+  script: |
+    set -eu
+    rm -rf gitops
+    git clone --depth 1 --branch "$GITOPS_BRANCH" "$GITOPS_REPO_URL" gitops
+    cd gitops
+
+    echo "Updating dev image.tag to $IMAGE_TAG"
+    yq -i '.image.tag = strenv(IMAGE_TAG)' "$VALUES_FILE"
+
+    git add "$VALUES_FILE"
+    if git diff --cached --quiet; then
+      echo "No changes to commit"
+      exit 0
+    fi
+    git commit -m "lti dev deploy ${IMAGE_TAG}"
+    git push origin "$GITOPS_BRANCH"
+
+# =========================
+# PRODUCTION (push branch production)
+# =========================
+build_push_prod:
+  stage: build
+  image: public.ecr.aws/docker/library/docker:27
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+  variables:
+    IMAGE_TAG: "prod-${CI_COMMIT_SHORT_SHA}"
+  before_script:
+    - set -eu
+    - docker version
+    - docker info
+    - *ecr_login
+  script: |
+    set -eu
+    # force base image pulls via AWS ECR Public to avoid Docker Hub TLS timeout
+    sed -i 's|^FROM golang:1.23-alpine AS builder$|FROM public.ecr.aws/docker/library/golang:1.23-alpine AS builder|' Dockerfile
+    sed -i 's|^FROM alpine:3.20$|FROM public.ecr.aws/docker/library/alpine:3.20|' Dockerfile
+    echo "Build & push (prod): $ECR_REPOSITORY:$IMAGE_TAG"
+    docker build --platform "$TARGET_PLATFORM" -f Dockerfile -t "$ECR_REPOSITORY:$IMAGE_TAG" .
+    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
+
+update_gitops_prod_lti:
+  stage: gitops
+  image: public.ecr.aws/docker/library/alpine:3.20
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+  needs: ["build_push_prod"]
+  variables:
+    IMAGE_TAG: "prod-${CI_COMMIT_SHORT_SHA}"
+    GITOPS_BRANCH: main
+    VALUES_FILE: environments/lti/prod/lti-values-prod.yaml
+    GITOPS_REPO_URL: https://oauth2:${GITOPS_TOKEN}@gitlab.com/cristian.anggita.parjaman/gitops.git
+  before_script:
+    - set -eu
+    - apk add --no-cache git yq
+    - git config --global user.email "ci@gitlab"
+    - git config --global user.name "gitlab-ci"
+  script: |
+    set -eu
+    rm -rf gitops
+    git clone --depth 1 --branch "$GITOPS_BRANCH" "$GITOPS_REPO_URL" gitops
+    cd gitops
+
+    echo "Updating prod image.tag to $IMAGE_TAG"
+    yq -i '.image.tag = strenv(IMAGE_TAG)' "$VALUES_FILE"
+
+    git add "$VALUES_FILE"
+    if git diff --cached --quiet; then
+      echo "No changes to commit"
+      exit 0
+    fi
+    git commit -m "lti prod deploy ${IMAGE_TAG}"
+    git push origin "$GITOPS_BRANCH"

Dockerfile

@@ -1,7 +1,7 @@
 # =========================
 # Builder stage
 # =========================
-FROM golang:1.23-alpine AS builder
+FROM public.ecr.aws/docker/library/golang:1.23-alpine AS builder
 
 RUN apk add --no-cache git ca-certificates tzdata
 WORKDIR /app
@@ -15,14 +15,17 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     go build -trimpath -ldflags="-s -w" -o lti-api ./cmd/api
 
-# Build SEED binary (pastikan cmd/seed ada)
+# Build SEED binary
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     go build -trimpath -ldflags="-s -w" -o lti-seed ./cmd/seed
 
+# Build migrate CLI with postgres + file drivers
+RUN GOBIN=/usr/local/bin go install -tags "postgres file" -ldflags="-s -w" github.com/golang-migrate/migrate/v4/cmd/migrate@v4.18.3
+
 # =========================
 # Runtime stage
 # =========================
-FROM alpine:3.20
+FROM public.ecr.aws/docker/library/alpine:3.20
 
 RUN apk add --no-cache ca-certificates tzdata curl bash postgresql-client \
   && adduser -D -H -u 10001 appuser
@@ -31,6 +34,8 @@ WORKDIR /app
 
 COPY --from=builder /app/lti-api /app/lti-api
 COPY --from=builder /app/lti-seed /app/lti-seed
+COPY --from=builder /usr/local/bin/migrate /app/migrate
+COPY --from=builder /app/internal/database/migrations /app/migrations
 
 USER appuser
 EXPOSE 8081

README.md

@@ -111,3 +111,4 @@ IT Development PT Mitra Berlian Unggas Group
 ## 📃 License
 
 > This project is private. All rights reserved.
+# mr test Sat  7 Feb 2026 00:14:58 WIB

ci/development.yml

@@ -1,91 +1,159 @@
 stages:
-  - deploy
+  - build
+  - gitops
 
-deploy-dev:
-  stage: deploy
-  image: alpine:3.20
+variables:
+  AWS_REGION: ap-southeast-3
+  ECR_REGISTRY: 886436954922.dkr.ecr.ap-southeast-3.amazonaws.com
+  ECR_REPO_NAME: mbugroup/lti-api
+  ECR_REPOSITORY: ${ECR_REGISTRY}/${ECR_REPO_NAME}
 
+  DOCKER_HOST: unix:///var/run/docker.sock
+  DOCKER_TLS_CERTDIR: ""
+  DOCKER_BUILDKIT: "1"
+
+workflow:
+  rules:
+    - if: '$CI_COMMIT_BRANCH'
+
+# =========================
+# Helper: login ECR
+# =========================
+.ecr_login: &ecr_login |
+  AWS_CLI_ENV_ARGS=""
+  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_REGION=$AWS_REGION"
+  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}"
+  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-}"
+  if [ -n "${AWS_SESSION_TOKEN:-}" ]; then
+    AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN"
+  fi
+
+  PASS="$(docker run --rm $AWS_CLI_ENV_ARGS public.ecr.aws/aws-cli/aws-cli:latest \
+    ecr get-login-password --region "$AWS_REGION" || true)"
+  if [ -z "$PASS" ]; then
+    echo "ERROR: Failed to get ECR login password."
+    exit 1
+  fi
+  echo "$PASS" | docker login --username AWS --password-stdin "$ECR_REGISTRY"
+
+# =========================
+# DEV
+# =========================
+build_push_dev_lti:
+  stage: build
+  image: public.ecr.aws/docker/library/docker:27
+  tags: [self-hosted-dev]
   rules:
     - if: '$CI_COMMIT_BRANCH == "development"'
-      when: on_success
-    - when: never
-
   variables:
-    DEPLOY_APP: "LTI-MBUGROUP"
-    GIT_SUBMODULE_STRATEGY: recursive
-    GIT_DEPTH: "1"
-
+    IMAGE_TAG: "dev-${CI_COMMIT_SHORT_SHA}"
   before_script:
-    - echo "🧰 Installing dependencies..."
-    - apk update && apk add --no-cache openssh git curl bash
+    - set -eu
+    - docker version
+    - docker info
+    - *ecr_login
+  script: |
+    set -eu
+    echo "Build & push: $ECR_REPOSITORY:$IMAGE_TAG"
 
-    # Setup SSH di runner
-    - mkdir -p ~/.ssh
-    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
-    - chmod 600 ~/.ssh/id_rsa
-    - eval "$(ssh-agent -s)"
-    - ssh-add ~/.ssh/id_rsa
+    docker build \
+      -t "$ECR_REPOSITORY:$IMAGE_TAG" \
+      .
 
-    # Trust host keys (server + gitlab) biar SSH gak nanya interaktif
-    - ssh-keyscan -H "$SERVER_IP" >> ~/.ssh/known_hosts
-    - ssh-keyscan -H gitlab.com >> ~/.ssh/known_hosts
+    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
 
-  script:
-    - echo "🚀 Deploying latest code to $SERVER_USER@$SERVER_IP"
-    - >
-      if ssh -o StrictHostKeyChecking=no "$SERVER_USER@$SERVER_IP" "
-        set -e
+update_gitops_dev_lti:
+  stage: gitops
+  image: public.ecr.aws/docker/library/alpine:3.20
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "development"'
+  needs: ["build_push_dev_lti"]
+  variables:
+    IMAGE_TAG: "dev-${CI_COMMIT_SHORT_SHA}"
+    GITOPS_BRANCH: main
+    VALUES_FILE: environments/lti/dev/lti-values-dev.yaml
+    GITOPS_REPO_URL: https://oauth2:${GITOPS_TOKEN}@gitlab.com/cristian.anggita.parjaman/gitops.git
+  before_script:
+    - set -eu
+    - apk add --no-cache git yq
+    - git config --global user.email "ci@gitlab"
+    - git config --global user.name "gitlab-ci"
+  script: |
+    set -eu
+    rm -rf gitops
+    git clone --depth 1 --branch "$GITOPS_BRANCH" "$GITOPS_REPO_URL" gitops
+    cd gitops
 
-        cd /home/devops/docker/deployment/development/lti-api
+    echo "Updating DEV image.tag to $IMAGE_TAG in $VALUES_FILE"
+    yq -i '.image.repository = strenv(ECR_REPOSITORY)' "$VALUES_FILE"
+    yq -i '.image.tag = strenv(IMAGE_TAG)' "$VALUES_FILE"
 
-        # Pastikan remote origin SSH (antisipasi kalau pernah ke-set HTTPS)
-        git remote set-url origin git@gitlab.com:mbugroup/lti-api.git
+    git add "$VALUES_FILE"
+    if git diff --cached --quiet; then
+      echo "No changes to commit"
+      exit 0
+    fi
+    git commit -m "lti dev deploy ${IMAGE_TAG}"
+    git push origin "$GITOPS_BRANCH"
 
-        # Pastikan server percaya gitlab.com juga (untuk git fetch via SSH)
-        mkdir -p ~/.ssh
-        ssh-keyscan -H gitlab.com >> ~/.ssh/known_hosts
+# =========================
+# PROD
+# =========================
+# build_push_prod_lti:
+#   stage: build
+#   image: public.ecr.aws/docker/library/docker:27
+#   tags: [self-hosted-dev]
+#   rules:
+#     - if: '$CI_COMMIT_BRANCH == "production"'
+#   variables:
+#     IMAGE_TAG: "prod-${CI_COMMIT_SHORT_SHA}"
+#   before_script:
+#     - set -eu
+#     - docker version
+#     - docker info
+#     - *ecr_login
+#   script: |
+#     set -eu
+#     echo "Build & push: $ECR_REPOSITORY:$IMAGE_TAG"
 
-        # Fetch/reset pakai SSH
-        GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git fetch origin development
-        git reset --hard origin/development
+#     docker build \
+#       -t "$ECR_REPOSITORY:$IMAGE_TAG" \
+#       .
 
-        docker compose restart dev-api-lti || docker compose up -d dev-api-lti
-      "; then
-        STATUS='success';
-      else
-        STATUS='failed';
-      fi;
+#     docker push "$ECR_REPOSITORY:$IMAGE_TAG"
 
-      RUN_URL="${CI_PROJECT_URL}/-/pipelines/${CI_PIPELINE_ID}";
+# update_gitops_prod_lti:
+#   stage: gitops
+#   image: public.ecr.aws/docker/library/alpine:3.20
+#   tags: [self-hosted-dev]
+#   rules:
+#     - if: '$CI_COMMIT_BRANCH == "production"'
+#   needs: ["build_push_prod_lti"]
+#   variables:
+#     IMAGE_TAG: "prod-${CI_COMMIT_SHORT_SHA}"
+#     GITOPS_BRANCH: main
+#     VALUES_FILE: environments/lti/prod/lti-values-prod.yaml
+#     GITOPS_REPO_URL: https://oauth2:${GITOPS_TOKEN}@gitlab.com/cristian.anggita.parjaman/gitops.git
+#   before_script:
+#     - set -eu
+#     - apk add --no-cache git yq
+#     - git config --global user.email "ci@gitlab"
+#     - git config --global user.name "gitlab-ci"
+#   script: |
+#     set -eu
+#     rm -rf gitops
+#     git clone --depth 1 --branch "$GITOPS_BRANCH" "$GITOPS_REPO_URL" gitops
+#     cd gitops
 
-      if [ "$STATUS" = "success" ]; then
-        COLOR=3066993;
-        TITLE="✅ Deployment API Succeeded";
-        DESC="Deployment job on branch \`${CI_COMMIT_REF_NAME}\` completed successfully.";
-      else
-        COLOR=15158332;
-        TITLE="❌ Deployment API Failed Gaes";
-        DESC="Deployment job on branch \`${CI_COMMIT_REF_NAME}\` failed.";
-      fi;
+#     echo "Updating PROD image.tag to $IMAGE_TAG in $VALUES_FILE"
+#     yq -i '.image.repository = strenv(ECR_REPOSITORY)' "$VALUES_FILE"
+#     yq -i '.image.tag = strenv(IMAGE_TAG)' "$VALUES_FILE"
 
-      echo "{
-        \"username\": \"CI Bot\",
-        \"embeds\": [{
-          \"title\": \"$TITLE\",
-          \"description\": \"$DESC\",
-          \"color\": $COLOR,
-          \"fields\": [
-            {\"name\": \"Repository\", \"value\": \"${CI_PROJECT_PATH}\", \"inline\": true},
-            {\"name\": \"Actor\", \"value\": \"${GITLAB_USER_LOGIN}\", \"inline\": true},
-            {\"name\": \"Commit\", \"value\": \"${CI_COMMIT_SHA}\", \"inline\": false},
-            {\"name\": \"Pipeline\", \"value\": \"[Open run](${RUN_URL})\", \"inline\": false}
-          ]
-        }]
-      }" > payload.json;
-
-      echo "📡 Sending notification to Discord...";
-      curl -sS -H "Content-Type: application/json" \
-        -d @payload.json "$DISCORD_WEBHOOK_URL";
-
-  environment:
-    name: development
+#     git add "$VALUES_FILE"
+#     if git diff --cached --quiet; then
+#       echo "No changes to commit"
+#       exit 0
+#     fi
+#     git commit -m "lti prod deploy ${IMAGE_TAG}"
+#     git push origin "$GITOPS_BRANCH"

cmd/delete-adjustments/main.go

@@ -11,12 +11,10 @@ import (
 	"strings"
 	"time"
 
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	"gitlab.com/mbugroup/lti-api.git/internal/config"
 	"gitlab.com/mbugroup/lti-api.git/internal/database"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
 	"gorm.io/gorm"
 )
@@ -61,13 +59,7 @@ func main() {
 	ctx := context.Background()
 	db := database.Connect(config.DBHost, config.DBName)
 
-	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
-	stockAllocRepo := commonRepo.NewStockAllocationRepository(db)
-	fifoSvc := commonSvc.NewFifoService(db, stockAllocRepo, productWarehouseRepo, nil)
 	fifoStockV2Svc := commonSvc.NewFifoStockV2Service(db, nil)
-	if err := registerAdjustmentFIFO(fifoSvc); err != nil {
-		log.Fatalf("failed to register adjustment fifo config: %v", err)
-	}
 
 	adjustments, err := loadAdjustments(ctx, db, ids)
 	if err != nil {
@@ -134,14 +126,9 @@ func main() {
 				reflowReq := commonSvc.FifoStockV2ReflowRequest{
 					FlagGroupCode:      route.FlagGroupCode,
 					ProductWarehouseID: adj.ProductWarehouseID,
-					Usable: commonSvc.FifoStockV2Ref{
-						ID:            adj.ID,
-						LegacyTypeKey: fifo.UsableKeyAdjustmentOut.String(),
-						FunctionCode:  route.FunctionCode,
-					},
-					DesiredQty:     0,
-					IdempotencyKey: fmt.Sprintf("delete-adjustment-usable-%d-%d", adj.ID, time.Now().UnixNano()),
-					Tx:             tx,
+					AsOf:               &adj.CreatedAt,
+					IdempotencyKey:     fmt.Sprintf("delete-adjustment-usable-%d-%d", adj.ID, time.Now().UnixNano()),
+					Tx:                 tx,
 				}
 				if _, err := fifoStockV2Svc.Reflow(ctx, reflowReq); err != nil {
 					return fmt.Errorf("reflow usable to zero: %w", err)
@@ -190,7 +177,7 @@ func main() {
 			}
 
 			fmt.Printf(
-				"PLAN adj=%d lane=STOCKABLE function=%s total=%.3f remove_qty=%.3f action=reverse_stock+delete\n",
+				"PLAN adj=%d lane=STOCKABLE function=%s total=%.3f remove_qty=%.3f action=reflow_to_zero+delete\n",
 				adj.ID,
 				route.FunctionCode,
 				adj.TotalQty,
@@ -203,16 +190,25 @@ func main() {
 			}
 
 			err = db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-				if removeQty > 0 {
-					if err := fifoSvc.AdjustStockableQuantity(ctx, commonSvc.StockAdjustRequest{
-						StockableKey:       fifo.StockableKeyAdjustmentIn,
-						StockableID:        adj.ID,
-						ProductWarehouseID: adj.ProductWarehouseID,
-						Quantity:           -removeQty,
-						Tx:                 tx,
-					}); err != nil {
-						return fmt.Errorf("reverse stockable quantity: %w", err)
-					}
+				if err := tx.WithContext(ctx).
+					Table("adjustment_stocks").
+					Where("id = ?", adj.ID).
+					Updates(map[string]any{
+						"total_qty":  0,
+						"total_used": 0,
+					}).Error; err != nil {
+					return fmt.Errorf("set stockable qty to zero: %w", err)
+				}
+
+				reflowReq := commonSvc.FifoStockV2ReflowRequest{
+					FlagGroupCode:      route.FlagGroupCode,
+					ProductWarehouseID: adj.ProductWarehouseID,
+					AsOf:               &adj.CreatedAt,
+					IdempotencyKey:     fmt.Sprintf("delete-adjustment-stockable-%d-%d", adj.ID, time.Now().UnixNano()),
+					Tx:                 tx,
+				}
+				if _, err := fifoStockV2Svc.Reflow(ctx, reflowReq); err != nil {
+					return fmt.Errorf("reflow stockable to zero: %w", err)
 				}
 
 				if err := hardDeleteStockableAllocations(ctx, tx, fifo.StockableKeyAdjustmentIn.String(), adj.ID); err != nil {
@@ -248,39 +244,6 @@ func main() {
 	}
 }
 
-func registerAdjustmentFIFO(fifoSvc commonSvc.FifoService) error {
-	if err := fifoSvc.RegisterStockable(fifo.StockableConfig{
-		Key:   fifo.StockableKeyAdjustmentIn,
-		Table: "adjustment_stocks",
-		Columns: fifo.StockableColumns{
-			ID:                 "id",
-			ProductWarehouseID: "product_warehouse_id",
-			TotalQuantity:      "total_qty",
-			TotalUsedQuantity:  "total_used",
-			CreatedAt:          "created_at",
-		},
-		OrderBy: []string{"created_at ASC", "id ASC"},
-	}); err != nil && !strings.Contains(strings.ToLower(err.Error()), "already registered") {
-		return err
-	}
-
-	if err := fifoSvc.RegisterUsable(fifo.UsableConfig{
-		Key:   fifo.UsableKeyAdjustmentOut,
-		Table: "adjustment_stocks",
-		Columns: fifo.UsableColumns{
-			ID:                 "id",
-			ProductWarehouseID: "product_warehouse_id",
-			UsageQuantity:      "usage_qty",
-			PendingQuantity:    "pending_qty",
-			CreatedAt:          "created_at",
-		},
-		OrderBy: []string{"created_at ASC", "id ASC"},
-	}); err != nil && !strings.Contains(strings.ToLower(err.Error()), "already registered") {
-		return err
-	}
-	return nil
-}
-
 func modeLabel(apply bool) string {
 	if apply {
 		return "APPLY"
@@ -403,6 +366,7 @@ func countActiveUsableAllocations(ctx context.Context, db *gorm.DB, usableType s
 		Table("stock_allocations").
 		Where("usable_type = ? AND usable_id = ?", usableType, usableID).
 		Where("status = ?", entity.StockAllocationStatusActive).
+		Where("allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		Count(&count).Error
 	return count, err
 }
@@ -413,19 +377,20 @@ func countActiveStockableAllocations(ctx context.Context, db *gorm.DB, stockable
 		Table("stock_allocations").
 		Where("stockable_type = ? AND stockable_id = ?", stockableType, stockableID).
 		Where("status = ?", entity.StockAllocationStatusActive).
+		Where("allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		Count(&count).Error
 	return count, err
 }
 
 func hardDeleteUsableAllocations(ctx context.Context, tx *gorm.DB, usableType string, usableID uint) error {
 	return tx.WithContext(ctx).
-		Exec("DELETE FROM stock_allocations WHERE usable_type = ? AND usable_id = ?", usableType, usableID).
+		Exec("DELETE FROM stock_allocations WHERE usable_type = ? AND usable_id = ? AND allocation_purpose = ?", usableType, usableID, entity.StockAllocationPurposeConsume).
 		Error
 }
 
 func hardDeleteStockableAllocations(ctx context.Context, tx *gorm.DB, stockableType string, stockableID uint) error {
 	return tx.WithContext(ctx).
-		Exec("DELETE FROM stock_allocations WHERE stockable_type = ? AND stockable_id = ?", stockableType, stockableID).
+		Exec("DELETE FROM stock_allocations WHERE stockable_type = ? AND stockable_id = ? AND allocation_purpose = ?", stockableType, stockableID, entity.StockAllocationPurposeConsume).
 		Error
 }
 

cmd/reflow-adjustments/main.go

@@ -121,12 +121,7 @@ func main() {
 			continue
 		}
 
-		usableType := fifo.UsableKeyAdjustmentOut.String()
-		if route.SourceTable == "adjustment_stocks" && strings.TrimSpace(route.LegacyTypeKey) != "" {
-			usableType = strings.TrimSpace(route.LegacyTypeKey)
-		}
-
-		activeAllocationCount, err := countActiveAllocations(ctx, db, usableType, adj.ID)
+		activeAllocationCount, err := countActiveAllocations(ctx, db, fifo.UsableKeyAdjustmentOut.String(), adj.ID)
 		if err != nil {
 			fmt.Printf("FAIL adj=%d error=count allocations: %v\n", adj.ID, err)
 			failed++
@@ -142,13 +137,7 @@ func main() {
 		reflowReq := commonSvc.FifoStockV2ReflowRequest{
 			FlagGroupCode:      route.FlagGroupCode,
 			ProductWarehouseID: adj.ProductWarehouseID,
-			Usable: commonSvc.FifoStockV2Ref{
-				ID:            adj.ID,
-				LegacyTypeKey: usableType,
-				FunctionCode:  route.FunctionCode,
-			},
-			DesiredQty:     desiredQty,
-			IdempotencyKey: fmt.Sprintf("manual-adjustment-reflow-%d-%d", adj.ID, time.Now().UnixNano()),
+			IdempotencyKey:     fmt.Sprintf("manual-adjustment-reflow-%d-%d", adj.ID, time.Now().UnixNano()),
 		}
 		if asOfCreatedAt {
 			asOf := adj.CreatedAt
@@ -335,6 +324,7 @@ func countActiveAllocations(ctx context.Context, db *gorm.DB, usableType string,
 		Table("stock_allocations").
 		Where("usable_type = ? AND usable_id = ?", usableType, usableID).
 		Where("status = ?", entity.StockAllocationStatusActive).
+		Where("allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		Count(&count).Error
 	if err != nil {
 		return 0, err

cmd/reflow-project-flock-kandang/main.go

@@ -0,0 +1,648 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+	"math"
+	"os"
+	"sort"
+	"strings"
+	"time"
+
+	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	"gitlab.com/mbugroup/lti-api.git/internal/config"
+	"gitlab.com/mbugroup/lti-api.git/internal/database"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
+	"gorm.io/gorm"
+)
+
+type productWarehouseScopeRow struct {
+	ProductWarehouseID    uint  `gorm:"column:product_warehouse_id"`
+	ProductID             uint  `gorm:"column:product_id"`
+	WarehouseID           uint  `gorm:"column:warehouse_id"`
+	ProjectFlockKandangID *uint `gorm:"column:project_flock_kandang_id"`
+}
+
+type reflowTarget struct {
+	ProductWarehouseID    uint
+	ProductID             uint
+	WarehouseID           uint
+	ProjectFlockKandangID *uint
+	FlagGroupCode         string
+}
+
+func main() {
+	var (
+		projectFlockKandangID uint
+		apply                 bool
+		asOfRaw               string
+		includeShared         bool
+	)
+
+	flag.UintVar(&projectFlockKandangID, "project-flock-kandang-id", 0, "Project flock kandang ID (required)")
+	flag.BoolVar(&apply, "apply", false, "Apply reflow. If false, run as dry-run")
+	flag.StringVar(&asOfRaw, "as-of", "", "Optional AsOf boundary. Format: RFC3339 or YYYY-MM-DD")
+	flag.BoolVar(&includeShared, "include-shared", true, "Include product warehouses referenced by transactions in this PFK scope (including shared/non-bound product warehouses)")
+	flag.Parse()
+
+	if projectFlockKandangID == 0 {
+		log.Fatal("--project-flock-kandang-id is required")
+	}
+
+	asOf, err := parseAsOf(asOfRaw)
+	if err != nil {
+		log.Fatalf("invalid --as-of: %v", err)
+	}
+
+	ctx := context.Background()
+	db := database.Connect(config.DBHost, config.DBName)
+	fifoStockV2Svc := commonSvc.NewFifoStockV2Service(db, nil)
+
+	exists, err := projectFlockKandangExists(ctx, db, projectFlockKandangID)
+	if err != nil {
+		log.Fatalf("failed to check project flock kandang: %v", err)
+	}
+	if !exists {
+		log.Fatalf("project_flock_kandang_id %d not found", projectFlockKandangID)
+	}
+
+	scopedPWs, err := loadScopedProductWarehouses(ctx, db, projectFlockKandangID, includeShared)
+	if err != nil {
+		log.Fatalf("failed to load scoped product warehouses: %v", err)
+	}
+	if len(scopedPWs) == 0 {
+		fmt.Printf("Mode: %s\n", modeLabel(apply))
+		fmt.Printf("Scope: project_flock_kandang_id=%d\n", projectFlockKandangID)
+		fmt.Println("No product warehouse found in scope")
+		return
+	}
+
+	targets := make([]reflowTarget, 0, len(scopedPWs))
+	skippedPW := 0
+	failedResolve := 0
+
+	for _, pw := range scopedPWs {
+		flagGroups, err := resolveFlagGroupsByProductWarehouse(ctx, db, pw.ProductWarehouseID)
+		if err != nil {
+			fmt.Printf("FAIL pw=%d error=resolve flag groups: %v\n", pw.ProductWarehouseID, err)
+			failedResolve++
+			continue
+		}
+		if len(flagGroups) == 0 {
+			fmt.Printf("SKIP pw=%d reason=no active fifo v2 route by product flag\n", pw.ProductWarehouseID)
+			skippedPW++
+			continue
+		}
+		for _, group := range flagGroups {
+			targets = append(targets, reflowTarget{
+				ProductWarehouseID:    pw.ProductWarehouseID,
+				ProductID:             pw.ProductID,
+				WarehouseID:           pw.WarehouseID,
+				ProjectFlockKandangID: pw.ProjectFlockKandangID,
+				FlagGroupCode:         group,
+			})
+		}
+	}
+
+	sort.Slice(targets, func(i, j int) bool {
+		if targets[i].ProductWarehouseID == targets[j].ProductWarehouseID {
+			return targets[i].FlagGroupCode < targets[j].FlagGroupCode
+		}
+		return targets[i].ProductWarehouseID < targets[j].ProductWarehouseID
+	})
+
+	fmt.Printf("Mode: %s\n", modeLabel(apply))
+	fmt.Printf("Scope: project_flock_kandang_id=%d include_shared=%t\n", projectFlockKandangID, includeShared)
+	if asOf != nil {
+		fmt.Printf("AsOf: %s\n", asOf.UTC().Format(time.RFC3339))
+	} else {
+		fmt.Println("AsOf: <nil> (full timeline)")
+	}
+	fmt.Printf("Product warehouses in scope: %d\n", len(scopedPWs))
+	fmt.Printf("Planned reflow targets: %d\n\n", len(targets))
+
+	for _, target := range targets {
+		fmt.Printf(
+			"PLAN pw=%d product=%d warehouse=%d pw_pfk=%s flag_group=%s\n",
+			target.ProductWarehouseID,
+			target.ProductID,
+			target.WarehouseID,
+			displayOptionalUint(target.ProjectFlockKandangID),
+			target.FlagGroupCode,
+		)
+	}
+
+	if !apply {
+		fmt.Println()
+		fmt.Printf("Summary: planned=%d skipped_pw=%d failed_resolve=%d applied=0 failed_apply=0\n", len(targets), skippedPW, failedResolve)
+		if failedResolve > 0 {
+			os.Exit(1)
+		}
+		return
+	}
+
+	successApply := 0
+	failedApply := 0
+	for idx, target := range targets {
+		req := commonSvc.FifoStockV2ReflowRequest{
+			FlagGroupCode:      target.FlagGroupCode,
+			ProductWarehouseID: target.ProductWarehouseID,
+			AsOf:               asOf,
+			IdempotencyKey: fmt.Sprintf(
+				"manual-pfk-reflow-%d-%d-%s-%d-%d",
+				projectFlockKandangID,
+				target.ProductWarehouseID,
+				strings.ToUpper(strings.TrimSpace(target.FlagGroupCode)),
+				time.Now().UnixNano(),
+				idx,
+			),
+		}
+
+		res, err := fifoStockV2Svc.Reflow(ctx, req)
+		if err != nil {
+			fmt.Printf("FAIL pw=%d flag_group=%s error=%v\n", target.ProductWarehouseID, target.FlagGroupCode, err)
+			failedApply++
+			continue
+		}
+
+		fmt.Printf(
+			"DONE pw=%d flag_group=%s rollback=%.3f allocate=%.3f pending=%.3f processed_usable=%d\n",
+			target.ProductWarehouseID,
+			target.FlagGroupCode,
+			res.Rollback.ReleasedQty,
+			res.Allocate.AllocatedQty,
+			res.Allocate.PendingQty,
+			res.ProcessedUsables,
+		)
+		successApply++
+	}
+
+	orphanPopulationRows := int64(0)
+	syncedPopulationQtyRows := int64(0)
+	syncedPopulationUsedRows := int64(0)
+	traceReleasedRows := int64(0)
+	traceInsertedRows := int64(0)
+	if rowsOrphan, rowsQty, rowsUsed, err := resyncProjectFlockPopulation(ctx, db, projectFlockKandangID); err != nil {
+		fmt.Printf("FAIL population_resync project_flock_kandang_id=%d error=%v\n", projectFlockKandangID, err)
+		failedApply++
+	} else {
+		orphanPopulationRows = rowsOrphan
+		syncedPopulationQtyRows = rowsQty
+		syncedPopulationUsedRows = rowsUsed
+		fmt.Printf(
+			"SYNC project_flock_populations orphan_marked=%d qty_synced=%d used_synced=%d\n",
+			orphanPopulationRows,
+			syncedPopulationQtyRows,
+			syncedPopulationUsedRows,
+		)
+	}
+
+	if released, inserted, err := resyncChickinTraceByProjectFlockKandang(ctx, db, fifoStockV2Svc, projectFlockKandangID); err != nil {
+		fmt.Printf("FAIL chickin_trace_resync project_flock_kandang_id=%d error=%v\n", projectFlockKandangID, err)
+		failedApply++
+	} else {
+		traceReleasedRows = released
+		traceInsertedRows = inserted
+		fmt.Printf(
+			"SYNC chickin_trace released=%d inserted=%d\n",
+			traceReleasedRows,
+			traceInsertedRows,
+		)
+	}
+
+	fmt.Println()
+	fmt.Printf(
+		"Summary: planned=%d skipped_pw=%d failed_resolve=%d applied=%d failed_apply=%d population_orphan=%d population_qty_synced=%d population_used_synced=%d trace_released=%d trace_inserted=%d\n",
+		len(targets),
+		skippedPW,
+		failedResolve,
+		successApply,
+		failedApply,
+		orphanPopulationRows,
+		syncedPopulationQtyRows,
+		syncedPopulationUsedRows,
+		traceReleasedRows,
+		traceInsertedRows,
+	)
+	if failedResolve > 0 || failedApply > 0 {
+		os.Exit(1)
+	}
+}
+
+func parseAsOf(raw string) (*time.Time, error) {
+	raw = strings.TrimSpace(raw)
+	if raw == "" {
+		return nil, nil
+	}
+
+	layouts := []string{
+		time.RFC3339Nano,
+		time.RFC3339,
+		"2006-01-02 15:04:05",
+		"2006-01-02",
+	}
+
+	for _, layout := range layouts {
+		parsed, err := time.Parse(layout, raw)
+		if err != nil {
+			continue
+		}
+		if layout == "2006-01-02" {
+			endOfDay := time.Date(parsed.Year(), parsed.Month(), parsed.Day(), 23, 59, 59, int(time.Second-time.Nanosecond), time.UTC)
+			return &endOfDay, nil
+		}
+		asOf := parsed.UTC()
+		return &asOf, nil
+	}
+
+	return nil, fmt.Errorf("unsupported format %q", raw)
+}
+
+func modeLabel(apply bool) string {
+	if apply {
+		return "APPLY"
+	}
+	return "DRY-RUN"
+}
+
+func displayOptionalUint(v *uint) string {
+	if v == nil {
+		return "NULL"
+	}
+	return fmt.Sprintf("%d", *v)
+}
+
+func projectFlockKandangExists(ctx context.Context, db *gorm.DB, projectFlockKandangID uint) (bool, error) {
+	var count int64
+	err := db.WithContext(ctx).
+		Table("project_flock_kandangs").
+		Where("id = ?", projectFlockKandangID).
+		Count(&count).Error
+	if err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
+func loadScopedProductWarehouses(ctx context.Context, db *gorm.DB, projectFlockKandangID uint, includeShared bool) ([]productWarehouseScopeRow, error) {
+	if !includeShared {
+		var rows []productWarehouseScopeRow
+		err := db.WithContext(ctx).
+			Table("product_warehouses").
+			Select("id AS product_warehouse_id, product_id, warehouse_id, project_flock_kandang_id").
+			Where("project_flock_kandang_id = ?", projectFlockKandangID).
+			Order("id ASC").
+			Scan(&rows).Error
+		if err != nil {
+			return nil, err
+		}
+		return rows, nil
+	}
+
+	query := `
+		WITH scoped_pw AS (
+			SELECT pw.id AS product_warehouse_id
+			FROM product_warehouses pw
+			WHERE pw.project_flock_kandang_id = ?
+
+			UNION
+			SELECT pc.product_warehouse_id
+			FROM project_chickins pc
+			WHERE pc.project_flock_kandang_id = ?
+				AND pc.deleted_at IS NULL
+
+			UNION
+			SELECT rs.product_warehouse_id
+			FROM recordings r
+			JOIN recording_stocks rs ON rs.recording_id = r.id
+			WHERE r.project_flock_kandangs_id = ?
+				AND r.deleted_at IS NULL
+
+			UNION
+			SELECT rd.product_warehouse_id
+			FROM recordings r
+			JOIN recording_depletions rd ON rd.recording_id = r.id
+			WHERE r.project_flock_kandangs_id = ?
+				AND r.deleted_at IS NULL
+
+			UNION
+			SELECT rd.source_product_warehouse_id
+			FROM recordings r
+			JOIN recording_depletions rd ON rd.recording_id = r.id
+			WHERE r.project_flock_kandangs_id = ?
+				AND r.deleted_at IS NULL
+				AND rd.source_product_warehouse_id IS NOT NULL
+
+			UNION
+			SELECT re.product_warehouse_id
+			FROM recordings r
+			JOIN recording_eggs re ON re.recording_id = r.id
+			WHERE r.project_flock_kandangs_id = ?
+				AND r.deleted_at IS NULL
+
+			UNION
+			SELECT lts.product_warehouse_id
+			FROM laying_transfer_sources lts
+			WHERE lts.source_project_flock_kandang_id = ?
+				AND lts.deleted_at IS NULL
+				AND lts.product_warehouse_id IS NOT NULL
+
+			UNION
+			SELECT ltt.product_warehouse_id
+			FROM laying_transfer_targets ltt
+			WHERE ltt.target_project_flock_kandang_id = ?
+				AND ltt.deleted_at IS NULL
+				AND ltt.product_warehouse_id IS NOT NULL
+
+			UNION
+			SELECT pi.product_warehouse_id
+			FROM purchase_items pi
+			WHERE pi.project_flock_kandang_id = ?
+				AND pi.product_warehouse_id IS NOT NULL
+		)
+		SELECT DISTINCT
+			pw.id AS product_warehouse_id,
+			pw.product_id,
+			pw.warehouse_id,
+			pw.project_flock_kandang_id
+		FROM scoped_pw s
+		JOIN product_warehouses pw ON pw.id = s.product_warehouse_id
+		ORDER BY pw.id ASC
+	`
+
+	var rows []productWarehouseScopeRow
+	err := db.WithContext(ctx).
+		Raw(
+			query,
+			projectFlockKandangID,
+			projectFlockKandangID,
+			projectFlockKandangID,
+			projectFlockKandangID,
+			projectFlockKandangID,
+			projectFlockKandangID,
+			projectFlockKandangID,
+			projectFlockKandangID,
+			projectFlockKandangID,
+		).
+		Scan(&rows).Error
+	if err != nil {
+		return nil, err
+	}
+	return rows, nil
+}
+
+func resolveFlagGroupsByProductWarehouse(ctx context.Context, db *gorm.DB, productWarehouseID uint) ([]string, error) {
+	var groups []string
+	err := db.WithContext(ctx).
+		Table("fifo_stock_v2_route_rules rr").
+		Select("DISTINCT rr.flag_group_code").
+		Joins("JOIN fifo_stock_v2_flag_groups fg ON fg.code = rr.flag_group_code AND fg.is_active = TRUE").
+		Where("rr.is_active = TRUE").
+		Where(`
+			EXISTS (
+				SELECT 1
+				FROM product_warehouses pw
+				JOIN flags f ON f.flagable_id = pw.product_id
+				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
+				WHERE pw.id = ?
+					AND f.flagable_type = ?
+					AND fm.flag_group_code = rr.flag_group_code
+			)
+		`, productWarehouseID, entity.FlagableTypeProduct).
+		Order("rr.flag_group_code ASC").
+		Scan(&groups).Error
+	if err != nil {
+		return nil, err
+	}
+	return groups, nil
+}
+
+func resyncProjectFlockPopulation(ctx context.Context, db *gorm.DB, projectFlockKandangID uint) (int64, int64, int64, error) {
+	if projectFlockKandangID == 0 {
+		return 0, 0, 0, nil
+	}
+
+	orphanResult := db.WithContext(ctx).Exec(`
+		UPDATE project_flock_populations pfp
+		SET deleted_at = NOW(),
+			updated_at = NOW()
+		FROM project_chickins pc
+		WHERE pfp.project_chickin_id = pc.id
+		  AND pc.project_flock_kandang_id = ?
+		  AND pc.deleted_at IS NOT NULL
+		  AND pfp.deleted_at IS NULL
+	`, projectFlockKandangID)
+	if orphanResult.Error != nil {
+		return 0, 0, 0, orphanResult.Error
+	}
+
+	qtyResult := db.WithContext(ctx).Exec(`
+		UPDATE project_flock_populations p
+		SET total_qty = GREATEST(COALESCE(pc.usage_qty, 0), 0),
+			updated_at = NOW()
+		FROM project_chickins pc
+		WHERE p.project_chickin_id = pc.id
+		  AND pc.project_flock_kandang_id = ?
+		  AND pc.deleted_at IS NULL
+		  AND p.deleted_at IS NULL
+	`, projectFlockKandangID)
+	if qtyResult.Error != nil {
+		return 0, 0, 0, qtyResult.Error
+	}
+
+	usedResult := db.WithContext(ctx).Exec(`
+		WITH scoped AS (
+			SELECT pfp.id, pfp.total_qty
+			FROM project_flock_populations pfp
+			JOIN project_chickins pc ON pc.id = pfp.project_chickin_id
+			WHERE pc.project_flock_kandang_id = ?
+			  AND pc.deleted_at IS NULL
+			  AND pfp.deleted_at IS NULL
+		),
+		alloc AS (
+			SELECT sa.stockable_id, SUM(sa.qty) AS used_qty
+			FROM stock_allocations sa
+			WHERE sa.stockable_type = 'PROJECT_FLOCK_POPULATION'
+			  AND sa.status = 'ACTIVE'
+				  AND sa.allocation_purpose = 'CONSUME'
+				GROUP BY sa.stockable_id
+			)
+		UPDATE project_flock_populations p
+		SET total_used_qty = LEAST(COALESCE(a.used_qty, 0), GREATEST(s.total_qty, 0)),
+			updated_at = NOW()
+		FROM scoped s
+		LEFT JOIN alloc a ON a.stockable_id = s.id
+		WHERE p.id = s.id
+	`, projectFlockKandangID)
+	if usedResult.Error != nil {
+		return 0, 0, 0, usedResult.Error
+	}
+
+	return orphanResult.RowsAffected, qtyResult.RowsAffected, usedResult.RowsAffected, nil
+}
+func resyncChickinTraceByProjectFlockKandang(
+	ctx context.Context,
+	db *gorm.DB,
+	fifoStockV2Svc commonSvc.FifoStockV2Service,
+	projectFlockKandangID uint,
+) (int64, int64, error) {
+	if projectFlockKandangID == 0 {
+		return 0, 0, nil
+	}
+
+	var productWarehouseIDs []uint
+	if err := db.WithContext(ctx).
+		Table("project_chickins").
+		Distinct("product_warehouse_id").
+		Where("project_flock_kandang_id = ?", projectFlockKandangID).
+		Where("deleted_at IS NULL").
+		Order("product_warehouse_id ASC").
+		Pluck("product_warehouse_id", &productWarehouseIDs).Error; err != nil {
+		return 0, 0, err
+	}
+	if len(productWarehouseIDs) == 0 {
+		return 0, 0, nil
+	}
+
+	totalReleased := int64(0)
+	totalInserted := int64(0)
+
+	for _, productWarehouseID := range productWarehouseIDs {
+		var releasedRows int64
+		var insertedRows int64
+
+		err := db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+			flagGroups, err := resolveFlagGroupsByProductWarehouse(ctx, tx, productWarehouseID)
+			if err != nil {
+				return err
+			}
+			if len(flagGroups) == 0 {
+				return nil
+			}
+			flagGroupCode := strings.TrimSpace(flagGroups[0])
+			if flagGroupCode == "" {
+				return nil
+			}
+
+			released := tx.WithContext(ctx).
+				Table("stock_allocations").
+				Where("product_warehouse_id = ?", productWarehouseID).
+				Where("usable_type = ?", fifo.UsableKeyProjectChickin.String()).
+				Where("allocation_purpose = ?", entity.StockAllocationPurposeTraceChickin).
+				Where("status = ?", entity.StockAllocationStatusActive).
+				Updates(map[string]any{
+					"status":      entity.StockAllocationStatusReleased,
+					"released_at": time.Now(),
+					"updated_at":  time.Now(),
+					"note":        "chickin_trace_reflow_reset",
+				})
+			if released.Error != nil {
+				return released.Error
+			}
+			releasedRows = released.RowsAffected
+
+			type chickinRow struct {
+				ID       uint      `gorm:"column:id"`
+				UsageQty float64   `gorm:"column:usage_qty"`
+				ChickIn  time.Time `gorm:"column:chick_in_date"`
+			}
+			chickins := make([]chickinRow, 0)
+			if err := tx.WithContext(ctx).
+				Table("project_chickins").
+				Select("id, usage_qty, chick_in_date").
+				Where("product_warehouse_id = ?", productWarehouseID).
+				Where("deleted_at IS NULL").
+				Where("usage_qty > 0").
+				Order("chick_in_date ASC, id ASC").
+				Scan(&chickins).Error; err != nil {
+				return err
+			}
+			if len(chickins) == 0 {
+				return nil
+			}
+
+			gatherRows, err := fifoStockV2Svc.Gather(ctx, commonSvc.FifoStockV2GatherRequest{
+				FlagGroupCode:      flagGroupCode,
+				Lane:               "STOCKABLE",
+				AllocationPurpose:  entity.StockAllocationPurposeTraceChickin,
+				IgnoreSourceUsed:   true,
+				ProductWarehouseID: productWarehouseID,
+				Limit:              50000,
+				Tx:                 tx,
+			})
+			if err != nil {
+				return err
+			}
+			if len(gatherRows) == 0 {
+				return nil
+			}
+
+			type lotKey struct {
+				StockableType string
+				StockableID   uint
+			}
+			remainingByLot := make(map[lotKey]float64, len(gatherRows))
+			for _, row := range gatherRows {
+				key := lotKey{StockableType: row.Ref.LegacyTypeKey, StockableID: row.Ref.ID}
+				remainingByLot[key] = row.AvailableQuantity
+			}
+
+			now := time.Now()
+			lotIndex := 0
+			for _, chickinRow := range chickins {
+				remaining := chickinRow.UsageQty
+				for remaining > 1e-6 && lotIndex < len(gatherRows) {
+					lot := gatherRows[lotIndex]
+					key := lotKey{StockableType: lot.Ref.LegacyTypeKey, StockableID: lot.Ref.ID}
+					available := remainingByLot[key]
+					if available <= 1e-6 {
+						lotIndex++
+						continue
+					}
+
+					portion := math.Min(remaining, available)
+					if portion <= 1e-6 {
+						lotIndex++
+						continue
+					}
+
+					insert := map[string]any{
+						"product_warehouse_id": productWarehouseID,
+						"stockable_type":       lot.Ref.LegacyTypeKey,
+						"stockable_id":         lot.Ref.ID,
+						"usable_type":          fifo.UsableKeyProjectChickin.String(),
+						"usable_id":            chickinRow.ID,
+						"qty":                  portion,
+						"status":               entity.StockAllocationStatusActive,
+						"allocation_purpose":   entity.StockAllocationPurposeTraceChickin,
+						"engine_version":       "v2",
+						"flag_group_code":      flagGroupCode,
+						"function_code":        "CHICKIN_TRACE",
+						"created_at":           now,
+						"updated_at":           now,
+					}
+					if err := tx.WithContext(ctx).Table("stock_allocations").Create(insert).Error; err != nil {
+						return err
+					}
+
+					insertedRows++
+					remaining -= portion
+					remainingByLot[key] = available - portion
+				}
+			}
+
+			return nil
+		})
+		if err != nil {
+			return totalReleased, totalInserted, err
+		}
+
+		totalReleased += releasedRows
+		totalInserted += insertedRows
+	}
+
+	return totalReleased, totalInserted, nil
+}

cmd/validate-chickin-trace/main.go

@@ -0,0 +1,122 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+	"math"
+	"os"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/config"
+	"gitlab.com/mbugroup/lti-api.git/internal/database"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
+	"gorm.io/gorm"
+)
+
+type mismatchRow struct {
+	ChickinID           uint    `gorm:"column:chickin_id"`
+	ProjectFlockKandang uint    `gorm:"column:project_flock_kandang_id"`
+	ProductWarehouseID  uint    `gorm:"column:product_warehouse_id"`
+	UsageQty            float64 `gorm:"column:usage_qty"`
+	TraceQty            float64 `gorm:"column:trace_qty"`
+}
+
+func main() {
+	var projectFlockKandangID uint
+	flag.UintVar(&projectFlockKandangID, "project-flock-kandang-id", 0, "Optional project flock kandang scope")
+	flag.Parse()
+
+	ctx := context.Background()
+	db := database.Connect(config.DBHost, config.DBName)
+
+	rows, err := loadTraceMismatches(ctx, db, projectFlockKandangID)
+	if err != nil {
+		log.Fatalf("failed to load trace mismatches: %v", err)
+	}
+
+	activeConsumeRows, err := countActiveConsumeProjectChickin(ctx, db, projectFlockKandangID)
+	if err != nil {
+		log.Fatalf("failed to count active consume rows: %v", err)
+	}
+
+	fmt.Printf("Scope project_flock_kandang_id=%d\n", projectFlockKandangID)
+	fmt.Printf("Mismatched chickin trace rows: %d\n", len(rows))
+	fmt.Printf("Active PROJECT_CHICKIN consume rows: %d\n", activeConsumeRows)
+
+	if len(rows) > 0 {
+		for _, row := range rows {
+			fmt.Printf(
+				"MISMATCH chickin_id=%d pfk=%d pw=%d usage=%.3f trace=%.3f diff=%.3f\n",
+				row.ChickinID,
+				row.ProjectFlockKandang,
+				row.ProductWarehouseID,
+				row.UsageQty,
+				row.TraceQty,
+				row.TraceQty-row.UsageQty,
+			)
+		}
+	}
+
+	if len(rows) > 0 || activeConsumeRows > 0 {
+		os.Exit(1)
+	}
+}
+
+func loadTraceMismatches(ctx context.Context, db *gorm.DB, projectFlockKandangID uint) ([]mismatchRow, error) {
+	query := db.WithContext(ctx).
+		Table("project_chickins pc").
+		Select(`
+			pc.id AS chickin_id,
+			pc.project_flock_kandang_id,
+			pc.product_warehouse_id,
+			COALESCE(pc.usage_qty, 0) AS usage_qty,
+			COALESCE(SUM(sa.qty), 0) AS trace_qty
+		`).
+		Joins(`
+			LEFT JOIN stock_allocations sa
+				ON sa.usable_type = ?
+				AND sa.usable_id = pc.id
+				AND sa.status = 'ACTIVE'
+				AND sa.allocation_purpose = 'TRACE_CHICKIN'
+		`, fifo.UsableKeyProjectChickin.String()).
+		Where("pc.deleted_at IS NULL").
+		Where("COALESCE(pc.usage_qty,0) > 0").
+		Group("pc.id, pc.project_flock_kandang_id, pc.product_warehouse_id, pc.usage_qty")
+
+	if projectFlockKandangID > 0 {
+		query = query.Where("pc.project_flock_kandang_id = ?", projectFlockKandangID)
+	}
+
+	rows := make([]mismatchRow, 0)
+	if err := query.Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	out := make([]mismatchRow, 0, len(rows))
+	for _, row := range rows {
+		if math.Abs(row.TraceQty-row.UsageQty) > 1e-3 {
+			out = append(out, row)
+		}
+	}
+	return out, nil
+}
+
+func countActiveConsumeProjectChickin(ctx context.Context, db *gorm.DB, projectFlockKandangID uint) (int64, error) {
+	q := db.WithContext(ctx).
+		Table("stock_allocations sa").
+		Joins("JOIN project_chickins pc ON pc.id = sa.usable_id").
+		Where("sa.usable_type = ?", fifo.UsableKeyProjectChickin.String()).
+		Where("sa.status = 'ACTIVE'").
+		Where("sa.allocation_purpose = 'CONSUME'")
+
+	if projectFlockKandangID > 0 {
+		q = q.Where("pc.project_flock_kandang_id = ?", projectFlockKandangID)
+	}
+
+	var count int64
+	if err := q.Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}

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

@@ -51,8 +51,8 @@ func (r *HppRepositoryImpl) GetDocCost(ctx context.Context, projectFlockKandangI
 	var total float64
 	err := r.db.WithContext(ctx).
 		Table("project_chickins AS pc").
-		Select("COALESCE(SUM(pc.usage_qty * COALESCE(pi.price, 0)), 0)").
-		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = pc.id AND sa.stockable_type = ?", fifo.UsableKeyProjectChickin.String(), fifo.StockableKeyPurchaseItems.String()).
+		Select("COALESCE(SUM(sa.qty * COALESCE(pi.price, 0)), 0)").
+		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = pc.id AND sa.stockable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?", fifo.UsableKeyProjectChickin.String(), fifo.StockableKeyPurchaseItems.String(), entity.StockAllocationStatusActive, entity.StockAllocationPurposeTraceChickin).
 		Joins("JOIN purchase_items AS pi ON pi.id = sa.stockable_id").
 		Where("pc.project_flock_kandang_id IN (?)", projectFlockKandangIDs).
 		Scan(&total).Error
@@ -103,11 +103,11 @@ func (r *HppRepositoryImpl) GetFeedUsageCost(ctx context.Context, projectFlockKa
 	var total float64
 	err := r.db.WithContext(ctx).
 		Table("recordings AS r").
-		Select("COALESCE(SUM(rs.usage_qty * COALESCE(pi.price, 0)), 0)").
+		Select("COALESCE(SUM(sa.qty * COALESCE(pi.price, 0)), 0)").
 		Joins("JOIN recording_stocks AS rs ON rs.recording_id = r.id").
 		Joins("JOIN product_warehouses AS pw ON pw.id = rs.product_warehouse_id").
 		Joins("JOIN flags AS f ON f.flagable_id = pw.product_id AND f.flagable_type = ?", entity.FlagableTypeProduct).
-		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND sa.stockable_type = ?", fifo.UsableKeyRecordingStock.String(), fifo.StockableKeyPurchaseItems.String()).
+		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND sa.stockable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?", fifo.UsableKeyRecordingStock.String(), fifo.StockableKeyPurchaseItems.String(), entity.StockAllocationStatusActive, entity.StockAllocationPurposeConsume).
 		Joins("JOIN purchase_items AS pi ON pi.id = sa.stockable_id").
 		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
 		Where("r.record_datetime <= ?", *date).
@@ -136,10 +136,10 @@ func (r *HppRepositoryImpl) GetOvkUsageCost(ctx context.Context, projectFlockKan
 	var total float64
 	err := r.db.WithContext(ctx).
 		Table("recordings AS r").
-		Select("COALESCE(SUM(rs.usage_qty * COALESCE(pi.price, 0)), 0)").
+		Select("COALESCE(SUM(sa.qty * COALESCE(pi.price, 0)), 0)").
 		Joins("JOIN recording_stocks AS rs ON rs.recording_id = r.id").
 		Joins("JOIN product_warehouses AS pw ON pw.id = rs.product_warehouse_id").
-		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND sa.stockable_type = ?", fifo.UsableKeyRecordingStock.String(), fifo.StockableKeyPurchaseItems.String()).
+		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND sa.stockable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?", fifo.UsableKeyRecordingStock.String(), fifo.StockableKeyPurchaseItems.String(), entity.StockAllocationStatusActive, entity.StockAllocationPurposeConsume).
 		Joins("JOIN purchase_items AS pi ON pi.id = sa.stockable_id").
 		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
 		Where("r.record_datetime <= ?", *date).
@@ -175,15 +175,15 @@ func (r *HppRepositoryImpl) GetPulletCost(ctx context.Context, projectFlockKanda
 	err := r.db.WithContext(ctx).
 		Table("project_chickins AS pc").
 		Select(`
-			COALESCE(SUM(pc.usage_qty * CASE
+			COALESCE(SUM(sa.qty * CASE
 				WHEN sa.stockable_type = ? THEN COALESCE(pi.price, 0)
 				WHEN sa.stockable_type = ? THEN COALESCE(tpi.price, 0)
 				ELSE 0
 			END), 0)`,
 			stockablePurchase, stockableTransferIn).
-		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = pc.id", usableProjectChickin).
+		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = pc.id AND sa.status = ? AND sa.allocation_purpose = ?", usableProjectChickin, entity.StockAllocationStatusActive, entity.StockAllocationPurposeTraceChickin).
 		Joins("LEFT JOIN purchase_items AS pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", stockablePurchase).
-		Joins("LEFT JOIN stock_allocations AS tsa ON tsa.usable_type = ? AND tsa.usable_id = sa.stockable_id AND sa.stockable_type = ? AND tsa.stockable_type = ?", stockableTransferIn, stockableTransferIn, stockablePurchase).
+		Joins("LEFT JOIN stock_allocations AS tsa ON tsa.usable_type = ? AND tsa.usable_id = sa.stockable_id AND sa.stockable_type = ? AND tsa.stockable_type = ? AND tsa.status = ? AND tsa.allocation_purpose = ?", stockableTransferIn, stockableTransferIn, stockablePurchase, entity.StockAllocationStatusActive, entity.StockAllocationPurposeConsume).
 		Joins("LEFT JOIN purchase_items AS tpi ON tpi.id = tsa.stockable_id").
 		Where("pc.project_flock_kandang_id = ?", projectFlockKandangId).
 		Scan(&total).Error
@@ -245,9 +245,11 @@ func (r *HppRepositoryImpl) GetEggTerjualPiecesAndWeightKgByProjectFlockKandangI
 		`).
 		Joins("JOIN recording_eggs re ON re.recording_id = r.id").
 		Joins(
-			"JOIN stock_allocations sa ON sa.stockable_type = ? AND sa.stockable_id = re.id AND sa.usable_type = ?",
+			"JOIN stock_allocations sa ON sa.stockable_type = ? AND sa.stockable_id = re.id AND sa.usable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?",
 			fifo.StockableKeyRecordingEgg.String(),
 			fifo.UsableKeyMarketingDelivery.String(),
+			entity.StockAllocationStatusActive,
+			entity.StockAllocationPurposeConsume,
 		).
 		Joins("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id").
 		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).

internal/common/repository/common.stock_allocation.repository.go

@@ -33,7 +33,7 @@ func (r *StockAllocationRepositoryImpl) FindActiveByUsable(
 	var allocations []entity.StockAllocation
 
 	q := r.DB().WithContext(ctx).
-		Where("usable_type = ? AND usable_id = ? AND status = ?", usableType, usableID, entity.StockAllocationStatusActive)
+		Where("usable_type = ? AND usable_id = ? AND status = ? AND allocation_purpose = ?", usableType, usableID, entity.StockAllocationStatusActive, entity.StockAllocationPurposeConsume)
 
 	if modifier != nil {
 		q = modifier(q)
@@ -70,7 +70,7 @@ func (r *StockAllocationRepositoryImpl) ReleaseByUsable(
 
 	q := baseDB.WithContext(ctx).
 		Model(&entity.StockAllocation{}).
-		Where("usable_type = ? AND usable_id = ? AND status = ?", usableType, usableID, entity.StockAllocationStatusActive)
+		Where("usable_type = ? AND usable_id = ? AND status = ? AND allocation_purpose = ?", usableType, usableID, entity.StockAllocationStatusActive, entity.StockAllocationPurposeConsume)
 
 	return q.Updates(updates).Error
 }

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

@@ -528,6 +528,7 @@ func (s *fifoService) allocateFromStock(
 			UsableType:         usableKey.String(),
 			UsableId:           usableID,
 			Qty:                portion,
+			AllocationPurpose:  entities.StockAllocationPurposeConsume,
 			Status:             entities.StockAllocationStatusActive,
 		})
 
@@ -890,22 +891,22 @@ func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, p
 				query = query.Order(order)
 			}
 
-		if err := query.Find(&rows).Error; err != nil {
-			return nil, err
-		}
-		for _, row := range rows {
-			if row.Pending <= 0 {
-				continue
+			if err := query.Find(&rows).Error; err != nil {
+				return nil, err
 			}
-			candidates = append(candidates, pendingCandidate{
-				UsableKey: key,
-				Config:    cfg,
-				UsableID:  row.ID,
-				Pending:   row.Pending,
-				CreatedAt: time.Unix(0, row.CreatedAt),
-			})
-		}
-	} else {
+			for _, row := range rows {
+				if row.Pending <= 0 {
+					continue
+				}
+				candidates = append(candidates, pendingCandidate{
+					UsableKey: key,
+					Config:    cfg,
+					UsableID:  row.ID,
+					Pending:   row.Pending,
+					CreatedAt: time.Unix(0, row.CreatedAt),
+				})
+			}
+		} else {
 			var rows []struct {
 				ID        uint
 				Pending   float64   `gorm:"column:pending_qty"`

internal/common/service/fifo_stock_v2/allocate.go

@@ -141,6 +141,9 @@ func (s *fifoStockV2Service) allocateInternal(ctx context.Context, tx *gorm.DB,
 		if remaining <= 0 {
 			break
 		}
+		if shouldSkipStockableForUsable(req, lot.Ref.LegacyTypeKey) {
+			continue
+		}
 		if lot.AvailableQuantity <= 0 {
 			continue
 		}
@@ -157,6 +160,7 @@ func (s *fifoStockV2Service) allocateInternal(ctx context.Context, tx *gorm.DB,
 			"usable_id":            req.Usable.ID,
 			"qty":                  portion,
 			"status":               activeAllocationStatus(),
+			"allocation_purpose":   defaultAllocationPurpose(),
 			"created_at":           now,
 			"updated_at":           now,
 			"engine_version":       "v2",
@@ -206,6 +210,20 @@ func (s *fifoStockV2Service) allocateInternal(ctx context.Context, tx *gorm.DB,
 	return result, nil
 }
 
+func shouldSkipStockableForUsable(req AllocateRequest, stockableType string) bool {
+	usableType := strings.ToUpper(strings.TrimSpace(req.Usable.LegacyTypeKey))
+	functionCode := strings.ToUpper(strings.TrimSpace(req.Usable.FunctionCode))
+	stockable := strings.ToUpper(strings.TrimSpace(stockableType))
+
+	// CHICKIN_OUT must consume physical stock sources, not population lots,
+	// otherwise approved chickin can consume its own just-created population.
+	if (usableType == "PROJECT_CHICKIN" || functionCode == "CHICKIN_OUT") && stockable == "PROJECT_FLOCK_POPULATION" {
+		return true
+	}
+
+	return false
+}
+
 func (s *fifoStockV2Service) Rollback(ctx context.Context, req RollbackRequest) (*RollbackResult, error) {
 	if err := s.validateRollbackRequest(req); err != nil {
 		return nil, err
@@ -401,12 +419,9 @@ func (s *fifoStockV2Service) rollbackInternal(
 }
 
 func (s *fifoStockV2Service) Reflow(ctx context.Context, req ReflowRequest) (*ReflowResult, error) {
-	if strings.TrimSpace(req.FlagGroupCode) == "" || req.ProductWarehouseID == 0 || req.Usable.ID == 0 || strings.TrimSpace(req.Usable.LegacyTypeKey) == "" {
+	if strings.TrimSpace(req.FlagGroupCode) == "" || req.ProductWarehouseID == 0 {
 		return nil, fmt.Errorf("%w: invalid reflow request", ErrInvalidRequest)
 	}
-	if req.DesiredQty < 0 {
-		return nil, fmt.Errorf("%w: desired qty must be >= 0", ErrInvalidRequest)
-	}
 
 	result := &ReflowResult{}
 	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
@@ -420,11 +435,7 @@ func (s *fifoStockV2Service) Reflow(ctx context.Context, req ReflowRequest) (*Re
 		hash := requestHash(map[string]any{
 			"flag_group_code":      req.FlagGroupCode,
 			"product_warehouse_id": req.ProductWarehouseID,
-			"usable_type":          req.Usable.LegacyTypeKey,
-			"usable_id":            req.Usable.ID,
-			"desired_qty":          req.DesiredQty,
 			"as_of":                req.AsOf,
-			"allow_over_consume":   req.AllowOverConsume,
 		})
 		logRow, reused, err := s.beginOperation(
 			tx,
@@ -433,8 +444,8 @@ func (s *fifoStockV2Service) Reflow(ctx context.Context, req ReflowRequest) (*Re
 			hash,
 			req.ProductWarehouseID,
 			req.FlagGroupCode,
-			req.Usable.LegacyTypeKey,
-			req.Usable.ID,
+			"",
+			0,
 		)
 		if err != nil {
 			return err
@@ -456,32 +467,77 @@ func (s *fifoStockV2Service) Reflow(ctx context.Context, req ReflowRequest) (*Re
 			}()
 		}
 
-		rollbackRes, rollbackErr := s.rollbackInternal(ctx, tx, RollbackRequest{
+		usableRows, gatherErr := s.gatherAllRows(ctx, tx, GatherRequest{
+			FlagGroupCode:      req.FlagGroupCode,
+			Lane:               LaneUsable,
 			ProductWarehouseID: req.ProductWarehouseID,
-			Usable:             req.Usable,
-			ReleaseQty:         nil,
-			Reason:             "reflow reset",
-		}, req.FlagGroupCode)
-		if rollbackErr != nil {
-			err = rollbackErr
-			return rollbackErr
+			Limit:              s.defaultGatherLimit,
+		})
+		if gatherErr != nil {
+			err = gatherErr
+			return gatherErr
 		}
-		result.Rollback = *rollbackRes
+		result.ProcessedUsables = len(usableRows)
 
-		if req.DesiredQty > 0 {
+		for _, usableRow := range usableRows {
+			desiredQty := usableRow.Quantity + usableRow.PendingQuantity
+
+			rollbackRes, rollbackErr := s.rollbackInternal(ctx, tx, RollbackRequest{
+				ProductWarehouseID: req.ProductWarehouseID,
+				Usable:             usableRow.Ref,
+				ReleaseQty:         nil,
+				Reason:             "reflow reset",
+			}, req.FlagGroupCode)
+			if rollbackErr != nil {
+				err = rollbackErr
+				return rollbackErr
+			}
+			result.Rollback.ReleasedQty += rollbackRes.ReleasedQty
+			if len(rollbackRes.Details) > 0 {
+				result.Rollback.Details = append(result.Rollback.Details, rollbackRes.Details...)
+			}
+			minDesired := rollbackRes.ReleasedQty + usableRow.PendingQuantity
+			if desiredQty < minDesired {
+				desiredQty = minDesired
+			}
+
+			if desiredQty <= 0 {
+				continue
+			}
 			allocateRes, allocateErr := s.allocateInternal(ctx, tx, AllocateRequest{
 				FlagGroupCode:      req.FlagGroupCode,
 				ProductWarehouseID: req.ProductWarehouseID,
-				Usable:             req.Usable,
-				NeedQty:            req.DesiredQty,
-				AllowOverConsume:   req.AllowOverConsume,
-				AsOf:               req.AsOf,
+				Usable:             usableRow.Ref,
+				NeedQty:            desiredQty,
+				AsOf:               nil,
 			})
 			if allocateErr != nil {
 				err = allocateErr
 				return allocateErr
 			}
-			result.Allocate = *allocateRes
+			result.Allocate.AllocatedQty += allocateRes.AllocatedQty
+			result.Allocate.PendingQty += allocateRes.PendingQty
+			if len(allocateRes.Details) > 0 {
+				result.Allocate.Details = append(result.Allocate.Details, allocateRes.Details...)
+			}
+		}
+
+		expectedQty, calcErr := s.calculateWarehouseAvailableForGroup(ctx, tx, req.ProductWarehouseID, req.FlagGroupCode, nil)
+		if calcErr != nil {
+			err = calcErr
+			return calcErr
+		}
+		actualQty, loadErr := s.loadWarehouseQty(ctx, tx, req.ProductWarehouseID)
+		if loadErr != nil {
+			err = loadErr
+			return loadErr
+		}
+		drift := expectedQty - actualQty
+		if math.Abs(drift) >= 1e-6 {
+			if adjustErr := s.adjustProductWarehouseQty(tx, req.ProductWarehouseID, drift); adjustErr != nil {
+				err = adjustErr
+				return adjustErr
+			}
 		}
 
 		if finishErr := s.finishOperation(tx, logRow, result); finishErr != nil {
@@ -496,6 +552,54 @@ func (s *fifoStockV2Service) Reflow(ctx context.Context, req ReflowRequest) (*Re
 	return result, nil
 }
 
+func (s *fifoStockV2Service) gatherAllRows(
+	ctx context.Context,
+	tx *gorm.DB,
+	req GatherRequest,
+) ([]GatherRow, error) {
+	limit := req.Limit
+	if limit <= 0 {
+		limit = s.defaultGatherLimit
+	}
+	if limit <= 0 {
+		limit = 1000
+	}
+
+	req.Limit = limit
+	out := make([]GatherRow, 0, limit)
+
+	var cursorSortAt *time.Time
+	cursorSourceTable := ""
+	var cursorSourceID uint
+
+	for {
+		req.AfterSortAt = cursorSortAt
+		req.AfterSourceTable = cursorSourceTable
+		req.AfterSourceID = cursorSourceID
+
+		rows, err := s.gatherRows(ctx, tx, req)
+		if err != nil {
+			return nil, err
+		}
+		if len(rows) == 0 {
+			break
+		}
+
+		out = append(out, rows...)
+		if len(rows) < limit {
+			break
+		}
+
+		last := rows[len(rows)-1]
+		lastSortAt := last.SortAt
+		cursorSortAt = &lastSortAt
+		cursorSourceTable = last.SourceTable
+		cursorSourceID = last.SourceID
+	}
+
+	return out, nil
+}
+
 func (s *fifoStockV2Service) loadActiveAllocations(
 	tx *gorm.DB,
 	usableType string,
@@ -504,7 +608,7 @@ func (s *fifoStockV2Service) loadActiveAllocations(
 ) ([]allocationRow, error) {
 	query := tx.Table("stock_allocations").
 		Select("id, product_warehouse_id, stockable_type, stockable_id, usable_type, usable_id, qty, status, created_at").
-		Where("usable_type = ? AND usable_id = ? AND status = ?", usableType, usableID, activeAllocationStatus())
+		Where("usable_type = ? AND usable_id = ? AND status = ? AND allocation_purpose = ?", usableType, usableID, activeAllocationStatus(), defaultAllocationPurpose())
 	if productWarehouseID > 0 {
 		query = query.Where("product_warehouse_id = ?", productWarehouseID)
 	}
@@ -603,6 +707,7 @@ func (s *fifoStockV2Service) resolveRollbackFlagGroup(ctx context.Context, tx *g
 		Select("flag_group_code").
 		Where("usable_type = ? AND usable_id = ?", req.Usable.LegacyTypeKey, req.Usable.ID).
 		Where("engine_version = 'v2'").
+		Where("allocation_purpose = ?", defaultAllocationPurpose()).
 		Where("flag_group_code IS NOT NULL AND flag_group_code <> ''").
 		Order("id DESC").
 		Limit(1).

internal/common/service/fifo_stock_v2/gather.go

@@ -48,6 +48,8 @@ func (s *fifoStockV2Service) Gather(ctx context.Context, req GatherRequest) ([]G
 }
 
 func (s *fifoStockV2Service) gatherRows(ctx context.Context, tx *gorm.DB, req GatherRequest) ([]GatherRow, error) {
+	req.AllocationPurpose = normalizeAllocationPurpose(req.AllocationPurpose)
+
 	rules, err := s.loadRouteRules(ctx, tx, req.FlagGroupCode, req.Lane)
 	if err != nil {
 		return nil, err
@@ -151,19 +153,29 @@ func (s *fifoStockV2Service) buildGatherSubquery(rule routeRule, trait traitRule
 	usedExpr := "0::numeric"
 	pendingExpr := "0::numeric"
 	availableExpr := baseQtyExpr
-	extraArgs := make([]any, 0, 1)
+	extraArgs := make([]any, 0, 2)
+	whereExtraArgs := make([]any, 0, 1)
 
 	if req.Lane == LaneStockable {
-		if rule.UsedQuantityCol != nil && strings.TrimSpace(*rule.UsedQuantityCol) != "" {
+		if !req.IgnoreSourceUsed && rule.UsedQuantityCol != nil && strings.TrimSpace(*rule.UsedQuantityCol) != "" {
 			usedCol, _ := mustSafeIdentifier(*rule.UsedQuantityCol)
 			usedExpr = fmt.Sprintf("COALESCE(src.%s,0)::numeric", usedCol)
 		} else {
+			// NOTE:
+			// usedExpr is referenced twice in the generated SELECT:
+			// 1) as used_quantity
+			// 2) inside available_quantity = base - usedExpr
+			// plus once in stockable WHERE clause via availableExpr > 0.
+			// We split the args because the WHERE placeholder order appears
+			// after product/flag filter placeholders in the final SQL.
 			usedExpr = fmt.Sprintf(
-				"(SELECT COALESCE(SUM(sa.qty),0)::numeric FROM stock_allocations sa WHERE sa.stockable_type = ? AND sa.stockable_id = src.%s AND sa.status = '%s')",
+				"(SELECT COALESCE(SUM(sa.qty),0)::numeric FROM stock_allocations sa WHERE sa.stockable_type = ? AND sa.stockable_id = src.%s AND sa.status = '%s' AND sa.allocation_purpose = ?)",
 				sourceIDCol,
 				activeAllocationStatus(),
 			)
-			extraArgs = append(extraArgs, rule.LegacyTypeKey)
+			extraArgs = append(extraArgs, rule.LegacyTypeKey, req.AllocationPurpose)
+			extraArgs = append(extraArgs, rule.LegacyTypeKey, req.AllocationPurpose)
+			whereExtraArgs = append(whereExtraArgs, rule.LegacyTypeKey, req.AllocationPurpose)
 		}
 		availableExpr = fmt.Sprintf("(%s - %s)", baseQtyExpr, usedExpr)
 	} else {
@@ -179,6 +191,12 @@ func (s *fifoStockV2Service) buildGatherSubquery(rule routeRule, trait traitRule
 		return "", nil, err
 	}
 
+	functionCodeExpr := "?::text"
+	functionCodeArgs := []any{rule.FunctionCode}
+	if rule.SourceTable == "adjustment_stocks" {
+		functionCodeExpr = "COALESCE(NULLIF(src.function_code,''), ?::text)"
+	}
+
 	whereParts := []string{
 		fmt.Sprintf("src.%s = ?", productWarehouseCol),
 		fmt.Sprintf(`EXISTS (
@@ -197,6 +215,9 @@ func (s *fifoStockV2Service) buildGatherSubquery(rule routeRule, trait traitRule
 	if req.AsOf != nil {
 		whereParts = append(whereParts, fmt.Sprintf("%s <= ?", sortExpr))
 	}
+	if req.From != nil {
+		whereParts = append(whereParts, fmt.Sprintf("%s >= ?", sortExpr))
+	}
 
 	if rule.ScopeSQL != nil && strings.TrimSpace(*rule.ScopeSQL) != "" {
 		whereParts = append(whereParts, fmt.Sprintf("(%s)", normalizeScopeSQL(*rule.ScopeSQL)))
@@ -206,7 +227,7 @@ func (s *fifoStockV2Service) buildGatherSubquery(rule routeRule, trait traitRule
 		SELECT
 			?::text AS source_table,
 			?::text AS legacy_type_key,
-			?::text AS function_code,
+			%s AS function_code,
 			src.%s AS source_id,
 			src.%s AS product_warehouse_id,
 			%s AS sort_at,
@@ -218,24 +239,28 @@ func (s *fifoStockV2Service) buildGatherSubquery(rule routeRule, trait traitRule
 		FROM %s src
 		%s
 		WHERE %s
-	`, sourceIDCol, productWarehouseCol, sortExpr, baseQtyExpr, usedExpr, pendingExpr, availableExpr, sourceTable, joinClause, strings.Join(whereParts, " AND "))
+	`, functionCodeExpr, sourceIDCol, productWarehouseCol, sortExpr, baseQtyExpr, usedExpr, pendingExpr, availableExpr, sourceTable, joinClause, strings.Join(whereParts, " AND "))
 
 	args := []any{
 		rule.SourceTable,
 		rule.LegacyTypeKey,
-		rule.FunctionCode,
-		trait.SortPriority,
 	}
+	args = append(args, functionCodeArgs...)
+	args = append(args, trait.SortPriority)
 	args = append(args, extraArgs...)
 	args = append(args,
 		req.ProductWarehouseID,
 		entity.FlagableTypeProduct,
 		req.FlagGroupCode,
 	)
+	args = append(args, whereExtraArgs...)
 
 	if req.AsOf != nil {
 		args = append(args, *req.AsOf)
 	}
+	if req.From != nil {
+		args = append(args, *req.From)
+	}
 
 	return subquery, args, nil
 }

internal/common/service/fifo_stock_v2/population_allocation.go

@@ -0,0 +1,131 @@
+package fifo_stock_v2
+
+import (
+	"context"
+	"errors"
+	"math"
+	"sort"
+
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
+
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+)
+
+func ReleasePopulationConsumptionByUsable(
+	ctx context.Context,
+	tx *gorm.DB,
+	usableType string,
+	usableID uint,
+) error {
+	if tx == nil {
+		return errors.New("transaction is required")
+	}
+	if usableType == "" || usableID == 0 {
+		return errors.New("usable type and id are required")
+	}
+
+	stockAllocationRepo := commonRepo.NewStockAllocationRepository(tx)
+	allocations, err := stockAllocationRepo.FindActiveByUsable(ctx, usableType, usableID, nil)
+	if err != nil {
+		return err
+	}
+
+	for _, allocation := range allocations {
+		if allocation.StockableType != fifo.StockableKeyProjectFlockPopulation.String() || allocation.StockableId == 0 || allocation.Qty <= 0 {
+			continue
+		}
+		if err := tx.WithContext(ctx).
+			Model(&entity.ProjectFlockPopulation{}).
+			Where("id = ?", allocation.StockableId).
+			Update("total_used_qty", gorm.Expr("GREATEST(total_used_qty - ?, 0)", allocation.Qty)).Error; err != nil {
+			return err
+		}
+	}
+
+	return stockAllocationRepo.ReleaseByUsable(ctx, usableType, usableID, nil, nil)
+}
+
+func AllocatePopulationConsumption(
+	ctx context.Context,
+	tx *gorm.DB,
+	populations []entity.ProjectFlockPopulation,
+	productWarehouseID uint,
+	usableType string,
+	usableID uint,
+	consumeQty float64,
+) error {
+	if consumeQty <= 0 {
+		return nil
+	}
+	if tx == nil {
+		return errors.New("transaction is required")
+	}
+	if productWarehouseID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Product warehouse tidak valid")
+	}
+	if usableType == "" || usableID == 0 {
+		return errors.New("usable type and id are required")
+	}
+	if len(populations) == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Populasi tidak ditemukan")
+	}
+
+	if err := ReleasePopulationConsumptionByUsable(ctx, tx, usableType, usableID); err != nil {
+		return err
+	}
+
+	sort.Slice(populations, func(i, j int) bool {
+		if populations[i].CreatedAt.Equal(populations[j].CreatedAt) {
+			return populations[i].Id < populations[j].Id
+		}
+		return populations[i].CreatedAt.Before(populations[j].CreatedAt)
+	})
+
+	stockAllocationRepo := commonRepo.NewStockAllocationRepository(tx)
+	remaining := consumeQty
+	for _, pop := range populations {
+		available := pop.TotalQty - pop.TotalUsedQty
+		if available <= 0 {
+			continue
+		}
+		portion := math.Min(available, remaining)
+		if portion <= 0 {
+			continue
+		}
+
+		allocation := &entity.StockAllocation{
+			ProductWarehouseId: productWarehouseID,
+			StockableType:      fifo.StockableKeyProjectFlockPopulation.String(),
+			StockableId:        pop.Id,
+			UsableType:         usableType,
+			UsableId:           usableID,
+			Qty:                portion,
+			Status:             entity.StockAllocationStatusActive,
+			AllocationPurpose:  entity.StockAllocationPurposeConsume,
+		}
+		if err := stockAllocationRepo.CreateOne(ctx, allocation, nil); err != nil {
+			return err
+		}
+
+		if err := tx.WithContext(ctx).
+			Model(&entity.ProjectFlockPopulation{}).
+			Where("id = ?", pop.Id).
+			Update("total_used_qty", gorm.Expr("total_used_qty + ?", portion)).Error; err != nil {
+			return err
+		}
+
+		remaining -= portion
+		if remaining <= 1e-6 {
+			break
+		}
+	}
+
+	if remaining > 1e-6 {
+		return fiber.NewError(fiber.StatusBadRequest, "Populasi tidak mencukupi")
+	}
+
+	return nil
+}

internal/common/service/fifo_stock_v2/service.go

@@ -238,7 +238,7 @@ func nearlyZero(v float64) bool {
 }
 
 func (s *fifoStockV2Service) ensureStockAllocationColumns(tx *gorm.DB) error {
-	checkCols := []string{"engine_version", "flag_group_code", "function_code", "idempotency_key"}
+	checkCols := []string{"engine_version", "flag_group_code", "function_code", "idempotency_key", "allocation_purpose"}
 	for _, col := range checkCols {
 		var count int64
 		err := tx.Raw(`
@@ -263,3 +263,15 @@ func activeAllocationStatus() string {
 func releasedAllocationStatus() string {
 	return entity.StockAllocationStatusReleased
 }
+
+func defaultAllocationPurpose() string {
+	return entity.StockAllocationPurposeConsume
+}
+
+func normalizeAllocationPurpose(purpose string) string {
+	purpose = strings.TrimSpace(strings.ToUpper(purpose))
+	if purpose == "" {
+		return defaultAllocationPurpose()
+	}
+	return purpose
+}

internal/common/service/fifo_stock_v2/types.go

@@ -33,7 +33,10 @@ type Ref struct {
 type GatherRequest struct {
 	FlagGroupCode      string
 	Lane               Lane
+	AllocationPurpose  string
+	IgnoreSourceUsed   bool
 	ProductWarehouseID uint
+	From               *time.Time
 	AsOf               *time.Time
 	Limit              int
 	AfterSortAt        *time.Time
@@ -98,17 +101,15 @@ type RollbackResult struct {
 type ReflowRequest struct {
 	FlagGroupCode      string
 	ProductWarehouseID uint
-	Usable             Ref
-	DesiredQty         float64
-	AllowOverConsume   *bool
-	IdempotencyKey     string
 	AsOf               *time.Time
+	IdempotencyKey     string
 	Tx                 *gorm.DB
 }
 
 type ReflowResult struct {
-	Rollback RollbackResult
-	Allocate AllocateResult
+	ProcessedUsables int
+	Rollback         RollbackResult
+	Allocate         AllocateResult
 }
 
 type RecalculateRequest struct {

internal/config/config.go

@@ -57,6 +57,7 @@ var (
 	SSOPortalURL                   string
 	SSOClients                     map[string]SSOClientConfig
 	SSOAccessCookieName            string
+	SSOAccessCookieFallback        []string
 	SSORefreshCookieName           string
 	SSOCookieDomain                string
 	SSOCookieSecure                bool
@@ -107,7 +108,7 @@ func init() {
 	JWTResetPasswordExp = viper.GetInt("JWT_RESET_PASSWORD_EXP_MINUTES")
 	JWTVerifyEmailExp = viper.GetInt("JWT_VERIFY_EMAIL_EXP_MINUTES")
 
-	//Cors
+	// Cors
 	CORSAllowOrigins = parseList("CORS_ALLOW_ORIGINS")
 	CORSAllowMethods = parseListWithDefault("CORS_ALLOW_METHODS", "GET,POST,PUT,PATCH,DELETE,OPTIONS")
 	CORSAllowHeaders = parseListWithDefault("CORS_ALLOW_HEADERS", "Content-Type,Authorization,X-Requested-With")
@@ -147,6 +148,7 @@ func init() {
 	SSOGetMeURL = viper.GetString("SSO_GETME_URL")
 	SSOPortalURL = strings.TrimSpace(viper.GetString("SSO_PORTAL_URL"))
 	SSOAccessCookieName = defaultString(viper.GetString("SSO_ACCESS_COOKIE_NAME"), "sso_access")
+	SSOAccessCookieFallback = parseList("SSO_ACCESS_COOKIE_FALLBACK")
 	SSORefreshCookieName = defaultString(viper.GetString("SSO_REFRESH_COOKIE_NAME"), "sso_refresh")
 	SSOCookieDomain = viper.GetString("SSO_COOKIE_DOMAIN")
 	SSOCookieSecure = viper.GetBool("SSO_COOKIE_SECURE")

internal/database/database.go

@@ -37,7 +37,7 @@ func Connect(dbHost, dbName string) *gorm.DB {
 	db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
 		Logger:                 logger.Default.LogMode(logger.Info),
 		SkipDefaultTransaction: true,
-		PrepareStmt:            true,
+		PrepareStmt:            false,
 		TranslateError:         true,
 	})
 	if err != nil {

internal/database/migrations/20260217000000_bootstrap_fifo_stock_v2_core_pre_seed.up.sql

@@ -0,0 +1,154 @@
+BEGIN;
+
+-- Bootstrap FIFO v2 core tables before seed migration (20260218090010).
+-- Keep definitions aligned with 20260304033546_create_fifo_stock_v2_core.
+
+CREATE TABLE IF NOT EXISTS fifo_stock_v2_flag_groups (
+    code VARCHAR(64) PRIMARY KEY,
+    name VARCHAR(128) NOT NULL,
+    priority INT NOT NULL DEFAULT 100,
+    is_active BOOLEAN NOT NULL DEFAULT TRUE,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE TABLE IF NOT EXISTS fifo_stock_v2_flag_members (
+    flag_name VARCHAR(64) PRIMARY KEY,
+    flag_group_code VARCHAR(64) NOT NULL REFERENCES fifo_stock_v2_flag_groups(code),
+    priority INT NOT NULL DEFAULT 100,
+    is_active BOOLEAN NOT NULL DEFAULT TRUE,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE TABLE IF NOT EXISTS fifo_stock_v2_traits (
+    id BIGSERIAL PRIMARY KEY,
+    source_table VARCHAR(64) NOT NULL,
+    lane VARCHAR(16) NOT NULL CHECK (lane IN ('STOCKABLE', 'USABLE')),
+    date_table VARCHAR(64) NULL,
+    date_join_left_col VARCHAR(64) NULL,
+    date_join_right_col VARCHAR(64) NULL,
+    date_column VARCHAR(64) NOT NULL,
+    fallback_date_column VARCHAR(64) NULL,
+    sort_priority INT NOT NULL DEFAULT 100,
+    id_column VARCHAR(64) NOT NULL DEFAULT 'id',
+    is_active BOOLEAN NOT NULL DEFAULT TRUE,
+    UNIQUE (source_table, lane)
+);
+
+CREATE TABLE IF NOT EXISTS fifo_stock_v2_route_rules (
+    id BIGSERIAL PRIMARY KEY,
+    flag_group_code VARCHAR(64) NOT NULL REFERENCES fifo_stock_v2_flag_groups(code),
+    lane VARCHAR(16) NOT NULL CHECK (lane IN ('STOCKABLE', 'USABLE')),
+    function_code VARCHAR(64) NOT NULL,
+    source_table VARCHAR(64) NOT NULL,
+    source_id_column VARCHAR(64) NOT NULL DEFAULT 'id',
+    product_warehouse_col VARCHAR(64) NOT NULL,
+    quantity_col VARCHAR(64) NOT NULL,
+    used_quantity_col VARCHAR(64) NULL,
+    pending_quantity_col VARCHAR(64) NULL,
+    scope_sql TEXT NULL,
+    legacy_type_key VARCHAR(100) NOT NULL,
+    allow_pending_default BOOLEAN NOT NULL DEFAULT TRUE,
+    is_active BOOLEAN NOT NULL DEFAULT TRUE,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    UNIQUE (flag_group_code, lane, function_code, source_table)
+);
+
+CREATE TABLE IF NOT EXISTS fifo_stock_v2_overconsume_rules (
+    id BIGSERIAL PRIMARY KEY,
+    flag_group_code VARCHAR(64) NULL REFERENCES fifo_stock_v2_flag_groups(code),
+    function_code VARCHAR(64) NULL,
+    lane VARCHAR(16) NOT NULL DEFAULT 'USABLE' CHECK (lane IN ('STOCKABLE', 'USABLE')),
+    allow_overconsume BOOLEAN NOT NULL,
+    priority INT NOT NULL DEFAULT 100,
+    reason TEXT NULL,
+    is_active BOOLEAN NOT NULL DEFAULT TRUE
+);
+
+CREATE TABLE IF NOT EXISTS fifo_stock_v2_operation_log (
+    id BIGSERIAL PRIMARY KEY,
+    idempotency_key VARCHAR(128) NOT NULL,
+    operation VARCHAR(16) NOT NULL CHECK (operation IN ('ALLOCATE', 'ROLLBACK', 'REFLOW', 'RECALCULATE')),
+    product_warehouse_id BIGINT NOT NULL,
+    flag_group_code VARCHAR(64) NOT NULL,
+    usable_type VARCHAR(100) NULL,
+    usable_id BIGINT NULL,
+    request_hash VARCHAR(64) NOT NULL,
+    status VARCHAR(16) NOT NULL CHECK (status IN ('RUNNING', 'DONE', 'FAILED')),
+    result_payload JSONB NULL,
+    error_text TEXT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    finished_at TIMESTAMPTZ NULL,
+    UNIQUE (idempotency_key, operation)
+);
+
+CREATE TABLE IF NOT EXISTS fifo_stock_v2_reflow_runs (
+    id BIGSERIAL PRIMARY KEY,
+    mode VARCHAR(16) NOT NULL CHECK (mode IN ('DRY_RUN', 'APPLY')),
+    status VARCHAR(16) NOT NULL CHECK (status IN ('RUNNING', 'PAUSED', 'DONE', 'FAILED', 'CANCELLED')),
+    as_of TIMESTAMPTZ NULL,
+    started_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    finished_at TIMESTAMPTZ NULL,
+    total_shards INT NOT NULL DEFAULT 0,
+    processed_shards INT NOT NULL DEFAULT 0,
+    processed_rows BIGINT NOT NULL DEFAULT 0,
+    mismatch_rows BIGINT NOT NULL DEFAULT 0,
+    created_by BIGINT NULL,
+    note TEXT NULL
+);
+
+CREATE TABLE IF NOT EXISTS fifo_stock_v2_reflow_checkpoints (
+    id BIGSERIAL PRIMARY KEY,
+    run_id BIGINT NOT NULL REFERENCES fifo_stock_v2_reflow_runs(id) ON DELETE CASCADE,
+    flag_group_code VARCHAR(64) NOT NULL,
+    product_warehouse_id BIGINT NOT NULL,
+    last_sort_at TIMESTAMPTZ NULL,
+    last_source_table VARCHAR(64) NULL,
+    last_source_id BIGINT NULL,
+    status VARCHAR(16) NOT NULL CHECK (status IN ('PENDING', 'RUNNING', 'DONE', 'FAILED')) DEFAULT 'PENDING',
+    retry_count INT NOT NULL DEFAULT 0,
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    UNIQUE (run_id, flag_group_code, product_warehouse_id)
+);
+
+CREATE TABLE IF NOT EXISTS fifo_stock_v2_shadow_allocations (
+    id BIGSERIAL PRIMARY KEY,
+    run_id BIGINT NOT NULL REFERENCES fifo_stock_v2_reflow_runs(id) ON DELETE CASCADE,
+    product_warehouse_id BIGINT NOT NULL,
+    stockable_type VARCHAR(100) NOT NULL,
+    stockable_id BIGINT NOT NULL,
+    usable_type VARCHAR(100) NOT NULL,
+    usable_id BIGINT NOT NULL,
+    qty NUMERIC(15,3) NOT NULL,
+    status VARCHAR(20) NOT NULL DEFAULT 'ACTIVE',
+    sort_at TIMESTAMPTZ NULL,
+    source_table VARCHAR(64) NULL,
+    source_id BIGINT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_fifo_v2_shadow_run_usable
+    ON fifo_stock_v2_shadow_allocations(run_id, usable_type, usable_id);
+
+CREATE INDEX IF NOT EXISTS idx_fifo_v2_shadow_run_stockable
+    ON fifo_stock_v2_shadow_allocations(run_id, stockable_type, stockable_id);
+
+ALTER TABLE stock_allocations
+    ADD COLUMN IF NOT EXISTS engine_version VARCHAR(8) NOT NULL DEFAULT 'v1',
+    ADD COLUMN IF NOT EXISTS flag_group_code VARCHAR(64) NULL,
+    ADD COLUMN IF NOT EXISTS function_code VARCHAR(64) NULL,
+    ADD COLUMN IF NOT EXISTS reflow_run_id BIGINT NULL,
+    ADD COLUMN IF NOT EXISTS idempotency_key VARCHAR(128) NULL;
+
+CREATE INDEX IF NOT EXISTS idx_stock_allocations_engine_version
+    ON stock_allocations(engine_version);
+
+CREATE INDEX IF NOT EXISTS idx_stock_allocations_flag_group
+    ON stock_allocations(flag_group_code);
+
+CREATE INDEX IF NOT EXISTS idx_stock_allocations_idempotency
+    ON stock_allocations(idempotency_key);
+
+COMMIT;

internal/database/migrations/20260218090010_seed_fifo_stock_v2_config.down.sql

@@ -1,36 +1,60 @@
 BEGIN;
 
-DELETE FROM fifo_stock_v2_overconsume_rules
-WHERE reason IN (
-    'fifo_v2_default_allow',
-    'fifo_v2_exception_ayam_depletion_block',
-    'fifo_v2_exception_marketing_block',
-    'fifo_v2_exception_transfer_block',
-    'fifo_v2_exception_adjustment_block',
-    'fifo_v2_exception_transfer_laying_block'
-);
+DO $$
+BEGIN
+    IF to_regclass('public.fifo_stock_v2_overconsume_rules') IS NOT NULL THEN
+        EXECUTE '
+            DELETE FROM fifo_stock_v2_overconsume_rules
+            WHERE reason IN (
+                ''fifo_v2_default_allow'',
+                ''fifo_v2_exception_ayam_depletion_block'',
+                ''fifo_v2_exception_marketing_block'',
+                ''fifo_v2_exception_transfer_block'',
+                ''fifo_v2_exception_adjustment_block'',
+                ''fifo_v2_exception_transfer_laying_block''
+            )
+        ';
+    END IF;
 
-DELETE FROM fifo_stock_v2_route_rules
-WHERE flag_group_code IN ('AYAM', 'AFKIR_CULLING_MATI', 'PAKAN', 'OVK', 'TELUR', 'TELUR_GRADE');
+    IF to_regclass('public.fifo_stock_v2_route_rules') IS NOT NULL THEN
+        EXECUTE '
+            DELETE FROM fifo_stock_v2_route_rules
+            WHERE flag_group_code IN (''AYAM'', ''AFKIR_CULLING_MATI'', ''PAKAN'', ''OVK'', ''TELUR'', ''TELUR_GRADE'')
+        ';
+    END IF;
 
-DELETE FROM fifo_stock_v2_traits
-WHERE source_table IN (
-    'purchase_items',
-    'stock_transfer_details',
-    'laying_transfer_targets',
-    'laying_transfer_sources',
-    'adjustment_stocks',
-    'recording_stocks',
-    'recording_depletions',
-    'recording_eggs',
-    'marketing_delivery_products',
-    'project_chickins'
-);
+    IF to_regclass('public.fifo_stock_v2_traits') IS NOT NULL THEN
+        EXECUTE '
+            DELETE FROM fifo_stock_v2_traits
+            WHERE source_table IN (
+                ''purchase_items'',
+                ''stock_transfer_details'',
+                ''laying_transfer_targets'',
+                ''laying_transfer_sources'',
+                ''adjustment_stocks'',
+                ''recording_stocks'',
+                ''recording_depletions'',
+                ''recording_eggs'',
+                ''marketing_delivery_products'',
+                ''project_chickins'',
+                ''project_flock_populations''
+            )
+        ';
+    END IF;
 
-DELETE FROM fifo_stock_v2_flag_members
-WHERE flag_group_code IN ('AYAM', 'AFKIR_CULLING_MATI', 'PAKAN', 'OVK', 'TELUR', 'TELUR_GRADE');
+    IF to_regclass('public.fifo_stock_v2_flag_members') IS NOT NULL THEN
+        EXECUTE '
+            DELETE FROM fifo_stock_v2_flag_members
+            WHERE flag_group_code IN (''AYAM'', ''AFKIR_CULLING_MATI'', ''PAKAN'', ''OVK'', ''TELUR'', ''TELUR_GRADE'')
+        ';
+    END IF;
 
-DELETE FROM fifo_stock_v2_flag_groups
-WHERE code IN ('AYAM', 'AFKIR_CULLING_MATI', 'PAKAN', 'OVK', 'TELUR', 'TELUR_GRADE');
+    IF to_regclass('public.fifo_stock_v2_flag_groups') IS NOT NULL THEN
+        EXECUTE '
+            DELETE FROM fifo_stock_v2_flag_groups
+            WHERE code IN (''AYAM'', ''AFKIR_CULLING_MATI'', ''PAKAN'', ''OVK'', ''TELUR'', ''TELUR_GRADE'')
+        ';
+    END IF;
+END $$;
 
 COMMIT;

internal/database/migrations/20260218090010_seed_fifo_stock_v2_config.up.sql

@@ -1,248 +1,6 @@
 BEGIN;
 
-INSERT INTO fifo_stock_v2_flag_groups(code, name, priority)
-VALUES
-    ('AYAM', 'AYAM', 10),
-    ('AFKIR_CULLING_MATI', 'AFKIR/CULLING/MATI', 20),
-    ('PAKAN', 'PAKAN', 30),
-    ('OVK', 'OVK', 40),
-    ('TELUR', 'TELUR', 50),
-    ('TELUR_GRADE', 'UTUH/PUTIH/RETAK/PECAH/PAPACAL/JUMBO', 60)
-ON CONFLICT (code) DO UPDATE
-SET
-    name = EXCLUDED.name,
-    priority = EXCLUDED.priority,
-    updated_at = NOW();
-
-INSERT INTO fifo_stock_v2_flag_members(flag_name, flag_group_code, priority)
-VALUES
-    ('DOC', 'AYAM', 10),
-    ('PULLET', 'AYAM', 20),
-    ('LAYER', 'AYAM', 30),
-
-    ('AYAM-AFKIR', 'AFKIR_CULLING_MATI', 10),
-    ('AYAM-CULLING', 'AFKIR_CULLING_MATI', 20),
-    ('AYAM-MATI', 'AFKIR_CULLING_MATI', 30),
-
-    ('PAKAN', 'PAKAN', 10),
-    ('PRE-STARTER', 'PAKAN', 20),
-    ('STARTER', 'PAKAN', 30),
-    ('FINISHER', 'PAKAN', 40),
-
-    ('OVK', 'OVK', 10),
-    ('OBAT', 'OVK', 20),
-    ('VITAMIN', 'OVK', 30),
-    ('KIMIA', 'OVK', 40),
-
-    ('TELUR', 'TELUR', 10),
-
-    ('TELUR-UTUH', 'TELUR_GRADE', 10),
-    ('TELUR-PUTIH', 'TELUR_GRADE', 20),
-    ('TELUR-RETAK', 'TELUR_GRADE', 30),
-    ('TELUR-PECAH', 'TELUR_GRADE', 40),
-    ('TELUR-PAPACAL', 'TELUR_GRADE', 50),
-    ('TELUR-JUMBO', 'TELUR_GRADE', 60)
-ON CONFLICT (flag_name) DO UPDATE
-SET
-    flag_group_code = EXCLUDED.flag_group_code,
-    priority = EXCLUDED.priority,
-    updated_at = NOW();
-
-INSERT INTO fifo_stock_v2_traits(
-    source_table,
-    lane,
-    date_table,
-    date_join_left_col,
-    date_join_right_col,
-    date_column,
-    fallback_date_column,
-    sort_priority,
-    id_column
-)
-VALUES
-    ('purchase_items', 'STOCKABLE', NULL, NULL, NULL, 'received_date', NULL, 10, 'id'),
-
-    ('stock_transfer_details', 'STOCKABLE', 'stock_transfers', 'stock_transfer_id', 'id', 'transfer_date', NULL, 20, 'id'),
-    ('stock_transfer_details', 'USABLE', 'stock_transfers', 'stock_transfer_id', 'id', 'transfer_date', NULL, 20, 'id'),
-
-    ('laying_transfer_targets', 'STOCKABLE', 'laying_transfers', 'laying_transfer_id', 'id', 'transfer_date', NULL, 25, 'id'),
-    ('laying_transfer_sources', 'USABLE', 'laying_transfers', 'laying_transfer_id', 'id', 'transfer_date', NULL, 25, 'id'),
-
-    ('adjustment_stocks', 'STOCKABLE', NULL, NULL, NULL, 'created_at', NULL, 30, 'id'),
-    ('adjustment_stocks', 'USABLE', NULL, NULL, NULL, 'created_at', NULL, 30, 'id'),
-
-    ('recording_stocks', 'USABLE', 'recordings', 'recording_id', 'id', 'record_datetime', NULL, 35, 'id'),
-    ('recording_depletions', 'USABLE', 'recordings', 'recording_id', 'id', 'record_datetime', NULL, 35, 'id'),
-    ('recording_depletions', 'STOCKABLE', 'recordings', 'recording_id', 'id', 'record_datetime', NULL, 35, 'id'),
-
-    ('recording_eggs', 'STOCKABLE', 'recordings', 'recording_id', 'id', 'record_datetime', 'created_at', 40, 'id'),
-
-    ('marketing_delivery_products', 'USABLE', NULL, NULL, NULL, 'delivery_date', 'created_at', 45, 'id'),
-
-    ('project_chickins', 'USABLE', NULL, NULL, NULL, 'chick_in_date', 'created_at', 50, 'id')
-ON CONFLICT (source_table, lane) DO UPDATE
-SET
-    date_table = EXCLUDED.date_table,
-    date_join_left_col = EXCLUDED.date_join_left_col,
-    date_join_right_col = EXCLUDED.date_join_right_col,
-    date_column = EXCLUDED.date_column,
-    fallback_date_column = EXCLUDED.fallback_date_column,
-    sort_priority = EXCLUDED.sort_priority,
-    id_column = EXCLUDED.id_column,
-    is_active = TRUE;
-
-INSERT INTO fifo_stock_v2_route_rules(
-    flag_group_code,
-    lane,
-    function_code,
-    source_table,
-    source_id_column,
-    product_warehouse_col,
-    quantity_col,
-    used_quantity_col,
-    pending_quantity_col,
-    scope_sql,
-    legacy_type_key,
-    allow_pending_default,
-    is_active
-)
-VALUES
-    -- AYAM STOCKABLE
-    ('AYAM', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('AYAM', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('AYAM', 'STOCKABLE', 'PURCHASE_IN', 'purchase_items', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'PURCHASE_ITEMS', TRUE, TRUE),
-    ('AYAM', 'STOCKABLE', 'TRANSFER_TO_LAYING_IN', 'laying_transfer_targets', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'TRANSFERTOLAYING_IN', TRUE, TRUE),
-
-    -- AYAM USABLE
-    ('AYAM', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'CHICKIN_OUT', 'project_chickins', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_usage_qty', 'deleted_at IS NULL', 'PROJECT_CHICKIN', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'RECORDING_DEPLETION_OUT', 'recording_depletions', 'id', 'source_product_warehouse_id', 'qty', NULL, 'pending_qty', NULL, 'RECORDING_DEPLETION', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'TRANSFER_TO_LAYING_OUT', 'laying_transfer_sources', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_usage_qty', 'deleted_at IS NULL', 'TRANSFERTOLAYING_OUT', TRUE, TRUE),
-
-    -- AFKIR/CULLING/MATI STOCKABLE
-    ('AFKIR_CULLING_MATI', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('AFKIR_CULLING_MATI', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('AFKIR_CULLING_MATI', 'STOCKABLE', 'RECORDING_DEPLETION_IN', 'recording_depletions', 'id', 'product_warehouse_id', 'qty', NULL, NULL, NULL, 'RECORDING_DEPLETION', TRUE, TRUE),
-
-    -- AFKIR/CULLING/MATI USABLE
-    ('AFKIR_CULLING_MATI', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('AFKIR_CULLING_MATI', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('AFKIR_CULLING_MATI', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-
-    -- PAKAN STOCKABLE
-    ('PAKAN', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('PAKAN', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('PAKAN', 'STOCKABLE', 'PURCHASE_IN', 'purchase_items', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'PURCHASE_ITEMS', TRUE, TRUE),
-
-    -- PAKAN USABLE
-    ('PAKAN', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('PAKAN', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('PAKAN', 'USABLE', 'RECORDING_STOCK_OUT', 'recording_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'RECORDING_STOCK', TRUE, TRUE),
-    ('PAKAN', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-
-    -- OVK STOCKABLE
-    ('OVK', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('OVK', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('OVK', 'STOCKABLE', 'PURCHASE_IN', 'purchase_items', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'PURCHASE_ITEMS', TRUE, TRUE),
-
-    -- OVK USABLE
-    ('OVK', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('OVK', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('OVK', 'USABLE', 'RECORDING_STOCK_OUT', 'recording_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'RECORDING_STOCK', TRUE, TRUE),
-    ('OVK', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-
-    -- TELUR STOCKABLE
-    ('TELUR', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('TELUR', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('TELUR', 'STOCKABLE', 'RECORDING_EGG_IN', 'recording_eggs', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'RECORDING_EGG', TRUE, TRUE),
-
-    -- TELUR USABLE
-    ('TELUR', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('TELUR', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('TELUR', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-
-    -- TELUR_GRADE STOCKABLE
-    ('TELUR_GRADE', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('TELUR_GRADE', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('TELUR_GRADE', 'STOCKABLE', 'RECORDING_EGG_IN', 'recording_eggs', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'RECORDING_EGG', TRUE, TRUE),
-
-    -- TELUR_GRADE USABLE
-    ('TELUR_GRADE', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('TELUR_GRADE', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('TELUR_GRADE', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE)
-ON CONFLICT (flag_group_code, lane, function_code, source_table) DO UPDATE
-SET
-    source_id_column = EXCLUDED.source_id_column,
-    product_warehouse_col = EXCLUDED.product_warehouse_col,
-    quantity_col = EXCLUDED.quantity_col,
-    used_quantity_col = EXCLUDED.used_quantity_col,
-    pending_quantity_col = EXCLUDED.pending_quantity_col,
-    scope_sql = EXCLUDED.scope_sql,
-    legacy_type_key = EXCLUDED.legacy_type_key,
-    allow_pending_default = EXCLUDED.allow_pending_default,
-    is_active = EXCLUDED.is_active,
-    updated_at = NOW();
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, NULL, 'USABLE', TRUE, 999, 'fifo_v2_default_allow', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code IS NULL
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_default_allow'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT 'AYAM', 'RECORDING_DEPLETION_OUT', 'USABLE', FALSE, 10, 'fifo_v2_exception_ayam_depletion_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code = 'AYAM'
-      AND function_code = 'RECORDING_DEPLETION_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_ayam_depletion_block'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, 'MARKETING_OUT', 'USABLE', FALSE, 20, 'fifo_v2_exception_marketing_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code = 'MARKETING_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_marketing_block'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, 'STOCK_TRANSFER_OUT', 'USABLE', FALSE, 30, 'fifo_v2_exception_transfer_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code = 'STOCK_TRANSFER_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_transfer_block'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, 'ADJUSTMENT_OUT', 'USABLE', FALSE, 40, 'fifo_v2_exception_adjustment_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code = 'ADJUSTMENT_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_adjustment_block'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, 'TRANSFER_TO_LAYING_OUT', 'USABLE', FALSE, 50, 'fifo_v2_exception_transfer_laying_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code = 'TRANSFER_TO_LAYING_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_transfer_laying_block'
-);
+-- no-op: moved to 20260306090010_seed_fifo_stock_v2_config_after_core.up.sql
+-- to ensure FIFO core tables exist before seeding on fresh migrations.
 
 COMMIT;

internal/database/migrations/20260228143207_disable_chickin_fifo_consumption.down.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+-- no-op: moved to 20260306090011_disable_chickin_fifo_consumption_after_core.down.sql
+
+COMMIT;

internal/database/migrations/20260228143207_disable_chickin_fifo_consumption.up.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+-- no-op: moved to 20260306090011_disable_chickin_fifo_consumption_after_core.up.sql
+-- to ensure FIFO core + seed are applied before this data update migration.
+
+COMMIT;

internal/database/migrations/20260302064432_add_allocation_purpose_to_stock_allocations.down.sql

@@ -0,0 +1,13 @@
+BEGIN;
+
+DROP INDEX IF EXISTS idx_stock_allocations_purpose_stockable_active;
+DROP INDEX IF EXISTS idx_stock_allocations_purpose_usable_active;
+DROP INDEX IF EXISTS idx_stock_allocations_purpose_status;
+
+ALTER TABLE stock_allocations
+    DROP CONSTRAINT IF EXISTS stock_allocations_allocation_purpose_check;
+
+ALTER TABLE stock_allocations
+    DROP COLUMN IF EXISTS allocation_purpose;
+
+COMMIT;

internal/database/migrations/20260302064432_add_allocation_purpose_to_stock_allocations.up.sql

@@ -0,0 +1,33 @@
+BEGIN;
+
+ALTER TABLE stock_allocations
+    ADD COLUMN IF NOT EXISTS allocation_purpose VARCHAR(32);
+
+UPDATE stock_allocations
+SET allocation_purpose = 'CONSUME'
+WHERE allocation_purpose IS NULL
+   OR BTRIM(allocation_purpose) = '';
+
+ALTER TABLE stock_allocations
+    ALTER COLUMN allocation_purpose SET DEFAULT 'CONSUME',
+    ALTER COLUMN allocation_purpose SET NOT NULL;
+
+ALTER TABLE stock_allocations
+    DROP CONSTRAINT IF EXISTS stock_allocations_allocation_purpose_check;
+
+ALTER TABLE stock_allocations
+    ADD CONSTRAINT stock_allocations_allocation_purpose_check
+    CHECK (allocation_purpose IN ('CONSUME', 'TRACE_CHICKIN'));
+
+CREATE INDEX IF NOT EXISTS idx_stock_allocations_purpose_status
+    ON stock_allocations (allocation_purpose, status);
+
+CREATE INDEX IF NOT EXISTS idx_stock_allocations_purpose_usable_active
+    ON stock_allocations (allocation_purpose, usable_type, usable_id)
+    WHERE status = 'ACTIVE';
+
+CREATE INDEX IF NOT EXISTS idx_stock_allocations_purpose_stockable_active
+    ON stock_allocations (allocation_purpose, stockable_type, stockable_id)
+    WHERE status = 'ACTIVE';
+
+COMMIT;

internal/database/migrations/20260304033546_create_fifo_stock_v2_core.down.sql

@@ -0,0 +1,24 @@
+BEGIN;
+
+DROP INDEX IF EXISTS idx_stock_allocations_idempotency;
+DROP INDEX IF EXISTS idx_stock_allocations_flag_group;
+DROP INDEX IF EXISTS idx_stock_allocations_engine_version;
+
+ALTER TABLE stock_allocations
+    DROP COLUMN IF EXISTS idempotency_key,
+    DROP COLUMN IF EXISTS reflow_run_id,
+    DROP COLUMN IF EXISTS function_code,
+    DROP COLUMN IF EXISTS flag_group_code,
+    DROP COLUMN IF EXISTS engine_version;
+
+DROP TABLE IF EXISTS fifo_stock_v2_shadow_allocations;
+DROP TABLE IF EXISTS fifo_stock_v2_reflow_checkpoints;
+DROP TABLE IF EXISTS fifo_stock_v2_reflow_runs;
+DROP TABLE IF EXISTS fifo_stock_v2_operation_log;
+DROP TABLE IF EXISTS fifo_stock_v2_overconsume_rules;
+DROP TABLE IF EXISTS fifo_stock_v2_route_rules;
+DROP TABLE IF EXISTS fifo_stock_v2_traits;
+DROP TABLE IF EXISTS fifo_stock_v2_flag_members;
+DROP TABLE IF EXISTS fifo_stock_v2_flag_groups;
+
+COMMIT;

internal/database/migrations/20260304033605_add_deferred_execution_to_laying_transfers.down.sql

@@ -1,3 +1,5 @@
+BEGIN;
+
 DROP INDEX IF EXISTS idx_laying_transfers_executed_by;
 DROP INDEX IF EXISTS idx_laying_transfers_executed_at;
 DROP INDEX IF EXISTS idx_laying_transfers_effective_move_date;
@@ -9,3 +11,5 @@ ALTER TABLE laying_transfers
     DROP COLUMN IF EXISTS executed_by,
     DROP COLUMN IF EXISTS executed_at,
     DROP COLUMN IF EXISTS effective_move_date;
+
+COMMIT;

internal/database/migrations/20260304033605_add_deferred_execution_to_laying_transfers.up.sql

@@ -1,3 +1,5 @@
+BEGIN;
+
 ALTER TABLE laying_transfers
     ADD COLUMN IF NOT EXISTS effective_move_date DATE,
     ADD COLUMN IF NOT EXISTS executed_at TIMESTAMPTZ,
@@ -44,3 +46,5 @@ WHERE (
     ORDER BY a.id DESC
     LIMIT 1
 ) = 'APPROVED';
+
+COMMIT;

internal/database/migrations/20260304063215_fix_fifo_chickin_out.down.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+-- no-op: moved to 20260306090012_fix_fifo_chickin_out_after_seed.down.sql
+
+COMMIT;

internal/database/migrations/20260304063215_fix_fifo_chickin_out.up.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+-- no-op: moved to 20260306090012_fix_fifo_chickin_out_after_seed.up.sql
+-- to ensure AYAM flag group exists before route-rule upsert.
+
+COMMIT;

internal/database/migrations/20260304101500_add_economic_cutoff_date_to_laying_transfers.down.sql

@@ -0,0 +1,8 @@
+BEGIN;
+
+DROP INDEX IF EXISTS idx_laying_transfers_economic_cutoff_date;
+
+ALTER TABLE laying_transfers
+    DROP COLUMN IF EXISTS economic_cutoff_date;
+
+COMMIT;

internal/database/migrations/20260304101500_add_economic_cutoff_date_to_laying_transfers.up.sql

@@ -0,0 +1,13 @@
+BEGIN;
+
+ALTER TABLE laying_transfers
+    ADD COLUMN IF NOT EXISTS economic_cutoff_date DATE;
+
+CREATE INDEX IF NOT EXISTS idx_laying_transfers_economic_cutoff_date
+    ON laying_transfers(economic_cutoff_date);
+
+UPDATE laying_transfers
+SET economic_cutoff_date = COALESCE(economic_cutoff_date, effective_move_date, transfer_date)
+WHERE economic_cutoff_date IS NULL;
+
+COMMIT;

internal/database/migrations/20260305105044_add_ayam_flag_member_fifo_v2.down.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+-- no-op: moved to 20260306090013_add_ayam_flag_member_fifo_v2_after_seed.down.sql
+
+COMMIT;

internal/database/migrations/20260305105044_add_ayam_flag_member_fifo_v2.up.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+-- no-op: moved to 20260306090013_add_ayam_flag_member_fifo_v2_after_seed.up.sql
+-- to ensure AYAM flag group exists before inserting AYAM member.
+
+COMMIT;

internal/database/migrations/20260306090010_seed_fifo_stock_v2_config_after_core.down.sql

@@ -0,0 +1,37 @@
+BEGIN;
+
+DELETE FROM fifo_stock_v2_overconsume_rules
+WHERE reason IN (
+    'fifo_v2_default_allow',
+    'fifo_v2_exception_ayam_depletion_block',
+    'fifo_v2_exception_marketing_block',
+    'fifo_v2_exception_transfer_block',
+    'fifo_v2_exception_adjustment_block',
+    'fifo_v2_exception_transfer_laying_block'
+);
+
+DELETE FROM fifo_stock_v2_route_rules
+WHERE flag_group_code IN ('AYAM', 'AFKIR_CULLING_MATI', 'PAKAN', 'OVK', 'TELUR', 'TELUR_GRADE');
+
+DELETE FROM fifo_stock_v2_traits
+WHERE source_table IN (
+    'purchase_items',
+    'stock_transfer_details',
+    'laying_transfer_targets',
+    'laying_transfer_sources',
+    'adjustment_stocks',
+    'recording_stocks',
+    'recording_depletions',
+    'recording_eggs',
+    'marketing_delivery_products',
+    'project_chickins',
+    'project_flock_populations'
+);
+
+DELETE FROM fifo_stock_v2_flag_members
+WHERE flag_group_code IN ('AYAM', 'AFKIR_CULLING_MATI', 'PAKAN', 'OVK', 'TELUR', 'TELUR_GRADE');
+
+DELETE FROM fifo_stock_v2_flag_groups
+WHERE code IN ('AYAM', 'AFKIR_CULLING_MATI', 'PAKAN', 'OVK', 'TELUR', 'TELUR_GRADE');
+
+COMMIT;

internal/database/migrations/20260306090010_seed_fifo_stock_v2_config_after_core.up.sql

@@ -0,0 +1,250 @@
+BEGIN;
+
+INSERT INTO fifo_stock_v2_flag_groups(code, name, priority)
+VALUES
+    ('AYAM', 'AYAM', 10),
+    ('AFKIR_CULLING_MATI', 'AFKIR/CULLING/MATI', 20),
+    ('PAKAN', 'PAKAN', 30),
+    ('OVK', 'OVK', 40),
+    ('TELUR', 'TELUR', 50),
+    ('TELUR_GRADE', 'UTUH/PUTIH/RETAK/PECAH/PAPACAL/JUMBO', 60)
+ON CONFLICT (code) DO UPDATE
+SET
+    name = EXCLUDED.name,
+    priority = EXCLUDED.priority,
+    updated_at = NOW();
+
+INSERT INTO fifo_stock_v2_flag_members(flag_name, flag_group_code, priority)
+VALUES
+    ('DOC', 'AYAM', 10),
+    ('PULLET', 'AYAM', 20),
+    ('LAYER', 'AYAM', 30),
+
+    ('AYAM-AFKIR', 'AFKIR_CULLING_MATI', 10),
+    ('AYAM-CULLING', 'AFKIR_CULLING_MATI', 20),
+    ('AYAM-MATI', 'AFKIR_CULLING_MATI', 30),
+
+    ('PAKAN', 'PAKAN', 10),
+    ('PRE-STARTER', 'PAKAN', 20),
+    ('STARTER', 'PAKAN', 30),
+    ('FINISHER', 'PAKAN', 40),
+
+    ('OVK', 'OVK', 10),
+    ('OBAT', 'OVK', 20),
+    ('VITAMIN', 'OVK', 30),
+    ('KIMIA', 'OVK', 40),
+
+    ('TELUR', 'TELUR', 10),
+
+    ('TELUR-UTUH', 'TELUR_GRADE', 10),
+    ('TELUR-PUTIH', 'TELUR_GRADE', 20),
+    ('TELUR-RETAK', 'TELUR_GRADE', 30),
+    ('TELUR-PECAH', 'TELUR_GRADE', 40),
+    ('TELUR-PAPACAL', 'TELUR_GRADE', 50),
+    ('TELUR-JUMBO', 'TELUR_GRADE', 60)
+ON CONFLICT (flag_name) DO UPDATE
+SET
+    flag_group_code = EXCLUDED.flag_group_code,
+    priority = EXCLUDED.priority,
+    updated_at = NOW();
+
+INSERT INTO fifo_stock_v2_traits(
+    source_table,
+    lane,
+    date_table,
+    date_join_left_col,
+    date_join_right_col,
+    date_column,
+    fallback_date_column,
+    sort_priority,
+    id_column
+)
+VALUES
+    ('purchase_items', 'STOCKABLE', NULL, NULL, NULL, 'received_date', NULL, 10, 'id'),
+
+    ('stock_transfer_details', 'STOCKABLE', 'stock_transfers', 'stock_transfer_id', 'id', 'transfer_date', NULL, 20, 'id'),
+    ('stock_transfer_details', 'USABLE', 'stock_transfers', 'stock_transfer_id', 'id', 'transfer_date', NULL, 20, 'id'),
+
+    ('laying_transfer_targets', 'STOCKABLE', 'laying_transfers', 'laying_transfer_id', 'id', 'transfer_date', NULL, 25, 'id'),
+    ('laying_transfer_sources', 'USABLE', 'laying_transfers', 'laying_transfer_id', 'id', 'transfer_date', NULL, 25, 'id'),
+
+    ('adjustment_stocks', 'STOCKABLE', NULL, NULL, NULL, 'created_at', NULL, 30, 'id'),
+    ('adjustment_stocks', 'USABLE', NULL, NULL, NULL, 'created_at', NULL, 30, 'id'),
+
+    ('recording_stocks', 'USABLE', 'recordings', 'recording_id', 'id', 'record_datetime', NULL, 35, 'id'),
+    ('recording_depletions', 'USABLE', 'recordings', 'recording_id', 'id', 'record_datetime', NULL, 35, 'id'),
+    ('recording_depletions', 'STOCKABLE', 'recordings', 'recording_id', 'id', 'record_datetime', NULL, 35, 'id'),
+
+    ('recording_eggs', 'STOCKABLE', 'recordings', 'recording_id', 'id', 'record_datetime', 'created_at', 40, 'id'),
+
+    ('marketing_delivery_products', 'USABLE', NULL, NULL, NULL, 'delivery_date', 'created_at', 45, 'id'),
+
+    ('project_chickins', 'USABLE', NULL, NULL, NULL, 'chick_in_date', 'created_at', 50, 'id'),
+    ('project_flock_populations', 'STOCKABLE', 'project_chickins', 'project_chickin_id', 'id', 'chick_in_date', 'created_at', 55, 'id')
+ON CONFLICT (source_table, lane) DO UPDATE
+SET
+    date_table = EXCLUDED.date_table,
+    date_join_left_col = EXCLUDED.date_join_left_col,
+    date_join_right_col = EXCLUDED.date_join_right_col,
+    date_column = EXCLUDED.date_column,
+    fallback_date_column = EXCLUDED.fallback_date_column,
+    sort_priority = EXCLUDED.sort_priority,
+    id_column = EXCLUDED.id_column,
+    is_active = TRUE;
+
+INSERT INTO fifo_stock_v2_route_rules(
+    flag_group_code,
+    lane,
+    function_code,
+    source_table,
+    source_id_column,
+    product_warehouse_col,
+    quantity_col,
+    used_quantity_col,
+    pending_quantity_col,
+    scope_sql,
+    legacy_type_key,
+    allow_pending_default,
+    is_active
+)
+VALUES
+    -- AYAM STOCKABLE
+    ('AYAM', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
+    ('AYAM', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
+    ('AYAM', 'STOCKABLE', 'PURCHASE_IN', 'purchase_items', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'PURCHASE_ITEMS', TRUE, TRUE),
+    ('AYAM', 'STOCKABLE', 'TRANSFER_TO_LAYING_IN', 'laying_transfer_targets', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'TRANSFERTOLAYING_IN', TRUE, TRUE),
+    ('AYAM', 'STOCKABLE', 'POPULATION_IN', 'project_flock_populations', 'id', 'product_warehouse_id', 'total_qty', 'total_used_qty', NULL, NULL, 'PROJECT_FLOCK_POPULATION', TRUE, TRUE),
+
+    -- AYAM USABLE
+    ('AYAM', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
+    ('AYAM', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
+    ('AYAM', 'USABLE', 'CHICKIN_OUT', 'project_chickins', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_usage_qty', 'deleted_at IS NULL', 'PROJECT_CHICKIN', TRUE, TRUE),
+    ('AYAM', 'USABLE', 'RECORDING_DEPLETION_OUT', 'recording_depletions', 'id', 'source_product_warehouse_id', 'qty', NULL, 'pending_qty', NULL, 'RECORDING_DEPLETION', TRUE, TRUE),
+    ('AYAM', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
+    ('AYAM', 'USABLE', 'TRANSFER_TO_LAYING_OUT', 'laying_transfer_sources', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_usage_qty', 'deleted_at IS NULL', 'TRANSFERTOLAYING_OUT', TRUE, TRUE),
+
+    -- AFKIR/CULLING/MATI STOCKABLE
+    ('AFKIR_CULLING_MATI', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
+    ('AFKIR_CULLING_MATI', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
+    ('AFKIR_CULLING_MATI', 'STOCKABLE', 'RECORDING_DEPLETION_IN', 'recording_depletions', 'id', 'product_warehouse_id', 'qty', NULL, NULL, NULL, 'RECORDING_DEPLETION', TRUE, TRUE),
+
+    -- AFKIR/CULLING/MATI USABLE
+    ('AFKIR_CULLING_MATI', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
+    ('AFKIR_CULLING_MATI', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
+    ('AFKIR_CULLING_MATI', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
+
+    -- PAKAN STOCKABLE
+    ('PAKAN', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
+    ('PAKAN', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
+    ('PAKAN', 'STOCKABLE', 'PURCHASE_IN', 'purchase_items', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'PURCHASE_ITEMS', TRUE, TRUE),
+
+    -- PAKAN USABLE
+    ('PAKAN', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
+    ('PAKAN', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
+    ('PAKAN', 'USABLE', 'RECORDING_STOCK_OUT', 'recording_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'RECORDING_STOCK', TRUE, TRUE),
+    ('PAKAN', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
+
+    -- OVK STOCKABLE
+    ('OVK', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
+    ('OVK', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
+    ('OVK', 'STOCKABLE', 'PURCHASE_IN', 'purchase_items', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'PURCHASE_ITEMS', TRUE, TRUE),
+
+    -- OVK USABLE
+    ('OVK', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
+    ('OVK', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
+    ('OVK', 'USABLE', 'RECORDING_STOCK_OUT', 'recording_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'RECORDING_STOCK', TRUE, TRUE),
+    ('OVK', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
+
+    -- TELUR STOCKABLE
+    ('TELUR', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
+    ('TELUR', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
+    ('TELUR', 'STOCKABLE', 'RECORDING_EGG_IN', 'recording_eggs', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'RECORDING_EGG', TRUE, TRUE),
+
+    -- TELUR USABLE
+    ('TELUR', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
+    ('TELUR', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
+    ('TELUR', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
+
+    -- TELUR_GRADE STOCKABLE
+    ('TELUR_GRADE', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
+    ('TELUR_GRADE', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
+    ('TELUR_GRADE', 'STOCKABLE', 'RECORDING_EGG_IN', 'recording_eggs', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'RECORDING_EGG', TRUE, TRUE),
+
+    -- TELUR_GRADE USABLE
+    ('TELUR_GRADE', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
+    ('TELUR_GRADE', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
+    ('TELUR_GRADE', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE)
+ON CONFLICT (flag_group_code, lane, function_code, source_table) DO UPDATE
+SET
+    source_id_column = EXCLUDED.source_id_column,
+    product_warehouse_col = EXCLUDED.product_warehouse_col,
+    quantity_col = EXCLUDED.quantity_col,
+    used_quantity_col = EXCLUDED.used_quantity_col,
+    pending_quantity_col = EXCLUDED.pending_quantity_col,
+    scope_sql = EXCLUDED.scope_sql,
+    legacy_type_key = EXCLUDED.legacy_type_key,
+    allow_pending_default = EXCLUDED.allow_pending_default,
+    is_active = EXCLUDED.is_active,
+    updated_at = NOW();
+
+INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
+SELECT NULL, NULL, 'USABLE', TRUE, 999, 'fifo_v2_default_allow', TRUE
+WHERE NOT EXISTS (
+    SELECT 1 FROM fifo_stock_v2_overconsume_rules
+    WHERE flag_group_code IS NULL
+      AND function_code IS NULL
+      AND lane = 'USABLE'
+      AND reason = 'fifo_v2_default_allow'
+);
+
+INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
+SELECT 'AYAM', 'RECORDING_DEPLETION_OUT', 'USABLE', FALSE, 10, 'fifo_v2_exception_ayam_depletion_block', TRUE
+WHERE NOT EXISTS (
+    SELECT 1 FROM fifo_stock_v2_overconsume_rules
+    WHERE flag_group_code = 'AYAM'
+      AND function_code = 'RECORDING_DEPLETION_OUT'
+      AND lane = 'USABLE'
+      AND reason = 'fifo_v2_exception_ayam_depletion_block'
+);
+
+INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
+SELECT NULL, 'MARKETING_OUT', 'USABLE', FALSE, 20, 'fifo_v2_exception_marketing_block', TRUE
+WHERE NOT EXISTS (
+    SELECT 1 FROM fifo_stock_v2_overconsume_rules
+    WHERE flag_group_code IS NULL
+      AND function_code = 'MARKETING_OUT'
+      AND lane = 'USABLE'
+      AND reason = 'fifo_v2_exception_marketing_block'
+);
+
+INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
+SELECT NULL, 'STOCK_TRANSFER_OUT', 'USABLE', FALSE, 30, 'fifo_v2_exception_transfer_block', TRUE
+WHERE NOT EXISTS (
+    SELECT 1 FROM fifo_stock_v2_overconsume_rules
+    WHERE flag_group_code IS NULL
+      AND function_code = 'STOCK_TRANSFER_OUT'
+      AND lane = 'USABLE'
+      AND reason = 'fifo_v2_exception_transfer_block'
+);
+
+INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
+SELECT NULL, 'ADJUSTMENT_OUT', 'USABLE', FALSE, 40, 'fifo_v2_exception_adjustment_block', TRUE
+WHERE NOT EXISTS (
+    SELECT 1 FROM fifo_stock_v2_overconsume_rules
+    WHERE flag_group_code IS NULL
+      AND function_code = 'ADJUSTMENT_OUT'
+      AND lane = 'USABLE'
+      AND reason = 'fifo_v2_exception_adjustment_block'
+);
+
+INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
+SELECT NULL, 'TRANSFER_TO_LAYING_OUT', 'USABLE', FALSE, 50, 'fifo_v2_exception_transfer_laying_block', TRUE
+WHERE NOT EXISTS (
+    SELECT 1 FROM fifo_stock_v2_overconsume_rules
+    WHERE flag_group_code IS NULL
+      AND function_code = 'TRANSFER_TO_LAYING_OUT'
+      AND lane = 'USABLE'
+      AND reason = 'fifo_v2_exception_transfer_laying_block'
+);
+
+COMMIT;

internal/database/migrations/20260306090011_disable_chickin_fifo_consumption_after_core.down.sql

@@ -0,0 +1,13 @@
+BEGIN;
+
+-- Restore CHICKIN route if rollback is required.
+-- NOTE: released PROJECT_CHICKIN allocations are not restored by this down migration.
+UPDATE fifo_stock_v2_route_rules
+SET is_active = TRUE,
+    updated_at = NOW()
+WHERE flag_group_code = 'AYAM'
+  AND lane = 'USABLE'
+  AND function_code = 'CHICKIN_OUT'
+  AND source_table = 'project_chickins';
+
+COMMIT;

internal/database/migrations/20260306090011_disable_chickin_fifo_consumption_after_core.up.sql

@@ -0,0 +1,151 @@
+BEGIN;
+
+-- Disable CHICKIN as FIFO USABLE so chick-in acts as business tagging/conversion,
+-- not physical stock consumption.
+UPDATE fifo_stock_v2_route_rules
+SET is_active = FALSE,
+    updated_at = NOW()
+WHERE flag_group_code = 'AYAM'
+  AND lane = 'USABLE'
+  AND function_code = 'CHICKIN_OUT'
+  AND source_table = 'project_chickins'
+  AND is_active = TRUE;
+
+-- Release existing active allocations created by PROJECT_CHICKIN
+-- and return warehouse qty back.
+WITH released AS (
+    UPDATE stock_allocations
+    SET status = 'RELEASED',
+        released_at = COALESCE(released_at, NOW()),
+        updated_at = NOW(),
+        note = CASE
+            WHEN COALESCE(note, '') = '' THEN 'fifo_v2_chickin_conversion_release'
+            ELSE note || '; fifo_v2_chickin_conversion_release'
+        END
+    WHERE usable_type = 'PROJECT_CHICKIN'
+      AND status = 'ACTIVE'
+    RETURNING product_warehouse_id, qty
+),
+pw_delta AS (
+    SELECT product_warehouse_id, COALESCE(SUM(qty), 0) AS qty_delta
+    FROM released
+    GROUP BY product_warehouse_id
+)
+UPDATE product_warehouses pw
+SET qty = COALESCE(pw.qty, 0) + d.qty_delta
+FROM pw_delta d
+WHERE pw.id = d.product_warehouse_id;
+
+-- Resync stockable total_used columns from remaining ACTIVE allocations.
+
+-- purchase_items (PURCHASE_ITEMS)
+UPDATE purchase_items pi
+SET total_used = COALESCE(a.used, 0)
+FROM (
+    SELECT stockable_id, SUM(qty) AS used
+    FROM stock_allocations
+    WHERE status = 'ACTIVE'
+      AND stockable_type = 'PURCHASE_ITEMS'
+    GROUP BY stockable_id
+) a
+WHERE pi.id = a.stockable_id;
+
+UPDATE purchase_items pi
+SET total_used = 0
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM stock_allocations sa
+    WHERE sa.status = 'ACTIVE'
+      AND sa.stockable_type = 'PURCHASE_ITEMS'
+      AND sa.stockable_id = pi.id
+);
+
+-- stock_transfer_details (STOCK_TRANSFER_IN)
+UPDATE stock_transfer_details std
+SET total_used = COALESCE(a.used, 0)
+FROM (
+    SELECT stockable_id, SUM(qty) AS used
+    FROM stock_allocations
+    WHERE status = 'ACTIVE'
+      AND stockable_type = 'STOCK_TRANSFER_IN'
+    GROUP BY stockable_id
+) a
+WHERE std.id = a.stockable_id;
+
+UPDATE stock_transfer_details std
+SET total_used = 0
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM stock_allocations sa
+    WHERE sa.status = 'ACTIVE'
+      AND sa.stockable_type = 'STOCK_TRANSFER_IN'
+      AND sa.stockable_id = std.id
+);
+
+-- adjustment_stocks (ADJUSTMENT_IN)
+UPDATE adjustment_stocks ast
+SET total_used = COALESCE(a.used, 0)
+FROM (
+    SELECT stockable_id, SUM(qty) AS used
+    FROM stock_allocations
+    WHERE status = 'ACTIVE'
+      AND stockable_type = 'ADJUSTMENT_IN'
+    GROUP BY stockable_id
+) a
+WHERE ast.id = a.stockable_id;
+
+UPDATE adjustment_stocks ast
+SET total_used = 0
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM stock_allocations sa
+    WHERE sa.status = 'ACTIVE'
+      AND sa.stockable_type = 'ADJUSTMENT_IN'
+      AND sa.stockable_id = ast.id
+);
+
+-- laying_transfer_targets (TRANSFERTOLAYING_IN)
+UPDATE laying_transfer_targets ltt
+SET total_used = COALESCE(a.used, 0)
+FROM (
+    SELECT stockable_id, SUM(qty) AS used
+    FROM stock_allocations
+    WHERE status = 'ACTIVE'
+      AND stockable_type = 'TRANSFERTOLAYING_IN'
+    GROUP BY stockable_id
+) a
+WHERE ltt.id = a.stockable_id;
+
+UPDATE laying_transfer_targets ltt
+SET total_used = 0
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM stock_allocations sa
+    WHERE sa.status = 'ACTIVE'
+      AND sa.stockable_type = 'TRANSFERTOLAYING_IN'
+      AND sa.stockable_id = ltt.id
+);
+
+-- recording_eggs (RECORDING_EGG)
+UPDATE recording_eggs re
+SET total_used = COALESCE(a.used, 0)
+FROM (
+    SELECT stockable_id, SUM(qty) AS used
+    FROM stock_allocations
+    WHERE status = 'ACTIVE'
+      AND stockable_type = 'RECORDING_EGG'
+    GROUP BY stockable_id
+) a
+WHERE re.id = a.stockable_id;
+
+UPDATE recording_eggs re
+SET total_used = 0
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM stock_allocations sa
+    WHERE sa.status = 'ACTIVE'
+      AND sa.stockable_type = 'RECORDING_EGG'
+      AND sa.stockable_id = re.id
+);
+
+COMMIT;

internal/database/migrations/20260306090012_fix_fifo_chickin_out_after_seed.down.sql

@@ -0,0 +1,9 @@
+BEGIN;
+
+DELETE FROM fifo_stock_v2_route_rules
+WHERE flag_group_code = 'AYAM'
+  AND lane = 'USABLE'
+  AND function_code = 'CHICKIN_OUT'
+  AND source_table = 'project_chickins';
+
+COMMIT;

internal/database/migrations/20260306090012_fix_fifo_chickin_out_after_seed.up.sql

@@ -0,0 +1,34 @@
+BEGIN;
+
+INSERT INTO fifo_stock_v2_route_rules(
+    flag_group_code,
+    lane,
+    function_code,
+    source_table,
+    source_id_column,
+    product_warehouse_col,
+    quantity_col,
+    used_quantity_col,
+    pending_quantity_col,
+    scope_sql,
+    legacy_type_key,
+    allow_pending_default,
+    is_active
+)
+VALUES
+    ('AYAM', 'USABLE', 'CHICKIN_OUT', 'project_chickins', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_usage_qty', 'deleted_at IS NULL', 'PROJECT_CHICKIN', TRUE, TRUE)
+ON CONFLICT (flag_group_code, lane, function_code, source_table) DO UPDATE
+SET
+    source_id_column = EXCLUDED.source_id_column,
+    product_warehouse_col = EXCLUDED.product_warehouse_col,
+    quantity_col = EXCLUDED.quantity_col,
+    used_quantity_col = EXCLUDED.used_quantity_col,
+    pending_quantity_col = EXCLUDED.pending_quantity_col,
+    scope_sql = EXCLUDED.scope_sql,
+    legacy_type_key = EXCLUDED.legacy_type_key,
+    allow_pending_default = EXCLUDED.allow_pending_default,
+    updated_at = NOW(),
+    -- Keep existing is_active (do not override disable migration if it was intentional).
+    is_active = fifo_stock_v2_route_rules.is_active;
+
+COMMIT;

internal/database/migrations/20260306090013_add_ayam_flag_member_fifo_v2_after_seed.down.sql

@@ -0,0 +1,7 @@
+BEGIN;
+
+DELETE FROM fifo_stock_v2_flag_members
+WHERE flag_name = 'AYAM'
+  AND flag_group_code = 'AYAM';
+
+COMMIT;

internal/database/migrations/20260306090013_add_ayam_flag_member_fifo_v2_after_seed.up.sql

@@ -0,0 +1,13 @@
+BEGIN;
+
+INSERT INTO fifo_stock_v2_flag_members(flag_name, flag_group_code, priority, is_active, created_at, updated_at)
+VALUES
+    ('AYAM', 'AYAM', 5, TRUE, NOW(), NOW())
+ON CONFLICT (flag_name) DO UPDATE
+SET
+    flag_group_code = EXCLUDED.flag_group_code,
+    priority = EXCLUDED.priority,
+    is_active = TRUE,
+    updated_at = NOW();
+
+COMMIT;

internal/database/migrations/20260307130342_single_source_transfer_laying_header.down.sql

@@ -0,0 +1,60 @@
+BEGIN;
+
+UPDATE fifo_stock_v2_route_rules
+SET
+    is_active = TRUE,
+    updated_at = NOW()
+WHERE flag_group_code = 'AYAM'
+  AND lane = 'USABLE'
+  AND function_code = 'TRANSFER_TO_LAYING_OUT'
+  AND source_table = 'laying_transfer_sources';
+
+UPDATE fifo_stock_v2_route_rules
+SET
+    is_active = FALSE,
+    updated_at = NOW()
+WHERE flag_group_code = 'AYAM'
+  AND lane = 'USABLE'
+  AND function_code = 'TRANSFER_TO_LAYING_OUT'
+  AND source_table = 'laying_transfers';
+
+UPDATE fifo_stock_v2_traits
+SET is_active = TRUE
+WHERE source_table = 'laying_transfer_sources'
+  AND lane = 'USABLE';
+
+UPDATE fifo_stock_v2_traits
+SET is_active = FALSE
+WHERE source_table = 'laying_transfers'
+  AND lane = 'USABLE';
+
+DROP INDEX IF EXISTS idx_laying_transfers_source_project_flock_kandang_id;
+DROP INDEX IF EXISTS idx_laying_transfers_source_product_warehouse_id;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1 FROM pg_constraint
+        WHERE conname = 'fk_laying_transfers_source_project_flock_kandang_id'
+    ) THEN
+        ALTER TABLE laying_transfers
+            DROP CONSTRAINT fk_laying_transfers_source_project_flock_kandang_id;
+    END IF;
+
+    IF EXISTS (
+        SELECT 1 FROM pg_constraint
+        WHERE conname = 'fk_laying_transfers_source_product_warehouse_id'
+    ) THEN
+        ALTER TABLE laying_transfers
+            DROP CONSTRAINT fk_laying_transfers_source_product_warehouse_id;
+    END IF;
+END $$;
+
+ALTER TABLE laying_transfers
+    DROP COLUMN IF EXISTS source_project_flock_kandang_id,
+    DROP COLUMN IF EXISTS source_product_warehouse_id,
+    DROP COLUMN IF EXISTS source_requested_qty,
+    DROP COLUMN IF EXISTS source_usage_qty,
+    DROP COLUMN IF EXISTS source_pending_usage_qty;
+
+COMMIT;

internal/database/migrations/20260307130342_single_source_transfer_laying_header.up.sql

@@ -0,0 +1,170 @@
+BEGIN;
+
+ALTER TABLE laying_transfers
+    ADD COLUMN IF NOT EXISTS source_project_flock_kandang_id BIGINT,
+    ADD COLUMN IF NOT EXISTS source_product_warehouse_id BIGINT,
+    ADD COLUMN IF NOT EXISTS source_requested_qty NUMERIC(15,3) NOT NULL DEFAULT 0,
+    ADD COLUMN IF NOT EXISTS source_usage_qty NUMERIC(15,3) NOT NULL DEFAULT 0,
+    ADD COLUMN IF NOT EXISTS source_pending_usage_qty NUMERIC(15,3) NOT NULL DEFAULT 0;
+
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'project_flock_kandangs')
+        AND NOT EXISTS (
+            SELECT 1 FROM pg_constraint WHERE conname = 'fk_laying_transfers_source_project_flock_kandang_id'
+        ) THEN
+        ALTER TABLE laying_transfers
+            ADD CONSTRAINT fk_laying_transfers_source_project_flock_kandang_id
+            FOREIGN KEY (source_project_flock_kandang_id)
+            REFERENCES project_flock_kandangs(id)
+            ON DELETE RESTRICT
+            ON UPDATE CASCADE;
+    END IF;
+
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'product_warehouses')
+        AND NOT EXISTS (
+            SELECT 1 FROM pg_constraint WHERE conname = 'fk_laying_transfers_source_product_warehouse_id'
+        ) THEN
+        ALTER TABLE laying_transfers
+            ADD CONSTRAINT fk_laying_transfers_source_product_warehouse_id
+            FOREIGN KEY (source_product_warehouse_id)
+            REFERENCES product_warehouses(id)
+            ON DELETE SET NULL
+            ON UPDATE CASCADE;
+    END IF;
+END $$;
+
+CREATE INDEX IF NOT EXISTS idx_laying_transfers_source_project_flock_kandang_id
+    ON laying_transfers(source_project_flock_kandang_id);
+
+CREATE INDEX IF NOT EXISTS idx_laying_transfers_source_product_warehouse_id
+    ON laying_transfers(source_product_warehouse_id);
+
+WITH single_source AS (
+    SELECT
+        lts.laying_transfer_id,
+        MIN(lts.source_project_flock_kandang_id) AS source_project_flock_kandang_id,
+        MIN(lts.product_warehouse_id) AS source_product_warehouse_id
+    FROM laying_transfer_sources lts
+    WHERE lts.deleted_at IS NULL
+    GROUP BY lts.laying_transfer_id
+    HAVING COUNT(*) = 1
+)
+UPDATE laying_transfers lt
+SET
+    source_project_flock_kandang_id = ss.source_project_flock_kandang_id,
+    source_product_warehouse_id = ss.source_product_warehouse_id
+FROM single_source ss
+WHERE lt.id = ss.laying_transfer_id
+  AND (lt.source_project_flock_kandang_id IS NULL OR lt.source_project_flock_kandang_id = 0);
+
+WITH source_totals AS (
+    SELECT
+        laying_transfer_id,
+        COALESCE(SUM(requested_qty), 0) AS requested_qty,
+        COALESCE(SUM(usage_qty), 0) AS usage_qty,
+        COALESCE(SUM(pending_usage_qty), 0) AS pending_qty
+    FROM laying_transfer_sources
+    WHERE deleted_at IS NULL
+    GROUP BY laying_transfer_id
+)
+UPDATE laying_transfers lt
+SET
+    source_requested_qty = CASE
+        WHEN lt.source_requested_qty = 0 THEN st.requested_qty
+        ELSE lt.source_requested_qty
+    END,
+    source_usage_qty = CASE
+        WHEN lt.source_usage_qty = 0 THEN st.usage_qty
+        ELSE lt.source_usage_qty
+    END,
+    source_pending_usage_qty = CASE
+        WHEN lt.source_pending_usage_qty = 0 THEN st.pending_qty
+        ELSE lt.source_pending_usage_qty
+    END
+FROM source_totals st
+WHERE lt.id = st.laying_transfer_id;
+
+WITH target_totals AS (
+    SELECT
+        laying_transfer_id,
+        COALESCE(SUM(total_qty), 0) AS total_qty
+    FROM laying_transfer_targets
+    WHERE deleted_at IS NULL
+    GROUP BY laying_transfer_id
+)
+UPDATE laying_transfers lt
+SET source_requested_qty = tt.total_qty
+FROM target_totals tt
+WHERE lt.id = tt.laying_transfer_id
+  AND (lt.source_requested_qty IS NULL OR lt.source_requested_qty = 0);
+
+INSERT INTO fifo_stock_v2_traits(
+    source_table,
+    lane,
+    date_table,
+    date_join_left_col,
+    date_join_right_col,
+    date_column,
+    fallback_date_column,
+    sort_priority,
+    id_column
+)
+VALUES
+    ('laying_transfers', 'USABLE', NULL, NULL, NULL, 'transfer_date', NULL, 25, 'id')
+ON CONFLICT (source_table, lane) DO UPDATE
+SET
+    date_table = EXCLUDED.date_table,
+    date_join_left_col = EXCLUDED.date_join_left_col,
+    date_join_right_col = EXCLUDED.date_join_right_col,
+    date_column = EXCLUDED.date_column,
+    fallback_date_column = EXCLUDED.fallback_date_column,
+    sort_priority = EXCLUDED.sort_priority,
+    id_column = EXCLUDED.id_column,
+    is_active = TRUE;
+
+UPDATE fifo_stock_v2_traits
+SET is_active = FALSE
+WHERE source_table = 'laying_transfer_sources'
+  AND lane = 'USABLE';
+
+INSERT INTO fifo_stock_v2_route_rules(
+    flag_group_code,
+    lane,
+    function_code,
+    source_table,
+    source_id_column,
+    product_warehouse_col,
+    quantity_col,
+    used_quantity_col,
+    pending_quantity_col,
+    scope_sql,
+    legacy_type_key,
+    allow_pending_default,
+    is_active
+)
+VALUES
+    ('AYAM', 'USABLE', 'TRANSFER_TO_LAYING_OUT', 'laying_transfers', 'id', 'source_product_warehouse_id', 'source_usage_qty', NULL, 'source_pending_usage_qty', 'deleted_at IS NULL', 'TRANSFERTOLAYING_OUT', TRUE, TRUE)
+ON CONFLICT (flag_group_code, lane, function_code, source_table) DO UPDATE
+SET
+    source_id_column = EXCLUDED.source_id_column,
+    product_warehouse_col = EXCLUDED.product_warehouse_col,
+    quantity_col = EXCLUDED.quantity_col,
+    used_quantity_col = EXCLUDED.used_quantity_col,
+    pending_quantity_col = EXCLUDED.pending_quantity_col,
+    scope_sql = EXCLUDED.scope_sql,
+    legacy_type_key = EXCLUDED.legacy_type_key,
+    allow_pending_default = EXCLUDED.allow_pending_default,
+    is_active = TRUE,
+    updated_at = NOW();
+
+UPDATE fifo_stock_v2_route_rules
+SET
+    is_active = FALSE,
+    updated_at = NOW()
+WHERE flag_group_code = 'AYAM'
+  AND lane = 'USABLE'
+  AND function_code = 'TRANSFER_TO_LAYING_OUT'
+  AND source_table = 'laying_transfer_sources';
+
+COMMIT;

internal/database/migrations/20260308094032_fix_fifo_v2_population_route_rule.down.sql

@@ -0,0 +1,18 @@
+BEGIN;
+
+UPDATE fifo_stock_v2_route_rules
+SET
+    is_active = FALSE,
+    updated_at = NOW()
+WHERE flag_group_code = 'AYAM'
+  AND lane = 'STOCKABLE'
+  AND function_code = 'POPULATION_IN'
+  AND source_table = 'project_flock_populations'
+  AND legacy_type_key = 'PROJECT_FLOCK_POPULATION';
+
+UPDATE fifo_stock_v2_traits
+SET is_active = FALSE
+WHERE source_table = 'project_flock_populations'
+  AND lane = 'STOCKABLE';
+
+COMMIT;

internal/database/migrations/20260308094032_fix_fifo_v2_population_route_rule.up.sql

@@ -0,0 +1,81 @@
+BEGIN;
+
+INSERT INTO fifo_stock_v2_traits(
+    source_table,
+    lane,
+    date_table,
+    date_join_left_col,
+    date_join_right_col,
+    date_column,
+    fallback_date_column,
+    sort_priority,
+    id_column,
+    is_active
+)
+VALUES
+    ('project_flock_populations', 'STOCKABLE', 'project_chickins', 'project_chickin_id', 'id', 'chick_in_date', 'created_at', 55, 'id', TRUE)
+ON CONFLICT (source_table, lane) DO UPDATE
+SET
+    date_table = EXCLUDED.date_table,
+    date_join_left_col = EXCLUDED.date_join_left_col,
+    date_join_right_col = EXCLUDED.date_join_right_col,
+    date_column = EXCLUDED.date_column,
+    fallback_date_column = EXCLUDED.fallback_date_column,
+    sort_priority = EXCLUDED.sort_priority,
+    id_column = EXCLUDED.id_column,
+    is_active = TRUE;
+
+INSERT INTO fifo_stock_v2_route_rules(
+    flag_group_code,
+    lane,
+    function_code,
+    source_table,
+    source_id_column,
+    product_warehouse_col,
+    quantity_col,
+    used_quantity_col,
+    pending_quantity_col,
+    scope_sql,
+    legacy_type_key,
+    allow_pending_default,
+    is_active
+)
+VALUES
+    ('AYAM', 'STOCKABLE', 'POPULATION_IN', 'project_flock_populations', 'id', 'product_warehouse_id', 'total_qty', 'total_used_qty', NULL, NULL, 'PROJECT_FLOCK_POPULATION', TRUE, TRUE)
+ON CONFLICT (flag_group_code, lane, function_code, source_table) DO UPDATE
+SET
+    source_id_column = EXCLUDED.source_id_column,
+    product_warehouse_col = EXCLUDED.product_warehouse_col,
+    quantity_col = EXCLUDED.quantity_col,
+    used_quantity_col = EXCLUDED.used_quantity_col,
+    pending_quantity_col = EXCLUDED.pending_quantity_col,
+    scope_sql = EXCLUDED.scope_sql,
+    legacy_type_key = EXCLUDED.legacy_type_key,
+    allow_pending_default = EXCLUDED.allow_pending_default,
+    is_active = TRUE,
+    updated_at = NOW();
+
+UPDATE project_flock_populations p
+SET total_used_qty = COALESCE(a.used, 0)
+FROM (
+    SELECT stockable_id, SUM(qty) AS used
+    FROM stock_allocations
+    WHERE stockable_type = 'PROJECT_FLOCK_POPULATION'
+      AND status = 'ACTIVE'
+      AND allocation_purpose = 'CONSUME'
+    GROUP BY stockable_id
+) a
+WHERE p.id = a.stockable_id;
+
+UPDATE project_flock_populations p
+SET total_used_qty = 0
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM stock_allocations sa
+    WHERE sa.stockable_type = 'PROJECT_FLOCK_POPULATION'
+      AND sa.status = 'ACTIVE'
+      AND sa.allocation_purpose = 'CONSUME'
+      AND sa.stockable_id = p.id
+);
+
+COMMIT;

internal/database/migrations/20260308101515_create_table_kandang_groups.down.sql

@@ -0,0 +1,28 @@
+BEGIN;
+
+ALTER TABLE daily_checklists
+    DROP CONSTRAINT IF EXISTS fk_daily_checklists_kandang;
+
+UPDATE daily_checklists dc
+SET kandang_id = k.id
+FROM kandangs k
+WHERE
+    dc.kandang_id = k.kandang_group_id;
+
+ALTER TABLE daily_checklists
+    ADD CONSTRAINT fk_daily_checklists_kandang
+        FOREIGN KEY (kandang_id) REFERENCES kandangs (id) ON DELETE CASCADE;
+
+DROP INDEX IF EXISTS idx_kandangs_kandang_group_id;
+
+ALTER TABLE kandangs
+    DROP CONSTRAINT IF EXISTS fk_kandangs_kandang_group;
+
+ALTER TABLE kandangs
+    DROP COLUMN IF EXISTS kandang_group_id;
+
+DROP INDEX IF EXISTS kandang_groups_name_unique;
+
+DROP TABLE IF EXISTS kandang_groups;
+
+COMMIT;

internal/database/migrations/20260308101515_create_table_kandang_groups.up.sql

@@ -0,0 +1,91 @@
+BEGIN;
+
+CREATE TABLE kandang_groups (
+    id BIGSERIAL PRIMARY KEY,
+    name VARCHAR(50) NOT NULL,
+    status VARCHAR(20) NOT NULL,
+    location_id BIGINT NOT NULL REFERENCES locations (id) ON DELETE RESTRICT ON UPDATE CASCADE,
+    pic_id BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE,
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    deleted_at TIMESTAMPTZ,
+    created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+CREATE UNIQUE INDEX kandang_groups_name_unique ON kandang_groups (name)
+WHERE
+    deleted_at IS NULL;
+
+ALTER TABLE kandangs
+    ADD COLUMN kandang_group_id BIGINT;
+
+CREATE TEMP TABLE tmp_kandang_group_map (
+    kandang_id BIGINT PRIMARY KEY,
+    kandang_group_id BIGINT NOT NULL
+) ON COMMIT DROP;
+
+INSERT INTO tmp_kandang_group_map (kandang_id, kandang_group_id)
+SELECT
+    k.id,
+    nextval(pg_get_serial_sequence('kandang_groups', 'id'))
+FROM kandangs k
+ORDER BY
+    k.id;
+
+INSERT INTO kandang_groups (
+    id,
+    name,
+    status,
+    location_id,
+    pic_id,
+    created_at,
+    updated_at,
+    deleted_at,
+    created_by
+)
+SELECT
+    m.kandang_group_id,
+    k.name,
+    k.status,
+    k.location_id,
+    CASE WHEN pic.id IS NOT NULL THEN k.pic_id ELSE NULL END,
+    k.created_at,
+    k.updated_at,
+    k.deleted_at,
+    CASE WHEN creator.id IS NOT NULL THEN k.created_by ELSE NULL END
+FROM kandangs k
+         JOIN tmp_kandang_group_map m ON m.kandang_id = k.id
+         LEFT JOIN users pic ON pic.id = k.pic_id
+         LEFT JOIN users creator ON creator.id = k.created_by
+ORDER BY
+    k.id;
+
+UPDATE kandangs k
+SET kandang_group_id = m.kandang_group_id
+FROM tmp_kandang_group_map m
+WHERE
+    m.kandang_id = k.id;
+
+ALTER TABLE daily_checklists
+    DROP CONSTRAINT IF EXISTS fk_daily_checklists_kandang;
+
+UPDATE daily_checklists dc
+SET kandang_id = m.kandang_group_id
+FROM tmp_kandang_group_map m
+WHERE
+    dc.kandang_id = m.kandang_id;
+
+ALTER TABLE daily_checklists
+    ADD CONSTRAINT fk_daily_checklists_kandang
+        FOREIGN KEY (kandang_id) REFERENCES kandang_groups (id) ON DELETE CASCADE;
+
+ALTER TABLE kandangs
+    ALTER COLUMN kandang_group_id SET NOT NULL;
+
+ALTER TABLE kandangs
+    ADD CONSTRAINT fk_kandangs_kandang_group
+        FOREIGN KEY (kandang_group_id) REFERENCES kandang_groups (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+CREATE INDEX idx_kandangs_kandang_group_id ON kandangs (kandang_group_id);
+
+COMMIT;

internal/database/migrations/20260308113033_enable_fifo_v2_chickin_out.down.sql

@@ -0,0 +1,12 @@
+BEGIN;
+
+UPDATE fifo_stock_v2_route_rules
+SET
+    is_active = FALSE,
+    updated_at = NOW()
+WHERE flag_group_code = 'AYAM'
+  AND lane = 'USABLE'
+  AND function_code = 'CHICKIN_OUT'
+  AND source_table = 'project_chickins';
+
+COMMIT;

internal/database/migrations/20260308113033_enable_fifo_v2_chickin_out.up.sql

@@ -0,0 +1,33 @@
+BEGIN;
+
+INSERT INTO fifo_stock_v2_route_rules(
+    flag_group_code,
+    lane,
+    function_code,
+    source_table,
+    source_id_column,
+    product_warehouse_col,
+    quantity_col,
+    used_quantity_col,
+    pending_quantity_col,
+    scope_sql,
+    legacy_type_key,
+    allow_pending_default,
+    is_active
+)
+VALUES
+    ('AYAM', 'USABLE', 'CHICKIN_OUT', 'project_chickins', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_usage_qty', 'deleted_at IS NULL', 'PROJECT_CHICKIN', TRUE, TRUE)
+ON CONFLICT (flag_group_code, lane, function_code, source_table) DO UPDATE
+SET
+    source_id_column = EXCLUDED.source_id_column,
+    product_warehouse_col = EXCLUDED.product_warehouse_col,
+    quantity_col = EXCLUDED.quantity_col,
+    used_quantity_col = EXCLUDED.used_quantity_col,
+    pending_quantity_col = EXCLUDED.pending_quantity_col,
+    scope_sql = EXCLUDED.scope_sql,
+    legacy_type_key = EXCLUDED.legacy_type_key,
+    allow_pending_default = EXCLUDED.allow_pending_default,
+    is_active = TRUE,
+    updated_at = NOW();
+
+COMMIT;

internal/database/migrations/20260309085123_alter_table_employee_kandangs.down.sql

@@ -0,0 +1,54 @@
+BEGIN;
+
+ALTER TABLE employee_kandangs
+    DROP CONSTRAINT IF EXISTS fk_employee_kandangs_kandang;
+
+ALTER TABLE employee_kandangs
+    DROP CONSTRAINT IF EXISTS uq_employee_kandangs;
+
+CREATE TEMP TABLE tmp_kandang_group_to_kandang_map (
+    kandang_group_id BIGINT PRIMARY KEY,
+    kandang_id BIGINT NOT NULL
+) ON COMMIT DROP;
+
+INSERT INTO tmp_kandang_group_to_kandang_map (kandang_group_id, kandang_id)
+SELECT
+    k.kandang_group_id,
+    MIN(k.id) AS kandang_id
+FROM kandangs k
+WHERE k.kandang_group_id IS NOT NULL
+GROUP BY k.kandang_group_id;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM employee_kandangs ek
+        LEFT JOIN tmp_kandang_group_to_kandang_map m ON m.kandang_group_id = ek.kandang_id
+        WHERE m.kandang_id IS NULL
+    ) THEN
+        RAISE EXCEPTION 'Cannot rollback employee_kandangs migration: kandang_group_id has no kandang mapping';
+    END IF;
+END $$;
+
+UPDATE employee_kandangs ek
+SET kandang_id = m.kandang_id,
+    updated_at = NOW()
+FROM tmp_kandang_group_to_kandang_map m
+WHERE m.kandang_group_id = ek.kandang_id;
+
+DELETE FROM employee_kandangs ek1
+USING employee_kandangs ek2
+WHERE ek1.id > ek2.id
+  AND ek1.employee_id = ek2.employee_id
+  AND ek1.kandang_id = ek2.kandang_id;
+
+ALTER TABLE employee_kandangs
+    ADD CONSTRAINT fk_employee_kandangs_kandang
+        FOREIGN KEY (kandang_id) REFERENCES kandangs (id)
+            ON DELETE CASCADE;
+
+ALTER TABLE employee_kandangs
+    ADD CONSTRAINT uq_employee_kandangs UNIQUE (employee_id, kandang_id);
+
+COMMIT;

internal/database/migrations/20260309085123_alter_table_employee_kandangs.up.sql

@@ -0,0 +1,41 @@
+BEGIN;
+
+ALTER TABLE employee_kandangs
+    DROP CONSTRAINT IF EXISTS fk_employee_kandangs_kandang;
+
+ALTER TABLE employee_kandangs
+    DROP CONSTRAINT IF EXISTS uq_employee_kandangs;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM employee_kandangs ek
+        LEFT JOIN kandangs k ON k.id = ek.kandang_id
+        WHERE k.kandang_group_id IS NULL
+    ) THEN
+        RAISE EXCEPTION 'Cannot migrate employee_kandangs: kandang_id has no kandang_group_id mapping';
+    END IF;
+END $$;
+
+UPDATE employee_kandangs ek
+SET kandang_id = k.kandang_group_id,
+    updated_at = NOW()
+FROM kandangs k
+WHERE k.id = ek.kandang_id;
+
+DELETE FROM employee_kandangs ek1
+USING employee_kandangs ek2
+WHERE ek1.id > ek2.id
+  AND ek1.employee_id = ek2.employee_id
+  AND ek1.kandang_id = ek2.kandang_id;
+
+ALTER TABLE employee_kandangs
+    ADD CONSTRAINT fk_employee_kandangs_kandang
+        FOREIGN KEY (kandang_id) REFERENCES kandang_groups (id)
+            ON DELETE CASCADE;
+
+ALTER TABLE employee_kandangs
+    ADD CONSTRAINT uq_employee_kandangs UNIQUE (employee_id, kandang_id);
+
+COMMIT;

internal/entities/daily-checklist.go

@@ -17,7 +17,7 @@ type DailyChecklist struct {
 	CreatedAt    time.Time `gorm:"autoCreateTime"`
 	UpdatedAt    time.Time `gorm:"autoUpdateTime"`
 
-	Kandang   Kandang              `gorm:"foreignKey:KandangId;references:Id"`
+	Kandang   KandangGroup         `gorm:"foreignKey:KandangId;references:Id"`
 	Checklist *Checklist           `gorm:"foreignKey:ChecklistId;references:Id"`
 	Creator   *User                `gorm:"foreignKey:CreatedBy;references:Id"`
 	Tasks     []DailyChecklistTask `gorm:"foreignKey:DailyChecklistId;references:Id"`

internal/entities/employee.go

@@ -26,6 +26,6 @@ type EmployeeKandang struct {
 	CreatedAt  time.Time `gorm:"autoCreateTime"`
 	UpdatedAt  time.Time `gorm:"autoUpdateTime"`
 
-	Employee Employee `gorm:"foreignKey:EmployeeId;references:Id"`
-	Kandang  Kandang  `gorm:"foreignKey:KandangId;references:Id"`
+	Employee Employee     `gorm:"foreignKey:EmployeeId;references:Id"`
+	Kandang  KandangGroup `gorm:"foreignKey:KandangId;references:Id"`
 }

internal/entities/kandang.go

@@ -11,6 +11,7 @@ type Kandang struct {
 	Name                 string                `gorm:"type:varchar(50);not null;uniqueIndex:kandangs_name_unique,where:deleted_at IS NULL"`
 	Status               string                `gorm:"type:varchar(50);not null"`
 	LocationId           uint                  `gorm:"not null"`
+	KandangGroupId       uint                  `gorm:"not null"`
 	Capacity             float64               `gorm:"not null"`
 	PicId                uint                  `gorm:"not null"`
 	CreatedBy            uint                  `gorm:"not null"`
@@ -19,6 +20,7 @@ type Kandang struct {
 	DeletedAt            gorm.DeletedAt        `gorm:"index" json:"-"`
 	CreatedUser          User                  `gorm:"foreignKey:CreatedBy;references:Id"`
 	Location             Location              `gorm:"foreignKey:LocationId;references:Id"`
+	KandangGroup         KandangGroup          `gorm:"foreignKey:KandangGroupId;references:Id"`
 	Pic                  User                  `gorm:"foreignKey:PicId;references:Id"`
 	Warehouses           []Warehouse           `gorm:"foreignKey:KandangId;references:Id"`
 	ProjectFlockKandangs []ProjectFlockKandang `gorm:"foreignKey:KandangId;references:Id" json:"-"`

internal/entities/kandang_group.go

@@ -0,0 +1,24 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type KandangGroup struct {
+	Id         uint           `gorm:"primaryKey"`
+	Name       string         `gorm:"type:varchar(50);not null;uniqueIndex:kandang_groups_name_unique,where:deleted_at IS NULL"`
+	Status     string         `gorm:"type:varchar(50);not null"`
+	LocationId uint           `gorm:"not null"`
+	PicId      uint           `gorm:"not null"`
+	CreatedBy  uint           `gorm:"not null"`
+	CreatedAt  time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt  time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt  gorm.DeletedAt `gorm:"index" json:"-"`
+
+	CreatedUser User      `gorm:"foreignKey:CreatedBy;references:Id"`
+	Location    Location  `gorm:"foreignKey:LocationId;references:Id"`
+	Pic         User      `gorm:"foreignKey:PicId;references:Id"`
+	Kandangs    []Kandang `gorm:"foreignKey:KandangGroupId;references:Id"`
+}

internal/entities/laying_transfer.go

@@ -7,25 +7,33 @@ import (
 )
 
 type LayingTransfer struct {
-	Id                 uint           `gorm:"primaryKey"`
-	TransferNumber     string         `gorm:"uniqueIndex;not null"`
-	FromProjectFlockId uint           `gorm:"not null"`
-	ToProjectFlockId   uint           `gorm:"not null"`
-	TransferDate       time.Time      `gorm:"type:date;not null"`
-	EffectiveMoveDate  *time.Time     `gorm:"type:date"`
-	ExecutedAt         *time.Time     `gorm:"type:timestamptz"`
-	ExecutedBy         *uint          `gorm:"index"`
-	Notes              string         `gorm:"type:text"`
-	CreatedBy          uint           `gorm:"not null"`
-	CreatedAt          time.Time      `gorm:"autoCreateTime"`
-	UpdatedAt          time.Time      `gorm:"autoUpdateTime"`
-	DeletedAt          gorm.DeletedAt `gorm:"index"`
+	Id                          uint           `gorm:"primaryKey"`
+	TransferNumber              string         `gorm:"uniqueIndex;not null"`
+	FromProjectFlockId          uint           `gorm:"not null"`
+	ToProjectFlockId            uint           `gorm:"not null"`
+	SourceProjectFlockKandangId *uint          `gorm:"index"`
+	SourceProductWarehouseId    *uint          `gorm:"index"`
+	SourceRequestedQty          float64        `gorm:"type:numeric(15,3);default:0;not null"`
+	SourceUsageQty              float64        `gorm:"type:numeric(15,3);default:0;not null"`
+	SourcePendingUsageQty       float64        `gorm:"type:numeric(15,3);default:0;not null"`
+	TransferDate                time.Time      `gorm:"type:date;not null"`
+	EconomicCutoffDate          *time.Time     `gorm:"type:date"`
+	EffectiveMoveDate           *time.Time     `gorm:"type:date"`
+	ExecutedAt                  *time.Time     `gorm:"type:timestamptz"`
+	ExecutedBy                  *uint          `gorm:"index"`
+	Notes                       string         `gorm:"type:text"`
+	CreatedBy                   uint           `gorm:"not null"`
+	CreatedAt                   time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt                   time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt                   gorm.DeletedAt `gorm:"index"`
 
-	FromProjectFlock *ProjectFlock          `gorm:"foreignKey:FromProjectFlockId;references:Id"`
-	ToProjectFlock   *ProjectFlock          `gorm:"foreignKey:ToProjectFlockId;references:Id"`
-	CreatedUser      *User                  `gorm:"foreignKey:CreatedBy;references:Id"`
-	ExecutedUser     *User                  `gorm:"foreignKey:ExecutedBy;references:Id"`
-	Sources          []LayingTransferSource `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
-	Targets          []LayingTransferTarget `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
-	LatestApproval   *Approval              `gorm:"-" json:"-"`
+	FromProjectFlock          *ProjectFlock          `gorm:"foreignKey:FromProjectFlockId;references:Id"`
+	ToProjectFlock            *ProjectFlock          `gorm:"foreignKey:ToProjectFlockId;references:Id"`
+	SourceProjectFlockKandang *ProjectFlockKandang   `gorm:"foreignKey:SourceProjectFlockKandangId;references:Id"`
+	SourceProductWarehouse    *ProductWarehouse      `gorm:"foreignKey:SourceProductWarehouseId;references:Id"`
+	CreatedUser               *User                  `gorm:"foreignKey:CreatedBy;references:Id"`
+	ExecutedUser              *User                  `gorm:"foreignKey:ExecutedBy;references:Id"`
+	Sources                   []LayingTransferSource `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
+	Targets                   []LayingTransferTarget `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
+	LatestApproval            *Approval              `gorm:"-" json:"-"`
 }

internal/entities/recording.go

@@ -43,4 +43,6 @@ type Recording struct {
 	StandardEggMass      *float64 `gorm:"-"`
 	StandardEggWeight    *float64 `gorm:"-"`
 	StandardFcr          *float64 `gorm:"-"`
+	PopulationCanChange  *bool    `gorm:"-"`
+	TransferExecuted     *bool    `gorm:"-"`
 }

internal/entities/stock_allocation.go

@@ -10,6 +10,9 @@ const (
 	StockAllocationStatusPending  = "PENDING"
 	StockAllocationStatusActive   = "ACTIVE"
 	StockAllocationStatusReleased = "RELEASED"
+
+	StockAllocationPurposeConsume      = "CONSUME"
+	StockAllocationPurposeTraceChickin = "TRACE_CHICKIN"
 )
 
 // StockAllocation links a usable record (consumption) with an incoming stock record.
@@ -22,7 +25,8 @@ type StockAllocation struct {
 	UsableType         string         `gorm:"size:100;not null;index:stock_allocations_usage_lookup,priority:1"`
 	UsableId           uint           `gorm:"not null;index:stock_allocations_usage_lookup,priority:2"`
 	Qty                float64        `gorm:"type:numeric(15,3);not null"`
-	Status             string         `gorm:"size:20;not null;default:ACTIVE"`
+	AllocationPurpose  string         `gorm:"size:32;not null;default:CONSUME;index:stock_allocations_purpose_status,priority:1"`
+	Status             string         `gorm:"size:20;not null;default:ACTIVE;index:stock_allocations_purpose_status,priority:2"`
 	Note               *string        `gorm:"type:text"`
 	CreatedAt          time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt          time.Time      `gorm:"autoUpdateTime"`

internal/middleware/auth.go

@@ -19,11 +19,11 @@ const (
 
 // AuthContext keeps authentication details captured by the middleware.
 type AuthContext struct {
-	Token        string
-	Verification *sso.VerificationResult
-	User         *entity.User
-	Roles        []sso.Role
-	Permissions  map[string]struct{}
+	Token           string
+	Verification    *sso.VerificationResult
+	User            *entity.User
+	Roles           []sso.Role
+	Permissions     map[string]struct{}
 	UserAreaIDs     []uint
 	UserLocationIDs []uint
 	UserAllArea     bool
@@ -36,8 +36,30 @@ type AuthContext struct {
 func Auth(userService service.UserService, requiredScopes ...string) fiber.Handler {
 	return func(c *fiber.Ctx) error {
 		token := bearerToken(c)
-		if token == "" {
-			token = strings.TrimSpace(c.Cookies(config.SSOAccessCookieName))
+		tokenSource := ""
+		if token != "" {
+			tokenSource = "header"
+		} else {
+			primaryName := strings.TrimSpace(config.SSOAccessCookieName)
+			if primaryName != "" {
+				token = strings.TrimSpace(c.Cookies(primaryName))
+				if token != "" {
+					tokenSource = "cookie:" + primaryName
+				}
+			}
+			if token == "" {
+				for _, name := range config.SSOAccessCookieFallback {
+					name = strings.TrimSpace(name)
+					if name == "" || name == primaryName {
+						continue
+					}
+					token = strings.TrimSpace(c.Cookies(name))
+					if token != "" {
+						tokenSource = "cookie:" + name
+						break
+					}
+				}
+			}
 		}
 		if token == "" {
 			return fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
@@ -45,7 +67,11 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 
 		verification, err := sso.VerifyAccessToken(token)
 		if err != nil {
-			utils.Log.WithError(err).Warn("auth: token verification failed")
+			if sso.IsSignatureError(err) {
+				logSignatureError("auth", tokenSource, token, err)
+			} else {
+				utils.Log.WithError(err).Warn("auth: token verification failed")
+			}
 			return fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
 		}
 
@@ -89,11 +115,11 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 		}
 
 		ctx := &AuthContext{
-			Token:        token,
-			Verification: verification,
-			User:         user,
-			Roles:        roles,
-			Permissions:  permissions,
+			Token:           token,
+			Verification:    verification,
+			User:            user,
+			Roles:           roles,
+			Permissions:     permissions,
 			UserAreaIDs:     nil,
 			UserLocationIDs: nil,
 			UserAllArea:     false,
@@ -216,6 +242,26 @@ func hasAllScopes(have, required []string) bool {
 	return true
 }
 
+func logSignatureError(ctxLabel, tokenSource, token string, err error) {
+	info := sso.ExtractTokenInfo(token)
+	aud := strings.Join(info.Aud, ",")
+	utils.Log.Errorf(
+		"access token verification failed: %v | ctx=%s source=%s iss=%s kid=%s aud=%s sub=%s exp=%d iat=%d nbf=%d expected_iss=%s expected_aud=%v",
+		err,
+		ctxLabel,
+		tokenSource,
+		info.Iss,
+		info.Kid,
+		aud,
+		info.Sub,
+		info.Exp,
+		info.Iat,
+		info.Nbf,
+		config.SSOIssuer,
+		config.SSOAllowedAudiences,
+	)
+}
+
 // RequirePermissions ensures the authenticated user possesses all specified permissions.
 func RequirePermissions(perms ...string) fiber.Handler {
 	required := canonicalPermissions(perms)

internal/middleware/permissions.go

@@ -130,6 +130,8 @@ const (
 	P_KandangsUpdateOne = "lti.master.kandangs.update"
 	P_KandangsDeleteOne = "lti.master.kandangs.delete"
 
+	P_KandangGroups = "lti.daily_checklist.master_data.kandang"
+
 	P_LocationsGetAll    = "lti.master.locations.list"
 	P_LocationsGetOne    = "lti.master.locations.detail"
 	P_LocationsCreateOne = "lti.master.locations.create"

internal/modules/closings/dto/closingOverhead.dto.go

@@ -1,8 +1,6 @@
 package dto
 
 import (
-	"encoding/json"
-
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 )
 
@@ -71,7 +69,7 @@ func ToOverheadDTO(budget *entity.ProjectBudget, realization *entity.ExpenseReal
 	return dto
 }
 
-func ToOverheadListDTOs(budgets []entity.ProjectBudget, realizations []entity.ExpenseRealization, totalChickinQty, totalActualPopulation float64, isPerKandang bool, totalKandangCount int, projectFlockKandangCountMap map[uint]int) OverheadListDTO {
+func ToOverheadListDTOs(budgets []entity.ProjectBudget, realizations []entity.ExpenseRealization, totalChickinQty, totalActualPopulation float64, isPerKandang bool, totalKandangCount int) OverheadListDTO {
 	overheadsByNonstockID := make(map[uint]*OverheadDTO)
 	latestDateByNonstockID := make(map[uint]string)
 
@@ -113,35 +111,6 @@ func ToOverheadListDTOs(budgets []entity.ProjectBudget, realizations []entity.Ex
 		qty := realizations[i].Qty
 		totalAmount := calculateTotal(realizations[i].Qty, realizations[i].Price)
 
-		// Farm-level expense division
-		if realizations[i].ExpenseNonstock.Expense != nil &&
-			realizations[i].ExpenseNonstock.Expense.ProjectFlockId != nil {
-			projectFlockIDs := parseProjectFlockIDsFromJSON(*realizations[i].ExpenseNonstock.Expense.ProjectFlockId)
-
-			if len(projectFlockIDs) > 0 {
-				totalKandangInAllProjects := 0
-				for _, pfID := range projectFlockIDs {
-					if count, exists := projectFlockKandangCountMap[pfID]; exists {
-						totalKandangInAllProjects += count
-					}
-				}
-
-				if totalKandangInAllProjects > 0 {
-					if isPerKandang {
-						qty = qty / float64(totalKandangInAllProjects)
-						totalAmount = totalAmount / float64(totalKandangInAllProjects)
-					} else {
-						// Overhead ALL: divide by total kandang then multiply by this project's kandang count
-						perKandangAmount := totalAmount / float64(totalKandangInAllProjects)
-						perKandangQty := qty / float64(totalKandangInAllProjects)
-
-						qty = perKandangQty * float64(totalKandangCount)
-						totalAmount = perKandangAmount * float64(totalKandangCount)
-					}
-				}
-			}
-		}
-
 		overheadsByNonstockID[nonstockID].ActualQuantity += qty
 		overheadsByNonstockID[nonstockID].ActualTotalAmount += totalAmount
 
@@ -191,27 +160,6 @@ func ToOverheadListDTOs(budgets []entity.ProjectBudget, realizations []entity.Ex
 	}
 }
 
-func parseProjectFlockIDsFromJSON(projectFlockJSON string) []uint {
-	if projectFlockJSON == "" {
-		return []uint{}
-	}
-
-	var projectFlocks []uint
-	if err := json.Unmarshal([]byte(projectFlockJSON), &projectFlocks); err != nil {
-		return []uint{}
-	}
-
-	return projectFlocks
-}
-
-func countProjectFlocksInJSON(projectFlockJSON string) int {
-	projectFlocks := parseProjectFlockIDsFromJSON(projectFlockJSON)
-	if len(projectFlocks) == 0 {
-		return 1
-	}
-	return len(projectFlocks)
-}
-
 func getItemInfo(nonstock *entity.Nonstock) (string, string) {
 	if nonstock != nil && nonstock.Id != 0 {
 		return nonstock.Name, nonstock.Uom.Name

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

@@ -65,7 +65,7 @@ type SapronakCategoryRowDTO struct {
 	QtyOut          float64 `json:"qty_out"`
 	QtyUsed         float64 `json:"qty_used"`
 	Description     string  `json:"description"`
-	ProductCategory []string `json:"product_category"`
+	ProductCategory string  `json:"product_category"`
 	UnitPrice       float64 `json:"unit_price"`
 	TotalAmount     float64 `json:"total_amount"`
 	Notes           string  `json:"notes"`
@@ -183,13 +183,13 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 		"PULLET": 0,
 	}
 
-	buildFlagList := func(productID uint, fallback string) []string {
+	buildFlagList := func(productID uint, fallback string) string {
 		rawFlags := productFlags[productID]
 		if len(rawFlags) == 0 {
 			if fallback == "" {
-				return []string{}
+				return ""
 			}
-			return []string{fallback}
+			return fallback
 		}
 		seen := make(map[string]struct{}, len(rawFlags))
 		ordered := make([]string, 0, len(rawFlags))
@@ -220,7 +220,7 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 			}
 			return li < lj
 		})
-		return ordered
+		return strings.Join(ordered, " ")
 	}
 
 	for _, group := range report.Groups {
@@ -317,6 +317,27 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 		}
 	}
 
+	// For chicken categories, keep qty_used aligned with qty_in - qty_out.
+	// Sales are excluded; usage represents remaining after transfers.
+	adjustChicken := func(cat *SapronakCategoryDTO) {
+		if cat == nil {
+			return
+		}
+		for i := range cat.Rows {
+			row := &cat.Rows[i]
+			remaining := row.QtyIn - row.QtyOut
+			if remaining < 0 {
+				remaining = 0
+			}
+			row.QtyUsed = remaining
+			if row.UnitPrice > 0 {
+				row.TotalAmount = row.QtyUsed * row.UnitPrice
+			}
+		}
+	}
+	adjustChicken(result.Doc)
+	adjustChicken(result.Pullet)
+
 	buildTotals := func(cat *SapronakCategoryDTO, label string) {
 		if cat == nil {
 			return
@@ -345,5 +366,22 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 	buildTotals(result.Doc, "TOTAL DOC")
 	buildTotals(result.Ovk, "TOTAL OVK")
 	buildTotals(result.Pakan, "TOTAL PAKAN")
+
+	// For chicken categories, enforce total qty_used = qty_in - qty_out.
+	adjustChickenTotal := func(cat *SapronakCategoryDTO) {
+		if cat == nil {
+			return
+		}
+		remaining := cat.Total.QtyIn - cat.Total.QtyOut
+		if remaining < 0 {
+			remaining = 0
+		}
+		cat.Total.QtyUsed = remaining
+		if cat.Total.AvgUnitPrice > 0 {
+			cat.Total.TotalAmount = cat.Total.AvgUnitPrice * remaining
+		}
+	}
+	adjustChickenTotal(result.Doc)
+	adjustChickenTotal(result.Pullet)
 	return result
 }

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

@@ -25,17 +25,17 @@ type ClosingRepository interface {
 	SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, float64, float64, error)
 	SumRecordingEggQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, 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)
-	FetchSapronakUsage(ctx context.Context, pfkID uint) ([]SapronakUsageRow, error)
-	FetchSapronakUsageDetails(ctx context.Context, pfkID uint) (map[uint][]SapronakDetailRow, error)
-	FetchSapronakChickinUsage(ctx context.Context, pfkID uint) ([]SapronakUsageRow, error)
-	FetchSapronakChickinUsageDetails(ctx context.Context, pfkID uint) (map[uint][]SapronakDetailRow, error)
-	FetchSapronakUsageAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
-	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)
+	FetchSapronakIncoming(ctx context.Context, kandangID uint, start, end *time.Time) ([]SapronakIncomingRow, error)
+	FetchSapronakIncomingDetails(ctx context.Context, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakUsage(ctx context.Context, pfkID uint, start, end *time.Time) ([]SapronakUsageRow, error)
+	FetchSapronakUsageDetails(ctx context.Context, pfkID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakChickinUsage(ctx context.Context, pfkID uint, start, end *time.Time) ([]SapronakUsageRow, error)
+	FetchSapronakChickinUsageDetails(ctx context.Context, pfkID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakUsageAllocatedDetails(ctx context.Context, projectFlockKandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakAdjustments(ctx context.Context, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error)
+	FetchSapronakTransfers(ctx context.Context, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error)
+	FetchSapronakSales(ctx context.Context, projectFlockKandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakSalesAllocatedDetails(ctx context.Context, projectFlockKandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error)
 	GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error)
 }
 
@@ -86,6 +86,8 @@ type SapronakQueryParams struct {
 	Limit                  int
 	Offset                 int
 	Search                 string
+	StartDate              *time.Time
+	EndDate                *time.Time
 }
 
 func (r *ClosingRepositoryImpl) GetSapronak(ctx context.Context, params SapronakQueryParams) ([]SapronakRow, int64, error) {
@@ -142,15 +144,33 @@ func (r *ClosingRepositoryImpl) GetSapronak(ctx context.Context, params Sapronak
 	}
 
 	var totalResults int64
-	countSQL := fmt.Sprintf("SELECT COUNT(*) FROM (%s) AS combined%s", unionSQL, searchClause)
-	countArgs := append(append([]any{}, args...), searchArgs...)
+	dateClause := ""
+	var dateArgs []any
+	if params.StartDate != nil {
+		dateClause += " AND sort_date::date >= ?"
+		dateArgs = append(dateArgs, params.StartDate)
+	}
+	if params.EndDate != nil {
+		dateClause += " AND sort_date::date <= ?"
+		dateArgs = append(dateArgs, params.EndDate)
+	}
+	whereClause := searchClause
+	if dateClause != "" {
+		if whereClause == "" {
+			whereClause = " WHERE " + strings.TrimPrefix(dateClause, " AND ")
+		} else {
+			whereClause += dateClause
+		}
+	}
+	countSQL := fmt.Sprintf("SELECT COUNT(*) FROM (%s) AS combined%s", unionSQL, whereClause)
+	countArgs := append(append(append([]any{}, args...), searchArgs...), dateArgs...)
 	if err := db.Raw(countSQL, countArgs...).Scan(&totalResults).Error; err != nil {
 		return nil, 0, err
 	}
 
-	dataArgs := append(append([]any{}, args...), searchArgs...)
+	dataArgs := append(append(append([]any{}, args...), searchArgs...), dateArgs...)
 	dataArgs = append(dataArgs, params.Limit, params.Offset)
-	dataSQL := fmt.Sprintf("SELECT * FROM (%s) AS combined%s ORDER BY sort_date ASC, id ASC LIMIT ? OFFSET ?", unionSQL, searchClause)
+	dataSQL := fmt.Sprintf("SELECT * FROM (%s) AS combined%s ORDER BY sort_date ASC, id ASC LIMIT ? OFFSET ?", unionSQL, whereClause)
 
 	var rows []SapronakRow
 	if err := db.Raw(dataSQL, dataArgs...).Scan(&rows).Error; err != nil {
@@ -213,6 +233,25 @@ func (r *ClosingRepositoryImpl) GetSapronakSummary(ctx context.Context, params S
 		searchArgs = append(searchArgs, like, like, like, like, like, like, like, like, like)
 	}
 
+	dateClause := ""
+	var dateArgs []any
+	if params.StartDate != nil {
+		dateClause += " AND sort_date::date >= ?"
+		dateArgs = append(dateArgs, params.StartDate)
+	}
+	if params.EndDate != nil {
+		dateClause += " AND sort_date::date <= ?"
+		dateArgs = append(dateArgs, params.EndDate)
+	}
+	whereClause := searchClause
+	if dateClause != "" {
+		if whereClause == "" {
+			whereClause = " WHERE " + strings.TrimPrefix(dateClause, " AND ")
+		} else {
+			whereClause += dateClause
+		}
+	}
+
 	querySQL := fmt.Sprintf(`
 SELECT
 	product_category AS category,
@@ -222,8 +261,8 @@ SELECT
 FROM (%s) AS combined%s
 GROUP BY product_category, unit_id, unit
 ORDER BY product_category ASC, unit ASC
-`, unionSQL, searchClause)
-	queryArgs := append(append([]any{}, args...), searchArgs...)
+`, unionSQL, whereClause)
+	queryArgs := append(append(append([]any{}, args...), searchArgs...), dateArgs...)
 
 	var rows []SapronakSummaryRow
 	if err := db.Raw(querySQL, queryArgs...).Scan(&rows).Error; err != nil {
@@ -778,6 +817,16 @@ type SapronakDetailRow struct {
 
 func (r *ClosingRepositoryImpl) withCtx(ctx context.Context) *gorm.DB { return r.DB().WithContext(ctx) }
 
+func applyDateRange(db *gorm.DB, column string, start, end *time.Time) *gorm.DB {
+	if start != nil {
+		db = db.Where(column+"::date >= ?", start)
+	}
+	if end != nil {
+		db = db.Where(column+"::date <= ?", end)
+	}
+	return db
+}
+
 func applyJoins(db *gorm.DB, joins ...string) *gorm.DB {
 	for _, j := range joins {
 		if strings.TrimSpace(j) != "" {
@@ -878,6 +927,14 @@ func (r *ClosingRepositoryImpl) fetchSapronakUsage(
 	return rows, nil
 }
 
+func scanUsage(db *gorm.DB) ([]SapronakUsageRow, error) {
+	rows := make([]SapronakUsageRow, 0)
+	if err := db.Group("pw.product_id, p.name, f.name, p.product_price").Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+	return rows, nil
+}
+
 func (r *ClosingRepositoryImpl) detailQuery(
 	ctx context.Context,
 	table string,
@@ -909,11 +966,11 @@ func (r *ClosingRepositoryImpl) fetchSapronakDetails(
 	return scanAndGroupDetails(r.detailQuery(ctx, table, pwJoinCond, joins, selectSQL, where, args...))
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakUsage(ctx context.Context, pfkID uint) ([]SapronakUsageRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakUsage(ctx context.Context, pfkID uint, start, end *time.Time) ([]SapronakUsageRow, error) {
 	if pfkID == 0 {
 		return nil, nil
 	}
-	return r.fetchSapronakUsage(
+	db := r.usageQuery(
 		ctx,
 		"recording_stocks rs",
 		"pw.id = rs.product_warehouse_id",
@@ -922,13 +979,15 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsage(ctx context.Context, pfkID ui
 		pfkID,
 		sapronakFlagsUsage,
 	)
+	db = applyDateRange(db, "r.record_datetime", start, end)
+	return scanUsage(db)
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakChickinUsage(ctx context.Context, pfkID uint) ([]SapronakUsageRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakChickinUsage(ctx context.Context, pfkID uint, start, end *time.Time) ([]SapronakUsageRow, error) {
 	if pfkID == 0 {
 		return []SapronakUsageRow{}, nil
 	}
-	return r.fetchSapronakUsage(
+	db := r.usageQuery(
 		ctx,
 		"project_chickins pc",
 		"pw.id = pc.product_warehouse_id",
@@ -937,10 +996,12 @@ func (r *ClosingRepositoryImpl) FetchSapronakChickinUsage(ctx context.Context, p
 		pfkID,
 		sapronakFlagsChickin,
 	)
+	db = applyDateRange(db, "pc.chick_in_date", start, end)
+	return scanUsage(db)
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakUsageDetails(ctx context.Context, pfkID uint) (map[uint][]SapronakDetailRow, error) {
-	return r.fetchSapronakDetails(
+func (r *ClosingRepositoryImpl) FetchSapronakUsageDetails(ctx context.Context, pfkID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error) {
+	db := r.detailQuery(
 		ctx,
 		"recording_stocks rs",
 		"pw.id = rs.product_warehouse_id",
@@ -959,10 +1020,12 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageDetails(ctx context.Context, p
 		pfkID,
 		sapronakFlagsUsage,
 	)
+	db = applyDateRange(db, "r.record_datetime", start, end)
+	return scanAndGroupDetails(db)
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakChickinUsageDetails(ctx context.Context, pfkID uint) (map[uint][]SapronakDetailRow, error) {
-	return r.fetchSapronakDetails(
+func (r *ClosingRepositoryImpl) FetchSapronakChickinUsageDetails(ctx context.Context, pfkID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error) {
+	db := r.detailQuery(
 		ctx,
 		"project_chickins pc",
 		"pw.id = pc.product_warehouse_id",
@@ -981,13 +1044,16 @@ func (r *ClosingRepositoryImpl) FetchSapronakChickinUsageDetails(ctx context.Con
 		pfkID,
 		sapronakFlagsChickin,
 	)
+	db = applyDateRange(db, "pc.chick_in_date", start, end)
+	return scanAndGroupDetails(db)
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.Context, projectFlockKandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error) {
 	if projectFlockKandangID == 0 {
 		return map[uint][]SapronakDetailRow{}, nil
 	}
 
+	dateExpr := "COALESCE(pi.received_date, st.transfer_date, lt.transfer_date, ast.created_at, pc.chick_in_date, r.record_datetime)"
 	query := r.withCtx(ctx).
 		Table("stock_allocations AS sa").
 		Select(`
@@ -1029,17 +1095,19 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 		Joins("LEFT JOIN adjustment_stocks ast ON ast.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 products p_resolve ON p_resolve.id = COALESCE(pi.product_id, pw_ltt.product_id, pw.product_id)").
+		Joins("LEFT JOIN product_warehouses pw_pc ON pw_pc.id = pc.product_warehouse_id").
+		Joins("LEFT JOIN products p_resolve ON p_resolve.id = COALESCE(pi.product_id, pw_ltt.product_id, pw_pc.product_id, pw.product_id)").
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
+		Where("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where(`
-			(sa.usable_type = ? AND r.project_flock_kandangs_id = ?)
+			(sa.usable_type = ? AND r.project_flock_kandangs_id = ? AND f.name IN ?)
 			OR
-			(sa.usable_type = ? AND pc_used.project_flock_kandang_id = ?)
+			(sa.usable_type = ? AND pc_used.project_flock_kandang_id = ? AND f.name IN ?)
 		`,
-			fifo.UsableKeyRecordingStock.String(), projectFlockKandangID,
-			fifo.UsableKeyProjectChickin.String(), projectFlockKandangID,
+			fifo.UsableKeyRecordingStock.String(), projectFlockKandangID, sapronakFlagsUsage,
+			fifo.UsableKeyProjectChickin.String(), projectFlockKandangID, sapronakFlagsChickin,
 		)
 	query = r.joinSapronakProductFlag(query, "p_resolve").
 		Group(`
@@ -1048,11 +1116,12 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 			po.po_number, st.movement_number, lt.transfer_number, ast.id, pc.id, r.id,
 			pi.price, p_resolve.product_price
 		`)
+	query = applyDateRange(query, dateExpr, start, end)
 
 	return scanAndGroupDetails(query)
 }
 
-func (r *ClosingRepositoryImpl) incomingPurchaseBase(ctx context.Context, kandangID uint) *gorm.DB {
+func (r *ClosingRepositoryImpl) incomingPurchaseBase(ctx context.Context, kandangID uint, start, end *time.Time) *gorm.DB {
 	db := r.withCtx(ctx).
 		Table("purchase_items AS pi").
 		Joins("JOIN purchases po ON po.id = pi.purchase_id AND po.deleted_at IS NULL").
@@ -1061,12 +1130,13 @@ func (r *ClosingRepositoryImpl) incomingPurchaseBase(ctx context.Context, kandan
 		Where("w.kandang_id = ?", kandangID).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where("pi.received_date IS NOT NULL")
+	db = applyDateRange(db, "pi.received_date", start, end)
 	return r.joinSapronakProductFlag(db, "p")
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakIncoming(ctx context.Context, kandangID uint) ([]SapronakIncomingRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakIncoming(ctx context.Context, kandangID uint, start, end *time.Time) ([]SapronakIncomingRow, error) {
 	rows := make([]SapronakIncomingRow, 0)
-	db := r.incomingPurchaseBase(ctx, kandangID).Select(`
+	db := r.incomingPurchaseBase(ctx, kandangID, start, end).Select(`
 		pi.product_id AS product_id,
 		p.name AS product_name,
 		f.name AS flag,
@@ -1080,9 +1150,9 @@ func (r *ClosingRepositoryImpl) FetchSapronakIncoming(ctx context.Context, kanda
 	return rows, nil
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakIncomingDetails(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakIncomingDetails(ctx context.Context, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error) {
 	return scanAndGroupDetails(
-		r.incomingPurchaseBase(ctx, kandangID).Select(`
+		r.incomingPurchaseBase(ctx, kandangID, start, end).Select(`
 			pi.product_id AS product_id,
 			p.name AS product_name,
 			f.name AS flag,
@@ -1177,7 +1247,7 @@ func splitStockLogs(rows []stockLogSapronakRow, refFn func(stockLogSapronakRow)
 	return in, out
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakAdjustments(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakAdjustments(ctx context.Context, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
 	poByWarehouse := r.DB().
 		Table("purchase_items pi").
 		Select("DISTINCT ON (pi.product_warehouse_id) pi.product_warehouse_id, po.po_number, pi.received_date").
@@ -1204,11 +1274,13 @@ func (r *ClosingRepositoryImpl) FetchSapronakAdjustments(ctx context.Context, ka
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where("COALESCE(ast.total_qty, 0) > 0")
 	incomingQuery = r.joinSapronakProductFlag(incomingQuery, "p")
+	incomingQuery = applyDateRange(incomingQuery, "ast.created_at", start, end)
 	incoming, err := scanAndGroupDetails(incomingQuery)
 	if err != nil {
 		return nil, nil, err
 	}
 
+	dateExpr := "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)"
 	outgoingQuery := r.withCtx(ctx).
 		Table("stock_allocations AS sa").
 		Select(`
@@ -1236,11 +1308,13 @@ func (r *ClosingRepositoryImpl) FetchSapronakAdjustments(ctx context.Context, ka
 		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("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		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")
+	outgoingQuery = applyDateRange(outgoingQuery, dateExpr, start, end)
 	outgoing, err := scanAndGroupDetails(outgoingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1249,7 +1323,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakAdjustments(ctx context.Context, ka
 	return incoming, outgoing, nil
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
 	incomingQuery := r.withCtx(ctx).
 		Table("stock_transfer_details AS std").
 		Select(`
@@ -1271,6 +1345,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Where("(fw.kandang_id IS NULL OR fw.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll)
 	incomingQuery = r.joinSapronakProductFlag(incomingQuery, "p")
+	incomingQuery = applyDateRange(incomingQuery, "st.transfer_date", start, end)
 	incoming, err := scanAndGroupDetails(incomingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1289,8 +1364,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 			COALESCE(p.product_price, 0) AS price
 		`).
 		Joins("JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id").
-		Joins("LEFT JOIN laying_transfer_sources lts ON lts.laying_transfer_id = lt.id").
-		Joins("LEFT JOIN product_warehouses pw_source ON pw_source.id = lts.product_warehouse_id").
+		Joins("LEFT JOIN product_warehouses pw_source ON pw_source.id = lt.source_product_warehouse_id").
 		Joins("LEFT JOIN warehouses w_source ON w_source.id = pw_source.warehouse_id").
 		Joins("JOIN product_warehouses pw ON pw.id = ltt.product_warehouse_id").
 		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
@@ -1299,6 +1373,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Where("(w_source.kandang_id IS NULL OR w_source.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll)
 	incomingLayingQuery = r.joinSapronakProductFlag(incomingLayingQuery, "p")
+	incomingLayingQuery = applyDateRange(incomingLayingQuery, "lt.transfer_date", start, end)
 	incomingLaying, err := scanAndGroupDetails(incomingLayingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1327,11 +1402,13 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Joins("LEFT JOIN warehouses w_dest ON w_dest.id = pw_dest.warehouse_id").
 		Joins("JOIN products p ON p.id = std.product_id").
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
+		Where("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(w_dest.kandang_id IS NULL OR w_dest.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group("std.id, std.product_id, p.name, f.name, st.transfer_date, st.movement_number, p.product_price")
 	outgoingQuery = r.joinSapronakProductFlag(outgoingQuery, "p")
+	outgoingQuery = applyDateRange(outgoingQuery, "st.transfer_date", start, end)
 	outgoing, err := scanAndGroupDetails(outgoingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1349,8 +1426,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 			COALESCE(SUM(sa.qty), 0) AS qty_out,
 			COALESCE(p.product_price, 0) AS price
 		`).
-		Joins("JOIN laying_transfer_sources lts ON lts.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyTransferToLayingOut.String()).
-		Joins("JOIN laying_transfers lt ON lt.id = lts.laying_transfer_id").
+		Joins("JOIN laying_transfers lt ON lt.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyTransferToLayingOut.String()).
 		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.laying_transfer_id = lt.id").
 		Joins("LEFT JOIN product_warehouses pw_dest ON pw_dest.id = ltt.product_warehouse_id").
 		Joins("LEFT JOIN warehouses w_dest ON w_dest.id = pw_dest.warehouse_id").
@@ -1358,11 +1434,13 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		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("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(w_dest.kandang_id IS NULL OR w_dest.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll).
-		Group("lts.id, pw.product_id, p.name, f.name, lt.transfer_date, lt.transfer_number, p.product_price")
+		Group("lt.id, pw.product_id, p.name, f.name, lt.transfer_date, lt.transfer_number, p.product_price")
 	outgoingLayingQuery = r.joinSapronakProductFlag(outgoingLayingQuery, "p")
+	outgoingLayingQuery = applyDateRange(outgoingLayingQuery, "lt.transfer_date", start, end)
 	outgoingLaying, err := scanAndGroupDetails(outgoingLayingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1374,7 +1452,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 	return incoming, outgoing, nil
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectFlockKandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error) {
 	query := r.withCtx(ctx).
 		Table("stock_allocations AS sa").
 		Select(`
@@ -1393,11 +1471,13 @@ func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectF
 		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
+		Where("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group("mdp.id, pw.product_id, p.name, f.name, mdp.delivery_date, mdp.created_at, m.so_number, mdp.unit_price, mp.unit_price")
 
 	query = r.joinSapronakProductFlag(query, "p")
+	query = applyDateRange(query, "COALESCE(mdp.delivery_date, mdp.created_at)", start, end)
 	sales, err := scanAndGroupDetails(query)
 	if err != nil {
 		return nil, err
@@ -1419,9 +1499,10 @@ func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectF
 		Joins("JOIN marketings m ON m.id = mp.marketing_id").
 		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN stock_allocations sa ON sa.usable_id = mdp.id AND sa.usable_type = ? AND sa.status = ?",
+		Joins("LEFT JOIN stock_allocations sa ON sa.usable_id = mdp.id AND sa.usable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?",
 			fifo.UsableKeyMarketingDelivery.String(),
 			entity.StockAllocationStatusActive,
+			entity.StockAllocationPurposeConsume,
 		).
 		Where("mdp.usage_qty > 0").
 		Where("sa.id IS NULL").
@@ -1430,6 +1511,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectF
 		Group("mdp.id, pw.product_id, p.name, f.name, mdp.delivery_date, mdp.created_at, m.so_number, mdp.unit_price, mp.unit_price")
 
 	nonFifoQuery = r.joinSapronakProductFlag(nonFifoQuery, "p")
+	nonFifoQuery = applyDateRange(nonFifoQuery, "COALESCE(mdp.delivery_date, mdp.created_at)", start, end)
 	nonFifoSales, err := scanAndGroupDetails(nonFifoQuery)
 	if err != nil {
 		return nil, err
@@ -1442,56 +1524,114 @@ func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectF
 	return sales, nil
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakSalesAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakSalesAllocatedDetails(ctx context.Context, projectFlockKandangID uint, start, end *time.Time) (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(
+	pfpType := fifo.StockableKeyProjectFlockPopulation.String()
+	dateExpr := fmt.Sprintf(`
+		CASE
+			WHEN sa.stockable_type = '%s' THEN COALESCE(
+				pi_pc.received_date,
+				st_pc.transfer_date,
+				lt_pc.transfer_date,
+				ast_pc.created_at,
+				pc.chick_in_date
+			)
+			ELSE 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,
+			)
+		END
+	`, pfpType)
+
+	query := r.withCtx(ctx).
+		Table("stock_allocations AS sa").
+		Select(fmt.Sprintf(`
+			p_resolve.id AS product_id,
+			p_resolve.name AS product_name,
+			f.name AS flag,
+			CASE
+				WHEN sa.stockable_type = '%s' THEN COALESCE(
+					pi_pc.received_date,
+					st_pc.transfer_date,
+					lt_pc.transfer_date,
+					ast_pc.created_at,
+					pc.chick_in_date
+				)
+				ELSE COALESCE(
+					pi.received_date,
+					st.transfer_date,
+					lt.transfer_date,
+					ast.created_at
+				)
+			END AS date,
+			CASE
+				WHEN sa.stockable_type = '%s' THEN COALESCE(
+					po_pc.po_number,
+					st_pc.movement_number,
+					lt_pc.transfer_number,
+					CASE WHEN ast_pc.id IS NOT NULL THEN CONCAT('ADJ-', ast_pc.id) END,
+					CONCAT('CHICKIN-', pc.id),
+					''
+				)
+				ELSE COALESCE(
+					po.po_number,
+					st.movement_number,
+					lt.transfer_number,
+					CASE WHEN ast.id IS NOT NULL THEN CONCAT('ADJ-', ast.id) END,
+					''
+				)
+			END 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").
+			CASE
+				WHEN sa.stockable_type = '%s' THEN COALESCE(pi_pc.price, p_resolve.product_price, 0)
+				ELSE COALESCE(pi.price, p_resolve.product_price, 0)
+			END AS price
+		`, pfpType, pfpType, pfpType)).
 		Joins("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyMarketingDelivery.String()).
+		Joins("JOIN product_warehouses pw_sales ON pw_sales.id = mdp.product_warehouse_id").
+		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
 		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 product_warehouses pw_ltt ON pw_ltt.id = ltt.product_warehouse_id").
 		Joins("LEFT JOIN adjustment_stocks ast ON ast.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 stock_allocations sa_pc ON sa_pc.usable_type = ? AND sa_pc.usable_id = pc.id", fifo.UsableKeyProjectChickin.String()).
+		Joins("LEFT JOIN purchase_items pi_pc ON pi_pc.id = sa_pc.stockable_id AND sa_pc.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
+		Joins("LEFT JOIN purchases po_pc ON po_pc.id = pi_pc.purchase_id").
+		Joins("LEFT JOIN stock_transfer_details std_pc ON std_pc.id = sa_pc.stockable_id AND sa_pc.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
+		Joins("LEFT JOIN stock_transfers st_pc ON st_pc.id = std_pc.stock_transfer_id").
+		Joins("LEFT JOIN laying_transfer_targets ltt_pc ON ltt_pc.id = sa_pc.stockable_id AND sa_pc.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
+		Joins("LEFT JOIN laying_transfers lt_pc ON lt_pc.id = ltt_pc.laying_transfer_id").
+		Joins("LEFT JOIN adjustment_stocks ast_pc ON ast_pc.id = sa_pc.stockable_id AND sa_pc.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()).
+		Joins("LEFT JOIN product_warehouses pw_pc ON pw_pc.id = pc.product_warehouse_id").
+		Joins(fmt.Sprintf("LEFT JOIN products p_resolve ON p_resolve.id = CASE WHEN sa.stockable_type = '%s' THEN pw_pc.product_id ELSE COALESCE(pi.product_id, pw_ltt.product_id, pw.product_id) END", pfpType)).
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
+		Where("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		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,
+			p_resolve.id, p_resolve.name, f.name,
+			pi_pc.received_date, st_pc.transfer_date, lt_pc.transfer_date, ast_pc.created_at, pc.chick_in_date,
 			pi.received_date, st.transfer_date, lt.transfer_date, ast.created_at,
+			po_pc.po_number, st_pc.movement_number, lt_pc.transfer_number, ast_pc.id, pc.id,
 			po.po_number, st.movement_number, lt.transfer_number, ast.id,
-			pi.price, p.product_price
+			pi_pc.price, pi.price, p_resolve.product_price, sa.stockable_type
 		`)
 
-	query = r.joinSapronakProductFlag(query, "p")
+	query = r.joinSapronakProductFlag(query, "p_resolve")
+	query = applyDateRange(query, dateExpr, start, end)
 	return scanAndGroupDetails(query)
 }
 
@@ -1505,7 +1645,6 @@ func (r *ClosingRepositoryImpl) GetProductsWithFlagsByIDs(ctx context.Context, p
 		Preload("Flags").
 		Where("id IN ?", productIDs).
 		Find(&products).Error
-
 	if err != nil {
 		return nil, err
 	}

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

@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"math"
@@ -33,6 +32,14 @@ import (
 	"gorm.io/gorm"
 )
 
+type activeKandangMetric struct {
+	ProjectFlockKandangID uint
+	ProjectFlockID        uint
+	KandangID             uint
+	Category              string
+	Metric                float64
+}
+
 type ClosingService interface {
 	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]dto.ClosingListItemDTO, int64, error)
 	GetProjectFlockByID(ctx *fiber.Ctx, id uint) (*entity.ProjectFlock, error)
@@ -385,6 +392,11 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 	}
 
 	offset := (params.Page - 1) * params.Limit
+	startDate, endDate, err := s.getSapronakDateRange(c.Context(), projectFlockID, params.KandangID)
+	if err != nil {
+		s.Log.Errorf("Failed to resolve sapronak date range for project flock %d: %+v", projectFlockID, err)
+		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to resolve sapronak date range")
+	}
 	rows, totalResults, err := s.Repository.GetSapronak(c.Context(), repository.SapronakQueryParams{
 		Type:                   params.Type,
 		WarehouseIDs:           warehouseIDs,
@@ -392,6 +404,8 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 		Limit:                  params.Limit,
 		Offset:                 offset,
 		Search:                 params.Search,
+		StartDate:              startDate,
+		EndDate:                endDate,
 	})
 	if err != nil {
 		s.Log.Errorf("Failed to fetch sapronak %s for project flock %d: %+v", params.Type, projectFlockID, err)
@@ -468,11 +482,19 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 		}
 	}
 
+	startDate, endDate, err := s.getSapronakDateRange(c.Context(), projectFlockID, params.KandangID)
+	if err != nil {
+		s.Log.Errorf("Failed to resolve sapronak date range for project flock %d: %+v", projectFlockID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to resolve sapronak date range")
+	}
+
 	rows, err := s.Repository.GetSapronakSummary(c.Context(), repository.SapronakQueryParams{
 		Type:                   params.Type,
 		WarehouseIDs:           warehouseIDs,
 		ProjectFlockKandangIDs: projectFlockKandangIDs,
 		Search:                 params.Search,
+		StartDate:              startDate,
+		EndDate:                endDate,
 	})
 	if err != nil {
 		s.Log.Errorf("Failed to fetch sapronak %s summary for project flock %d: %+v", params.Type, projectFlockID, err)
@@ -542,6 +564,90 @@ func (s closingService) getProjectFlockKandangIDs(ctx context.Context, projectFl
 	return ids, nil
 }
 
+func (s closingService) getSapronakDateRange(ctx context.Context, projectFlockID uint, kandangID *uint) (*time.Time, *time.Time, error) {
+	db := s.Repository.DB().WithContext(ctx)
+
+	if kandangID != nil && *kandangID > 0 {
+		var pfk entity.ProjectFlockKandang
+		if err := db.Select("id, created_at, closed_at").First(&pfk, *kandangID).Error; err != nil {
+			return nil, nil, err
+		}
+
+		var minChickin *time.Time
+		if err := db.Table("project_chickins").
+			Select("MIN(chick_in_date)").
+			Where("project_flock_kandang_id = ?", pfk.Id).
+			Scan(&minChickin).Error; err != nil {
+			return nil, nil, err
+		}
+
+		start := pfk.CreatedAt
+		if minChickin != nil && !minChickin.IsZero() {
+			start = *minChickin
+		}
+		startDate := dateOnlyUTC(start)
+
+		var endDate *time.Time
+		if pfk.ClosedAt != nil {
+			d := dateOnlyUTC(*pfk.ClosedAt)
+			endDate = &d
+		}
+
+		return &startDate, endDate, nil
+	}
+
+	var minCreated time.Time
+	if err := db.Model(&entity.ProjectFlockKandang{}).
+		Select("MIN(created_at)").
+		Where("project_flock_id = ?", projectFlockID).
+		Scan(&minCreated).Error; err != nil {
+		return nil, nil, err
+	}
+
+	var minChickin *time.Time
+	if err := db.Table("project_chickins pc").
+		Select("MIN(pc.chick_in_date)").
+		Joins("JOIN project_flock_kandangs pfk ON pfk.id = pc.project_flock_kandang_id").
+		Where("pfk.project_flock_id = ?", projectFlockID).
+		Scan(&minChickin).Error; err != nil {
+		return nil, nil, err
+	}
+
+	start := minCreated
+	if minChickin != nil && !minChickin.IsZero() {
+		start = *minChickin
+	}
+	startDate := dateOnlyUTC(start)
+
+	var endDate *time.Time
+	var openCount int64
+	if err := db.Model(&entity.ProjectFlockKandang{}).
+		Where("project_flock_id = ? AND closed_at IS NULL", projectFlockID).
+		Count(&openCount).Error; err != nil {
+		return nil, nil, err
+	}
+	if openCount == 0 {
+		var maxClosed *time.Time
+		if err := db.Model(&entity.ProjectFlockKandang{}).
+			Select("MAX(closed_at)").
+			Where("project_flock_id = ?", projectFlockID).
+			Scan(&maxClosed).Error; err != nil {
+			return nil, nil, err
+		}
+		if maxClosed != nil && !maxClosed.IsZero() {
+			d := dateOnlyUTC(*maxClosed)
+			endDate = &d
+		}
+	}
+
+	return &startDate, endDate, nil
+}
+
+func dateOnlyUTC(t time.Time) time.Time {
+	u := t.UTC()
+	return time.Date(u.Year(), u.Month(), u.Day(), 0, 0, 0, 0, time.UTC)
+}
+
 func formatQuantity(qty float64, uom string) string {
 	qtyStr := strconv.FormatFloat(qty, 'f', -1, 64)
 	if uom == "" {
@@ -616,38 +722,17 @@ func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFl
 		return nil, err
 	}
 
+	realizations, err = s.allocateFarmOverheadRealizations(c.Context(), projectFlockID, projectFlockKandangID, realizations)
+	if err != nil {
+		return nil, err
+	}
+
 	projectFlockKandangs, err := s.ProjectFlockKandangRepo.GetByProjectFlockID(c.Context(), projectFlockID)
 	if err != nil {
 		return nil, err
 	}
 	totalKandangCount := len(projectFlockKandangs)
 
-	// Build kandang count map for farm expense division
-	projectFlockKandangCountMap := make(map[uint]int)
-	projectFlockKandangCountMap[projectFlockID] = totalKandangCount
-
-	involvedProjectFlocks := make(map[uint]bool)
-	for _, realization := range realizations {
-		if realization.ExpenseNonstock != nil &&
-			realization.ExpenseNonstock.Expense != nil &&
-			realization.ExpenseNonstock.Expense.ProjectFlockId != nil {
-			var projectFlockIDs []uint
-			if err := json.Unmarshal([]byte(*realization.ExpenseNonstock.Expense.ProjectFlockId), &projectFlockIDs); err == nil {
-				for _, pfID := range projectFlockIDs {
-					if pfID != projectFlockID {
-						involvedProjectFlocks[pfID] = true
-					}
-				}
-			}
-		}
-	}
-
-	for pfID := range involvedProjectFlocks {
-		if pfKandangs, err := s.ProjectFlockKandangRepo.GetByProjectFlockID(c.Context(), pfID); err == nil {
-			projectFlockKandangCountMap[pfID] = len(pfKandangs)
-		}
-	}
-
 	chickins, err := s.ChickinRepo.GetByProjectFlockID(c.Context(), projectFlockID)
 	if err != nil {
 		return nil, err
@@ -688,11 +773,197 @@ func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFl
 
 	totalActualPopulation := totalChickinQty - totalDepletion
 
-	result := dto.ToOverheadListDTOs(budgets, realizations, totalChickinQty, totalActualPopulation, projectFlockKandangID != nil, totalKandangCount, projectFlockKandangCountMap)
+	result := dto.ToOverheadListDTOs(budgets, realizations, totalChickinQty, totalActualPopulation, projectFlockKandangID != nil, totalKandangCount)
 
 	return &result, nil
 }
 
+type activeKandangMetricRow struct {
+	ProjectFlockKandangID uint    `gorm:"column:project_flock_kandang_id"`
+	ProjectFlockID        uint    `gorm:"column:project_flock_id"`
+	KandangID             uint    `gorm:"column:kandang_id"`
+	Category              string  `gorm:"column:category"`
+	ChickinQty            float64 `gorm:"column:chickin_qty"`
+	DepletionQty          float64 `gorm:"column:depletion_qty"`
+	EggQty                float64 `gorm:"column:egg_qty"`
+}
+
+func (s closingService) getActiveKandangMetrics(ctx context.Context, locationID uint, transactionDate time.Time) ([]activeKandangMetric, error) {
+	db := s.Repository.DB().WithContext(ctx)
+
+	rows := []activeKandangMetricRow{}
+	rawSQL := `
+SELECT
+	pfk.id AS project_flock_kandang_id,
+	pfk.project_flock_id AS project_flock_id,
+	pfk.kandang_id AS kandang_id,
+	pf.category AS category,
+	COALESCE((
+		SELECT SUM(pc.usage_qty)
+		FROM project_chickins pc
+		WHERE pc.project_flock_kandang_id = pfk.id
+			AND pc.chick_in_date::date <= ?
+	), 0) AS chickin_qty,
+	COALESCE((
+		SELECT SUM(rd.qty)
+		FROM recording_depletions rd
+		JOIN recordings r ON r.id = rd.recording_id
+		WHERE r.project_flock_kandangs_id = pfk.id
+			AND r.record_datetime::date <= ?
+	), 0) AS depletion_qty,
+	COALESCE((
+		SELECT SUM(re.qty)
+		FROM recording_eggs re
+		JOIN recordings r2 ON r2.id = re.recording_id
+		WHERE r2.project_flock_kandangs_id = pfk.id
+			AND r2.record_datetime::date <= ?
+	), 0) AS egg_qty
+FROM project_flock_kandangs pfk
+JOIN project_flocks pf ON pf.id = pfk.project_flock_id
+WHERE pf.location_id = ?
+	AND (pfk.closed_at IS NULL OR pfk.closed_at::date > ?)
+	AND EXISTS (
+		SELECT 1
+		FROM project_chickins pc2
+		WHERE pc2.project_flock_kandang_id = pfk.id
+			AND pc2.chick_in_date::date <= ?
+	)
+`
+	if err := db.Raw(rawSQL, transactionDate, transactionDate, transactionDate, locationID, transactionDate, transactionDate).Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	result := make([]activeKandangMetric, 0, len(rows))
+	for _, row := range rows {
+		metric := 0.0
+		switch strings.ToLower(strings.TrimSpace(row.Category)) {
+		case "growing":
+			metric = row.ChickinQty
+		case "laying":
+			metric = row.EggQty
+		default:
+			s.Log.Warnf("Unknown project flock category for overhead allocation: %s (pfk=%d)", row.Category, row.ProjectFlockKandangID)
+		}
+
+		result = append(result, activeKandangMetric{
+			ProjectFlockKandangID: row.ProjectFlockKandangID,
+			ProjectFlockID:        row.ProjectFlockID,
+			KandangID:             row.KandangID,
+			Category:              row.Category,
+			Metric:                metric,
+		})
+	}
+
+	return result, nil
+}
+
+func round2(value float64) float64 {
+	return math.Round(value*100) / 100
+}
+
+func allocateFarmLevelQty(totalQty float64, metrics []activeKandangMetric) map[uint]float64 {
+	allocations := make(map[uint]float64, len(metrics))
+	if totalQty == 0 || len(metrics) == 0 {
+		return allocations
+	}
+
+	totalMetric := 0.0
+	var maxMetric float64
+	var maxMetricID uint
+	for _, m := range metrics {
+		if m.Metric <= 0 {
+			continue
+		}
+		totalMetric += m.Metric
+		if m.Metric > maxMetric || maxMetricID == 0 {
+			maxMetric = m.Metric
+			maxMetricID = m.ProjectFlockKandangID
+		}
+	}
+	if totalMetric == 0 {
+		return allocations
+	}
+
+	sumRounded := 0.0
+	for _, m := range metrics {
+		if m.Metric <= 0 {
+			continue
+		}
+		portion := totalQty * (m.Metric / totalMetric)
+		rounded := round2(portion)
+		allocations[m.ProjectFlockKandangID] = rounded
+		sumRounded += rounded
+	}
+
+	diff := totalQty - sumRounded
+	if maxMetricID != 0 && diff != 0 {
+		allocations[maxMetricID] = round2(allocations[maxMetricID] + diff)
+	}
+
+	return allocations
+}
+
+func (s closingService) allocateFarmOverheadRealizations(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, realizations []entity.ExpenseRealization) ([]entity.ExpenseRealization, error) {
+	if len(realizations) == 0 {
+		return realizations, nil
+	}
+
+	cache := make(map[string][]activeKandangMetric)
+	allocated := make([]entity.ExpenseRealization, 0, len(realizations))
+
+	for _, realization := range realizations {
+		expenseNonstock := realization.ExpenseNonstock
+		if expenseNonstock == nil || expenseNonstock.Expense == nil {
+			allocated = append(allocated, realization)
+			continue
+		}
+
+		// If already bound to a specific project flock kandang, don't re-allocate.
+		if expenseNonstock.ProjectFlockKandangId != nil {
+			allocated = append(allocated, realization)
+			continue
+		}
+
+		expense := expenseNonstock.Expense
+		locationID := uint(expense.LocationId)
+		txDate := expense.RealizationDate
+
+		cacheKey := fmt.Sprintf("%d|%s", locationID, txDate.Format("2006-01-02"))
+		metrics, exists := cache[cacheKey]
+		if !exists {
+			var err error
+			metrics, err = s.getActiveKandangMetrics(ctx, locationID, txDate)
+			if err != nil {
+				return nil, err
+			}
+			cache[cacheKey] = metrics
+		}
+
+		allocations := allocateFarmLevelQty(realization.Qty, metrics)
+		allocatedQty := 0.0
+		if projectFlockKandangID != nil {
+			allocatedQty = allocations[*projectFlockKandangID]
+		} else {
+			for _, m := range metrics {
+				if m.ProjectFlockID == projectFlockID {
+					allocatedQty += allocations[m.ProjectFlockKandangID]
+				}
+			}
+			allocatedQty = round2(allocatedQty)
+		}
+
+		adj := realization
+		adj.Qty = allocatedQty
+		if adj.Qty == 0 {
+			adj.Price = realization.Price
+		}
+
+		allocated = append(allocated, adj)
+	}
+
+	return allocated, nil
+}
+
 func (s closingService) GetExpeditionHPP(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error) {
 	if projectFlockKandangID != nil {
 		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {

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

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -123,7 +124,7 @@ func (s sapronakService) computeSapronakReports(ctx context.Context, params *val
 			continue
 		}
 
-		// We no longer filter by date for closing sapronak report; pass nil pointers.
+		// Filter sapronak data by project flock period range.
 		items, groups, totalIncoming, totalUsage, err := s.buildSapronakItems(ctx, pfk, params.Flag)
 		if err != nil {
 			s.Log.Errorf("Failed to build sapronak items for pfk %d: %+v", pfk.Id, err)
@@ -379,33 +380,33 @@ func buildSapronakDetails(
 }
 
 func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.ProjectFlockKandang, flagFilter string) ([]dto.SapronakItemDTO, []dto.SapronakGroupDTO, float64, float64, error) {
-	// For sapronak closing report we intentionally ignore date range
-	// and aggregate all historical transactions for the kandang/project.
-	incomingRows, err := s.Repository.FetchSapronakIncoming(ctx, pfk.KandangId)
+	// Filter by project flock period (start = first chickin or pfk created_at, end = closed_at if any).
+	startDate, endDate := sapronakPeriodRange(pfk)
+	incomingRows, err := s.Repository.FetchSapronakIncoming(ctx, pfk.KandangId, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	incomingDetailsRows, err := s.Repository.FetchSapronakIncomingDetails(ctx, pfk.KandangId)
+	incomingDetailsRows, err := s.Repository.FetchSapronakIncomingDetails(ctx, pfk.KandangId, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	usageRows, err := s.Repository.FetchSapronakUsage(ctx, pfk.Id)
+	usageRows, err := s.Repository.FetchSapronakUsage(ctx, pfk.Id, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	chickinUsageRows, err := s.Repository.FetchSapronakChickinUsage(ctx, pfk.Id)
+	chickinUsageRows, err := s.Repository.FetchSapronakChickinUsage(ctx, pfk.Id, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	usageDetailsRows, err := s.Repository.FetchSapronakUsageDetails(ctx, pfk.Id)
+	usageDetailsRows, err := s.Repository.FetchSapronakUsageDetails(ctx, pfk.Id, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	chickinUsageDetailsRows, err := s.Repository.FetchSapronakChickinUsageDetails(ctx, pfk.Id)
+	chickinUsageDetailsRows, err := s.Repository.FetchSapronakChickinUsageDetails(ctx, pfk.Id, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	usageAllocatedDetails, err := s.Repository.FetchSapronakUsageAllocatedDetails(ctx, pfk.Id)
+	usageAllocatedDetails, err := s.Repository.FetchSapronakUsageAllocatedDetails(ctx, pfk.Id, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
@@ -413,15 +414,15 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 		usageDetailsRows = usageAllocatedDetails
 		chickinUsageDetailsRows = map[uint][]repository.SapronakDetailRow{}
 	}
-	adjIncomingRows, adjOutgoingRows, err := s.Repository.FetchSapronakAdjustments(ctx, pfk.KandangId)
+	adjIncomingRows, adjOutgoingRows, err := s.Repository.FetchSapronakAdjustments(ctx, pfk.KandangId, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	transIncomingRows, transOutgoingRows, err := s.Repository.FetchSapronakTransfers(ctx, pfk.KandangId)
+	transIncomingRows, transOutgoingRows, err := s.Repository.FetchSapronakTransfers(ctx, pfk.KandangId, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	salesOutRows, err := s.Repository.FetchSapronakSalesAllocatedDetails(ctx, pfk.Id)
+	salesOutRows, err := s.Repository.FetchSapronakSalesAllocatedDetails(ctx, pfk.Id, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
@@ -470,6 +471,7 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	// should not be counted yet. Only when category is LAYING we allow
 	// pullet usage to contribute to qty_used.
 	isLaying := strings.EqualFold(string(pfk.ProjectFlock.Category), string(utils.ProjectFlockCategoryLaying))
+	hasChickin := len(pfk.Chickins) > 0
 
 	if !isLaying {
 		filteredUsage := make([]repository.SapronakUsageRow, 0, len(chickinUsageRows))
@@ -491,11 +493,6 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 		chickinUsageDetailsRows = filteredDetail
 	}
 
-	allUsageRows := append(usageRows, chickinUsageRows...)
-	incoming, usage := mapIncomingUsage(incomingRows, allUsageRows)
-	itemMap := make(map[uint]dto.SapronakItemDTO, len(incoming)+len(usage))
-	groupMap := make(map[string]*dto.SapronakGroupDTO)
-
 	for pid, rows := range chickinUsageDetailsRows {
 		if len(rows) == 0 {
 			continue
@@ -512,6 +509,11 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	transOutgoing := detailMaps.TransferOut
 	salesOutgoing := detailMaps.SalesOut
 
+	allUsageRows := append(usageRows, chickinUsageRows...)
+	incoming, usage := mapIncomingUsage(incomingRows, allUsageRows)
+	itemMap := make(map[uint]dto.SapronakItemDTO, len(incoming)+len(usage))
+	groupMap := make(map[string]*dto.SapronakGroupDTO)
+
 	transIncoming = dedupTransfers(transIncoming)
 	transOutgoing = dedupTransfers(transOutgoing)
 
@@ -775,6 +777,9 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 		if !matchesFlag(flag) {
 			continue
 		}
+		if hasChickin && (strings.EqualFold(flag, "DOC") || strings.EqualFold(flag, "PULLET") || strings.EqualFold(flag, "LAYER")) {
+			continue
+		}
 		group := ensureGroup(flag)
 		for _, d := range details {
 			if d.Flag == "" {
@@ -794,6 +799,10 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 		if !matchesFlag(flag) {
 			continue
 		}
+		// For chicken, we don't count sales as sapronak outflow.
+		if strings.EqualFold(flag, "DOC") || strings.EqualFold(flag, "PULLET") || strings.EqualFold(flag, "LAYER") {
+			continue
+		}
 		group := ensureGroup(flag)
 		for _, d := range details {
 			if d.Flag == "" {
@@ -815,3 +824,20 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 
 	return items, groups, totalIncoming, totalUsage, nil
 }
+
+func sapronakPeriodRange(pfk entity.ProjectFlockKandang) (*time.Time, *time.Time) {
+	if len(pfk.Chickins) == 0 {
+		start := dateOnlyUTC(pfk.CreatedAt)
+		return &start, pfk.ClosedAt
+	}
+
+	minDate := pfk.Chickins[0].ChickInDate
+	for _, c := range pfk.Chickins[1:] {
+		if c.ChickInDate.Before(minDate) {
+			minDate = c.ChickInDate
+		}
+	}
+
+	start := dateOnlyUTC(minDate)
+	return &start, pfk.ClosedAt
+}

internal/modules/constants/repositories/constant.repository.go

@@ -32,6 +32,44 @@ func (r *ConstantRepositoryImpl) GetConstants() (map[string]interface{}, error)
 	}
 	sort.Strings(flagList)
 
+	productMainFlags := utils.ProductMainFlags()
+	productMainFlagValues := make([]string, len(productMainFlags))
+	for i, flag := range productMainFlags {
+		productMainFlagValues[i] = string(flag)
+	}
+
+	type productFlagOption struct {
+		Flag                string   `json:"flag"`
+		SubFlags            []string `json:"sub_flags"`
+		AllowWithoutSubFlag bool     `json:"allow_without_sub_flag"`
+	}
+
+	productOptions := utils.ProductFlagOptions()
+	productFlagOptions := make([]productFlagOption, 0, len(productOptions))
+	for _, option := range productOptions {
+		subFlags := make([]string, len(option.SubFlags))
+		for i, subFlag := range option.SubFlags {
+			subFlags[i] = string(subFlag)
+		}
+		productFlagOptions = append(productFlagOptions, productFlagOption{
+			Flag:                string(option.Flag),
+			SubFlags:            subFlags,
+			AllowWithoutSubFlag: option.AllowWithoutSubFlag,
+		})
+	}
+
+	productSubFlagToFlagRaw := utils.ProductSubFlagToFlag()
+	productSubFlagToFlag := make(map[string]string, len(productSubFlagToFlagRaw))
+	for subFlag, flag := range productSubFlagToFlagRaw {
+		productSubFlagToFlag[string(subFlag)] = string(flag)
+	}
+
+	legacyAliasesRaw := utils.LegacyFlagTypeAliases()
+	legacyAliases := make(map[string]string, len(legacyAliasesRaw))
+	for legacy, canonical := range legacyAliasesRaw {
+		legacyAliases[string(legacy)] = string(canonical)
+	}
+
 	type approvalStepConstant struct {
 		StepNumber uint16 `json:"step_number"`
 		StepName   string `json:"step_name"`
@@ -96,9 +134,15 @@ func (r *ConstantRepositoryImpl) GetConstants() (map[string]interface{}, error)
 			"BISNIS",
 			"INDIVIDUAL",
 		},
-		"adjustment": map[string]interface{}{
-			"transaction_subtypes": adjustmentSubtypesByType,
-		},
-		"approval_workflows": approvalWorkflows,
-	}, nil
+			"adjustment": map[string]interface{}{
+				"transaction_subtypes": adjustmentSubtypesByType,
+			},
+			"legacy_flag_aliases": legacyAliases,
+			"product_flag_mapping": map[string]interface{}{
+				"flags":            productMainFlagValues,
+				"options":          productFlagOptions,
+				"sub_flag_to_flag": productSubFlagToFlag,
+			},
+			"approval_workflows": approvalWorkflows,
+		}, nil
 }

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

@@ -64,9 +64,11 @@ func (u *DailyChecklistController) GetAll(c *fiber.Ctx) error {
 			status = *item.Status
 		}
 
-		var kandang *kandangDTO.KandangRelationDTO
+		// var kandang *kandangDTO.KandangRelationDTO
+		var kandang *kandangDTO.KandangGroupRelationDTO
 		if item.Kandang.Id != 0 {
-			mapped := kandangDTO.ToKandangRelationDTO(item.Kandang)
+			// mapped := kandangDTO.ToKandangRelationDTO(item.Kandang)x
+			mapped := kandangDTO.ToKandangGroupRelationDTO(item.Kandang)
 			kandang = &mapped
 		}
 

internal/modules/daily-checklists/dto/daily-checklist.dto.go

@@ -19,19 +19,19 @@ type DailyChecklistRelationDTO struct {
 }
 
 type DailyChecklistListDTO struct {
-	Id            uint                           `json:"id"`
-	Name          string                         `json:"name"`
-	Status        string                         `json:"status"`
-	Category      string                         `json:"category"`
-	Date          time.Time                      `json:"date"`
-	Kandang       *kandangDTO.KandangRelationDTO `json:"kandang,omitempty"`
-	CreatedUser   *userDTO.UserRelationDTO       `json:"created_user"`
-	CreatedAt     time.Time                      `json:"created_at"`
-	UpdatedAt     time.Time                      `json:"updated_at"`
-	TotalPhase    int                            `json:"total_phase"`
-	TotalActivity int                            `json:"total_activity"`
-	Progress      int                            `json:"progress"`
-	RejectReason  *string                        `json:"reject_reason"`
+	Id            uint                                `json:"id"`
+	Name          string                              `json:"name"`
+	Status        string                              `json:"status"`
+	Category      string                              `json:"category"`
+	Date          time.Time                           `json:"date"`
+	Kandang       *kandangDTO.KandangGroupRelationDTO `json:"kandang,omitempty"`
+	CreatedUser   *userDTO.UserRelationDTO            `json:"created_user"`
+	CreatedAt     time.Time                           `json:"created_at"`
+	UpdatedAt     time.Time                           `json:"updated_at"`
+	TotalPhase    int                                 `json:"total_phase"`
+	TotalActivity int                                 `json:"total_activity"`
+	Progress      int                                 `json:"progress"`
+	RejectReason  *string                             `json:"reject_reason"`
 }
 
 type DailyChecklistDetailDTO struct {
@@ -156,9 +156,9 @@ func ToDailyChecklistListDTO(e entity.DailyChecklist) DailyChecklistListDTO {
 		status = *e.Status
 	}
 
-	var kandang *kandangDTO.KandangRelationDTO
+	var kandang *kandangDTO.KandangGroupRelationDTO
 	if e.Kandang.Id != 0 {
-		mapped := kandangDTO.ToKandangRelationDTO(e.Kandang)
+		mapped := kandangDTO.ToKandangGroupRelationDTO(e.Kandang)
 		kandang = &mapped
 	}
 

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

@@ -75,7 +75,7 @@ type DailyChecklistListItem struct {
 	RejectReason  *string
 	CreatedAt     time.Time
 	UpdatedAt     time.Time
-	Kandang       entity.Kandang
+	Kandang       entity.KandangGroup
 	TotalPhase    int
 	TotalActivity int
 	Progress      int
@@ -142,7 +142,7 @@ func (s dailyChecklistService) ensureChecklistAccess(c *fiber.Ctx, checklistID u
 
 	db := s.Repository.DB().WithContext(c.Context()).
 		Table("daily_checklists dc").
-		Joins("JOIN kandangs k ON k.id = dc.kandang_id").
+		Joins("JOIN kandang_groups 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)
@@ -168,7 +168,7 @@ func (s dailyChecklistService) ensureKandangAccess(c *fiber.Ctx, kandangID uint)
 	}
 
 	db := s.Repository.DB().WithContext(c.Context()).
-		Table("kandangs k").
+		Table("kandang_groups 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)
@@ -196,7 +196,7 @@ func (s dailyChecklistService) ensureTaskAccess(c *fiber.Ctx, taskID uint) error
 	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 kandang_groups 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)
@@ -225,7 +225,7 @@ 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 kandang_groups 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")
 
@@ -341,9 +341,9 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 		}
 	}
 
-	kandangMap := make(map[uint]entity.Kandang)
+	kandangMap := make(map[uint]entity.KandangGroup)
 	if len(kandangIDs) > 0 {
-		var kandangs []entity.Kandang
+		var kandangs []entity.KandangGroup
 		if err := s.Repository.DB().WithContext(c.Context()).
 			Where("id IN ?", kandangIDs).
 			Preload("Location").
@@ -1019,7 +1019,7 @@ func (s dailyChecklistService) GetSummary(c *fiber.Ctx, params *validation.Summa
 			MAX(a.updated_at) AS last_activity`).
 		Joins("JOIN daily_checklist_activity_tasks t ON t.id = a.task_id").
 		Joins("JOIN daily_checklists d ON d.id = t.checklist_id").
-		Joins("JOIN kandangs k ON k.id = d.kandang_id").
+		Joins("JOIN kandang_groups 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").
@@ -1092,7 +1092,7 @@ func (s dailyChecklistService) GetReport(c *fiber.Ctx, params *validation.Report
 			Joins("JOIN daily_checklist_activity_tasks dcat ON dcat.id = dca.task_id").
 			Joins("JOIN daily_checklists dc ON dc.id = dcat.checklist_id").
 			Joins("JOIN employees e ON e.id = dca.employee_id").
-			Joins("JOIN kandangs k ON k.id = dc.kandang_id").
+			Joins("JOIN kandang_groups 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").
 			Joins("JOIN phases p ON p.id = dcat.phase_id").

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

@@ -69,23 +69,19 @@ func (r *ExpenseRealizationRepositoryImpl) GetClosingOverhead(ctx context.Contex
 		Joins("JOIN expense_nonstocks ON expense_nonstocks.id = expense_realizations.expense_nonstock_id").
 		Joins("JOIN expenses ON expenses.id = expense_nonstocks.expense_id").
 		Joins("LEFT JOIN project_flock_kandangs ON project_flock_kandangs.id = expense_nonstocks.project_flock_kandang_id").
-		Joins("LEFT JOIN kandangs ON kandangs.id = expense_nonstocks.kandang_id").
 		Where("expenses.realization_date IS NOT NULL").
 		Where("expenses.category = ?", "BOP")
 
 	if projectFlockKandangID != nil {
 		db = db.Where(`(
 			expense_nonstocks.project_flock_kandang_id = ? OR
-			(expense_nonstocks.kandang_id = (SELECT kandang_id FROM project_flock_kandangs WHERE id = ?) AND
-			 expense_nonstocks.project_flock_kandang_id IS NULL) OR
 			(expenses.project_flock_id IS NOT NULL AND expenses.project_flock_id::jsonb @> ?::jsonb)
-		)`, *projectFlockKandangID, *projectFlockKandangID, fmt.Sprintf("[%d]", projectFlockID))
+		)`, *projectFlockKandangID, fmt.Sprintf("[%d]", projectFlockID))
 	} else {
 		db = db.Where(`(
 			project_flock_kandangs.project_flock_id = ? OR
-			kandangs.id IN (SELECT kandang_id FROM project_flock_kandangs WHERE project_flock_id = ?) OR
 			(expenses.project_flock_id IS NOT NULL AND expenses.project_flock_id::jsonb @> ?::jsonb)
-		)`, projectFlockID, projectFlockID, fmt.Sprintf("[%d]", projectFlockID))
+		)`, projectFlockID, fmt.Sprintf("[%d]", projectFlockID))
 	}
 
 	err := db.Find(&realizations).Error

internal/modules/inventory/adjustments/module.go

@@ -5,7 +5,6 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"gorm.io/gorm"
 
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	rAdjustmentStock "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/adjustments/repositories"
 	sAdjustment "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/adjustments/services"
@@ -17,7 +16,6 @@ import (
 	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
 	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
 )
 
 type AdjustmentModule struct{}
@@ -28,56 +26,22 @@ func (AdjustmentModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validat
 	warehouseRepo := rWarehouse.NewWarehouseRepository(db)
 	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
 	projectFlockKandangRepo := rProjectFlockKandang.NewProjectFlockKandangRepository(db)
+	projectFlockPopulationRepo := rProjectFlockKandang.NewProjectFlockPopulationRepository(db)
 	userRepo := rUser.NewUserRepository(db)
 	productRepo := rproduct.NewProductRepository(db)
 	adjustmentStockRepo := rAdjustmentStock.NewAdjustmentStockRepository(db)
-	stockAllocRepo := commonRepo.NewStockAllocationRepository(db)
-
-	fifoService := commonSvc.NewFifoService(db, stockAllocRepo, productWarehouseRepo, utils.Log)
 	fifoStockV2Service := commonSvc.NewFifoStockV2Service(db, utils.Log)
 
-	err := fifoService.RegisterStockable(fifo.StockableConfig{
-		Key:   fifo.StockableKeyAdjustmentIn,
-		Table: "adjustment_stocks",
-		Columns: fifo.StockableColumns{
-			ID:                 "id",
-			ProductWarehouseID: "product_warehouse_id",
-			TotalQuantity:      "total_qty",
-			TotalUsedQuantity:  "total_used",
-			CreatedAt:          "created_at",
-		},
-		OrderBy: []string{"created_at ASC", "id ASC"},
-	})
-	if err != nil {
-		panic("Failed to register ADJUSTMENT_IN as Stockable: " + err.Error())
-	}
-
-	err = fifoService.RegisterUsable(fifo.UsableConfig{
-		Key:   fifo.UsableKeyAdjustmentOut,
-		Table: "adjustment_stocks",
-		Columns: fifo.UsableColumns{
-			ID:                 "id",
-			ProductWarehouseID: "product_warehouse_id",
-			UsageQuantity:      "usage_qty",
-			PendingQuantity:    "pending_qty",
-			CreatedAt:          "created_at",
-		},
-		OrderBy: []string{"created_at ASC", "id ASC"},
-	})
-	if err != nil {
-		panic("Failed to register ADJUSTMENT_OUT as Usable: " + err.Error())
-	}
-
 	adjustmentService := sAdjustment.NewAdjustmentService(
 		productRepo,
 		stockLogsRepo,
 		warehouseRepo,
 		productWarehouseRepo,
 		adjustmentStockRepo,
-		fifoService,
 		fifoStockV2Service,
 		validate,
 		projectFlockKandangRepo,
+		projectFlockPopulationRepo,
 	)
 	userService := sUser.NewUserService(userRepo, validate)
 

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

@@ -11,6 +11,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/sirupsen/logrus"
 	common "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	fifoV2 "gitlab.com/mbugroup/lti-api.git/internal/common/service/fifo_stock_v2"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	adjustmentStockRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/adjustments/repositories"
@@ -32,21 +33,22 @@ type AdjustmentService interface {
 }
 
 type adjustmentService struct {
-	Log                       *logrus.Logger
-	Validate                  *validator.Validate
-	StockLogsRepository       stockLogsRepo.StockLogRepository
-	WarehouseRepo             warehouseRepo.WarehouseRepository
-	ProductWarehouseRepo      ProductWarehouse.ProductWarehouseRepository
-	ProductRepo               productRepo.ProductRepository
-	ProjectFlockKandangRepo   projectFlockKandangRepo.ProjectFlockKandangRepository
-	AdjustmentStockRepository adjustmentStockRepo.AdjustmentStockRepository
-	FifoSvc                   common.FifoService
-	FifoStockV2Svc            common.FifoStockV2Service
+	Log                        *logrus.Logger
+	Validate                   *validator.Validate
+	StockLogsRepository        stockLogsRepo.StockLogRepository
+	WarehouseRepo              warehouseRepo.WarehouseRepository
+	ProductWarehouseRepo       ProductWarehouse.ProductWarehouseRepository
+	ProductRepo                productRepo.ProductRepository
+	ProjectFlockKandangRepo    projectFlockKandangRepo.ProjectFlockKandangRepository
+	ProjectFlockPopulationRepo projectFlockKandangRepo.ProjectFlockPopulationRepository
+	AdjustmentStockRepository  adjustmentStockRepo.AdjustmentStockRepository
+	FifoStockV2Svc             common.FifoStockV2Service
 }
 
 const (
 	adjustmentLaneStockable = "STOCKABLE"
 	adjustmentLaneUsable    = "USABLE"
+	flagGroupAyam           = "AYAM"
 )
 
 func NewAdjustmentService(
@@ -55,22 +57,22 @@ func NewAdjustmentService(
 	warehouseRepo warehouseRepo.WarehouseRepository,
 	productWarehouseRepo ProductWarehouse.ProductWarehouseRepository,
 	adjustmentStockRepo adjustmentStockRepo.AdjustmentStockRepository,
-	fifoSvc common.FifoService,
 	fifoStockV2Svc common.FifoStockV2Service,
 	validate *validator.Validate,
 	projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository,
+	projectFlockPopulationRepo projectFlockKandangRepo.ProjectFlockPopulationRepository,
 ) AdjustmentService {
 	return &adjustmentService{
-		Log:                       utils.Log,
-		Validate:                  validate,
-		StockLogsRepository:       stockLogsRepo,
-		WarehouseRepo:             warehouseRepo,
-		ProductWarehouseRepo:      productWarehouseRepo,
-		ProductRepo:               productRepo,
-		ProjectFlockKandangRepo:   projectFlockKandangRepo,
-		AdjustmentStockRepository: adjustmentStockRepo,
-		FifoSvc:                   fifoSvc,
-		FifoStockV2Svc:            fifoStockV2Svc,
+		Log:                        utils.Log,
+		Validate:                   validate,
+		StockLogsRepository:        stockLogsRepo,
+		WarehouseRepo:              warehouseRepo,
+		ProductWarehouseRepo:       productWarehouseRepo,
+		ProductRepo:                productRepo,
+		ProjectFlockKandangRepo:    projectFlockKandangRepo,
+		ProjectFlockPopulationRepo: projectFlockPopulationRepo,
+		AdjustmentStockRepository:  adjustmentStockRepo,
+		FifoStockV2Svc:             fifoStockV2Svc,
 	}
 }
 
@@ -130,8 +132,11 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 	if functionCode == "" {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Transaction subtype is required")
 	}
-	if functionCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionIn) {
-		functionCode = string(utils.AdjustmentTransactionSubtypeRecordingDepletionOut)
+	if functionCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionOut) {
+		return nil, fiber.NewError(
+			fiber.StatusBadRequest,
+			"RECORDING_DEPLETION_OUT tidak boleh diinput manual. Gunakan RECORDING_DEPLETION_IN, sistem akan otomatis membuat depletion-out AYAM",
+		)
 	}
 
 	warehouseID, err := s.resolveWarehouseID(c.Context(), req)
@@ -167,15 +172,6 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 
 	transactionType := utils.ResolveAdjustmentTransactionType(routeMeta.FunctionCode)
 
-	allowPending := false
-	if routeMeta.Lane == adjustmentLaneUsable {
-		allowPending, err = s.resolveOverconsumePolicy(ctx, routeMeta)
-		if err != nil {
-			s.Log.Errorf("Failed to resolve overconsume rule: %+v", err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to resolve FIFO policy")
-		}
-	}
-
 	var createdAdjustmentStockId uint
 
 	var projectFlockKandangID *uint
@@ -221,6 +217,149 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get product warehouse")
 		}
 
+		if functionCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionIn) {
+			if routeMeta.Lane != adjustmentLaneStockable {
+				return fiber.NewError(fiber.StatusBadRequest, "Transaction subtype depletion in harus lane STOCKABLE")
+			}
+			if projectFlockKandangID == nil || *projectFlockKandangID == 0 {
+				return fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id aktif wajib tersedia untuk depletion conversion")
+			}
+			if s.FifoStockV2Svc == nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "FIFO v2 service is not available")
+			}
+
+			sourcePW, err := s.resolveAyamSourceProductWarehouse(ctx, tx, warehouseID, *projectFlockKandangID)
+			if err != nil {
+				return err
+			}
+			if err := common.EnsureProjectFlockNotClosedForProductWarehouses(
+				ctx,
+				tx,
+				[]uint{productWarehouse.Id, sourcePW.Id},
+			); err != nil {
+				return err
+			}
+
+			sourceRoute, err := s.resolveRouteByFunctionCode(
+				ctx,
+				sourcePW.ProductId,
+				string(utils.AdjustmentTransactionSubtypeRecordingDepletionOut),
+			)
+			if err != nil {
+				return err
+			}
+			if sourceRoute.Lane != adjustmentLaneUsable {
+				return fiber.NewError(fiber.StatusBadRequest, "Route depletion out untuk produk AYAM tidak valid")
+			}
+
+			sourceCode, err := adjustmentStockRepoTX.GenerateSequentialNumber(ctx, utils.AdjustmentStockNumberPrefix)
+			if err != nil {
+				return err
+			}
+			sourceAdjustment := &entity.AdjustmentStock{
+				ProductWarehouseId: sourcePW.Id,
+				TransactionType:    transactionType,
+				FunctionCode:       sourceRoute.FunctionCode,
+				UsageQty:           qty,
+				Price:              req.Price,
+				GrandTotal:         grandTotal,
+				AdjNumber:          sourceCode,
+			}
+			if err := adjustmentStockRepoTX.CreateOne(ctx, sourceAdjustment, nil); err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to create depletion source adjustment stock record")
+			}
+
+			destCode, err := adjustmentStockRepoTX.GenerateSequentialNumber(ctx, utils.AdjustmentStockNumberPrefix)
+			if err != nil {
+				return err
+			}
+			destinationAdjustment := &entity.AdjustmentStock{
+				ProductWarehouseId: productWarehouse.Id,
+				TransactionType:    transactionType,
+				FunctionCode:       routeMeta.FunctionCode,
+				TotalQty:           qty,
+				Price:              req.Price,
+				GrandTotal:         grandTotal,
+				AdjNumber:          destCode,
+			}
+			if err := adjustmentStockRepoTX.CreateOne(ctx, destinationAdjustment, nil); err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to create depletion destination adjustment stock record")
+			}
+
+			sourceAsOf := sourceAdjustment.CreatedAt
+			if _, err := s.FifoStockV2Svc.Reflow(ctx, common.FifoStockV2ReflowRequest{
+				FlagGroupCode:      sourceRoute.FlagGroupCode,
+				ProductWarehouseID: sourcePW.Id,
+				AsOf:               &sourceAsOf,
+				Tx:                 tx,
+			}); err != nil {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to auto depletion-out AYAM via FIFO v2: %v", err))
+			}
+
+			destinationAsOf := destinationAdjustment.CreatedAt
+			if _, err := s.FifoStockV2Svc.Reflow(ctx, common.FifoStockV2ReflowRequest{
+				FlagGroupCode:      routeMeta.FlagGroupCode,
+				ProductWarehouseID: destinationAdjustment.ProductWarehouseId,
+				AsOf:               &destinationAsOf,
+				Tx:                 tx,
+			}); err != nil {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to auto depletion-in destination via FIFO v2: %v", err))
+			}
+
+			refreshedSource, err := adjustmentStockRepoTX.GetByID(ctx, sourceAdjustment.Id, nil)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to refresh depletion source adjustment stock")
+			}
+			refreshedDestination, err := adjustmentStockRepoTX.GetByID(ctx, destinationAdjustment.Id, nil)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to refresh depletion destination adjustment stock")
+			}
+			consumedPopulationQty := refreshedSource.UsageQty + refreshedSource.PendingQty
+			if consumedPopulationQty > 0 {
+				if err := s.allocatePopulationForDepletionAdjustment(
+					ctx,
+					tx,
+					*projectFlockKandangID,
+					sourcePW.Id,
+					refreshedSource.Id,
+					consumedPopulationQty,
+				); err != nil {
+					return err
+				}
+				if err := s.resyncProjectFlockPopulationUsage(ctx, tx, *projectFlockKandangID); err != nil {
+					return fiber.NewError(fiber.StatusInternalServerError, "Failed to resync project flock population usage")
+				}
+			}
+
+			if err := s.createAdjustmentStockLog(
+				ctx,
+				stockLogRepoTX,
+				refreshedSource.Id,
+				refreshedSource.ProductWarehouseId,
+				note,
+				actorID,
+				0,
+				refreshedSource.UsageQty+refreshedSource.PendingQty,
+			); err != nil {
+				return err
+			}
+			if err := s.createAdjustmentStockLog(
+				ctx,
+				stockLogRepoTX,
+				refreshedDestination.Id,
+				refreshedDestination.ProductWarehouseId,
+				note,
+				actorID,
+				refreshedDestination.TotalQty,
+				0,
+			); err != nil {
+				return err
+			}
+
+			createdAdjustmentStockId = destinationAdjustment.Id
+			return nil
+		}
+
 		adjustmentStock := &entity.AdjustmentStock{
 			ProductWarehouseId: productWarehouse.Id,
 			TransactionType:    transactionType,
@@ -228,6 +367,12 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			Price:              req.Price,
 			GrandTotal:         grandTotal,
 		}
+		switch routeMeta.Lane {
+		case adjustmentLaneStockable:
+			adjustmentStock.TotalQty = qty
+		case adjustmentLaneUsable:
+			adjustmentStock.UsageQty = qty
+		}
 		code, err := adjustmentStockRepoTX.GenerateSequentialNumber(ctx, utils.AdjustmentStockNumberPrefix)
 		if err != nil {
 			return err
@@ -240,85 +385,44 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 		var increaseQty float64
 		var decreaseQty float64
 
-		switch routeMeta.Lane {
-		case adjustmentLaneStockable:
-			fifoNote := fmt.Sprintf("Stock Adjustment %s #%s", routeMeta.FunctionCode, adjustmentStock.AdjNumber)
-			result, err := s.FifoSvc.Replenish(ctx, common.StockReplenishRequest{
-				StockableKey:       fifo.StockableKeyAdjustmentIn,
-				StockableID:        adjustmentStock.Id,
-				ProductWarehouseID: productWarehouse.Id,
-				Quantity:           qty,
-				Note:               &fifoNote,
-				Tx:                 tx,
-			})
-			if err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to replenish stock via FIFO: %v", err))
-			}
-			increaseQty = result.AddedQuantity
-		case adjustmentLaneUsable:
-			if s.FifoStockV2Svc != nil {
-				usableLegacyTypeKey := fifo.UsableKeyAdjustmentOut.String()
-				if routeMeta.SourceTable == "adjustment_stocks" && strings.TrimSpace(routeMeta.LegacyTypeKey) != "" {
-					usableLegacyTypeKey = strings.TrimSpace(routeMeta.LegacyTypeKey)
-				}
-
-				reflowResult, err := s.FifoStockV2Svc.Reflow(ctx, common.FifoStockV2ReflowRequest{
-					FlagGroupCode:      routeMeta.FlagGroupCode,
-					ProductWarehouseID: productWarehouse.Id,
-					Usable: common.FifoStockV2Ref{
-						ID:            adjustmentStock.Id,
-						LegacyTypeKey: usableLegacyTypeKey,
-						FunctionCode:  routeMeta.FunctionCode,
-					},
-					DesiredQty:       qty,
-					AllowOverConsume: &allowPending,
-					Tx:               tx,
-				})
-				if err != nil {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to consume stock via FIFO v2: %v", err))
-				}
-				decreaseQty = reflowResult.Allocate.AllocatedQty
-			} else {
-				result, err := s.FifoSvc.Consume(ctx, common.StockConsumeRequest{
-					UsableKey:          fifo.UsableKeyAdjustmentOut,
-					UsableID:           adjustmentStock.Id,
-					ProductWarehouseID: productWarehouse.Id,
-					Quantity:           qty,
-					AllowPending:       allowPending,
-					Tx:                 tx,
-				})
-				if err != nil {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to consume stock via FIFO: %v", err))
-				}
-				decreaseQty = result.UsageQuantity
-			}
-		default:
+		if routeMeta.Lane != adjustmentLaneStockable && routeMeta.Lane != adjustmentLaneUsable {
 			return fiber.NewError(fiber.StatusBadRequest, "Unsupported transaction subtype lane")
 		}
+		if s.FifoStockV2Svc == nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "FIFO v2 service is not available")
+		}
 
-		stockLogs, err := stockLogRepoTX.GetByProductWarehouse(ctx, productWarehouse.Id, 1)
+		asOf := adjustmentStock.CreatedAt
+		if _, err := s.FifoStockV2Svc.Reflow(ctx, common.FifoStockV2ReflowRequest{
+			FlagGroupCode:      routeMeta.FlagGroupCode,
+			ProductWarehouseID: productWarehouse.Id,
+			AsOf:               &asOf,
+			Tx:                 tx,
+		}); err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to reflow stock via FIFO v2: %v", err))
+		}
+
+		refreshedAdjustment, err := adjustmentStockRepoTX.GetByID(ctx, adjustmentStock.Id, nil)
 		if err != nil {
-			s.Log.Errorf("Failed to get stock logs: %+v", err)
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to refresh adjustment stock")
+		}
+		switch routeMeta.Lane {
+		case adjustmentLaneStockable:
+			increaseQty = refreshedAdjustment.TotalQty
+		case adjustmentLaneUsable:
+			decreaseQty = refreshedAdjustment.UsageQty
 		}
 
-		currentStock := 0.0
-		if len(stockLogs) > 0 {
-			currentStock = stockLogs[0].Stock
-		}
-
-		newLog := &entity.StockLog{
-			LoggableType:       string(utils.StockLogTypeAdjustment),
-			LoggableId:         adjustmentStock.Id,
-			Notes:              note,
-			ProductWarehouseId: productWarehouse.Id,
-			CreatedBy:          actorID,
-			Increase:           increaseQty,
-			Decrease:           decreaseQty,
-			Stock:              currentStock + increaseQty - decreaseQty,
-		}
-
-		if err := stockLogRepoTX.CreateOne(ctx, newLog, nil); err != nil {
+		if err := s.createAdjustmentStockLog(
+			ctx,
+			stockLogRepoTX,
+			adjustmentStock.Id,
+			productWarehouse.Id,
+			note,
+			actorID,
+			increaseQty,
+			decreaseQty,
+		); err != nil {
 			return err
 		}
 
@@ -449,6 +553,180 @@ func (s *adjustmentService) getActiveProjectFlockKandangID(ctx context.Context,
 	return uint(projectFlockKandang.Id), nil
 }
 
+func (s *adjustmentService) resolveAyamSourceProductWarehouse(
+	ctx context.Context,
+	tx *gorm.DB,
+	warehouseID uint,
+	projectFlockKandangID uint,
+) (*entity.ProductWarehouse, error) {
+	if tx == nil {
+		return nil, fmt.Errorf("transaction is required")
+	}
+	if projectFlockKandangID == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id tidak valid untuk depletion conversion")
+	}
+
+	var sourcePW entity.ProductWarehouse
+	err := tx.WithContext(ctx).
+		Model(&entity.ProductWarehouse{}).
+		Where("project_flock_kandang_id = ?", projectFlockKandangID).
+		Where(`
+			EXISTS (
+				SELECT 1
+				FROM flags f
+				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
+				WHERE f.flagable_type = ?
+				  AND f.flagable_id = product_warehouses.product_id
+				  AND fm.flag_group_code = ?
+				)
+			`, entity.FlagableTypeProduct, flagGroupAyam).
+		Order(gorm.Expr("CASE WHEN warehouse_id = ? THEN 0 ELSE 1 END ASC", warehouseID)).
+		Order("id ASC").
+		Take(&sourcePW).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Produk sumber AYAM pada project flock kandang yang sama tidak ditemukan")
+		}
+		return nil, err
+	}
+
+	return &sourcePW, nil
+}
+
+func (s *adjustmentService) createAdjustmentStockLog(
+	ctx context.Context,
+	stockLogRepo stockLogsRepo.StockLogRepository,
+	adjustmentID uint,
+	productWarehouseID uint,
+	note string,
+	actorID uint,
+	increaseQty float64,
+	decreaseQty float64,
+) error {
+	if stockLogRepo == nil || adjustmentID == 0 || productWarehouseID == 0 {
+		return nil
+	}
+	if increaseQty == 0 && decreaseQty == 0 {
+		return nil
+	}
+
+	stockLogs, err := stockLogRepo.GetByProductWarehouse(ctx, productWarehouseID, 1)
+	if err != nil {
+		s.Log.Errorf("Failed to get stock logs: %+v", err)
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+	}
+
+	currentStock := 0.0
+	if len(stockLogs) > 0 {
+		currentStock = stockLogs[0].Stock
+	}
+
+	newLog := &entity.StockLog{
+		LoggableType:       string(utils.StockLogTypeAdjustment),
+		LoggableId:         adjustmentID,
+		Notes:              note,
+		ProductWarehouseId: productWarehouseID,
+		CreatedBy:          actorID,
+		Increase:           increaseQty,
+		Decrease:           decreaseQty,
+		Stock:              currentStock + increaseQty - decreaseQty,
+	}
+
+	return stockLogRepo.CreateOne(ctx, newLog, nil)
+}
+
+func (s *adjustmentService) allocatePopulationForDepletionAdjustment(
+	ctx context.Context,
+	tx *gorm.DB,
+	projectFlockKandangID uint,
+	sourceProductWarehouseID uint,
+	adjustmentID uint,
+	consumeQty float64,
+) error {
+	if consumeQty <= 0 {
+		return nil
+	}
+	if tx == nil {
+		return errors.New("transaction is required")
+	}
+	if projectFlockKandangID == 0 || sourceProductWarehouseID == 0 || adjustmentID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid depletion adjustment population context")
+	}
+	if s.ProjectFlockPopulationRepo == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Project flock population repository is not available")
+	}
+
+	popRepoTx := s.ProjectFlockPopulationRepo.WithTx(tx)
+	populations, err := popRepoTx.GetByProjectFlockKandangIDAndProductWarehouseID(ctx, projectFlockKandangID, sourceProductWarehouseID)
+	if err != nil {
+		return err
+	}
+	if len(populations) == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Populasi tidak ditemukan untuk depletion adjustment")
+	}
+
+	return fifoV2.AllocatePopulationConsumption(
+		ctx,
+		tx,
+		populations,
+		sourceProductWarehouseID,
+		fifo.UsableKeyAdjustmentOut.String(),
+		adjustmentID,
+		consumeQty,
+	)
+}
+
+func (s *adjustmentService) resyncProjectFlockPopulationUsage(ctx context.Context, tx *gorm.DB, projectFlockKandangID uint) error {
+	if tx == nil || projectFlockKandangID == 0 {
+		return nil
+	}
+
+	idsSubquery := `
+		SELECT pfp.id
+		FROM project_flock_populations pfp
+		JOIN project_chickins pc ON pc.id = pfp.project_chickin_id
+		WHERE pc.project_flock_kandang_id = ?
+	`
+
+	updateWithAlloc := `
+		UPDATE project_flock_populations p
+		SET total_used_qty = COALESCE(a.used, 0)
+		FROM (
+			SELECT stockable_id, SUM(qty) AS used
+			FROM stock_allocations
+			WHERE stockable_type = 'PROJECT_FLOCK_POPULATION'
+			  AND status = 'ACTIVE'
+			  AND allocation_purpose = 'CONSUME'
+			GROUP BY stockable_id
+		) a
+		WHERE p.id = a.stockable_id
+		  AND p.id IN (` + idsSubquery + `)
+	`
+
+	resetMissing := `
+		UPDATE project_flock_populations p
+		SET total_used_qty = 0
+		WHERE p.id IN (` + idsSubquery + `)
+			AND NOT EXISTS (
+				SELECT 1
+				FROM stock_allocations sa
+				WHERE sa.stockable_type = 'PROJECT_FLOCK_POPULATION'
+				  AND sa.status = 'ACTIVE'
+				  AND sa.allocation_purpose = 'CONSUME'
+				  AND sa.stockable_id = p.id
+			)
+	`
+
+	db := tx.WithContext(ctx)
+	if err := db.Exec(updateWithAlloc, projectFlockKandangID).Error; err != nil {
+		return err
+	}
+	if err := db.Exec(resetMissing, projectFlockKandangID).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
 func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Query) ([]*entity.AdjustmentStock, int64, error) {
 	if err := s.Validate.Struct(query); err != nil {
 		return nil, 0, err
@@ -461,24 +739,25 @@ func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Qu
 	}
 	offset := (query.Page - 1) * query.Limit
 
-	var isProductsExist bool
-	isWarehousesExist, err := s.WarehouseRepo.IdExists(c.Context(), uint(query.WarehouseID))
-
-	if err != nil {
-		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate warehouse")
-	}
-	if query.WarehouseID > 0 && !isWarehousesExist {
-		return nil, 0, fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
+	if query.WarehouseID > 0 {
+		isWarehouseExist, err := s.WarehouseRepo.IdExists(c.Context(), query.WarehouseID)
+		if err != nil {
+			return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate warehouse")
+		}
+		if !isWarehouseExist {
+			return nil, 0, fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
+		}
 	}
 
-	isProductsExist, err = s.ProductRepo.IdExists(c.Context(), uint(query.ProductID))
-
-	if err != nil {
-		s.Log.Errorf("Failed to check product existence: %+v", err)
-		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate product")
-	}
-	if query.ProductID > 0 && !isProductsExist {
-		return nil, 0, fiber.NewError(fiber.StatusNotFound, "Product not found")
+	if query.ProductID > 0 {
+		isProductExist, err := s.ProductRepo.IdExists(c.Context(), query.ProductID)
+		if err != nil {
+			s.Log.Errorf("Failed to check product existence: %+v", err)
+			return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate product")
+		}
+		if !isProductExist {
+			return nil, 0, fiber.NewError(fiber.StatusNotFound, "Product not found")
+		}
 	}
 
 	scope, scopeErr := m.ResolveLocationScope(c, s.AdjustmentStockRepository.DB())

internal/modules/inventory/transfers/module.go

@@ -24,7 +24,6 @@ import (
 	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
 	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
 )
 
 type TransferModule struct{}
@@ -40,10 +39,10 @@ func (TransferModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	userRepo := rUser.NewUserRepository(db)
 	warehouseRepo := rWarehouse.NewWarehouseRepository(db)
 	projectFlockKandangRepo := rProjectFlockKandang.NewProjectFlockKandangRepository(db)
+	projectFlockPopulationRepo := rProjectFlockKandang.NewProjectFlockPopulationRepository(db)
 	kandangRepo := rKandang.NewKandangRepository(db)
 	nonstockRepo := rNonstock.NewNonstockRepository(db)
 	documentRepo := commonRepo.NewDocumentRepository(db)
-	stockAllocRepo := commonRepo.NewStockAllocationRepository(db)
 	expenseRepository := expenseRepo.NewExpenseRepository(db)
 	expenseRealizationRepo := expenseRepo.NewExpenseRealizationRepository(db)
 
@@ -69,7 +68,6 @@ func (TransferModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 		validate,
 	)
 
-	fifoService := commonSvc.NewFifoService(db, stockAllocRepo, productWarehouseRepo, utils.Log)
 	fifoStockV2Service := commonSvc.NewFifoStockV2Service(db, utils.Log)
 	expenseBridge := sTransfer.NewTransferExpenseBridge(
 		db,
@@ -79,39 +77,7 @@ func (TransferModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 		expenseServiceInstance,
 	)
 
-	err = fifoService.RegisterStockable(fifo.StockableConfig{
-		Key:   fifo.StockableKeyStockTransferIn,
-		Table: "stock_transfer_details",
-		Columns: fifo.StockableColumns{
-			ID:                 "id",
-			ProductWarehouseID: "dest_product_warehouse_id",
-			TotalQuantity:      "total_qty",
-			TotalUsedQuantity:  "total_used",
-			CreatedAt:          "created_at",
-		},
-		OrderBy: []string{"created_at ASC", "id ASC"},
-	})
-	if err != nil {
-		panic(err)
-	}
-
-	err = fifoService.RegisterUsable(fifo.UsableConfig{
-		Key:   fifo.UsableKeyStockTransferOut,
-		Table: "stock_transfer_details",
-		Columns: fifo.UsableColumns{
-			ID:                 "id",
-			ProductWarehouseID: "source_product_warehouse_id",
-			UsageQuantity:      "usage_qty",
-			PendingQuantity:    "pending_qty",
-			CreatedAt:          "created_at",
-		},
-		OrderBy: []string{"created_at ASC", "id ASC"},
-	})
-	if err != nil {
-		panic(err)
-	}
-
-	transferService := sTransfer.NewTransferService(validate, stockTransferRepo, stockTransferDetailRepo, stockTransferDeliveryRepo, StockTransferDeliveryItemRepo, stockLogsRepo, productWarehouseRepo, supplierRepo, warehouseRepo, projectFlockKandangRepo, documentSvc, fifoService, fifoStockV2Service, expenseBridge)
+	transferService := sTransfer.NewTransferService(validate, stockTransferRepo, stockTransferDetailRepo, stockTransferDeliveryRepo, StockTransferDeliveryItemRepo, stockLogsRepo, productWarehouseRepo, supplierRepo, warehouseRepo, projectFlockKandangRepo, projectFlockPopulationRepo, documentSvc, fifoStockV2Service, expenseBridge)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	TransferRoutes(router, userService, transferService)

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

@@ -11,6 +11,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/sirupsen/logrus"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	fifoV2 "gitlab.com/mbugroup/lti-api.git/internal/common/service/fifo_stock_v2"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
@@ -44,13 +45,13 @@ type transferService struct {
 	SupplierRepo                  rSupplier.SupplierRepository
 	WarehouseRepo                 warehouseRepo.WarehouseRepository
 	ProjectFlockKandangRepo       projectFlockKandangRepo.ProjectFlockKandangRepository
+	ProjectFlockPopulationRepo    projectFlockKandangRepo.ProjectFlockPopulationRepository
 	DocumentSvc                   commonSvc.DocumentService
-	FifoSvc                       commonSvc.FifoService
 	FifoStockV2Svc                commonSvc.FifoStockV2Service
 	ExpenseBridge                 TransferExpenseBridge
 }
 
-func NewTransferService(validate *validator.Validate, stockTransferRepo rStockTransfer.StockTransferRepository, stockTransferDetailRepo rStockTransfer.StockTransferDetailRepository, stockTransferDeliveryRepo rStockTransfer.StockTransferDeliveryRepository, stockTransferDeliveryItemRepo rStockTransfer.StockTransferDeliveryItemRepository, stockLogsRepo rStockLogs.StockLogRepository, productWarehouseRepo rProductWarehouse.ProductWarehouseRepository, supplierRepo rSupplier.SupplierRepository, warehouseRepo warehouseRepo.WarehouseRepository, projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, documentSvc commonSvc.DocumentService, fifoSvc commonSvc.FifoService, fifoStockV2Svc commonSvc.FifoStockV2Service, expenseBridge TransferExpenseBridge) TransferService {
+func NewTransferService(validate *validator.Validate, stockTransferRepo rStockTransfer.StockTransferRepository, stockTransferDetailRepo rStockTransfer.StockTransferDetailRepository, stockTransferDeliveryRepo rStockTransfer.StockTransferDeliveryRepository, stockTransferDeliveryItemRepo rStockTransfer.StockTransferDeliveryItemRepository, stockLogsRepo rStockLogs.StockLogRepository, productWarehouseRepo rProductWarehouse.ProductWarehouseRepository, supplierRepo rSupplier.SupplierRepository, warehouseRepo warehouseRepo.WarehouseRepository, projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, projectFlockPopulationRepo projectFlockKandangRepo.ProjectFlockPopulationRepository, documentSvc commonSvc.DocumentService, fifoStockV2Svc commonSvc.FifoStockV2Service, expenseBridge TransferExpenseBridge) TransferService {
 	return &transferService{
 		Log:                           utils.Log,
 		Validate:                      validate,
@@ -63,8 +64,8 @@ func NewTransferService(validate *validator.Validate, stockTransferRepo rStockTr
 		SupplierRepo:                  supplierRepo,
 		WarehouseRepo:                 warehouseRepo,
 		ProjectFlockKandangRepo:       projectFlockKandangRepo,
+		ProjectFlockPopulationRepo:    projectFlockPopulationRepo,
 		DocumentSvc:                   documentSvc,
-		FifoSvc:                       fifoSvc,
 		FifoStockV2Svc:                fifoStockV2Svc,
 		ExpenseBridge:                 expenseBridge,
 	}
@@ -444,83 +445,91 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			}
 		}
 
-		pakanProducts := map[uint]bool{}
-		if s.FifoStockV2Svc != nil && len(req.Products) > 0 {
-			pakanProducts, err = s.resolvePakanProducts(c.Context(), tx, req.Products)
-			if err != nil {
-				return err
-			}
+		if s.FifoStockV2Svc == nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "FIFO v2 service is not available")
 		}
+		flagGroupByProduct := make(map[uint]string, len(req.Products))
 
 		for _, product := range req.Products {
 			detail := detailMap[uint64(product.ProductID)]
+			if detail == nil || detail.SourceProductWarehouseID == nil || detail.DestProductWarehouseID == nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Data transfer detail tidak valid")
+			}
 
-			outUsageQty := 0.0
-			outPendingQty := 0.0
-			useFifoV2 := s.FifoStockV2Svc != nil && pakanProducts[uint(product.ProductID)]
-			if useFifoV2 {
-				s.Log.Infof(
-					"[fifo-v2][transfer] use reflow movement=%s detail_id=%d product_id=%d source_pw=%d qty=%.3f",
-					entityTransfer.MovementNumber,
-					detail.Id,
-					product.ProductID,
-					*detail.SourceProductWarehouseID,
-					product.ProductQty,
-				)
-				reflowResult, err := s.FifoStockV2Svc.Reflow(c.Context(), commonSvc.FifoStockV2ReflowRequest{
-					FlagGroupCode:      "PAKAN",
-					ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
-					Usable: commonSvc.FifoStockV2Ref{
-						ID:            uint(detail.Id),
-						LegacyTypeKey: fifo.UsableKeyStockTransferOut.String(),
-						FunctionCode:  "STOCK_TRANSFER_OUT",
-					},
-					DesiredQty: product.ProductQty,
-					Tx:         tx,
-				})
+			flagGroupCode, ok := flagGroupByProduct[uint(product.ProductID)]
+			if !ok {
+				flagGroupCode, err = s.resolveTransferFlagGroup(c.Context(), tx, uint(product.ProductID))
 				if err != nil {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
+					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("FIFO v2 route tidak ditemukan untuk produk %d: %v", product.ProductID, err))
 				}
-				outUsageQty = reflowResult.Allocate.AllocatedQty
-				outPendingQty = reflowResult.Allocate.PendingQty
-				s.Log.Infof(
-					"[fifo-v2][transfer] reflow result movement=%s detail_id=%d usage=%.3f pending=%.3f",
-					entityTransfer.MovementNumber,
-					detail.Id,
-					outUsageQty,
-					outPendingQty,
-				)
-			} else {
-				consumeResult, err := s.FifoSvc.Consume(c.Context(), commonSvc.StockConsumeRequest{
-					UsableKey:          fifo.UsableKeyStockTransferOut,
-					UsableID:           uint(detail.Id),
-					ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
-					Quantity:           product.ProductQty,
-					AllowPending:       false,
-					Tx:                 tx,
-				})
-				if err != nil {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
-				}
-				outUsageQty = consumeResult.UsageQuantity
-				outPendingQty = consumeResult.PendingQuantity
+				flagGroupByProduct[uint(product.ProductID)] = flagGroupCode
 			}
 
 			if err := tx.Model(&entity.StockTransferDetail{}).
 				Where("id = ?", detail.Id).
 				Updates(map[string]interface{}{
-					"usage_qty":   outUsageQty,
-					"pending_qty": outPendingQty,
+					"usage_qty":   product.ProductQty,
+					"pending_qty": 0,
+					"total_qty":   product.ProductQty,
 				}).Error; err != nil {
-				s.Log.Errorf("Failed to update tracking usage for detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
+				s.Log.Errorf("Failed to update transfer detail seed fields for detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
 				return fiber.NewError(fiber.StatusInternalServerError, "Gagal memperbarui data tracking")
 			}
 
+			asOf := transferDate
+			if _, err := s.FifoStockV2Svc.Reflow(c.Context(), commonSvc.FifoStockV2ReflowRequest{
+				FlagGroupCode:      flagGroupCode,
+				ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
+				AsOf:               &asOf,
+				Tx:                 tx,
+			}); err != nil {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
+			}
+			if _, err := s.FifoStockV2Svc.Reflow(c.Context(), commonSvc.FifoStockV2ReflowRequest{
+				FlagGroupCode:      flagGroupCode,
+				ProductWarehouseID: uint(*detail.DestProductWarehouseID),
+				AsOf:               &asOf,
+				Tx:                 tx,
+			}); err != nil {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Gagal reflow stok tujuan untuk produk %d. Error: %v", product.ProductID, err))
+			}
+
+			type usageSnapshot struct {
+				UsageQty   float64 `gorm:"column:usage_qty"`
+				PendingQty float64 `gorm:"column:pending_qty"`
+			}
+			var usage usageSnapshot
+			if err := tx.WithContext(c.Context()).
+				Table("stock_transfer_details").
+				Select("usage_qty, pending_qty").
+				Where("id = ?", detail.Id).
+				Take(&usage).Error; err != nil {
+				s.Log.Errorf("Failed to read transfer usage snapshot detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data tracking")
+			}
+			outUsageQty := usage.UsageQty
+			outPendingQty := usage.PendingQty
+			if outPendingQty > 1e-6 {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal", product.ProductID))
+			}
+
+			if strings.EqualFold(flagGroupCode, "AYAM") && outUsageQty > 0 {
+				if err := s.allocatePopulationForStockTransferOut(
+					c.Context(),
+					tx,
+					detail,
+					uint(*detail.SourceProductWarehouseID),
+					outUsageQty,
+				); err != nil {
+					return err
+				}
+			}
+
 			stockLogDecrease := &entity.StockLog{
 				ProductWarehouseId: uint(*detail.SourceProductWarehouseID),
 				CreatedBy:          uint(actorID),
 				Increase:           0,
-				Decrease:           product.ProductQty,
+				Decrease:           outUsageQty,
 				LoggableType:       string(utils.StockLogTypeTransfer),
 				LoggableId:         uint(detail.Id),
 				Notes:              "",
@@ -541,45 +550,12 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok keluar")
 			}
 
-			note := fmt.Sprintf("Transfer #%s", entityTransfer.MovementNumber)
-			inAddedQty := 0.0
-			if useFifoV2 {
-				s.Log.Infof(
-					"[fifo-v2][transfer] stock-in uses replenish path movement=%s detail_id=%d product_id=%d dest_pw=%d qty=%.3f",
-					entityTransfer.MovementNumber,
-					detail.Id,
-					product.ProductID,
-					*detail.DestProductWarehouseID,
-					product.ProductQty,
-				)
-			}
-			replenishResult, err := s.FifoSvc.Replenish(c.Context(), commonSvc.StockReplenishRequest{
-				StockableKey:       fifo.StockableKeyStockTransferIn,
-				StockableID:        uint(detail.Id),
-				ProductWarehouseID: uint(*detail.DestProductWarehouseID),
-				Quantity:           product.ProductQty,
-				Note:               &note,
-				Tx:                 tx,
-			})
-			if err != nil {
-				s.Log.Errorf("Failed to replenish stock for product_id=%d, pw_id=%d, qty=%.2f: %+v", product.ProductID, *detail.DestProductWarehouseID, product.ProductQty, err)
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal menambah stok gudang tujuan")
-			}
-			inAddedQty = replenishResult.AddedQuantity
-
-			if err := tx.Model(&entity.StockTransferDetail{}).
-				Where("id = ?", detail.Id).
-				Updates(map[string]interface{}{
-					"total_qty": inAddedQty,
-				}).Error; err != nil {
-				s.Log.Errorf("Failed to update tracking total for detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal memperbarui data tracking")
-			}
+			inAddedQty := outUsageQty
 
 			stockLogIncrease := &entity.StockLog{
 				ProductWarehouseId: uint(*detail.DestProductWarehouseID),
 				CreatedBy:          uint(actorID),
-				Increase:           product.ProductQty,
+				Increase:           inAddedQty,
 				Decrease:           0,
 				LoggableType:       string(utils.StockLogTypeTransfer),
 				LoggableId:         uint(detail.Id),
@@ -657,51 +633,96 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 	return result, nil
 }
 
-func (s *transferService) resolvePakanProducts(
+func (s *transferService) allocatePopulationForStockTransferOut(
 	ctx context.Context,
 	tx *gorm.DB,
-	products []validation.TransferProduct,
-) (map[uint]bool, error) {
-	out := make(map[uint]bool, len(products))
-	if len(products) == 0 {
-		return out, nil
+	detail *entity.StockTransferDetail,
+	sourceProductWarehouseID uint,
+	consumeQty float64,
+) error {
+	if consumeQty <= 0 {
+		return nil
+	}
+	if tx == nil {
+		return errors.New("transaction is required")
+	}
+	if detail == nil || detail.Id == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Data transfer detail tidak valid")
+	}
+	if sourceProductWarehouseID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Gudang sumber tidak valid")
 	}
 
-	productIDs := make([]uint, 0, len(products))
-	seen := make(map[uint]struct{}, len(products))
-	for _, product := range products {
-		if product.ProductID == 0 {
-			continue
-		}
-		if _, ok := seen[product.ProductID]; ok {
-			continue
-		}
-		seen[product.ProductID] = struct{}{}
-		productIDs = append(productIDs, product.ProductID)
+	pw, err := s.ProductWarehouseRepo.WithTx(tx).GetByID(ctx, sourceProductWarehouseID, nil)
+	if err != nil {
+		return err
 	}
-	if len(productIDs) == 0 {
-		return out, nil
+	if pw.ProjectFlockKandangId == nil || *pw.ProjectFlockKandangId == 0 {
+		return nil
+	}
+
+	populations, err := s.ProjectFlockPopulationRepo.WithTx(tx).GetByProjectFlockKandangIDAndProductWarehouseID(
+		ctx,
+		*pw.ProjectFlockKandangId,
+		sourceProductWarehouseID,
+	)
+	if err != nil {
+		return err
+	}
+	if len(populations) == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Populasi tidak ditemukan untuk transfer")
+	}
+
+	return fifoV2.AllocatePopulationConsumption(
+		ctx,
+		tx,
+		populations,
+		sourceProductWarehouseID,
+		fifo.UsableKeyStockTransferOut.String(),
+		uint(detail.Id),
+		consumeQty,
+	)
+}
+
+func (s *transferService) resolveTransferFlagGroup(
+	ctx context.Context,
+	tx *gorm.DB,
+	productID uint,
+) (string, error) {
+	if productID == 0 {
+		return "", fmt.Errorf("product id is required")
 	}
 
 	type row struct {
-		ProductID uint `gorm:"column:product_id"`
+		FlagGroupCode string `gorm:"column:flag_group_code"`
 	}
-	var rows []row
+	var selected row
 	err := tx.WithContext(ctx).
-		Table("flags f").
-		Select("DISTINCT f.flagable_id AS product_id").
-		Where("f.flagable_type = ?", entity.FlagableTypeProduct).
-		Where("f.name IN ?", []string{"PAKAN", "PRE-STARTER", "STARTER", "FINISHER"}).
-		Where("f.flagable_id IN ?", productIDs).
-		Scan(&rows).Error
+		Table("fifo_stock_v2_route_rules rr").
+		Select("rr.flag_group_code").
+		Joins("JOIN fifo_stock_v2_flag_groups fg ON fg.code = rr.flag_group_code AND fg.is_active = TRUE").
+		Where("rr.is_active = TRUE").
+		Where("rr.lane = ?", "USABLE").
+		Where("rr.function_code = ?", "STOCK_TRANSFER_OUT").
+		Where("rr.source_table = ?", "stock_transfer_details").
+		Where(`
+			EXISTS (
+				SELECT 1
+				FROM flags f
+				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
+				WHERE f.flagable_type = ?
+				  AND f.flagable_id = ?
+				  AND fm.flag_group_code = rr.flag_group_code
+			)
+		`, entity.FlagableTypeProduct, productID).
+		Order("rr.id ASC").
+		Limit(1).
+		Take(&selected).Error
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
-	for _, row := range rows {
-		out[row.ProductID] = true
-	}
-	return out, nil
+	return strings.TrimSpace(selected.FlagGroupCode), nil
 }
 
 func (s *transferService) notifyExpenseItemsDelivered(c *fiber.Ctx, transferID uint64, payloads []TransferExpenseReceivingPayload) error {

internal/modules/marketing/module.go

@@ -2,7 +2,6 @@ package marketing
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -20,7 +19,6 @@ import (
 	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
 	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
 )
 
 type MarketingModule struct{}
@@ -33,26 +31,10 @@ func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	userRepo := rUser.NewUserRepository(db)
 	customerRepo := rCustomer.NewCustomerRepository(db)
 	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
+	projectFlockPopulationRepo := rProjectFlockKandang.NewProjectFlockPopulationRepository(db)
 	stockLogRepo := rShared.NewStockLogRepository(db)
 
-	stockAllocationRepo := commonRepo.NewStockAllocationRepository(db)
-	fifoService := commonSvc.NewFifoService(db, stockAllocationRepo, productWarehouseRepo, utils.Log)
-
-	if err := fifoService.RegisterUsable(fifo.UsableConfig{
-		Key:   fifo.UsableKeyMarketingDelivery,
-		Table: "marketing_delivery_products",
-		Columns: fifo.UsableColumns{
-			ID:                 "id",
-			ProductWarehouseID: "product_warehouse_id",
-			UsageQuantity:      "usage_qty",
-			PendingQuantity:    "pending_qty",
-			CreatedAt:          "created_at",
-		},
-	}); err != nil {
-		if !strings.Contains(strings.ToLower(err.Error()), "already registered") {
-			panic(fmt.Sprintf("failed to register marketing delivery usable workflow: %v", err))
-		}
-	}
+	fifoStockV2Service := commonSvc.NewFifoStockV2Service(db, utils.Log)
 
 	approvalRepo := commonRepo.NewApprovalRepository(db)
 	approvalSvc := commonSvc.NewApprovalService(approvalRepo)
@@ -64,8 +46,8 @@ 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, fifoService, warehouseRepo, projectFlockKandangRepo, validate)
-	deliveryOrdersService := service.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, stockLogRepo, approvalSvc, fifoService, validate)
+	salesOrdersService := service.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, fifoStockV2Service, warehouseRepo, projectFlockKandangRepo, validate)
+	deliveryOrdersService := service.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, stockLogRepo, productWarehouseRepo, projectFlockPopulationRepo, approvalSvc, fifoStockV2Service, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	RegisterRoutes(router, userService, salesOrdersService, deliveryOrdersService)

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

@@ -4,15 +4,19 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	fifoV2 "gitlab.com/mbugroup/lti-api.git/internal/common/service/fifo_stock_v2"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	rProductWarehouse "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"
+	rProjectFlock "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
 	rShared "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
@@ -35,8 +39,10 @@ type deliveryOrdersService struct {
 	MarketingProductRepo         marketingRepo.MarketingProductRepository
 	MarketingDeliveryProductRepo marketingRepo.MarketingDeliveryProductRepository
 	StockLogRepo                 rShared.StockLogRepository
+	ProductWarehouseRepo         rProductWarehouse.ProductWarehouseRepository
+	ProjectFlockPopulationRepo   rProjectFlock.ProjectFlockPopulationRepository
 	ApprovalSvc                  commonSvc.ApprovalService
-	FifoSvc                      commonSvc.FifoService
+	FifoStockV2Svc               commonSvc.FifoStockV2Service
 }
 
 func NewDeliveryOrdersService(
@@ -44,8 +50,10 @@ func NewDeliveryOrdersService(
 	marketingProductRepo marketingRepo.MarketingProductRepository,
 	marketingDeliveryProductRepo marketingRepo.MarketingDeliveryProductRepository,
 	stockLogRepo rShared.StockLogRepository,
+	productWarehouseRepo rProductWarehouse.ProductWarehouseRepository,
+	projectFlockPopulationRepo rProjectFlock.ProjectFlockPopulationRepository,
 	approvalSvc commonSvc.ApprovalService,
-	fifoSvc commonSvc.FifoService,
+	fifoStockV2Svc commonSvc.FifoStockV2Service,
 	validate *validator.Validate,
 ) DeliveryOrdersService {
 	return &deliveryOrdersService{
@@ -54,8 +62,10 @@ func NewDeliveryOrdersService(
 		MarketingProductRepo:         marketingProductRepo,
 		MarketingDeliveryProductRepo: marketingDeliveryProductRepo,
 		StockLogRepo:                 stockLogRepo,
+		ProductWarehouseRepo:         productWarehouseRepo,
+		ProjectFlockPopulationRepo:   projectFlockPopulationRepo,
 		ApprovalSvc:                  approvalSvc,
-		FifoSvc:                      fifoSvc,
+		FifoStockV2Svc:               fifoStockV2Svc,
 	}
 }
 
@@ -117,18 +127,30 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
 			Preload("Products.DeliveryProduct")
 
 		if params.Status != "" {
+			status := strings.TrimSpace(params.Status)
 			latestApprovalSubQuery := s.MarketingRepo.DB().
 				WithContext(c.Context()).
 				Table("approvals").
-				Select("DISTINCT ON (approvable_id) approvable_id, step_name").
+				Select("DISTINCT ON (approvable_id) approvable_id, step_name, action").
 				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 strings.EqualFold(status, "DITOLAK") {
+				db = db.Where(`EXISTS (
+					SELECT 1
+					FROM (?) AS latest_approval
+					WHERE latest_approval.approvable_id = marketings.id
+						AND latest_approval.action = ?
+				)`, latestApprovalSubQuery, string(entity.ApprovalActionRejected))
+			} else {
+				db = db.Where(`EXISTS (
+					SELECT 1
+					FROM (?) AS latest_approval
+					WHERE latest_approval.approvable_id = marketings.id
+						AND LOWER(latest_approval.step_name) = LOWER(?)
+						AND (latest_approval.action IS NULL OR latest_approval.action <> ?)
+				)`, latestApprovalSubQuery, status, string(entity.ApprovalActionRejected))
+			}
 		}
 
 		if params.Search != "" {
@@ -203,7 +225,6 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
-
 	if err != nil {
 		return nil, 0, err
 	}
@@ -248,7 +269,6 @@ func (s deliveryOrdersService) GetOne(c *fiber.Ctx, id uint) (*dto.MarketingDeta
 			return db.Preload("ActionUser")
 		})
 		if err != nil {
-
 		} else if len(approvals) > 0 {
 			if marketing.LatestApproval == nil {
 				latest := approvals[len(approvals)-1]
@@ -300,7 +320,6 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 	}
 
 	err = s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
-
 		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
 		marketingDeliveryProductRepositoryTx := marketingRepo.NewMarketingDeliveryProductRepository(dbTransaction)
 		approvalSvcTx := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(dbTransaction))
@@ -367,7 +386,6 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 			deliveryProduct.VehicleNumber = requestedProduct.VehicleNumber
 
 			if requestedProduct.Qty > 0 {
-
 				if err := s.consumeDeliveryStock(c.Context(), dbTransaction, deliveryProduct, foundMarketingProduct, requestedProduct.Qty, actorID); err != nil {
 					return err
 				}
@@ -394,7 +412,6 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 
 		return nil
 	})
-
 	if err != nil {
 		if fiberErr, ok := err.(*fiber.Error); ok {
 			return nil, fiberErr
@@ -426,7 +443,6 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 	}
 
 	err = s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
-
 		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
 		marketingDeliveryProductRepositoryTx := marketingRepo.NewMarketingDeliveryProductRepository(dbTransaction)
 		marketingRepoTx := marketingRepo.NewMarketingRepository(dbTransaction)
@@ -515,7 +531,6 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 
 		return nil
 	})
-
 	if err != nil {
 		if fiberErr, ok := err.(*fiber.Error); ok {
 			return nil, fiberErr
@@ -548,37 +563,55 @@ func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gor
 	if deliveryProduct == nil || deliveryProduct.Id == 0 {
 		return fiber.NewError(fiber.StatusInternalServerError, "Delivery product not found")
 	}
-
-	result, err := s.FifoSvc.Consume(ctx, commonSvc.StockConsumeRequest{
-		UsableKey:          fifo.UsableKeyMarketingDelivery,
-		UsableID:           deliveryProduct.Id,
-		ProductWarehouseID: marketingProduct.ProductWarehouseId,
-		Quantity:           requestedQty,
-		AllowPending:       false,
-		Tx:                 tx,
-	})
-
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock for product warehouse %d: %v", marketingProduct.ProductWarehouseId, err))
+	if deliveryProduct.ProductWarehouseId == 0 {
+		return fiber.NewError(fiber.StatusInternalServerError, "Delivery product warehouse not found")
+	}
+	if deliveryProduct.ProductWarehouseId != marketingProduct.ProductWarehouseId {
+		return fiber.NewError(fiber.StatusBadRequest, "Delivery product warehouse mismatch with marketing product")
 	}
 
 	deliveryProductRepo := marketingRepo.NewMarketingDeliveryProductRepository(tx)
+	previousUsage := deliveryProduct.UsageQty
+	deliveryProduct.UsageQty = requestedQty
+	deliveryProduct.PendingQty = 0
 
-	if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, result.UsageQuantity, 0); err != nil {
+	if err := deliveryProductRepo.UpdateOne(ctx, deliveryProduct.Id, deliveryProduct, nil); err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
 	}
+	if err := reflowMarketingScope(
+		ctx,
+		s.FifoStockV2Svc,
+		tx,
+		marketingProduct.ProductWarehouseId,
+		resolveMarketingAsOf(deliveryProduct.DeliveryDate, deliveryProduct.CreatedAt),
+	); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock for product warehouse %d: %v", marketingProduct.ProductWarehouseId, err))
+	}
 
-	if actorID > 0 && result.UsageQuantity > 0 {
+	refreshed, err := deliveryProductRepo.GetByID(ctx, deliveryProduct.Id, nil)
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to refresh delivery product")
+	}
+	deliveryProduct.UsageQty = refreshed.UsageQty
+	deliveryProduct.PendingQty = refreshed.PendingQty
+	deliveryProduct.CreatedAt = refreshed.CreatedAt
+
+	if err := s.allocatePopulationForMarketingDelivery(ctx, tx, deliveryProduct, marketingProduct.ProductWarehouseId); err != nil {
+		return err
+	}
+
+	allocatedDelta := deliveryProduct.UsageQty - previousUsage
+	if actorID > 0 && allocatedDelta > 0 {
 		decreaseLog := &entity.StockLog{
-			Decrease:           result.UsageQuantity,
+			Decrease:           allocatedDelta,
 			LoggableType:       string(utils.StockLogTypeMarketing),
 			LoggableId:         deliveryProduct.Id,
-			ProductWarehouseId: marketingProduct.ProductWarehouseId,
+			ProductWarehouseId: deliveryProduct.ProductWarehouseId,
 			CreatedBy:          actorID,
-			Notes:              fmt.Sprintf("FIFO consume (%.2f)", result.UsageQuantity),
+			Notes:              fmt.Sprintf("FIFO v2 reflow consume (%.2f)", allocatedDelta),
 		}
 
-		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, deliveryProduct.ProductWarehouseId, 1)
 		if err != nil {
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
 		}
@@ -604,35 +637,49 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 	}
 
 	deliveryProductRepo := marketingRepo.NewMarketingDeliveryProductRepository(tx)
-	currentUsage, err := deliveryProductRepo.GetUsageQty(ctx, deliveryProduct.Id)
-	if err != nil {
-		currentUsage = 0
-	}
-
-	if currentUsage == 0 {
+	currentUsage := deliveryProduct.UsageQty
+	currentPending := deliveryProduct.PendingQty
+	if currentUsage <= 0 && currentPending <= 0 {
 		return nil
 	}
 
-	if err := s.FifoSvc.ReleaseUsage(ctx, commonSvc.StockReleaseRequest{
-		UsableKey: fifo.UsableKeyMarketingDelivery,
-		UsableID:  deliveryProduct.Id,
-		Tx:        tx,
-	}); err != nil {
+	deliveryProduct.UsageQty = 0
+	deliveryProduct.PendingQty = 0
+	if err := deliveryProductRepo.UpdateOne(ctx, deliveryProduct.Id, deliveryProduct, nil); err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to reset delivery product")
+	}
+
+	if err := reflowMarketingScope(
+		ctx,
+		s.FifoStockV2Svc,
+		tx,
+		marketingProduct.ProductWarehouseId,
+		resolveMarketingAsOf(deliveryProduct.DeliveryDate, deliveryProduct.CreatedAt),
+	); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to reflow stock for product warehouse %d: %v", marketingProduct.ProductWarehouseId, err))
+	}
+
+	refreshed, err := deliveryProductRepo.GetByID(ctx, deliveryProduct.Id, nil)
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to refresh delivery product")
+	}
+	deliveryProduct.UsageQty = refreshed.UsageQty
+	deliveryProduct.PendingQty = refreshed.PendingQty
+	deliveryProduct.CreatedAt = refreshed.CreatedAt
+
+	if err := fifoV2.ReleasePopulationConsumptionByUsable(ctx, tx, fifo.UsableKeyMarketingDelivery.String(), deliveryProduct.Id); err != nil {
 		return err
 	}
 
-	if err := deliveryProductRepo.ResetFifoFields(ctx, deliveryProduct.Id); err != nil {
-		return err
-	}
-
-	if actorID > 0 && currentUsage > 0 {
+	releasedUsage := currentUsage - deliveryProduct.UsageQty
+	if actorID > 0 && releasedUsage > 0 {
 		increaseLog := &entity.StockLog{
-			Increase:           currentUsage,
+			Increase:           releasedUsage,
 			LoggableType:       string(utils.StockLogTypeMarketing),
 			LoggableId:         deliveryProduct.Id,
 			ProductWarehouseId: marketingProduct.ProductWarehouseId,
 			CreatedBy:          actorID,
-			Notes:              fmt.Sprintf("Release delivery stock (%.2f)", currentUsage),
+			Notes:              fmt.Sprintf("FIFO v2 reflow release (%.2f)", releasedUsage),
 		}
 		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
 		if err != nil {
@@ -650,3 +697,57 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 
 	return nil
 }
+
+func (s deliveryOrdersService) allocatePopulationForMarketingDelivery(
+	ctx context.Context,
+	tx *gorm.DB,
+	deliveryProduct *entity.MarketingDeliveryProduct,
+	productWarehouseID uint,
+) error {
+	if deliveryProduct == nil || deliveryProduct.Id == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Delivery product tidak valid")
+	}
+	if tx == nil {
+		return errors.New("transaction is required")
+	}
+	if deliveryProduct.UsageQty <= 0 {
+		return nil
+	}
+	if productWarehouseID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Product warehouse tidak ditemukan")
+	}
+
+	flagGroupCode, err := resolveMarketingFlagGroupByProductWarehouse(ctx, tx, productWarehouseID)
+	if err != nil {
+		return err
+	}
+	if !strings.EqualFold(flagGroupCode, "AYAM") {
+		return nil
+	}
+
+	pw, err := s.ProductWarehouseRepo.WithTx(tx).GetByID(ctx, productWarehouseID, nil)
+	if err != nil {
+		return err
+	}
+	if pw.ProjectFlockKandangId == nil || *pw.ProjectFlockKandangId == 0 {
+		return nil
+	}
+
+	populations, err := s.ProjectFlockPopulationRepo.WithTx(tx).GetByProjectFlockKandangIDAndProductWarehouseID(ctx, *pw.ProjectFlockKandangId, productWarehouseID)
+	if err != nil {
+		return err
+	}
+	if len(populations) == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Populasi tidak ditemukan untuk delivery")
+	}
+
+	return fifoV2.AllocatePopulationConsumption(
+		ctx,
+		tx,
+		populations,
+		productWarehouseID,
+		fifo.UsableKeyMarketingDelivery.String(),
+		deliveryProduct.Id,
+		deliveryProduct.UsageQty,
+	)
+}

internal/modules/marketing/services/fifo_stock_v2_helper.go

@@ -0,0 +1,97 @@
+package service
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gorm.io/gorm"
+)
+
+const (
+	marketingOutFunctionCode = "MARKETING_OUT"
+	marketingUsableLane      = "USABLE"
+	marketingSourceTable     = "marketing_delivery_products"
+)
+
+func reflowMarketingScope(
+	ctx context.Context,
+	fifoStockV2Svc commonSvc.FifoStockV2Service,
+	tx *gorm.DB,
+	productWarehouseID uint,
+	asOf *time.Time,
+) error {
+	if fifoStockV2Svc == nil {
+		return fmt.Errorf("FIFO v2 service is not available")
+	}
+	if productWarehouseID == 0 {
+		return fmt.Errorf("product warehouse id is required")
+	}
+
+	flagGroupCode, err := resolveMarketingFlagGroupByProductWarehouse(ctx, tx, productWarehouseID)
+	if err != nil {
+		return err
+	}
+	if strings.TrimSpace(flagGroupCode) == "" {
+		return fmt.Errorf("flag group code is not found for product warehouse %d", productWarehouseID)
+	}
+
+	_, err = fifoStockV2Svc.Reflow(ctx, commonSvc.FifoStockV2ReflowRequest{
+		FlagGroupCode:      flagGroupCode,
+		ProductWarehouseID: productWarehouseID,
+		AsOf:               asOf,
+		Tx:                 tx,
+	})
+	return err
+}
+
+func resolveMarketingFlagGroupByProductWarehouse(ctx context.Context, tx *gorm.DB, productWarehouseID uint) (string, error) {
+	type row struct {
+		FlagGroupCode string `gorm:"column:flag_group_code"`
+	}
+
+	var selected row
+	err := tx.WithContext(ctx).
+		Table("fifo_stock_v2_route_rules rr").
+		Select("rr.flag_group_code").
+		Joins("JOIN fifo_stock_v2_flag_groups fg ON fg.code = rr.flag_group_code AND fg.is_active = TRUE").
+		Where("rr.is_active = TRUE").
+		Where("rr.lane = ?", marketingUsableLane).
+		Where("rr.function_code = ?", marketingOutFunctionCode).
+		Where("rr.source_table = ?", marketingSourceTable).
+		Where(`
+			EXISTS (
+				SELECT 1
+				FROM product_warehouses pw
+				JOIN flags f ON f.flagable_id = pw.product_id
+				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
+				WHERE pw.id = ?
+				  AND f.flagable_type = ?
+				  AND fm.flag_group_code = rr.flag_group_code
+			)
+		`, productWarehouseID, entity.FlagableTypeProduct).
+		Order("rr.id ASC").
+		Limit(1).
+		Take(&selected).Error
+	if err != nil {
+		return "", err
+	}
+
+	return strings.TrimSpace(selected.FlagGroupCode), nil
+}
+
+func resolveMarketingAsOf(deliveryDate, createdAt *time.Time) *time.Time {
+	if deliveryDate != nil {
+		asOf := *deliveryDate
+		return &asOf
+	}
+	if createdAt != nil {
+		asOf := *createdAt
+		return &asOf
+	}
+	asOf := time.Now()
+	return &asOf
+}

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

@@ -20,7 +20,6 @@ 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"
@@ -43,12 +42,12 @@ type salesOrdersService struct {
 	ProductWarehouseRepo    productWarehouseRepo.ProductWarehouseRepository
 	UserRepo                userRepo.UserRepository
 	ApprovalSvc             commonSvc.ApprovalService
-	FifoSvc                 commonSvc.FifoService
+	FifoStockV2Svc          commonSvc.FifoStockV2Service
 	WarehouseRepo           warehouseRepo.WarehouseRepository
 	ProjectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository
 }
 
-func NewSalesOrdersService(marketingRepo repository.MarketingRepository, customerRepo customerRepo.CustomerRepository, productWarehouseRepo productWarehouseRepo.ProductWarehouseRepository, userRepo userRepo.UserRepository, approvalSvc commonSvc.ApprovalService, fifoSvc commonSvc.FifoService, warehouseRepo warehouseRepo.WarehouseRepository,
+func NewSalesOrdersService(marketingRepo repository.MarketingRepository, customerRepo customerRepo.CustomerRepository, productWarehouseRepo productWarehouseRepo.ProductWarehouseRepository, userRepo userRepo.UserRepository, approvalSvc commonSvc.ApprovalService, fifoStockV2Svc commonSvc.FifoStockV2Service, warehouseRepo warehouseRepo.WarehouseRepository,
 	projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, validate *validator.Validate) SalesOrdersService {
 	return &salesOrdersService{
 		Log:                     utils.Log,
@@ -58,7 +57,7 @@ func NewSalesOrdersService(marketingRepo repository.MarketingRepository, custome
 		ProductWarehouseRepo:    productWarehouseRepo,
 		UserRepo:                userRepo,
 		ApprovalSvc:             approvalSvc,
-		FifoSvc:                 fifoSvc,
+		FifoStockV2Svc:          fifoStockV2Svc,
 		WarehouseRepo:           warehouseRepo,
 		ProjectFlockKandangRepo: projectFlockKandangRepo,
 	}
@@ -152,6 +151,31 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 		}
 	}
 
+	requestedByWarehouse := make(map[uint]float64)
+	for _, item := range req.MarketingProducts {
+		if item.ProductWarehouseId == 0 {
+			continue
+		}
+		requestedByWarehouse[item.ProductWarehouseId] += item.Qty
+	}
+
+	for pwID, requestedQty := range requestedByWarehouse {
+		productWarehouse, err := s.ProductWarehouseRepo.GetDetailByID(c.Context(), pwID)
+		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return nil, fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Product warehouse %d not found", pwID))
+			}
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to check stock availability")
+		}
+		availableQty := productWarehouse.Quantity
+		if availableQty+1e-6 < requestedQty {
+			return nil, fiber.NewError(
+				fiber.StatusBadRequest,
+				fmt.Sprintf("Stok tidak mencukupi untuk gudang %d: diminta %.3f, tersedia %.3f", pwID, requestedQty, availableQty),
+			)
+		}
+	}
+
 	soDate, err := utils.ParseDateString(req.Date)
 	if err != nil {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid date format")
@@ -376,15 +400,18 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 						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))
+							nextRequestedQty := deliveryProduct.UsageQty + deliveryProduct.PendingQty + qtyDiff
+							if err := invDeliveryRepoTx.UpdateFifoFields(c.Context(), deliveryProduct.Id, nextRequestedQty, 0); err != nil {
+								return fiber.NewError(fiber.StatusInternalServerError, "Failed to update marketing delivery fifo fields")
+							}
+							if err := reflowMarketingScope(
+								c.Context(),
+								s.FifoStockV2Svc,
+								dbTransaction,
+								rp.ProductWarehouseId,
+								resolveMarketingAsOf(deliveryProduct.DeliveryDate, deliveryProduct.CreatedAt),
+							); err != nil {
+								return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to reflow stock via FIFO v2: %v", err))
 							}
 						}
 					}
@@ -439,12 +466,17 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 							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.UpdateFifoFields(c.Context(), deliveryProduct.Id, 0, 0); err != nil {
+							return fiber.NewError(fiber.StatusInternalServerError, "Failed to reset marketing delivery fifo fields")
+						}
+						if err := reflowMarketingScope(
+							c.Context(),
+							s.FifoStockV2Svc,
+							dbTransaction,
+							deliveryProduct.ProductWarehouseId,
+							resolveMarketingAsOf(deliveryProduct.DeliveryDate, deliveryProduct.CreatedAt),
+						); err != nil {
+							return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to reflow stock via FIFO v2: %v", err))
 						}
 
 						if err := invDeliveryRepoTx.DeleteOne(c.Context(), deliveryProduct.Id); err != nil {
@@ -523,12 +555,17 @@ func (s salesOrdersService) DeleteOne(c *fiber.Ctx, id uint) error {
 			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))
+					if err := marketingDeliveryProductRepoTx.UpdateFifoFields(c.Context(), dp.Id, 0, 0); err != nil {
+						return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to reset fifo fields for delivery product %d", dp.Id))
+					}
+					if err := reflowMarketingScope(
+						c.Context(),
+						s.FifoStockV2Svc,
+						dbTransaction,
+						dp.ProductWarehouseId,
+						resolveMarketingAsOf(dp.DeliveryDate, dp.CreatedAt),
+					); err != nil {
+						return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to reflow stock via FIFO v2 for delivery product %d: %v", dp.Id, err))
 					}
 				}
 			}

internal/modules/master/employees/dto/employees.dto.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
+	kandangGroupDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/dto"
 )
 
 // === DTO Structs ===
@@ -15,12 +15,12 @@ type EmployeesRelationDTO struct {
 }
 
 type EmployeesListDTO struct {
-	Id        uint                            `json:"id"`
-	Name      string                          `json:"name"`
-	IsActive  bool                            `json:"is_active"`
-	Kandangs  []kandangDTO.KandangRelationDTO `json:"kandangs"`
-	CreatedAt time.Time                       `json:"created_at"`
-	UpdatedAt time.Time                       `json:"updated_at"`
+	Id        uint                                      `json:"id"`
+	Name      string                                    `json:"name"`
+	IsActive  bool                                      `json:"is_active"`
+	Kandangs  []kandangGroupDTO.KandangGroupRelationDTO `json:"kandangs"`
+	CreatedAt time.Time                                 `json:"created_at"`
+	UpdatedAt time.Time                                 `json:"updated_at"`
 }
 
 type EmployeesDetailDTO struct {
@@ -37,12 +37,12 @@ func ToEmployeesRelationDTO(e entity.Employees) EmployeesRelationDTO {
 }
 
 func ToEmployeesListDTO(e entity.Employees) EmployeesListDTO {
-	kandangs := make([]kandangDTO.KandangRelationDTO, 0, len(e.EmployeeKandangs))
+	kandangs := make([]kandangGroupDTO.KandangGroupRelationDTO, 0, len(e.EmployeeKandangs))
 	for _, rel := range e.EmployeeKandangs {
 		if rel.Kandang.Id == 0 {
 			continue
 		}
-		kandangs = append(kandangs, kandangDTO.ToKandangRelationDTO(rel.Kandang))
+		kandangs = append(kandangs, kandangGroupDTO.ToKandangGroupRelationDTO(rel.Kandang))
 	}
 
 	return EmployeesListDTO{

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

@@ -52,7 +52,7 @@ func (s employeesService) ensureEmployeeAccess(c *fiber.Ctx, employeeID uint) er
 	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 kandang_groups 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).
@@ -79,7 +79,7 @@ func (s employeesService) ensureKandangIDsAccess(c *fiber.Ctx, kandangIDs []uint
 	}
 
 	db := s.Repository.DB().WithContext(c.Context()).
-		Table("kandangs k").
+		Table("kandang_groups 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)
@@ -109,7 +109,7 @@ 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 kandang_groups 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

internal/modules/master/kandang-groups/controllers/kandang_group.controller.go

@@ -0,0 +1,146 @@
+package controller
+
+import (
+	"math"
+	"strconv"
+
+	"github.com/gofiber/fiber/v2"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/dto"
+	service "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/services"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/response"
+)
+
+type KandangGroupController struct {
+	KandangGroupService service.KandangGroupService
+}
+
+func NewKandangGroupController(kandangGroupService service.KandangGroupService) *KandangGroupController {
+	return &KandangGroupController{
+		KandangGroupService: kandangGroupService,
+	}
+}
+
+func (u *KandangGroupController) GetAll(c *fiber.Ctx) error {
+	query := &validation.Query{
+		Page:       c.QueryInt("page", 1),
+		Limit:      c.QueryInt("limit", 10),
+		Search:     c.Query("search", ""),
+		LocationId: c.QueryInt("location_id", 0),
+		PicId:      c.QueryInt("pic_id", 0),
+	}
+
+	if query.Page < 1 || query.Limit < 1 {
+		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
+	}
+
+	result, totalResults, err := u.KandangGroupService.GetAll(c, query)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.SuccessWithPaginate[dto.KandangGroupListDTO]{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get all kandang groups successfully",
+			Meta: response.Meta{
+				Page:         query.Page,
+				Limit:        query.Limit,
+				TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
+				TotalResults: totalResults,
+			},
+			Data: dto.ToKandangGroupListDTOs(result),
+		})
+}
+
+func (u *KandangGroupController) GetOne(c *fiber.Ctx) error {
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	result, err := u.KandangGroupService.GetOne(c, uint(id))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get kandang group successfully",
+			Data:    dto.ToKandangGroupListDTO(*result),
+		})
+}
+
+func (u *KandangGroupController) CreateOne(c *fiber.Ctx) error {
+	req := new(validation.Create)
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	result, err := u.KandangGroupService.CreateOne(c, req)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusCreated).
+		JSON(response.Success{
+			Code:    fiber.StatusCreated,
+			Status:  "success",
+			Message: "Create kandang group successfully",
+			Data:    dto.ToKandangGroupListDTO(*result),
+		})
+}
+
+func (u *KandangGroupController) UpdateOne(c *fiber.Ctx) error {
+	req := new(validation.Update)
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	result, err := u.KandangGroupService.UpdateOne(c, req, uint(id))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Update kandang group successfully",
+			Data:    dto.ToKandangGroupListDTO(*result),
+		})
+}
+
+func (u *KandangGroupController) DeleteOne(c *fiber.Ctx) error {
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	if err := u.KandangGroupService.DeleteOne(c, uint(id)); err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Common{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Delete kandang group successfully",
+		})
+}

internal/modules/master/kandang-groups/dto/kandang_group.dto.go

@@ -0,0 +1,114 @@
+package dto
+
+import (
+	"time"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
+	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
+)
+
+type KandangGroupRelationDTO struct {
+	Id       uint                             `json:"id"`
+	Name     string                           `json:"name"`
+	Status   string                           `json:"status"`
+	Location *locationDTO.LocationRelationDTO `json:"location,omitempty"`
+	Pic      *userDTO.UserRelationDTO         `json:"pic,omitempty"`
+}
+
+type RecordingKandangDTO struct {
+	Id   uint   `json:"id"`
+	Name string `json:"name"`
+}
+
+type KandangGroupListDTO struct {
+	Id                uint                            `json:"id"`
+	Name              string                          `json:"name"`
+	Status            string                          `json:"status"`
+	Location          locationDTO.LocationRelationDTO `json:"location"`
+	Pic               userDTO.UserRelationDTO         `json:"pic"`
+	CreatedUser       userDTO.UserRelationDTO         `json:"created_user"`
+	CreatedAt         time.Time                       `json:"created_at"`
+	UpdatedAt         time.Time                       `json:"updated_at"`
+	RecordingKandangs []RecordingKandangDTO           `json:"recording_kandangs"`
+}
+
+type KandangGroupDetailDTO struct {
+	KandangGroupListDTO
+}
+
+func ToKandangGroupRelationDTO(e entity.KandangGroup) KandangGroupRelationDTO {
+	var location *locationDTO.LocationRelationDTO
+	if e.Location.Id != 0 {
+		mapped := locationDTO.ToLocationRelationDTO(e.Location)
+		location = &mapped
+	}
+
+	var pic *userDTO.UserRelationDTO
+	if e.Pic.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(e.Pic)
+		pic = &mapped
+	}
+
+	return KandangGroupRelationDTO{
+		Id:       e.Id,
+		Name:     e.Name,
+		Status:   e.Status,
+		Location: location,
+		Pic:      pic,
+	}
+}
+
+func ToKandangGroupListDTO(e entity.KandangGroup) KandangGroupListDTO {
+	var location locationDTO.LocationRelationDTO
+	if e.Location.Id != 0 {
+		mapped := locationDTO.ToLocationRelationDTO(e.Location)
+		location = mapped
+	}
+
+	var pic userDTO.UserRelationDTO
+	if e.Pic.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(e.Pic)
+		pic = mapped
+	}
+
+	var createdUser userDTO.UserRelationDTO
+	if e.CreatedUser.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(e.CreatedUser)
+		createdUser = mapped
+	}
+
+	recordingKandangs := make([]RecordingKandangDTO, 0, len(e.Kandangs))
+	for _, kandang := range e.Kandangs {
+		recordingKandangs = append(recordingKandangs, RecordingKandangDTO{
+			Id:   kandang.Id,
+			Name: kandang.Name,
+		})
+	}
+
+	return KandangGroupListDTO{
+		Id:                e.Id,
+		Name:              e.Name,
+		Status:            e.Status,
+		Location:          location,
+		Pic:               pic,
+		CreatedAt:         e.CreatedAt,
+		UpdatedAt:         e.UpdatedAt,
+		CreatedUser:       createdUser,
+		RecordingKandangs: recordingKandangs,
+	}
+}
+
+func ToKandangGroupListDTOs(e []entity.KandangGroup) []KandangGroupListDTO {
+	result := make([]KandangGroupListDTO, len(e))
+	for i, r := range e {
+		result[i] = ToKandangGroupListDTO(r)
+	}
+	return result
+}
+
+func ToKandangGroupDetailDTO(e entity.KandangGroup) KandangGroupDetailDTO {
+	return KandangGroupDetailDTO{
+		KandangGroupListDTO: ToKandangGroupListDTO(e),
+	}
+}

internal/modules/master/kandang-groups/module.go

@@ -0,0 +1,25 @@
+package kandanggroups
+
+import (
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+
+	rKandangGroup "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/repositories"
+	sKandangGroup "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/services"
+
+	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
+	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+)
+
+type KandangGroupModule struct{}
+
+func (KandangGroupModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
+	kandangGroupRepo := rKandangGroup.NewKandangGroupRepository(db)
+	userRepo := rUser.NewUserRepository(db)
+
+	kandangGroupService := sKandangGroup.NewKandangGroupService(kandangGroupRepo, validate)
+	userService := sUser.NewUserService(userRepo, validate)
+
+	KandangGroupRoutes(router, userService, kandangGroupService)
+}

internal/modules/master/kandang-groups/repositories/kandang_group.repository.go

@@ -0,0 +1,41 @@
+package repository
+
+import (
+	"context"
+
+	"gorm.io/gorm"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+)
+
+type KandangGroupRepository interface {
+	repository.BaseRepository[entity.KandangGroup]
+	LocationExists(ctx context.Context, locationId uint) (bool, error)
+	PicExists(ctx context.Context, picId uint) (bool, error)
+	NameExists(ctx context.Context, name string, excludeID *uint) (bool, error)
+}
+
+type KandangGroupRepositoryImpl struct {
+	*repository.BaseRepositoryImpl[entity.KandangGroup]
+	db *gorm.DB
+}
+
+func NewKandangGroupRepository(db *gorm.DB) KandangGroupRepository {
+	return &KandangGroupRepositoryImpl{
+		BaseRepositoryImpl: repository.NewBaseRepository[entity.KandangGroup](db),
+		db:                 db,
+	}
+}
+
+func (r *KandangGroupRepositoryImpl) LocationExists(ctx context.Context, locationId uint) (bool, error) {
+	return repository.Exists[entity.Location](ctx, r.db, locationId)
+}
+
+func (r *KandangGroupRepositoryImpl) PicExists(ctx context.Context, picId uint) (bool, error) {
+	return repository.Exists[entity.User](ctx, r.db, picId)
+}
+
+func (r *KandangGroupRepositoryImpl) NameExists(ctx context.Context, name string, excludeID *uint) (bool, error) {
+	return repository.ExistsByName[entity.KandangGroup](ctx, r.db, name, excludeID)
+}

internal/modules/master/kandang-groups/route.go

@@ -0,0 +1,23 @@
+package kandanggroups
+
+import (
+	"github.com/gofiber/fiber/v2"
+
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/controllers"
+	kandanggroup "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/services"
+	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+)
+
+func KandangGroupRoutes(v1 fiber.Router, u user.UserService, s kandanggroup.KandangGroupService) {
+	ctrl := controller.NewKandangGroupController(s)
+
+	route := v1.Group("/kandang-groups")
+	route.Use(m.Auth(u))
+
+	route.Get("/", ctrl.GetAll)
+	route.Post("/", m.RequirePermissions(m.P_KandangGroups), ctrl.CreateOne)
+	route.Get("/:id", m.RequirePermissions(m.P_KandangGroups), ctrl.GetOne)
+	route.Patch("/:id", m.RequirePermissions(m.P_KandangGroups), ctrl.UpdateOne)
+	route.Delete("/:id", m.RequirePermissions(m.P_KandangGroups), ctrl.DeleteOne)
+}

internal/modules/master/kandang-groups/services/kandang_group.service.go

@@ -0,0 +1,242 @@
+package service
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"github.com/sirupsen/logrus"
+	"gorm.io/gorm"
+
+	common "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"
+	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/repositories"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandang-groups/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+)
+
+type KandangGroupService interface {
+	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.KandangGroup, int64, error)
+	GetOne(ctx *fiber.Ctx, id uint) (*entity.KandangGroup, error)
+	CreateOne(ctx *fiber.Ctx, req *validation.Create) (*entity.KandangGroup, error)
+	UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*entity.KandangGroup, error)
+	DeleteOne(ctx *fiber.Ctx, id uint) error
+}
+
+type kandangGroupService struct {
+	Log        *logrus.Logger
+	Validate   *validator.Validate
+	Repository repository.KandangGroupRepository
+}
+
+func NewKandangGroupService(repo repository.KandangGroupRepository, validate *validator.Validate) KandangGroupService {
+	return &kandangGroupService{
+		Log:        utils.Log,
+		Validate:   validate,
+		Repository: repo,
+	}
+}
+
+func (s kandangGroupService) withRelations(db *gorm.DB) *gorm.DB {
+	return db.
+		Preload("CreatedUser").
+		Preload("Location").
+		Preload("Pic").
+		Preload("Kandangs", func(tx *gorm.DB) *gorm.DB {
+			return tx.Select("id", "name", "kandang_group_id").Order("name ASC")
+		})
+}
+
+func (s kandangGroupService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.KandangGroup, int64, error) {
+	if err := s.Validate.Struct(params); err != nil {
+		return nil, 0, err
+	}
+
+	var scopeErr error
+	offset := (params.Page - 1) * params.Limit
+
+	kandangGroups, 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, "kandang_groups.location_id")
+		if params.Search != "" {
+			db = db.Where("kandang_groups.name ILIKE ?", "%"+params.Search+"%")
+		}
+		if params.LocationId != 0 {
+			db = db.Where("kandang_groups.location_id = ?", params.LocationId)
+		}
+		if params.PicId != 0 {
+			db = db.Where("kandang_groups.pic_id = ?", params.PicId)
+		}
+		return db.Order("kandang_groups.created_at DESC").Order("kandang_groups.updated_at DESC")
+	})
+
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
+	if err != nil {
+		s.Log.Errorf("Failed to get kandang groups: %+v", err)
+		return nil, 0, err
+	}
+
+	return kandangGroups, total, nil
+}
+
+func (s kandangGroupService) GetOne(c *fiber.Ctx, id uint) (*entity.KandangGroup, error) {
+	var scopeErr error
+
+	kandangGroup, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationScope(c, db, "kandang_groups.location_id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusNotFound, "Kandang group not found")
+	}
+	if err != nil {
+		s.Log.Errorf("Failed to get kandang group by id: %+v", err)
+		return nil, err
+	}
+
+	return kandangGroup, nil
+}
+
+func (s *kandangGroupService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entity.KandangGroup, error) {
+	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 group name: %+v", err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to check kandang group name")
+	} else if exists {
+		return nil, fiber.NewError(fiber.StatusConflict, fmt.Sprintf("Kandang group with name %s already exists", req.Name))
+	}
+
+	if err := common.EnsureRelations(c.Context(),
+		common.RelationCheck{Name: "Location", ID: &req.LocationId, Exists: s.Repository.LocationExists},
+		common.RelationCheck{Name: "Pic", ID: &req.PicId, Exists: s.Repository.PicExists},
+	); err != nil {
+		return nil, err
+	}
+
+	status := strings.ToUpper(strings.TrimSpace(req.Status))
+	if status == "" {
+		status = string(utils.KandangStatusNonActive)
+	}
+	if !utils.IsValidKandangStatus(status) {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid kandang group status")
+	}
+
+	actorID, err := m.ActorIDFromContext(c)
+	if err != nil {
+		return nil, err
+	}
+
+	createBody := &entity.KandangGroup{
+		Name:       req.Name,
+		Status:     status,
+		LocationId: req.LocationId,
+		PicId:      req.PicId,
+		CreatedBy:  actorID,
+	}
+
+	if err := s.Repository.CreateOne(c.Context(), createBody, nil); err != nil {
+		s.Log.Errorf("Failed to create kandang group: %+v", err)
+		return nil, err
+	}
+
+	return s.GetOne(c, createBody.Id)
+}
+
+func (s kandangGroupService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.KandangGroup, error) {
+	if err := s.Validate.Struct(req); err != nil {
+		return nil, err
+	}
+
+	existing, err := s.GetOne(c, id)
+	if err != nil {
+		return nil, err
+	}
+
+	if req.LocationId != nil {
+		if err := m.EnsureLocationAccess(c, s.Repository.DB(), *req.LocationId); err != nil {
+			return nil, err
+		}
+	}
+
+	updateBody := make(map[string]any)
+
+	if req.Name != nil {
+		if exists, err := s.Repository.NameExists(c.Context(), *req.Name, &id); err != nil {
+			s.Log.Errorf("Failed to check kandang group name: %+v", err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to check kandang group name")
+		} else if exists {
+			return nil, fiber.NewError(fiber.StatusConflict, fmt.Sprintf("Kandang group with name %s already exists", *req.Name))
+		}
+		updateBody["name"] = *req.Name
+	}
+
+	if err := common.EnsureRelations(c.Context(),
+		common.RelationCheck{Name: "Location", ID: req.LocationId, Exists: s.Repository.LocationExists},
+		common.RelationCheck{Name: "Pic", ID: req.PicId, Exists: s.Repository.PicExists},
+	); err != nil {
+		return nil, err
+	}
+
+	if req.LocationId != nil {
+		updateBody["location_id"] = *req.LocationId
+	}
+	if req.PicId != nil {
+		updateBody["pic_id"] = *req.PicId
+	}
+	if req.Status != nil {
+		status := strings.ToUpper(strings.TrimSpace(*req.Status))
+		if !utils.IsValidKandangStatus(status) {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid kandang group status")
+		}
+		updateBody["status"] = status
+	}
+
+	if len(updateBody) == 0 {
+		return existing, nil
+	}
+
+	if err := s.Repository.PatchOne(c.Context(), id, updateBody, nil); err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, fiber.NewError(fiber.StatusNotFound, "Kandang group not found")
+		}
+		s.Log.Errorf("Failed to update kandang group: %+v", err)
+		return nil, err
+	}
+
+	return s.GetOne(c, id)
+}
+
+func (s kandangGroupService) DeleteOne(c *fiber.Ctx, id uint) error {
+	kandangGroup, err := s.GetOne(c, id)
+	if err != nil {
+		return err
+	}
+	if len(kandangGroup.Kandangs) > 0 {
+		return fiber.NewError(fiber.StatusConflict, "Kandang group tidak boleh dihapus karena masih memiliki relasi kandang")
+	}
+
+	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return fiber.NewError(fiber.StatusNotFound, "Kandang group not found")
+		}
+		s.Log.Errorf("Failed to delete kandang group: %+v", err)
+		return err
+	}
+
+	return nil
+}

internal/modules/master/kandang-groups/validations/kandang_group.validation.go

@@ -0,0 +1,23 @@
+package validation
+
+type Create struct {
+	Name       string `json:"name" validate:"required_strict,min=3,max=50"`
+	Status     string `json:"status,omitempty" validate:"omitempty,min=3,max=50"`
+	LocationId uint   `json:"location_id" validate:"required_strict,number,gt=0"`
+	PicId      uint   `json:"pic_id" validate:"required_strict,number,gt=0"`
+}
+
+type Update struct {
+	Name       *string `json:"name,omitempty" validate:"omitempty,max=50"`
+	Status     *string `json:"status,omitempty" validate:"omitempty,min=3,max=50"`
+	LocationId *uint   `json:"location_id,omitempty" validate:"omitempty,number,gt=0"`
+	PicId      *uint   `json:"pic_id,omitempty" validate:"omitempty,number,gt=0"`
+}
+
+type Query struct {
+	Page       int    `query:"page" validate:"omitempty,number,min=1"`
+	Limit      int    `query:"limit" validate:"omitempty,number,min=1,max=500"`
+	Search     string `query:"search" validate:"omitempty,max=50"`
+	LocationId int    `query:"location_id" validate:"omitempty,number,gt=0"`
+	PicId      int    `query:"pic_id" validate:"omitempty,number,gt=0"`
+}

internal/modules/master/kandangs/dto/kandang.dto.go

@@ -11,24 +11,32 @@ import (
 // === DTO Structs ===
 
 type KandangRelationDTO struct {
-	Id       uint                             `json:"id"`
-	Name     string                           `json:"name"`
-	Status   string                           `json:"status"`
-	Capacity float64                          `json:"capacity"`
-	Location *locationDTO.LocationRelationDTO `json:"location,omitempty"`
-	Pic      *userDTO.UserRelationDTO         `json:"pic,omitempty"`
+	Id           uint                             `json:"id"`
+	Name         string                           `json:"name"`
+	Status       string                           `json:"status"`
+	Capacity     float64                          `json:"capacity"`
+	KandangGroup *KandangGroupRelationDTO         `json:"kandang_group,omitempty"`
+	Location     *locationDTO.LocationRelationDTO `json:"location,omitempty"`
+	Pic          *userDTO.UserRelationDTO         `json:"pic,omitempty"`
+}
+
+type KandangGroupRelationDTO struct {
+	Id     uint   `json:"id"`
+	Name   string `json:"name"`
+	Status string `json:"status"`
 }
 
 type KandangListDTO struct {
-	Id          uint                            `json:"id"`
-	Name        string                          `json:"name"`
-	Status      string                          `json:"status"`
-	Capacity    float64                         `json:"capacity"`
-	Location    locationDTO.LocationRelationDTO `json:"location"`
-	Pic         userDTO.UserRelationDTO         `json:"pic"`
-	CreatedUser userDTO.UserRelationDTO         `json:"created_user"`
-	CreatedAt   time.Time                       `json:"created_at"`
-	UpdatedAt   time.Time                       `json:"updated_at"`
+	Id           uint                            `json:"id"`
+	Name         string                          `json:"name"`
+	Status       string                          `json:"status"`
+	Capacity     float64                         `json:"capacity"`
+	KandangGroup KandangGroupRelationDTO         `json:"kandang_group"`
+	Location     locationDTO.LocationRelationDTO `json:"location"`
+	Pic          userDTO.UserRelationDTO         `json:"pic"`
+	CreatedUser  userDTO.UserRelationDTO         `json:"created_user"`
+	CreatedAt    time.Time                       `json:"created_at"`
+	UpdatedAt    time.Time                       `json:"updated_at"`
 }
 
 type KandangDetailDTO struct {
@@ -38,6 +46,12 @@ type KandangDetailDTO struct {
 // === Mapper Functions ===
 
 func ToKandangRelationDTO(e entity.Kandang) KandangRelationDTO {
+	var kandangGroup *KandangGroupRelationDTO
+	if e.KandangGroup.Id != 0 {
+		mapped := ToKandangGroupRelationDTO(e.KandangGroup)
+		kandangGroup = &mapped
+	}
+
 	var location *locationDTO.LocationRelationDTO
 	if e.Location.Id != 0 {
 		mapped := locationDTO.ToLocationRelationDTO(e.Location)
@@ -51,16 +65,31 @@ func ToKandangRelationDTO(e entity.Kandang) KandangRelationDTO {
 	}
 
 	return KandangRelationDTO{
-		Id:       e.Id,
-		Name:     e.Name,
-		Status:   e.Status,
-		Capacity: e.Capacity,
-		Location: location,
-		Pic:      pic,
+		Id:           e.Id,
+		Name:         e.Name,
+		Status:       e.Status,
+		Capacity:     e.Capacity,
+		KandangGroup: kandangGroup,
+		Location:     location,
+		Pic:          pic,
+	}
+}
+
+func ToKandangGroupRelationDTO(e entity.KandangGroup) KandangGroupRelationDTO {
+	return KandangGroupRelationDTO{
+		Id:     e.Id,
+		Name:   e.Name,
+		Status: e.Status,
 	}
 }
 
 func ToKandangListDTO(e entity.Kandang) KandangListDTO {
+	var kandangGroup KandangGroupRelationDTO
+	if e.KandangGroup.Id != 0 {
+		mapped := ToKandangGroupRelationDTO(e.KandangGroup)
+		kandangGroup = mapped
+	}
+
 	var location locationDTO.LocationRelationDTO
 	if e.Location.Id != 0 {
 		mapped := locationDTO.ToLocationRelationDTO(e.Location)
@@ -80,15 +109,16 @@ func ToKandangListDTO(e entity.Kandang) KandangListDTO {
 	}
 
 	return KandangListDTO{
-		Id:          e.Id,
-		Name:        e.Name,
-		Status:      e.Status,
-		Location:    location,
-		Capacity:    e.Capacity,
-		Pic:         pic,
-		CreatedAt:   e.CreatedAt,
-		UpdatedAt:   e.UpdatedAt,
-		CreatedUser: createdUser,
+		Id:           e.Id,
+		Name:         e.Name,
+		Status:       e.Status,
+		Location:     location,
+		KandangGroup: kandangGroup,
+		Capacity:     e.Capacity,
+		Pic:          pic,
+		CreatedAt:    e.CreatedAt,
+		UpdatedAt:    e.UpdatedAt,
+		CreatedUser:  createdUser,
 	}
 }
 

internal/modules/master/kandangs/repositories/kandang.repository.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"errors"
 
+	"github.com/gofiber/fiber/v2"
 	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"github.com/gofiber/fiber/v2"
 	"gorm.io/gorm"
 )
 
@@ -15,6 +15,7 @@ type KandangRepository interface {
 	repository.BaseRepository[entity.Kandang]
 	LocationExists(ctx context.Context, areaId uint) (bool, error)
 	PicExists(ctx context.Context, areaId uint) (bool, error)
+	KandangGroupExists(ctx context.Context, kandangGroupId uint) (bool, error)
 	NameExists(ctx context.Context, name string, excludeID *uint) (bool, error)
 	ProjectFlockExists(ctx context.Context, projectFlockID uint) (bool, error)
 	GetFirstByProjectFlockID(ctx context.Context, projectFlockID uint) (*entity.Kandang, error)
@@ -45,6 +46,10 @@ func (r *KandangRepositoryImpl) PicExists(ctx context.Context, picId uint) (bool
 	return repository.Exists[entity.User](ctx, r.db, picId)
 }
 
+func (r *KandangRepositoryImpl) KandangGroupExists(ctx context.Context, kandangGroupId uint) (bool, error) {
+	return repository.Exists[entity.KandangGroup](ctx, r.db, kandangGroupId)
+}
+
 func (r *KandangRepositoryImpl) NameExists(ctx context.Context, name string, excludeID *uint) (bool, error) {
 	return repository.ExistsByName[entity.Kandang](ctx, r.db, name, excludeID)
 }

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

@@ -3,13 +3,14 @@ package service
 import (
 	"errors"
 	"fmt"
+	"strings"
+
 	common "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"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"strings"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -40,7 +41,7 @@ func NewKandangService(repo repository.KandangRepository, validate *validator.Va
 }
 
 func (s kandangService) withRelations(db *gorm.DB) *gorm.DB {
-	return db.Preload("CreatedUser").Preload("Location").Preload("Pic").Preload("ProjectFlockKandangs.ProjectFlock")
+	return db.Preload("CreatedUser").Preload("Location").Preload("KandangGroup").Preload("Pic").Preload("ProjectFlockKandangs.ProjectFlock")
 
 }
 
@@ -99,6 +100,28 @@ func (s kandangService) GetOne(c *fiber.Ctx, id uint) (*entity.Kandang, error) {
 	return kandang, nil
 }
 
+func (s kandangService) ensureKandangGroupAccess(c *fiber.Ctx, groupID uint, expectedLocationID *uint) error {
+	var kandangGroup entity.KandangGroup
+	if err := s.Repository.DB().WithContext(c.Context()).
+		Select("id", "location_id").
+		First(&kandangGroup, groupID).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return fiber.NewError(fiber.StatusNotFound, "Kandang group not found")
+		}
+		return err
+	}
+
+	if err := m.EnsureLocationAccess(c, s.Repository.DB(), kandangGroup.LocationId); err != nil {
+		return fiber.NewError(fiber.StatusNotFound, "Kandang group not found")
+	}
+
+	if expectedLocationID != nil && kandangGroup.LocationId != *expectedLocationID {
+		return fiber.NewError(fiber.StatusBadRequest, "Kandang group location must match kandang location")
+	}
+
+	return nil
+}
+
 func (s *kandangService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entity.Kandang, error) {
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
@@ -116,10 +139,14 @@ func (s *kandangService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
 
 	if err := common.EnsureRelations(c.Context(),
 		common.RelationCheck{Name: "Location", ID: &req.LocationId, Exists: s.Repository.LocationExists},
+		common.RelationCheck{Name: "KandangGroup", ID: &req.GroupId, Exists: s.Repository.KandangGroupExists},
 		common.RelationCheck{Name: "Pic", ID: &req.PicId, Exists: s.Repository.PicExists},
 	); err != nil {
 		return nil, err
 	}
+	if err := s.ensureKandangGroupAccess(c, req.GroupId, &req.LocationId); err != nil {
+		return nil, err
+	}
 
 	status := strings.ToUpper(strings.TrimSpace(req.Status))
 	if status == "" {
@@ -154,12 +181,13 @@ func (s *kandangService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
 	}
 
 	createBody := &entity.Kandang{
-		Name:       req.Name,
-		LocationId: req.LocationId,
-		Capacity:   req.Capacity,
-		Status:     status,
-		PicId:      req.PicId,
-		CreatedBy:  actorID,
+		Name:           req.Name,
+		LocationId:     req.LocationId,
+		KandangGroupId: req.GroupId,
+		Capacity:       req.Capacity,
+		Status:         status,
+		PicId:          req.PicId,
+		CreatedBy:      actorID,
 	}
 
 	if err := s.Repository.CreateOne(c.Context(), createBody, nil); err != nil {
@@ -212,6 +240,7 @@ func (s kandangService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 
 	if err := common.EnsureRelations(c.Context(),
 		common.RelationCheck{Name: "Location", ID: req.LocationId, Exists: s.Repository.LocationExists},
+		common.RelationCheck{Name: "KandangGroup", ID: req.GroupId, Exists: s.Repository.KandangGroupExists},
 		common.RelationCheck{Name: "Pic", ID: req.PicId, Exists: s.Repository.PicExists},
 	); err != nil {
 		return nil, err
@@ -220,6 +249,16 @@ func (s kandangService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 	if req.LocationId != nil {
 		updateBody["location_id"] = *req.LocationId
 	}
+	if req.GroupId != nil {
+		targetLocationID := existing.LocationId
+		if req.LocationId != nil {
+			targetLocationID = *req.LocationId
+		}
+		if err := s.ensureKandangGroupAccess(c, *req.GroupId, &targetLocationID); err != nil {
+			return nil, err
+		}
+		updateBody["kandang_group_id"] = *req.GroupId
+	}
 
 	if req.PicId != nil {
 		updateBody["pic_id"] = *req.PicId

internal/modules/master/kandangs/validations/kandang.validation.go

@@ -5,6 +5,7 @@ type Create struct {
 	Status         string  `json:"status,omitempty" validate:"omitempty,min=3,max=50"`
 	Capacity       float64 `json:"capacity" validate:"required_strict,gt=0"`
 	LocationId     uint    `json:"location_id" validate:"required_strict,number,gt=0"`
+	GroupId        uint    `json:"group_id" validate:"required_strict,number,gt=0"`
 	PicId          uint    `json:"pic_id" validate:"required_strict,number,gt=0"`
 	ProjectFlockId *uint   `json:"project_flock_id" validate:"omitempty,number,gt=0"`
 }
@@ -14,6 +15,7 @@ type Update struct {
 	Status         *string  `json:"status,omitempty" validate:"omitempty,min=3,max=50"`
 	Capacity       *float64 `json:"capacity" validate:"omitempty,gt=0"`
 	LocationId     *uint    `json:"location_id,omitempty" validate:"omitempty,number,gt=0"`
+	GroupId        *uint    `json:"group_id" validate:"required_strict,number,gt=0"`
 	PicId          *uint    `json:"pic_id,omitempty" validate:"omitempty,number,gt=0"`
 	ProjectFlockId *uint    `json:"project_flock_id,omitempty" validate:"omitempty,number,gt=0"`
 }

internal/modules/master/locations/controllers/location.controller.go

@@ -24,10 +24,11 @@ func NewLocationController(locationService service.LocationService) *LocationCon
 
 func (u *LocationController) GetAll(c *fiber.Ctx) error {
 	query := &validation.Query{
-		Page:   c.QueryInt("page", 1),
-		Limit:  c.QueryInt("limit", 10),
-		Search: c.Query("search", ""),
-		AreaId: c.QueryInt("area_id", 0),
+		Page:      c.QueryInt("page", 1),
+		Limit:     c.QueryInt("limit", 10),
+		Search:    c.Query("search", ""),
+		AreaId:    c.QueryInt("area_id", 0),
+		HasLaying: c.QueryBool("has_laying", false),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

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

@@ -60,6 +60,17 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 		if params.AreaId != 0 {
 			db = db.Where("area_id = ?", params.AreaId)
 		}
+		if params.HasLaying {
+			db = db.Where(`
+				EXISTS (
+					SELECT 1
+					FROM project_flocks pf
+					WHERE pf.location_id = locations.id
+						AND pf.category = ?
+						AND pf.deleted_at IS NULL
+				)
+			`, utils.ProjectFlockCategoryLaying)
+		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 

internal/modules/master/locations/validations/location.validation.go

@@ -13,8 +13,9 @@ 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=500"`
-	Search string `query:"search" validate:"omitempty,max=50"`
-	AreaId int    `query:"area_id" validate:"omitempty,number,gt=0"`
+	Page      int    `query:"page" validate:"omitempty,number,min=1"`
+	Limit     int    `query:"limit" validate:"omitempty,number,min=1,max=500"`
+	Search    string `query:"search" validate:"omitempty,max=50"`
+	AreaId    int    `query:"area_id" validate:"omitempty,number,gt=0"`
+	HasLaying bool   `query:"has_laying"`
 }

internal/modules/master/products/controllers/product.controller.go

@@ -30,6 +30,22 @@ func (u *ProductController) GetAll(c *fiber.Ctx) error {
 		ProductCategoryID: c.QueryInt("product_category_id", 0),
 	}
 
+	if isDepletionParam := c.Query("is_depletion", ""); isDepletionParam != "" {
+		value, err := strconv.ParseBool(isDepletionParam)
+		if err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, "invalid is_depletion value")
+		}
+		query.IsDepletion = &value
+	}
+
+	if includeAllParam := c.Query("include_all", ""); includeAllParam != "" {
+		value, err := strconv.ParseBool(includeAllParam)
+		if err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, "invalid include_all value")
+		}
+		query.IncludeAll = &value
+	}
+
 	if query.Page < 1 || query.Limit < 1 {
 		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
 	}

internal/modules/master/products/dto/product.dto.go

@@ -7,6 +7,7 @@ import (
 	productCategoryDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/product-categories/dto"
 	uomDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/uoms/dto"
 	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
+	utils "gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
 // === DTO Structs ===
@@ -17,6 +18,9 @@ type ProductRelationDTO struct {
 	ProductPrice    float64                                        `gorm:"type:numeric(15,3);not null"`
 	SellingPrice    *float64                                       `gorm:"type:numeric(15,3)"`
 	Uom             *uomDTO.UomRelationDTO                         `json:"uom,omitempty"`
+	Flag            *string                                        `json:"flag,omitempty"`
+	SubFlag         *string                                        `json:"sub_flag,omitempty"`
+	SubFlags        *[]string                                      `json:"sub_flags,omitempty"`
 	Flags           *[]string                                      `json:"flags,omitempty"`
 	ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
 	Suppliers       []ProductSupplierDTO                           `json:"suppliers"`
@@ -31,6 +35,9 @@ type ProductListDTO struct {
 	SellingPrice    *float64                                       `json:"selling_price,omitempty"`
 	Tax             *float64                                       `json:"tax,omitempty"`
 	ExpiryPeriod    *int                                           `json:"expiry_period,omitempty"`
+	Flag            *string                                        `json:"flag,omitempty"`
+	SubFlag         *string                                        `json:"sub_flag,omitempty"`
+	SubFlags        []string                                       `json:"sub_flags,omitempty"`
 	Flags           []string                                       `json:"flags"`
 	Uom             *uomDTO.UomRelationDTO                         `json:"uom,omitempty"`
 	ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
@@ -59,6 +66,13 @@ func ToProductRelationDTO(e entity.Product) ProductRelationDTO {
 	for i, f := range e.Flags {
 		flags[i] = f.Name
 	}
+	flag, subFlag, subFlags := resolveProductFlagAndSubFlags(flags)
+	var subFlagsRef *[]string
+	if len(subFlags) > 0 {
+		values := make([]string, len(subFlags))
+		copy(values, subFlags)
+		subFlagsRef = &values
+	}
 
 	var uomRef *uomDTO.UomRelationDTO
 	if e.Uom.Id != 0 {
@@ -77,6 +91,9 @@ func ToProductRelationDTO(e entity.Product) ProductRelationDTO {
 		Name:            e.Name,
 		ProductPrice:    e.ProductPrice,
 		SellingPrice:    e.SellingPrice,
+		Flag:            flag,
+		SubFlag:         subFlag,
+		SubFlags:        subFlagsRef,
 		Flags:           &flags,
 		Uom:             uomRef,
 		ProductCategory: categoryRef,
@@ -101,6 +118,7 @@ func ToProductListDTO(e entity.Product) ProductListDTO {
 	for i, f := range e.Flags {
 		flags[i] = f.Name
 	}
+	flag, subFlag, subFlags := resolveProductFlagAndSubFlags(flags)
 
 	var uomRef *uomDTO.UomRelationDTO
 	if e.Uom.Id != 0 {
@@ -111,6 +129,9 @@ func ToProductListDTO(e entity.Product) ProductListDTO {
 	return ProductListDTO{
 		Id:              e.Id,
 		Name:            e.Name,
+		Flag:            flag,
+		SubFlag:         subFlag,
+		SubFlags:        subFlags,
 		Flags:           flags,
 		Uom:             uomRef,
 		Brand:           e.Brand,
@@ -141,6 +162,58 @@ func ToProductDetailDTO(e entity.Product) ProductDetailDTO {
 	}
 }
 
+func resolveProductFlagAndSubFlags(flags []string) (*string, *string, []string) {
+	normalized := utils.NormalizeFlagTypes(flags)
+	if len(normalized) == 0 {
+		return nil, nil, nil
+	}
+
+	available := make(map[utils.FlagType]struct{}, len(normalized))
+	for _, flag := range normalized {
+		available[flag] = struct{}{}
+	}
+
+	var selectedFlag utils.FlagType
+	for _, mainFlag := range utils.ProductMainFlags() {
+		if _, ok := available[mainFlag]; ok {
+			selectedFlag = mainFlag
+			break
+		}
+	}
+
+	if selectedFlag == "" {
+		subToMain := utils.ProductSubFlagToFlag()
+		for _, flag := range normalized {
+			if parent, ok := subToMain[flag]; ok {
+				selectedFlag = parent
+				break
+			}
+		}
+	}
+
+	if selectedFlag == "" {
+		return nil, nil, nil
+	}
+
+	flag := string(selectedFlag)
+
+	var subFlag *string
+	subFlagValues := make([]string, 0)
+	subFlagsByMain := utils.ProductSubFlagsByFlag()
+	for _, sub := range subFlagsByMain[selectedFlag] {
+		if _, ok := available[sub]; ok {
+			subFlagValues = append(subFlagValues, string(sub))
+		}
+	}
+
+	if len(subFlagValues) > 0 {
+		first := subFlagValues[0]
+		subFlag = &first
+	}
+
+	return &flag, subFlag, subFlagValues
+}
+
 func toProductSupplierDTOs(relations []entity.ProductSupplier) []ProductSupplierDTO {
 	if len(relations) == 0 {
 		return make([]ProductSupplierDTO, 0)

internal/modules/master/products/services/product.service.go

@@ -31,6 +31,12 @@ type productService struct {
 	Repository repository.ProductRepository
 }
 
+var depletionProductFlags = []string{
+	string(utils.FlagAyamAfkir),
+	string(utils.FlagAyamCulling),
+	string(utils.FlagAyamMati),
+}
+
 func normalizeProductFlags(raw []string) ([]string, error) {
 	normalized, invalid := utils.NormalizeFlagsForGroup(raw, utils.FlagGroupProduct)
 	if len(invalid) > 0 {
@@ -41,6 +47,159 @@ func normalizeProductFlags(raw []string) ([]string, error) {
 	return utils.FlagTypesToStrings(normalized), nil
 }
 
+func productMainFlagOptionsString() []string {
+	mainFlags := utils.ProductMainFlags()
+	result := make([]string, len(mainFlags))
+	for i, flag := range mainFlags {
+		result[i] = string(flag)
+	}
+	return result
+}
+
+func productSubFlagOptionsString(flag utils.FlagType) []string {
+	subFlagsByFlag := utils.ProductSubFlagsByFlag()
+	subFlags := subFlagsByFlag[flag]
+	result := make([]string, len(subFlags))
+	for i, subFlag := range subFlags {
+		result[i] = string(subFlag)
+	}
+	return result
+}
+
+func normalizeStructuredSubFlagsInput(subFlagRaw *string, subFlagsRaw []string, hasSubFlagsField bool) ([]utils.FlagType, error) {
+	values := make([]string, 0, len(subFlagsRaw)+1)
+
+	if subFlagRaw != nil {
+		single := strings.TrimSpace(*subFlagRaw)
+		if single == "" {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "sub_flag cannot be empty")
+		}
+		values = append(values, single)
+	}
+
+	if hasSubFlagsField {
+		for _, raw := range subFlagsRaw {
+			item := strings.TrimSpace(raw)
+			if item == "" {
+				return nil, fiber.NewError(fiber.StatusBadRequest, "sub_flags cannot contain empty value")
+			}
+			values = append(values, item)
+		}
+	}
+
+	if len(values) == 0 {
+		return nil, nil
+	}
+
+	return utils.NormalizeFlagTypes(values), nil
+}
+
+func resolveProductFlagsFromFlagInput(flagRaw *string, subFlagRaw *string, subFlagsRaw []string, hasSubFlagsField bool) ([]string, bool, error) {
+	if flagRaw == nil && subFlagRaw == nil && !hasSubFlagsField {
+		return nil, false, nil
+	}
+
+	if flagRaw == nil && (subFlagRaw != nil || hasSubFlagsField) {
+		return nil, false, fiber.NewError(fiber.StatusBadRequest, "flag is required when sub_flag/sub_flags is provided")
+	}
+
+	flagText := strings.TrimSpace(*flagRaw)
+	if flagText == "" {
+		return nil, false, fiber.NewError(fiber.StatusBadRequest, "flag cannot be empty")
+	}
+
+	flag := utils.CanonicalFlagType(flagText)
+	if !utils.IsProductMainFlag(flag) {
+		return nil, false, fiber.NewError(
+			fiber.StatusBadRequest,
+			fmt.Sprintf("Invalid product flag: %s. Allowed flags: %s", flagText, strings.Join(productMainFlagOptionsString(), ", ")),
+		)
+	}
+
+	out := []string{string(flag)}
+
+	normalizedSubFlags, err := normalizeStructuredSubFlagsInput(subFlagRaw, subFlagsRaw, hasSubFlagsField)
+	if err != nil {
+		return nil, false, err
+	}
+
+	if len(normalizedSubFlags) == 0 {
+		if !utils.ProductFlagAllowWithoutSubFlag(flag) {
+			return nil, false, fiber.NewError(
+				fiber.StatusBadRequest,
+				fmt.Sprintf("sub_flag/sub_flags is required for flag %s", string(flag)),
+			)
+		}
+		normalizedOut, normalizeErr := normalizeProductFlags(out)
+		if normalizeErr != nil {
+			return nil, false, normalizeErr
+		}
+		return normalizedOut, true, nil
+	}
+
+	invalidSubFlags := make([]string, 0)
+	for _, subFlag := range normalizedSubFlags {
+		if !utils.IsValidProductSubFlag(flag, subFlag) {
+			invalidSubFlags = append(invalidSubFlags, string(subFlag))
+		}
+	}
+	if len(invalidSubFlags) > 0 {
+		return nil, false, fiber.NewError(
+			fiber.StatusBadRequest,
+			fmt.Sprintf("Invalid sub_flags %s for flag %s. Allowed sub_flags: %s", strings.Join(invalidSubFlags, ", "), string(flag), strings.Join(productSubFlagOptionsString(flag), ", ")),
+		)
+	}
+
+	out = append(out, utils.FlagTypesToStrings(normalizedSubFlags)...)
+	normalizedOut, normalizeErr := normalizeProductFlags(out)
+	if normalizeErr != nil {
+		return nil, false, normalizeErr
+	}
+	return normalizedOut, true, nil
+}
+
+func resolveCreateProductFlags(req *validation.Create) ([]string, error) {
+	hasStructuredInput := req.Flag != nil || req.SubFlag != nil || req.SubFlags != nil
+	if len(req.Flags) > 0 && hasStructuredInput {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Use either flags or flag/sub_flag/sub_flags, not both")
+	}
+
+	if len(req.Flags) > 0 {
+		return normalizeProductFlags(req.Flags)
+	}
+
+	flags, _, err := resolveProductFlagsFromFlagInput(req.Flag, req.SubFlag, req.SubFlags, req.SubFlags != nil)
+	return flags, err
+}
+
+func resolveUpdateProductFlags(req *validation.Update) (bool, []string, error) {
+	hasStructuredInput := req.Flag != nil || req.SubFlag != nil || req.SubFlags != nil
+
+	if req.Flags != nil {
+		if hasStructuredInput {
+			if len(*req.Flags) > 0 {
+				return false, nil, fiber.NewError(fiber.StatusBadRequest, "Use either flags or flag/sub_flag/sub_flags, not both")
+			}
+		} else {
+			flags, err := normalizeProductFlags(*req.Flags)
+			if err != nil {
+				return false, nil, err
+			}
+			return true, flags, nil
+		}
+	}
+
+	subFlagsRaw := make([]string, 0)
+	if req.SubFlags != nil {
+		subFlagsRaw = *req.SubFlags
+	}
+	flags, provided, err := resolveProductFlagsFromFlagInput(req.Flag, req.SubFlag, subFlagsRaw, req.SubFlags != nil)
+	if err != nil {
+		return false, nil, err
+	}
+	return provided, flags, nil
+}
+
 func NewProductService(repo repository.ProductRepository, validate *validator.Validate) ProductService {
 	return &productService{
 		Log:        utils.Log,
@@ -70,12 +229,32 @@ func (s productService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity
 
 	products, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
-		db = db.Where("is_visible = ?", true)
+		// Default: show only visible products.
+		// include_all=true can be used to fetch all records (including hidden/system products).
+		if params.IncludeAll == nil || !*params.IncludeAll {
+			db = db.Where("is_visible = ?", true)
+		}
 		if params.Search != "" {
-			return db.Where("name ILIKE ?", "%"+params.Search+"%")
+			db = db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
 		if params.ProductCategoryID != 0 {
-			return db.Where("product_category_id = ?", params.ProductCategoryID)
+			db = db.Where("product_category_id = ?", params.ProductCategoryID)
+		}
+		if params.IsDepletion != nil {
+			existsQuery := `
+				EXISTS (
+					SELECT 1
+					FROM flags f
+					WHERE f.flagable_type = ?
+					  AND f.flagable_id = products.id
+					  AND UPPER(f.name) IN ?
+				)
+			`
+			if *params.IsDepletion {
+				db = db.Where(existsQuery, entity.FlagableTypeProduct, depletionProductFlags)
+			} else {
+				db = db.Where("NOT "+existsQuery, entity.FlagableTypeProduct, depletionProductFlags)
+			}
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
@@ -177,7 +356,7 @@ func (s *productService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
 		}
 	}
 
-	productFlags, flagErr := normalizeProductFlags(req.Flags)
+	productFlags, flagErr := resolveCreateProductFlags(req)
 	if flagErr != nil {
 		return nil, flagErr
 	}
@@ -337,13 +516,10 @@ func (s productService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		flagUpdate bool
 		flagValues []string
 	)
-	if req.Flags != nil {
-		flagUpdate = true
-		var flagErr error
-		flagValues, flagErr = normalizeProductFlags(*req.Flags)
-		if flagErr != nil {
-			return nil, flagErr
-		}
+	var flagErr error
+	flagUpdate, flagValues, flagErr = resolveUpdateProductFlags(req)
+	if flagErr != nil {
+		return nil, flagErr
 	}
 
 	if len(updateBody) == 0 && !supplierUpdate && !flagUpdate {