adjust max limit

[FIX][BE]: LSS390

See merge request mbugroup/lti-api!208

.gitignore

@@ -9,7 +9,7 @@ main
 bin/
 *.exe
 *.out
-
+.air.toml
 Makefile
 docker-compose.local.yml
 docker-compose.yaml

internal/database/migrations/20260115062032_add_fifo_recording_eggs.down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE recording_eggs
+    DROP COLUMN IF EXISTS total_used,
+    DROP COLUMN IF EXISTS total_qty;

internal/database/migrations/20260115062032_add_fifo_recording_eggs.up.sql

@@ -0,0 +1,7 @@
+ALTER TABLE recording_eggs
+    ADD COLUMN total_qty NUMERIC(15, 3) DEFAULT 0 NOT NULL,
+    ADD COLUMN total_used NUMERIC(15, 3) DEFAULT 0 NOT NULL;
+
+UPDATE recording_eggs
+SET total_qty = qty
+WHERE total_qty = 0;

internal/database/migrations/20260115082849_remove_price_from_nonstock_suppliers.down.sql

@@ -0,0 +1,3 @@
+-- Rollback: add price back to nonstock_suppliers
+ALTER TABLE nonstock_suppliers
+    ADD COLUMN IF NOT EXISTS price NUMERIC(15, 3) NOT NULL DEFAULT 0;

internal/database/migrations/20260115082849_remove_price_from_nonstock_suppliers.up.sql

@@ -0,0 +1,3 @@
+-- Migration: remove price from nonstock_suppliers
+ALTER TABLE nonstock_suppliers
+    DROP COLUMN IF EXISTS price;

internal/database/migrations/20260119055524_add_requested_qty_to_laying_transfer_sources.down.sql

@@ -0,0 +1,4 @@
+-- Rollback: Remove requested_qty column from laying_transfer_sources table
+
+ALTER TABLE laying_transfer_sources
+DROP COLUMN IF EXISTS requested_qty;

internal/database/migrations/20260119055524_add_requested_qty_to_laying_transfer_sources.up.sql

@@ -0,0 +1,9 @@
+-- Add requested_qty column to laying_transfer_sources table
+-- This field stores the quantity requested by user during create/update
+-- Separate from UsageQty (FIFO consumed) and PendingUsageQty (FIFO pending)
+
+ALTER TABLE laying_transfer_sources
+ADD COLUMN requested_qty NUMERIC(15,3) DEFAULT 0 NOT NULL;
+
+-- Add comment for documentation
+COMMENT ON COLUMN laying_transfer_sources.requested_qty IS 'Quantity requested by user during create/update';

internal/entities/laying_transfer_source.go

@@ -11,6 +11,7 @@ type LayingTransferSource struct {
 	LayingTransferId            uint           `gorm:"index;not null"`
 	SourceProjectFlockKandangId uint           `gorm:"not null"`
 	ProductWarehouseId          *uint          `gorm:""`
+	RequestedQty                float64        `gorm:"type:numeric(15,3);default:0;not null"` // Quantity requested by user
 	UsageQty                    float64        `gorm:"type:numeric(15,3);default:0;not null"`        // FIFO USABLE field
 	PendingUsageQty             float64        `gorm:"type:numeric(15,3);default:0;not null"`        // FIFO USABLE field
 	Note                        string         `gorm:"type:text"`

internal/entities/nonstock_supplier.go

@@ -5,7 +5,6 @@ import "time"
 type NonstockSupplier struct {
 	NonstockId uint      `gorm:"not null"`
 	SupplierId uint      `gorm:"not null"`
-	Price      float64   `gorm:"type:numeric(15,3);not null;default:0"`
 	CreatedAt  time.Time `gorm:"autoCreateTime"`
 
 	Nonstock Nonstock `gorm:"foreignKey:NonstockId;references:Id"`

internal/entities/recording_egg.go

@@ -7,6 +7,8 @@ type RecordingEgg struct {
 	RecordingId        uint             `gorm:"column:recording_id;not null;index"`
 	ProductWarehouseId uint             `gorm:"column:product_warehouse_id;not null"`
 	Qty                int              `gorm:"column:qty;not null"`
+	TotalQty           float64          `gorm:"column:total_qty"`
+	TotalUsed          float64          `gorm:"column:total_used"`
 	Weight             *float64         `gorm:"column:weight"`
 	CreatedBy          uint             `gorm:"column:created_by"`
 	CreatedAt          time.Time        `gorm:"autoCreateTime"`

internal/middleware/permissions.go

@@ -1,8 +1,9 @@
 package middleware
 
-const(
+const (
 	P_DashboardGetAll = "lti.dashboard.list"
 )
+
 // project-flock
 const (
 	P_ProjectFlockKandangsClosing      = "lti.production.project_flock_kandangs.closing"
@@ -51,6 +52,7 @@ const (
 	P_ReportDebtSupplierGetAll     = "lti.repport.debtsupplier.list"
 	P_ReportHppPerKandangGetAll    = "lti.repport.gethppperkandang.list"
 	P_ReportProductionResultGetAll = "lti.repport.production_result.list"
+	P_ReportCustomerPaymentGetAll  = "lti.repport.customerpayment.list"
 )
 
 const (
@@ -238,3 +240,15 @@ const (
 	P_UserGetAll = "lti.users.list"
 	P_UserGetOne = "lti.users.detail"
 )
+
+// daily-checklist
+const (
+	P_DailyChecklistDashboardList  = "lti.daily_checklist.dashboard.list"
+	P_DailyChecklistCreateOne      = "lti.daily_checklist.create"
+	P_DailyChecklistGetAll         = "lti.daily_checklist.list"
+	P_DailyChecklistGetOne         = "lti.daily_checklist.detail"
+	P_DailyChecklistReports        = "lti.daily_checklist.reports"
+	P_DailyChecklistEmployee       = "lti.daily_checklist.master_data.employee"
+	P_DailyChecklistActivity       = "lti.daily_checklist.master_data.activity"
+	P_DailyChecklistActivityConfig = "lti.daily_checklist.master_data.configuration"
+)

internal/modules/closings/controllers/closing.controller.go

@@ -16,12 +16,14 @@ import (
 type ClosingController struct {
 	ClosingService         service.ClosingService
 	SapronakService        service.SapronakService
+	ClosingKeuanganService service.ClosingKeuanganService
 }
 
-func NewClosingController(closingService service.ClosingService, sapronakService service.SapronakService) *ClosingController {
+func NewClosingController(closingService service.ClosingService, sapronakService service.SapronakService, closingKeuanganService service.ClosingKeuanganService) *ClosingController {
 	return &ClosingController{
 		ClosingService:         closingService,
 		SapronakService:        sapronakService,
+		ClosingKeuanganService: closingKeuanganService,
 	}
 }
 
@@ -338,7 +340,7 @@ func (u *ClosingController) GetClosingKeuangan(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid Project Flock Id")
 	}
 
-	result, err := u.ClosingService.GetClosingKeuangan(c, uint(projectFlockID))
+	result, err := u.ClosingKeuanganService.GetClosingKeuangan(c, uint(projectFlockID))
 	if err != nil {
 		return err
 	}
@@ -352,6 +354,34 @@ func (u *ClosingController) GetClosingKeuangan(c *fiber.Ctx) error {
 		})
 }
 
+func (u *ClosingController) GetClosingKeuanganByKandang(c *fiber.Ctx) error {
+	projectParam := c.Params("project_flock_id")
+	kandangParam := c.Params("project_flock_kandang_id")
+
+	projectFlockID, err := strconv.Atoi(projectParam)
+	if err != nil || projectFlockID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_id")
+	}
+
+	pfkID, err := strconv.Atoi(kandangParam)
+	if err != nil || pfkID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_kandang_id")
+	}
+
+	result, err := u.ClosingKeuanganService.GetClosingKeuanganByKandang(c, uint(projectFlockID), uint(pfkID))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get closing keuangan by kandang successfully",
+			Data:    result,
+		})
+}
+
 func (u *ClosingController) GetExpeditionHPP(c *fiber.Ctx) error {
 	param := c.Params("project_flock_id")
 

internal/modules/closings/dto/closing.dto.go

@@ -111,13 +111,13 @@ type ClosingPerformanceDTO struct {
 	FeedIntake    float64  `json:"feed_intake"`
 	FeedIntakeStd float64  `json:"feed_intake_std"`
 	HenDayAct     *float64 `json:"hen_day_act,omitempty"`
-	HendayStd     *float64 `json:"hen_day_std,omitempty"`
+	HendayStd     float64  `json:"hen_day_std"`
 	EggMass       *float64 `json:"egg_mass,omitempty"`
-	EggMassStd    *float64 `json:"egg_mass_std,omitempty"`
+	EggMassStd    float64  `json:"egg_mass_std"`
 	EggWeight     *float64 `json:"egg_weight,omitempty"`
-	EggWeightStd  *float64 `json:"egg_weight_std,omitempty"`
+	EggWeightStd  float64  `json:"egg_weight_std"`
 	HenHouseAct   *float64 `json:"hen_housed_act,omitempty"`
-	HenHouseStd   *float64 `json:"hen_housed_std,omitempty"`
+	HenHouseStd   float64  `json:"hen_housed_std"`
 }
 
 type ClosingSalesGroupDTO struct {

internal/modules/closings/dto/closingKeuangan.dto.go

@@ -1,84 +1,50 @@
 package dto
 
-import (
+// === CLOSING KEUANGAN CODES ===
-	"slices"
-	"strings"
 
-	"gitlab.com/mbugroup/lti-api.git/internal/entities"
+// Closing HPP Codes
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+type ClosingHPPCode string
-)
 
-// === CONSTANTS ===
 const (
-	HPPGroupPengeluaran = "HPP dan Pengeluaran"
+	HPPCodePakan      ClosingHPPCode = "PAKAN"
-	HPPGroupBahanBaku   = "HPP dan Bahan Baku"
+	HPPCodeOVK        ClosingHPPCode = "OVK"
-	HPPLabelOverhead    = "Pengeluaran Overhead"
+	HPPCodeDOC        ClosingHPPCode = "DOC"
-	HPPLabelEkspedisi   = "Beban Ekspedisi"
+	HPPCodeDepresiasi ClosingHPPCode = "DEPRESIASI"
-	HPPSummaryLabel     = "HPP"
+	HPPCodeOverhead   ClosingHPPCode = "OVERHEAD"
-
+	HPPCodeEkspedisi  ClosingHPPCode = "EKSPEDISI"
-	PLSalesTypeChicken = "Penjualan Ayam Besar"
-	PLSalesTypeEgg     = "Penjualan Telur"
-
-	PLItemTypeSapronak  = "Pembelian Sapronak"
-	PLItemTypeOverhead  = "Pengeluaran Overhead"
-	PLItemTypeEkspedisi = "Beban Ekspedisi"
-
-	PLSummaryLabelGrossProfit = "LABA RUGI BRUTTO"
-	PLSummaryLabelSubTotal    = "SUB TOTAL"
-	PLSummaryLabelNetProfit   = "LABA RUGI NETTO"
-
-	PurchaseLabelPrefix = "Pembelian "
 )
 
-// === CONTEXT STRUCTS ===
+// Closing Profit Loss Codes
+type ClosingProfitLossCode string
 
-type CalculationContext struct {
+const (
-	TotalPopulation     float64
+	PLCodeSales    ClosingProfitLossCode = "SALES"
-	TotalWeightProduced float64
+	PLCodeSapronak ClosingProfitLossCode = "SAPRONAK"
-	TotalEggWeightKg    float64
+	PLCodeOverhead ClosingProfitLossCode = "OVERHEAD"
-	TotalDepletion      float64
+	PLCodeEkspedisi ClosingProfitLossCode = "EKSPEDISI"
-	TotalWeightSold     float64
+)
-	ActualPopulation    float64
-}
 
-type ClosingKeuanganInput struct {
+// === NEW CLOSING KEUANGAN DTO ===
-	ProjectFlockCategory string
-	PurchaseItems        []entities.PurchaseItem
-	Budgets              []entities.ProjectBudget
-	Realizations         []entities.ExpenseRealization
-	DeliveryProducts     []entities.MarketingDeliveryProduct
-	Chickins             []entities.ProjectChickin
-	TotalWeightProduced  float64
-	TotalEggWeightKg     float64
-	TotalDepletion       float64
-}
-
-// === BASE METRICS ===
 
+// FinancialMetrics represents financial metrics with per unit and total amounts
 type FinancialMetrics struct {
 	RpPerBird float64 `json:"rp_per_bird"`
 	RpPerKg   float64 `json:"rp_per_kg"`
 	Amount    float64 `json:"amount"`
 }
 
-type Comparison struct {
+// HPPItem represents an item in HPP section
+type HPPItem struct {
+	ID          uint             `json:"id"`
+	Category    string           `json:"category"` // "purchase" or "overhead"
+	Code        string           `json:"code"`     // "PAKAN", "OVK", "DOC", "EKSPEDISI"
+	Label       string           `json:"label"`
 	Budgeting   FinancialMetrics `json:"budgeting"`
 	Realization FinancialMetrics `json:"realization"`
 }
 
-// === HPP PURCHASES PACKAGE ===
+// HPPSummary represents summary for HPP section
-
+type HPPSummary struct {
-type HppItem struct {
-	Type string `json:"type"`
-	Comparison
-}
-
-type HppGroup struct {
-	GroupName string    `json:"group_name"`
-	Data      []HppItem `json:"data"`
-}
-
-type SummaryHpp struct {
 	Label          string            `json:"label"`
 	Budgeting      FinancialMetrics  `json:"budgeting"`
 	Realization    FinancialMetrics  `json:"realization"`
@@ -86,50 +52,52 @@ type SummaryHpp struct {
 	EggRealization *FinancialMetrics `json:"egg_realization,omitempty"`
 }
 
-type HppPurchasesSection struct {
+// HPPSection represents HPP data section
-	Hpp        []HppGroup `json:"hpp"`
+type HPPSection struct {
-	SummaryHpp SummaryHpp `json:"summary_hpp"`
+	Items   []HPPItem   `json:"items"`
+	Summary HPPSummary `json:"summary"`
 }
 
-// === PROFIT LOSS PACKAGE ===
+// ProfitLossItem represents an item in Profit & Loss section
-
+type ProfitLossItem struct {
-type PLItem struct {
+	Code      string  `json:"code"` // "SALES", "PURCHASE_DOC", "OVERHEAD", "EKSPEDISI"
-	Type string `json:"type"`
-	FinancialMetrics
-}
-
-type PLSummaryItem struct {
 	Label     string  `json:"label"`
-	FinancialMetrics
+	Type      string  `json:"type"` // "income", "purchase", "overhead"
+	RpPerBird float64 `json:"rp_per_bird"`
+	RpPerKg   float64 `json:"rp_per_kg"`
+	Amount    float64 `json:"amount"`
 }
 
-type PLSummaryGroup struct {
+// ProfitLossSummary represents summary for Profit & Loss section
-	GrossProfit PLSummaryItem `json:"gross_profit"`
+type ProfitLossSummary struct {
-	SubTotal    PLSummaryItem `json:"sub_total"`
+	GrossProfit FinancialMetrics `json:"gross_profit"`
-	NetProfit   PLSummaryItem `json:"net_profit"`
+	SubTotal    FinancialMetrics `json:"sub_total"`
-}
+	NetProfit   FinancialMetrics `json:"net_profit"`
-
-type ProfitLossData struct {
-	Penjualan []PLItem       `json:"penjualan"`
-	Pembelian []PLItem       `json:"pembelian"`
-	Overhead  PLItem         `json:"overhead"`
-	Ekspedisi PLItem         `json:"ekspedisi"`
-	Summary   PLSummaryGroup `json:"summary"`
 }
 
+// ProfitLossSection represents Profit & Loss data section
 type ProfitLossSection struct {
-	Data ProfitLossData `json:"data"`
+	Items   []ProfitLossItem    `json:"items"`
+	Summary ProfitLossSummary   `json:"summary"`
 }
 
-// === RESPONSE DTO (ROOT) ===
+// ClosingKeuanganData represents the main data structure
-
+type ClosingKeuanganData struct {
-type ReportResponse struct {
+	HPP        HPPSection      `json:"hpp"`
-	HppPurchases HppPurchasesSection `json:"hpp_purchases"`
 	ProfitLoss ProfitLossSection `json:"profit_loss"`
 }
 
+// ClosingKeuanganResponse represents the full API response
+type ClosingKeuanganResponse struct {
+	Code    int                  `json:"code"`
+	Status  string               `json:"status"`
+	Message string               `json:"message"`
+	Data    ClosingKeuanganData  `json:"data"`
+}
+
 // === MAPPER FUNCTIONS ===
 
+// ToFinancialMetrics creates FinancialMetrics from values
 func ToFinancialMetrics(rpPerBird, rpPerKg, amount float64) FinancialMetrics {
 	return FinancialMetrics{
 		RpPerBird: rpPerBird,
@@ -138,451 +106,80 @@ func ToFinancialMetrics(rpPerBird, rpPerKg, amount float64) FinancialMetrics {
 	}
 }
 
-func ToComparison(budgeting, realization FinancialMetrics) Comparison {
+// ToHPPItem creates HPP item
-	return Comparison{
+func ToHPPItem(id uint, category, code, label string, budgeting, realization FinancialMetrics) HPPItem {
+	return HPPItem{
+		ID:          id,
+		Category:    category,
+		Code:        code,
+		Label:       label,
 		Budgeting:   budgeting,
 		Realization: realization,
 	}
 }
 
-// === HPP PENGELUARAN (from Purchase Items) ===
+// ToHPPSummary creates HPP summary
-
+func ToHPPSummary(label string, budgeting, realization FinancialMetrics, eggBudgeting, eggRealization *FinancialMetrics) HPPSummary {
-func getFlagLabel(flagType utils.FlagType) string {
+	return HPPSummary{
-	return PurchaseLabelPrefix + string(flagType)
-}
-
-func buildHppItemsByPurchaseFlags(purchaseItems []entities.PurchaseItem, ctx CalculationContext) []HppItem {
-	flags := []utils.FlagType{
-		utils.FlagDOC, utils.FlagPullet, utils.FlagLayer, utils.FlagPakan,
-		utils.FlagPreStarter, utils.FlagStarter, utils.FlagFinisher,
-		utils.FlagOVK, utils.FlagObat, utils.FlagVitamin, utils.FlagKimia,
-	}
-
-	items := []HppItem{}
-	seenFlags := make(map[utils.FlagType]bool)
-
-	for _, item := range purchaseItems {
-		if item.Product == nil || len(item.Product.Flags) == 0 {
-			continue
-		}
-
-		for _, flag := range item.Product.Flags {
-			flagType := utils.FlagType(flag.Name)
-
-			if slices.Contains(flags, flagType) && !seenFlags[flagType] {
-				amount := sumPurchasesByFlag(purchaseItems, flagType)
-				rpPerBird, rpPerKg := calculatePerUnitMetrics(amount, ctx.TotalPopulation, ctx.TotalWeightProduced)
-
-				items = append(items, HppItem{
-					Type: getFlagLabel(flagType),
-					Comparison: ToComparison(
-						ToFinancialMetrics(rpPerBird, rpPerKg, amount),
-						ToFinancialMetrics(rpPerBird, rpPerKg, amount),
-					),
-				})
-				seenFlags[flagType] = true
-			}
-		}
-	}
-
-	return items
-}
-
-// === HPP BAHAN BAKU (from ProjectBudget + ExpenseRealization) ===
-
-func createHppOverheadItem(budgetAmount, realizationAmount float64, ctx CalculationContext) HppItem {
-	budgetRpPerBird, budgetRpPerKg := calculatePerUnitMetrics(budgetAmount, ctx.TotalPopulation, ctx.TotalWeightProduced)
-	realizationRpPerBird, realizationRpPerKg := calculatePerUnitMetrics(realizationAmount, ctx.TotalPopulation, ctx.TotalWeightProduced)
-
-	return HppItem{
-		Type: HPPLabelOverhead,
-		Comparison: ToComparison(
-			ToFinancialMetrics(budgetRpPerBird, budgetRpPerKg, budgetAmount),
-			ToFinancialMetrics(realizationRpPerBird, realizationRpPerKg, realizationAmount),
-		),
-	}
-}
-
-func createHppEkspedisiItem(ekspedisiAmount float64, ctx CalculationContext) HppItem {
-	ekspedisiRpPerBird, ekspedisiRpPerKg := calculatePerUnitMetrics(ekspedisiAmount, ctx.TotalPopulation, ctx.TotalWeightProduced)
-
-	return HppItem{
-		Type: HPPLabelEkspedisi,
-		Comparison: ToComparison(
-			ToFinancialMetrics(ekspedisiRpPerBird, ekspedisiRpPerKg, ekspedisiAmount),
-			ToFinancialMetrics(ekspedisiRpPerBird, ekspedisiRpPerKg, ekspedisiAmount),
-		),
-	}
-}
-
-func ToHppBahanBakuGroup(budgets []entities.ProjectBudget, realizations []entities.ExpenseRealization, ctx CalculationContext) HppGroup {
-	items := []HppItem{}
-
-	budgetAmount := sumBudgetsByFilter(budgets, func(*entities.ProjectBudget) bool { return true })
-	realizationAmount := getOperationalExpenses(realizations)
-
-	if budgetAmount > 0 || realizationAmount > 0 {
-		items = append(items, createHppOverheadItem(budgetAmount, realizationAmount, ctx))
-	}
-
-	ekspedisiAmount := sumRealizationsByFilter(realizations, filterRealizationByNonstockFlag(utils.FlagEkspedisi))
-	items = append(items, createHppEkspedisiItem(ekspedisiAmount, ctx))
-
-	return HppGroup{
-		GroupName: HPPGroupBahanBaku,
-		Data:      items,
-	}
-}
-
-// === HPP SUMMARY ===
-
-func ToSummaryHpp(label string, purchaseItems []entities.PurchaseItem, budgets []entities.ProjectBudget, realizations []entities.ExpenseRealization, projectFlockCategory string, ctx CalculationContext) SummaryHpp {
-	purchaseTotal := sumPurchaseTotal(purchaseItems)
-	budgetTotal := sumBudgetsByFilter(budgets, func(*entities.ProjectBudget) bool { return true })
-	totalBudget := purchaseTotal + budgetTotal
-
-	totalRealization := sumRealizationsByFilter(realizations, func(*entities.ExpenseRealization) bool { return true })
-
-	budgetRpPerBird, budgetRpPerKg := calculatePerUnitMetrics(totalBudget, ctx.TotalPopulation, ctx.TotalWeightProduced)
-	realizationRpPerBird, realizationRpPerKg := calculatePerUnitMetrics(totalRealization, ctx.TotalPopulation, ctx.TotalWeightProduced)
-
-	summary := SummaryHpp{
 		Label:          label,
-		Budgeting:   ToFinancialMetrics(budgetRpPerBird, budgetRpPerKg, totalBudget),
+		Budgeting:      budgeting,
-		Realization: ToFinancialMetrics(realizationRpPerBird, realizationRpPerKg, totalRealization),
+		Realization:    realization,
-	}
+		EggBudgeting:   eggBudgeting,
-
+		EggRealization: eggRealization,
-	if projectFlockCategory == string(utils.ProjectFlockCategoryLaying) && ctx.TotalEggWeightKg > 0 {
-		budgetEggRpPerKg, _ := calculatePerUnitMetrics(totalBudget, 0, ctx.TotalEggWeightKg)
-		realizationEggRpPerKg, _ := calculatePerUnitMetrics(totalRealization, 0, ctx.TotalEggWeightKg)
-
-		summary.EggBudgeting = &FinancialMetrics{
-			RpPerBird: 0,
-			RpPerKg:   budgetEggRpPerKg,
-			Amount:    totalBudget,
-		}
-		summary.EggRealization = &FinancialMetrics{
-			RpPerBird: 0,
-			RpPerKg:   realizationEggRpPerKg,
-			Amount:    totalRealization,
-		}
-	}
-
-	return summary
-}
-
-func ToHppPurchasesSection(purchaseItems []entities.PurchaseItem, budgets []entities.ProjectBudget, realizations []entities.ExpenseRealization, projectFlockCategory string, ctx CalculationContext) HppPurchasesSection {
-	hppGroups := []HppGroup{
-		{
-			GroupName: HPPGroupPengeluaran,
-			Data:      buildHppItemsByPurchaseFlags(purchaseItems, ctx),
-		},
-		ToHppBahanBakuGroup(budgets, realizations, ctx),
-	}
-
-	summaryHpp := ToSummaryHpp(HPPSummaryLabel, purchaseItems, budgets, realizations, projectFlockCategory, ctx)
-
-	return HppPurchasesSection{
-		Hpp:        hppGroups,
-		SummaryHpp: summaryHpp,
 	}
 }
 
-// === PROFIT & LOSS ===
+// ToHPPSection creates HPP section
-
+func ToHPPSection(items []HPPItem, summary HPPSummary) HPPSection {
-func ToPLItem(itemType string, metrics FinancialMetrics) PLItem {
+	return HPPSection{
-	return PLItem{
+		Items:   items,
-		Type:             itemType,
-		FinancialMetrics: metrics,
-	}
-}
-
-func ToPLSummaryItem(label string, metrics FinancialMetrics) PLSummaryItem {
-	return PLSummaryItem{
-		Label:            label,
-		FinancialMetrics: metrics,
-	}
-}
-
-func createPLItemWithMetrics(itemType string, amount float64, ctx CalculationContext) PLItem {
-	rpPerBird, rpPerKg := calculatePerUnitMetrics(amount, ctx.ActualPopulation, ctx.TotalWeightProduced)
-	return ToPLItem(itemType, ToFinancialMetrics(rpPerBird, rpPerKg, amount))
-}
-
-func sumPLItems(items []PLItem) (totalAmount, totalPerBird float64) {
-	for _, item := range items {
-		totalAmount += item.Amount
-		totalPerBird += item.RpPerBird
-	}
-	return
-}
-
-func createPenjualanItem(salesType string, amount float64, ctx CalculationContext) PLItem {
-	rpPerBird, rpPerKg := calculatePerUnitMetrics(amount, ctx.ActualPopulation, ctx.TotalWeightSold)
-	return ToPLItem(salesType, ToFinancialMetrics(rpPerBird, rpPerKg, amount))
-}
-
-func ToPenjualanItems(projectFlockCategory string, deliveryProducts []entities.MarketingDeliveryProduct, ctx CalculationContext) []PLItem {
-	items := []PLItem{}
-
-	categorized := categorizeDeliveriesBySalesType(deliveryProducts)
-
-	if projectFlockCategory == string(utils.ProjectFlockCategoryLaying) {
-		ayamAmount := sumDeliveriesByCategory(categorized[PLSalesTypeChicken])
-		telurAmount := sumDeliveriesByCategory(categorized[PLSalesTypeEgg])
-
-		items = append(items, createPenjualanItem(PLSalesTypeChicken, ayamAmount, ctx))
-		items = append(items, createPenjualanItem(PLSalesTypeEgg, telurAmount, ctx))
-	} else {
-		ayamAmount := sumDeliveriesByCategory(categorized[PLSalesTypeChicken])
-		items = append(items, createPenjualanItem(PLSalesTypeChicken, ayamAmount, ctx))
-	}
-
-	return items
-}
-
-func ToPembelianItems(purchases []entities.PurchaseItem, realizations []entities.ExpenseRealization, ctx CalculationContext) []PLItem {
-	purchaseAmount := sumPurchaseTotal(purchases)
-
-	return []PLItem{
-		createPLItemWithMetrics(PLItemTypeSapronak, purchaseAmount, ctx),
-	}
-}
-
-func ToOverheadItems(realizations []entities.ExpenseRealization, ctx CalculationContext) []PLItem {
-	realizationAmount := getOperationalExpenses(realizations)
-	return []PLItem{
-		createPLItemWithMetrics(PLItemTypeOverhead, realizationAmount, ctx),
-	}
-}
-
-func ToEkspedisiItems(realizations []entities.ExpenseRealization, ctx CalculationContext) []PLItem {
-	amount := sumRealizationsByFilter(realizations, filterRealizationByNonstockFlag(utils.FlagEkspedisi))
-	return []PLItem{
-		createPLItemWithMetrics(PLItemTypeEkspedisi, amount, ctx),
-	}
-}
-
-func ToPLSummaryGroup(penjualanItems, pembelianItems, overheadItems, ekspedisiItems []PLItem) PLSummaryGroup {
-	totalPenjualan, totalPenjualanPerBird := sumPLItems(penjualanItems)
-	totalPembelian, totalPembelianPerBird := sumPLItems(pembelianItems)
-	totalOverhead, totalOverheadPerBird := sumPLItems(overheadItems)
-	totalEkspedisi, totalEkspedisiPerBird := sumPLItems(ekspedisiItems)
-
-	grossProfit := totalPenjualan - totalPembelian
-	grossProfitPerBird := totalPenjualanPerBird - totalPembelianPerBird
-
-	totalOtherExpenses := totalOverhead + totalEkspedisi
-	totalOtherExpensesPerBird := totalOverheadPerBird + totalEkspedisiPerBird
-
-	netProfit := grossProfit - totalOtherExpenses
-	netProfitPerBird := grossProfitPerBird - totalOtherExpensesPerBird
-
-	return PLSummaryGroup{
-		GrossProfit: ToPLSummaryItem(PLSummaryLabelGrossProfit, ToFinancialMetrics(grossProfitPerBird, 0, grossProfit)),
-		SubTotal:    ToPLSummaryItem(PLSummaryLabelSubTotal, ToFinancialMetrics(totalOtherExpensesPerBird, 0, totalOtherExpenses)),
-		NetProfit:   ToPLSummaryItem(PLSummaryLabelNetProfit, ToFinancialMetrics(netProfitPerBird, 0, netProfit)),
-	}
-}
-
-func ToProfitLossData(penjualanItems, pembelianItems, overheadItems, ekspedisiItems []PLItem) ProfitLossData {
-	summary := ToPLSummaryGroup(penjualanItems, pembelianItems, overheadItems, ekspedisiItems)
-
-	totalOverhead := aggregatePLItems(overheadItems, PLItemTypeOverhead)
-	totalEkspedisi := aggregatePLItems(ekspedisiItems, PLItemTypeEkspedisi)
-
-	return ProfitLossData{
-		Penjualan: penjualanItems,
-		Pembelian: pembelianItems,
-		Overhead:  totalOverhead,
-		Ekspedisi: totalEkspedisi,
 		Summary: summary,
 	}
 }
 
-func ToProfitLossSection(penjualanItems, pembelianItems, overheadItems, ekspedisiItems []PLItem) ProfitLossSection {
+// ToProfitLossItem creates Profit & Loss item
-	return ProfitLossSection{
+func ToProfitLossItem(code, label, itemType string, rpPerBird, rpPerKg, amount float64) ProfitLossItem {
-		Data: ToProfitLossData(penjualanItems, pembelianItems, overheadItems, ekspedisiItems),
+	return ProfitLossItem{
+		Code:      code,
+		Label:     label,
+		Type:      itemType,
+		RpPerBird: rpPerBird,
+		RpPerKg:   rpPerKg,
+		Amount:    amount,
 	}
 }
 
-func aggregatePLItems(items []PLItem, label string) PLItem {
+// ToProfitLossSummary creates Profit & Loss summary
-	totalAmount, totalPerBird := sumPLItems(items)
+func ToProfitLossSummary(grossProfit, subTotal, netProfit FinancialMetrics) ProfitLossSummary {
-	return ToPLItem(label, ToFinancialMetrics(totalPerBird, 0, totalAmount))
+	return ProfitLossSummary{
+		GrossProfit: grossProfit,
+		SubTotal:    subTotal,
+		NetProfit:   netProfit,
+	}
 }
 
-func ToReportResponse(hppPurchases HppPurchasesSection, profitLoss ProfitLossSection) ReportResponse {
+// ToProfitLossSection creates Profit & Loss section
-	return ReportResponse{
+func ToProfitLossSection(items []ProfitLossItem, summary ProfitLossSummary) ProfitLossSection {
-		HppPurchases: hppPurchases,
+	return ProfitLossSection{
+		Items:   items,
+		Summary: summary,
+	}
+}
+
+// ToClosingKeuanganData creates complete closing keuangan data
+func ToClosingKeuanganData(hpp HPPSection, profitLoss ProfitLossSection) ClosingKeuanganData {
+	return ClosingKeuanganData{
+		HPP:        hpp,
 		ProfitLoss: profitLoss,
 	}
 }
 
-func ToClosingKeuanganReport(input ClosingKeuanganInput) ReportResponse {
+// ToSuccessClosingKeuanganResponse creates success response
-	var totalPopulation float64
+func ToSuccessClosingKeuanganResponse(data ClosingKeuanganData) ClosingKeuanganResponse {
-	var totalWeightSold float64
+	return ClosingKeuanganResponse{
-
+		Code:    200,
-	for _, chickin := range input.Chickins {
+		Status:  "success",
-		totalPopulation += chickin.UsageQty
+		Message: "Get closing keuangan successfully",
-	}
+		Data:    data,
-
-	for _, delivery := range input.DeliveryProducts {
-		totalWeightSold += delivery.TotalWeight
-	}
-
-	ctx := CalculationContext{
-		TotalPopulation:     totalPopulation,
-		TotalWeightProduced: input.TotalWeightProduced,
-		TotalEggWeightKg:    input.TotalEggWeightKg,
-		TotalDepletion:      input.TotalDepletion,
-		TotalWeightSold:     totalWeightSold,
-		ActualPopulation:    totalPopulation - input.TotalDepletion,
-	}
-
-	hppSection := ToHppPurchasesSection(input.PurchaseItems, input.Budgets, input.Realizations, input.ProjectFlockCategory, ctx)
-	penjualanItems := ToPenjualanItems(input.ProjectFlockCategory, input.DeliveryProducts, ctx)
-	pembelianItems := ToPembelianItems(input.PurchaseItems, input.Realizations, ctx)
-	overheadItems := ToOverheadItems(input.Realizations, ctx)
-	ekspedisiItems := ToEkspedisiItems(input.Realizations, ctx)
-	plSection := ToProfitLossSection(penjualanItems, pembelianItems, overheadItems, ekspedisiItems)
-
-	return ToReportResponse(hppSection, plSection)
-}
-
-// === HELPER FUNCTIONS ===
-
-func calculatePerUnitMetrics(amount, totalPopulation, totalWeightSold float64) (rpPerBird, rpPerKg float64) {
-	if totalPopulation > 0 {
-		rpPerBird = amount / totalPopulation
-	}
-	if totalWeightSold > 0 {
-		rpPerKg = amount / totalWeightSold
-	}
-	return rpPerBird, rpPerKg
-}
-
-func hasProductFlag(flags []entities.Flag, flagType utils.FlagType) bool {
-	for _, flag := range flags {
-		if strings.ToUpper(flag.Name) == string(flagType) {
-			return true
-		}
-	}
-	return false
-}
-
-func filterByPurchaseFlag(flagType utils.FlagType) func(*entities.PurchaseItem) bool {
-	return func(item *entities.PurchaseItem) bool {
-		if item.Product == nil || len(item.Product.Flags) == 0 {
-			return false
-		}
-		return hasProductFlag(item.Product.Flags, flagType)
 	}
 }
-
-func filterRealizationByNonstockFlag(flagType utils.FlagType) func(*entities.ExpenseRealization) bool {
-	return func(realization *entities.ExpenseRealization) bool {
-		if realization.ExpenseNonstock == nil || realization.ExpenseNonstock.Nonstock == nil {
-			return false
-		}
-		return hasProductFlag(realization.ExpenseNonstock.Nonstock.Flags, flagType)
-	}
-}
-
-func filterRealizationExceptFlag(flagType utils.FlagType) func(*entities.ExpenseRealization) bool {
-	hasFlag := filterRealizationByNonstockFlag(flagType)
-	return func(realization *entities.ExpenseRealization) bool {
-		return !hasFlag(realization)
-	}
-}
-
-func sumByFilter[T any](items []T, extractor func(*T) float64, filter func(*T) bool) float64 {
-	amount := 0.0
-	for i := range items {
-		if filter(&items[i]) {
-			amount += extractor(&items[i])
-		}
-	}
-	return amount
-}
-
-func sumPurchasesByFilter(purchases []entities.PurchaseItem, filter func(*entities.PurchaseItem) bool) float64 {
-	return sumByFilter(purchases, func(p *entities.PurchaseItem) float64 { return p.TotalPrice }, filter)
-}
-
-func sumPurchasesByFlag(purchases []entities.PurchaseItem, flagType utils.FlagType) float64 {
-	return sumPurchasesByFilter(purchases, filterByPurchaseFlag(flagType))
-}
-
-func sumPurchaseTotal(purchases []entities.PurchaseItem) float64 {
-	return sumByFilter(purchases, func(p *entities.PurchaseItem) float64 { return p.TotalPrice }, func(*entities.PurchaseItem) bool { return true })
-}
-
-func sumBudgetsByFilter(budgets []entities.ProjectBudget, filter func(*entities.ProjectBudget) bool) float64 {
-	return sumByFilter(budgets, func(b *entities.ProjectBudget) float64 { return b.Price * b.Qty }, filter)
-}
-
-func sumRealizationsByFilter(realizations []entities.ExpenseRealization, filter func(*entities.ExpenseRealization) bool) float64 {
-	return sumByFilter(realizations, func(r *entities.ExpenseRealization) float64 { return r.Price * r.Qty }, filter)
-}
-
-func getOperationalExpenses(realizations []entities.ExpenseRealization) float64 {
-	return sumRealizationsByFilter(realizations, filterRealizationExceptFlag(utils.FlagEkspedisi))
-}
-
-func isChickenProductFlag(flagType utils.FlagType) bool {
-	switch flagType {
-	case utils.FlagDOC, utils.FlagPullet, utils.FlagLayer,
-		utils.FlagAyamAfkir, utils.FlagAyamCulling, utils.FlagAyamMati:
-		return true
-	}
-	return false
-}
-
-func isEggProductFlag(flagType utils.FlagType) bool {
-	switch flagType {
-	case utils.FlagTelur, utils.FlagTelurUtuh, utils.FlagTelurPecah,
-		utils.FlagTelurPutih, utils.FlagTelurRetak:
-		return true
-	}
-	return false
-}
-
-func getSalesTypeFromProductFlags(product *entities.Product) string {
-	if product == nil || len(product.Flags) == 0 {
-		return PLSalesTypeChicken
-	}
-
-	for _, flag := range product.Flags {
-		flagType := utils.FlagType(strings.ToUpper(flag.Name))
-
-		if isEggProductFlag(flagType) {
-			return PLSalesTypeEgg
-		}
-		if isChickenProductFlag(flagType) {
-			return PLSalesTypeChicken
-		}
-	}
-
-	return PLSalesTypeChicken
-}
-
-func categorizeDeliveriesBySalesType(deliveries []entities.MarketingDeliveryProduct) map[string][]entities.MarketingDeliveryProduct {
-	categorized := make(map[string][]entities.MarketingDeliveryProduct)
-
-	for _, delivery := range deliveries {
-		product := delivery.MarketingProduct.ProductWarehouse.Product
-		salesType := getSalesTypeFromProductFlags(&product)
-
-		categorized[salesType] = append(categorized[salesType], delivery)
-	}
-
-	return categorized
-}
-
-func sumDeliveriesByCategory(deliveries []entities.MarketingDeliveryProduct) float64 {
-	amount := 0.0
-	for _, delivery := range deliveries {
-		amount += delivery.TotalPrice
-	}
-	return amount
-}

internal/modules/closings/module.go

@@ -25,6 +25,7 @@ type ClosingModule struct{}
 
 func (ClosingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
 	closingRepo := rClosing.NewClosingRepository(db)
+	closingKeuanganRepo := rClosing.NewClosingKeuanganRepository(db)
 	userRepo := rUser.NewUserRepository(db)
 	projectFlockRepo := rProjectFlock.NewProjectflockRepository(db)
 	projectFlockKandangRepo := rProjectFlock.NewProjectFlockKandangRepository(db)
@@ -41,8 +42,9 @@ func (ClosingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 	approvalService := commonSvc.NewApprovalService(approvalRepo)
 
 	closingService := sClosing.NewClosingService(closingRepo, projectFlockRepo, projectFlockKandangRepo, marketingRepo, marketingDeliveryProductRepo, approvalService, expenseRealizationRepo, projectBudgetRepo, chickinRepo, purchaseRepo, recordingRepo, standardGrowthDetailRepo, productionStandardDetailRepo, validate)
+	closingKeuanganService := sClosing.NewClosingKeuanganService(closingKeuanganRepo, projectFlockRepo, projectFlockKandangRepo, marketingDeliveryProductRepo, expenseRealizationRepo, projectBudgetRepo, chickinRepo, recordingRepo)
 	sapronakService := sClosing.NewSapronakService(closingRepo, projectFlockKandangRepo, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 
-	ClosingRoutes(router, userService, closingService, sapronakService)
+	ClosingRoutes(router, userService, closingService, sapronakService, closingKeuanganService)
 }

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

@@ -33,7 +33,6 @@ type ClosingRepository interface {
 	FetchSapronakChickinUsageDetails(ctx context.Context, pfkID 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)
-	GetActualUsageCostByProjectFlockID(ctx context.Context, projectFlockID uint) ([]ActualUsageCostRow, error)
 	GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error)
 }
 
@@ -318,6 +317,7 @@ func (r *ClosingRepositoryImpl) GetExpeditionHPP(ctx context.Context, projectFlo
 		Joins("JOIN suppliers s ON s.id = e.supplier_id").
 		Where("pfk.project_flock_id = ?", projectFlockID).
 		Where("e.category = ?", "BOP").
+		Where("e.realization_date IS NOT NULL").
 		Where("UPPER(f.name) = ?", strings.ToUpper(string(utils.FlagEkspedisi)))
 
 	if projectFlockKandangID != nil && *projectFlockKandangID != 0 {
@@ -473,8 +473,8 @@ SELECT
 		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
 	), '') AS product_sub_category,
 	COALESCE(fw.name, '') AS source_warehouse,
-	'' AS destination_warehouse,
+	COALESCE(tw.name, '') AS destination_warehouse,
-	COALESCE(tw.name, '') AS destination,
+	'' AS destination,
 	std.usage_qty AS quantity,
 	u.name AS unit,
 	'Transfer to other unit' AS notes
@@ -522,8 +522,8 @@ SELECT
 		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
 	), '') AS product_sub_category,
 	w.name AS source_warehouse,
-	'' AS destination_warehouse,
+	'RETAIL CUSTOMER' AS destination_warehouse,
-	'RETAIL CUSTOMER' AS destination,
+	'' AS destination,
 	mp.qty AS quantity,
 	u.name AS unit,
 	m.notes AS notes
@@ -534,6 +534,13 @@ JOIN products prod ON prod.id = pw.product_id
 JOIN uoms u ON u.id = prod.uom_id
 JOIN warehouses w ON w.id = pw.warehouse_id
 WHERE pw.project_flock_kandang_id IN ?
+	AND EXISTS (
+		SELECT 1
+		FROM flags f
+		WHERE f.flagable_id = pw.product_id
+			AND f.flagable_type = 'products'
+			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET')
+	)
 `
 )
 
@@ -889,143 +896,58 @@ func (r *ClosingRepositoryImpl) FetchSapronakAdjustments(ctx context.Context, ka
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
-	rows, err := r.fetchStockLogs(ctx, kandangID, string(utils.StockLogTypeTransfer), true)
+	incomingQuery := r.withCtx(ctx).
+		Table("stock_transfer_details AS std").
+		Select(`
+			std.product_id AS product_id,
+			p.name AS product_name,
+			f.name AS flag,
+			st.transfer_date::timestamp AS date,
+			COALESCE(st.movement_number, '') AS reference,
+			COALESCE(std.total_qty, 0) AS qty_in,
+			0 AS qty_out,
+			COALESCE(p.product_price, 0) AS price
+		`).
+		Joins("JOIN stock_transfers st ON st.id = std.stock_transfer_id").
+		Joins("JOIN product_warehouses pw ON pw.id = std.dest_product_warehouse_id").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+		Joins("JOIN products p ON p.id = std.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
+		Where("w.kandang_id = ?", kandangID).
+		Where("f.name IN ?", sapronakFlagsAll)
+	incoming, err := scanAndGroupDetails(incomingQuery)
 	if err != nil {
 		return nil, nil, err
 	}
-	in, out := splitStockLogs(rows, func(row stockLogSapronakRow) string {
-		if ref := strings.TrimSpace(row.MovementNumber); ref != "" {
-			return ref
-		}
-		return fmt.Sprintf("TRF-%d", row.ID)
-	})
-	return in, out, nil
-}
 
-type ActualUsageCostRow struct {
+	outgoingQuery := r.withCtx(ctx).
-	ProductID    uint    `gorm:"column:product_id"`
+		Table("stock_allocations AS sa").
-	ProductName  string  `gorm:"column:product_name"`
-	FlagName     string  `gorm:"column:flag_name"`
-	TotalQty     float64 `gorm:"column:total_qty"`
-	TotalPrice   float64 `gorm:"column:total_price"`
-	AveragePrice float64 `gorm:"column:average_price"`
-}
-
-func (r *ClosingRepositoryImpl) GetActualUsageCostByProjectFlockID(ctx context.Context, projectFlockID uint) ([]ActualUsageCostRow, error) {
-	if projectFlockID == 0 {
-		return []ActualUsageCostRow{}, nil
-	}
-
-	db := r.DB().WithContext(ctx)
-
-	// Get all project flock kandang IDs for this project flock
-	var pfkIDs []uint
-	err := db.Table("project_flock_kandangs").
-		Where("project_flock_id = ?", projectFlockID).
-		Pluck("id", &pfkIDs).Error
-	if err != nil {
-		return nil, err
-	}
-
-	if len(pfkIDs) == 0 {
-		return []ActualUsageCostRow{}, nil
-	}
-
-	var rows []ActualUsageCostRow
-
-	purchaseStockableKey := fifo.StockableKeyPurchaseItems.String()
-	transferStockableKey := fifo.StockableKeyStockTransferIn.String()
-
-	recordingQuery := db.
-		Table("recordings AS r").
 		Select(`
-			pw.product_id AS product_id,
+			std.product_id AS product_id,
 			p.name AS product_name,
-			COALESCE(f.name, tf.name) AS flag_name,
+			f.name AS flag,
-			COALESCE(SUM(
+			st.transfer_date::timestamp AS date,
-				CASE
+			COALESCE(st.movement_number, '') AS reference,
-					WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0)
+			0 AS qty_in,
-					WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0)
+			COALESCE(SUM(sa.qty), 0) AS qty_out,
-					ELSE 0
+			COALESCE(p.product_price, 0) AS price
-				END
-			), 0) AS total_qty,
-			COALESCE(SUM(
-				CASE
-					WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0) * COALESCE(pi.price, 0)
-					WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0) * COALESCE(tpi.price, 0)
-					ELSE 0
-				END
-			), 0) AS total_price,
-			COALESCE(SUM(
-				CASE
-					WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0)
-					WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0)
-					ELSE 0
-				END
-			), 0) AS qty_divisor,
-			COALESCE(SUM(
-				CASE
-					WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0) * COALESCE(pi.price, 0)
-					WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0) * COALESCE(tpi.price, 0)
-					ELSE 0
-				END
-			), 0) / NULLIF(COALESCE(SUM(
-				CASE
-					WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0)
-					WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0)
-					ELSE 0
-				END
-			), 0), 0) AS average_price`,
-			purchaseStockableKey, transferStockableKey,
-			purchaseStockableKey, transferStockableKey,
-			purchaseStockableKey, transferStockableKey,
-			purchaseStockableKey, transferStockableKey,
-			purchaseStockableKey, transferStockableKey).
-		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 products AS p ON p.id = pw.product_id").
-		Joins("LEFT JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND sa.status = ?",
-			"recording_stocks", entity.StockAllocationStatusActive).
-		Joins("LEFT JOIN purchase_items AS pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", purchaseStockableKey).
-		Joins("LEFT JOIN stock_transfer_details AS std ON std.id = sa.stockable_id AND sa.stockable_type = ?", transferStockableKey).
-		Joins("LEFT JOIN stock_transfers AS st ON st.id = std.stock_transfer_id").
-		Joins("LEFT JOIN purchase_items AS tpi ON tpi.product_id = std.product_id AND tpi.warehouse_id = st.from_warehouse_id").
-		Joins("LEFT JOIN flags AS f ON f.flagable_id = pi.product_id AND f.flagable_type = ?", entity.FlagableTypeProduct).
-		Joins("LEFT JOIN flags AS tf ON tf.flagable_id = std.product_id AND tf.flagable_type = ?", entity.FlagableTypeProduct).
-		Where("r.project_flock_kandangs_id IN ?", pfkIDs).
-		Where("r.deleted_at IS NULL").
-		Group("pw.product_id, p.name, COALESCE(f.name, tf.name)")
-
-	if err := recordingQuery.Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	chickinQuery := db.
-		Table("project_chickins AS pc").
-		Select(`
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag_name,
-			COALESCE(SUM(pc.usage_qty), 0) AS total_qty,
-			COALESCE(SUM(pc.usage_qty * COALESCE(pi.price, 0)), 0) AS total_price,
-			COALESCE(AVG(COALESCE(pi.price, 0)), 0) AS average_price
 		`).
-		Joins("JOIN product_warehouses AS pw ON pw.id = pc.product_warehouse_id").
+		Joins("JOIN stock_transfer_details std ON std.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyStockTransferOut.String()).
-		Joins("JOIN products AS p ON p.id = pw.product_id").
+		Joins("JOIN stock_transfers st ON st.id = std.stock_transfer_id").
-		Joins("LEFT JOIN purchase_items AS pi ON pi.product_warehouse_id = pc.product_warehouse_id").
+		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
-		Joins("LEFT JOIN flags AS f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
-		Where("pc.project_flock_kandang_id IN ?", pfkIDs).
+		Joins("JOIN products p ON p.id = std.product_id").
-		Where("pc.usage_qty > 0").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
-		Group("pw.product_id, p.name, f.name")
+		Where("sa.status = ?", entity.StockAllocationStatusActive).
-
+		Where("w.kandang_id = ?", kandangID).
-	var chickinRows []ActualUsageCostRow
+		Where("f.name IN ?", sapronakFlagsAll).
-	if err := chickinQuery.Scan(&chickinRows).Error; err != nil {
+		Group("std.id, std.product_id, p.name, f.name, st.transfer_date, st.movement_number, p.product_price")
-		return nil, err
+	outgoing, err := scanAndGroupDetails(outgoingQuery)
+	if err != nil {
+		return nil, nil, err
 	}
 
-	rows = append(rows, chickinRows...)
+	return incoming, outgoing, nil
-
-	return rows, nil
 }
 
 func (r *ClosingRepositoryImpl) GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error) {

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

@@ -0,0 +1,365 @@
+package repository
+
+import (
+	"context"
+	"fmt"
+	"sort"
+	"strings"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	"gorm.io/gorm"
+)
+
+// ClosingKeuanganRepository handles database operations for closing keuangan
+type ClosingKeuanganRepository interface {
+	repository.BaseRepository[interface{}]
+
+	// All Product Usage
+	GetAllProductUsageByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint, flagFilters []string) ([]ProductUsageRow, error)
+
+	// Depletion per kandang
+	GetTotalDepletionByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error)
+
+	// Weight produced from uniformity per kandang
+	GetTotalWeightProducedFromUniformityByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error)
+
+	// DB returns the underlying GORM DB instance
+	DB() *gorm.DB
+}
+
+type ClosingKeuanganRepositoryImpl struct {
+	*repository.BaseRepositoryImpl[interface{}]
+}
+
+func NewClosingKeuanganRepository(db *gorm.DB) ClosingKeuanganRepository {
+	return &ClosingKeuanganRepositoryImpl{
+		BaseRepositoryImpl: repository.NewBaseRepository[interface{}](db),
+	}
+}
+
+// Result Rows
+
+type ProductUsageRow struct {
+	ProductID         uint    `gorm:"column:product_id"`
+	ProductName       string  `gorm:"column:product_name"`
+	FlagNames         string  `gorm:"column:flag_names"`
+	TotalQty          float64 `gorm:"column:total_qty"`
+	Price             float64 `gorm:"column:price"`
+	TotalPengeluaran  float64 `gorm:"column:total_pengeluaran"`
+}
+
+// GetAllProductUsageByProjectFlockKandangID gets all product usage for a project flock kandang
+// Combines data from all usable types: recordings, chickins, marketing, transfers, adjustments
+// flagFilters: optional filter to get only specific flags (e.g., ["PAKAN", "OVK"]), empty means get all
+func (r *ClosingKeuanganRepositoryImpl) GetAllProductUsageByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint, flagFilters []string) ([]ProductUsageRow, error) {
+	if projectFlockKandangID == 0 {
+		return []ProductUsageRow{}, nil
+	}
+
+	type SubQueryResult struct {
+		ProductID   uint    `gorm:"column:product_id"`
+		ProductName string  `gorm:"column:product_name"`
+		TotalQty    float64 `gorm:"column:total_qty"`
+		Price       float64 `gorm:"column:price"`
+	}
+
+	type AggregatedResult struct {
+		ProductID   uint    `gorm:"column:product_id"`
+		ProductName string  `gorm:"column:product_name"`
+		TotalQty    float64 `gorm:"column:total_qty"`
+		Price       float64 `gorm:"column:price"`
+		PriceCount  int     `gorm:"-"` // For calculating average price
+	}
+
+	type FlagResult struct {
+		ProductID uint   `gorm:"column:product_id"`
+		FlagNames string `gorm:"column:flag_names"`
+	}
+
+	var allResults []SubQueryResult
+
+	// Subquery 1: Recordings
+	var recordingsResults []SubQueryResult
+	err := r.DB().WithContext(ctx).
+		Table("recordings r").
+		Select("pw.product_id, p.name as product_name, "+
+			"COALESCE(SUM(CASE "+
+			"WHEN sa.stockable_type = 'PURCHASE_ITEMS' THEN COALESCE(sa.qty, 0) "+
+			"WHEN sa.stockable_type = 'STOCK_TRANSFER_IN' THEN COALESCE(std.usage_qty, 0) "+
+			"WHEN sa.stockable_type = 'TRANSFERTOLAYING_IN' THEN COALESCE(ltt.total_used, 0) "+
+			"WHEN sa.stockable_type = 'ADJUSTMENT_IN' THEN COALESCE(adjs.total_used, 0) "+
+			"WHEN sa.stockable_type = 'PROJECT_FLOCK_POPULATION' THEN COALESCE(pfp.total_used_qty, 0) "+
+			"ELSE 0 END), 0) as total_qty, "+
+			"COALESCE(AVG(CASE WHEN sa.stockable_type = 'PURCHASE_ITEMS' THEN COALESCE(pi.price, 0) END), 0) as price").
+		Joins("JOIN recording_stocks rs ON rs.recording_id = r.id").
+		Joins("JOIN product_warehouses pw ON pw.id = rs.product_warehouse_id").
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("LEFT JOIN stock_allocations sa ON sa.usable_type = 'RECORDING_STOCK' AND sa.usable_id = rs.id AND sa.status = 'ACTIVE'").
+		Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = 'PURCHASE_ITEMS'").
+		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = 'STOCK_TRANSFER_IN'").
+		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = 'TRANSFERTOLAYING_IN'").
+		Joins("LEFT JOIN adjustment_stocks adjs ON adjs.id = sa.stockable_id AND sa.stockable_type = 'ADJUSTMENT_IN'").
+		Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = 'PROJECT_FLOCK_POPULATION'").
+		Where("r.project_flock_kandangs_id = ?", projectFlockKandangID).
+		Where("r.deleted_at IS NULL").
+		Group("pw.product_id, p.name").
+		Scan(&recordingsResults).Error
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to get recordings product usage: %w", err)
+	}
+	fmt.Printf("[REPO] Recordings query: %d results for projectFlockKandangID=%d\n", len(recordingsResults), projectFlockKandangID)
+	allResults = append(allResults, recordingsResults...)
+
+	// Subquery 2: Chickins
+	var chickinsResults []SubQueryResult
+	err = r.DB().WithContext(ctx).
+		Table("project_chickins pc").
+		Select("pw.product_id, p.name as product_name, "+
+			"COALESCE(SUM(pc.usage_qty), 0) as total_qty, "+
+			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
+		Joins("JOIN product_warehouses pw ON pw.id = pc.product_warehouse_id").
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
+		Where("pc.project_flock_kandang_id = ?", projectFlockKandangID).
+		Where("pc.usage_qty > 0").
+		Group("pw.product_id, p.name").
+		Scan(&chickinsResults).Error
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to get chickins product usage: %w", err)
+	}
+	fmt.Printf("[REPO] Chickins query: %d results for projectFlockKandangID=%d\n", len(chickinsResults), projectFlockKandangID)
+	allResults = append(allResults, chickinsResults...)
+
+	// Subquery 3: Marketing Delivery
+	var marketingResults []SubQueryResult
+	err = r.DB().WithContext(ctx).
+		Table("marketing_delivery_products mdp").
+		Select("pw.product_id, p.name as product_name, "+
+			"COALESCE(SUM(mdp.usage_qty), 0) as total_qty, "+
+			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
+		Joins("JOIN marketing_products mp ON mp.id = mdp.marketing_product_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 purchase_items pi ON pi.product_warehouse_id = pw.id").
+		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
+		Group("pw.product_id, p.name").
+		Scan(&marketingResults).Error
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to get marketing product usage: %w", err)
+	}
+	fmt.Printf("[REPO] Marketing query: %d results for projectFlockKandangID=%d\n", len(marketingResults), projectFlockKandangID)
+	allResults = append(allResults, marketingResults...)
+
+	// Subquery 4: Laying Transfer Sources
+	var layingTransferResults []SubQueryResult
+	err = r.DB().WithContext(ctx).
+		Table("laying_transfer_sources lts").
+		Select("pw.product_id, p.name as product_name, "+
+			"COALESCE(SUM(lts.usage_qty), 0) as total_qty, "+
+			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
+		Joins("JOIN laying_transfers lt ON lt.id = lts.laying_transfer_id").
+		Joins("JOIN product_warehouses pw ON pw.id = lts.product_warehouse_id").
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
+		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
+		Group("pw.product_id, p.name").
+		Scan(&layingTransferResults).Error
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to get laying transfer product usage: %w", err)
+	}
+	fmt.Printf("[REPO] Laying Transfer query: %d results for projectFlockKandangID=%d\n", len(layingTransferResults), projectFlockKandangID)
+	allResults = append(allResults, layingTransferResults...)
+
+	// Subquery 5: Stock Transfer Details
+	var stockTransferResults []SubQueryResult
+	err = r.DB().WithContext(ctx).
+		Table("stock_transfer_details std").
+		Select("pw.product_id, p.name as product_name, "+
+			"COALESCE(SUM(std.usage_qty), 0) as total_qty, "+
+			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
+		Joins("JOIN product_warehouses pw ON pw.id = std.source_product_warehouse_id").
+		Joins("JOIN products p ON p.id = std.product_id").
+		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
+		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
+		Group("pw.product_id, p.name").
+		Scan(&stockTransferResults).Error
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to get stock transfer product usage: %w", err)
+	}
+	fmt.Printf("[REPO] Stock Transfer query: %d results for projectFlockKandangID=%d\n", len(stockTransferResults), projectFlockKandangID)
+	allResults = append(allResults, stockTransferResults...)
+
+	// Subquery 6: Adjustment Stocks
+	var adjustmentResults []SubQueryResult
+	err = r.DB().WithContext(ctx).
+		Table("adjustment_stocks ads").
+		Select("pw.product_id, p.name as product_name, "+
+			"COALESCE(SUM(ads.usage_qty), 0) as total_qty, "+
+			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
+		Joins("JOIN product_warehouses pw ON pw.id = ads.product_warehouse_id").
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
+		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
+		Where("ads.usage_qty > 0").
+		Group("pw.product_id, p.name").
+		Scan(&adjustmentResults).Error
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to get adjustment product usage: %w", err)
+	}
+	fmt.Printf("[REPO] Adjustment query: %d results for projectFlockKandangID=%d\n", len(adjustmentResults), projectFlockKandangID)
+	allResults = append(allResults, adjustmentResults...)
+
+	fmt.Printf("[REPO] Total raw results before aggregation: %d items\n", len(allResults))
+
+	// Aggregate results by product_id
+	aggregatedMap := make(map[uint]*AggregatedResult)
+	for _, result := range allResults {
+		key := result.ProductID
+		if existing, exists := aggregatedMap[key]; exists {
+			existing.TotalQty += result.TotalQty
+			existing.Price += result.Price
+			existing.PriceCount++
+		} else {
+			aggregatedMap[key] = &AggregatedResult{
+				ProductID:   result.ProductID,
+				ProductName: result.ProductName,
+				TotalQty:    result.TotalQty,
+				Price:       result.Price,
+				PriceCount:  1,
+			}
+		}
+	}
+
+	fmt.Printf("[REPO] Aggregated to %d unique products\n", len(aggregatedMap))
+
+	// Get flags for all products
+	productIDs := make([]uint, 0, len(aggregatedMap))
+	for id := range aggregatedMap {
+		productIDs = append(productIDs, id)
+	}
+
+	var flagResults []FlagResult
+	if len(productIDs) > 0 {
+		err = r.DB().WithContext(ctx).
+			Table("products p").
+			Select("p.id as product_id, STRING_AGG(DISTINCT f.name, ', ') as flag_names").
+			Joins("LEFT JOIN flags f ON f.flagable_type = 'products' AND f.flagable_id = p.id").
+			Where("p.id IN ?", productIDs).
+			Group("p.id").
+			Scan(&flagResults).Error
+
+		if err != nil {
+			return nil, fmt.Errorf("failed to get product flags: %w", err)
+		}
+	}
+	fmt.Printf("[REPO] Fetched flags for %d products\n", len(flagResults))
+
+	// Build flag map
+	flagMap := make(map[uint]string)
+	for _, flag := range flagResults {
+		flagMap[flag.ProductID] = flag.FlagNames
+	}
+
+	// Combine results and calculate average price
+	results := make([]ProductUsageRow, 0, len(aggregatedMap))
+	for _, agg := range aggregatedMap {
+		avgPrice := float64(0)
+		if agg.PriceCount > 0 {
+			avgPrice = agg.Price / float64(agg.PriceCount)
+		}
+
+		flagNames := flagMap[agg.ProductID]
+
+		// Apply flag filters if provided
+		if len(flagFilters) > 0 {
+			// Check if any of the flagFilters exist in flagNames
+			matched := false
+			for _, filter := range flagFilters {
+				if containsIgnoreCase(flagNames, filter) {
+					matched = true
+					break
+				}
+			}
+			if !matched {
+				continue // Skip this product if no flag matches
+			}
+		}
+
+		results = append(results, ProductUsageRow{
+			ProductID:        agg.ProductID,
+			ProductName:      agg.ProductName,
+			FlagNames:        flagNames,
+			TotalQty:         agg.TotalQty,
+			Price:            avgPrice,
+			TotalPengeluaran: agg.TotalQty * avgPrice,
+		})
+	}
+
+	fmt.Printf("[REPO] After filtering with flagFilters=%v: %d results\n", flagFilters, len(results))
+	for i, r := range results {
+		fmt.Printf("[REPO]   Result[%d]: ProductID=%d, ProductName=%s, FlagNames=%s, TotalQty=%.2f, Price=%.2f, TotalPengeluaran=%.2f\n",
+			i, r.ProductID, r.ProductName, r.FlagNames, r.TotalQty, r.Price, r.TotalPengeluaran)
+	}
+
+	// Sort by product name
+	sort.Slice(results, func(i, j int) bool {
+		return results[i].ProductName < results[j].ProductName
+	})
+
+	fmt.Printf("[REPO] Final sorted results: %d items\n", len(results))
+	return results, nil
+}
+
+// GetTotalDepletionByProjectFlockKandangID gets total depletion for a specific kandang
+func (r *ClosingKeuanganRepositoryImpl) GetTotalDepletionByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error) {
+	var result float64
+	err := r.DB().WithContext(ctx).
+		Table("recording_depletions").
+		Select("COALESCE(SUM(recording_depletions.qty), 0)").
+		Joins("JOIN recordings ON recordings.id = recording_depletions.recording_id").
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = recordings.project_flock_kandangs_id").
+		Where("project_flock_kandangs.id = ?", projectFlockKandangID).
+		Scan(&result).Error
+	return result, err
+}
+
+// GetTotalWeightProducedFromUniformityByProjectFlockKandangID calculates total weight produced from uniformity data for a specific kandang
+// Formula: (mean_up / 1.10) * chick_qty_of_weight / 1000
+func (r *ClosingKeuanganRepositoryImpl) GetTotalWeightProducedFromUniformityByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error) {
+	if projectFlockKandangID == 0 {
+		return 0, nil
+	}
+
+	var uniformity struct {
+		MeanUp           float64
+		ChickQtyOfWeight float64
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("project_flock_kandang_uniformity").
+		Select("mean_up, chick_qty_of_weight").
+		Where("project_flock_kandang_id = ?", projectFlockKandangID).
+		Order("id DESC").
+		Limit(1).
+		Scan(&uniformity).Error
+
+	if err != nil {
+		return 0, err
+	}
+
+	// Calculate weight: (mean_up / 1.10) * chick_qty_of_weight / 1000
+	totalWeight := (uniformity.MeanUp / 1.10) * uniformity.ChickQtyOfWeight / 1000
+
+	return totalWeight, nil
+}
+
+// containsIgnoreCase checks if a string contains a substring (case-insensitive)
+func containsIgnoreCase(str, substr string) bool {
+	return strings.Contains(strings.ToUpper(str), strings.ToUpper(substr))
+}

internal/modules/closings/route.go

@@ -9,8 +9,8 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
-func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService, sapronakSvc closing.SapronakService) {
+func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService, sapronakSvc closing.SapronakService, closingKeuanganSvc closing.ClosingKeuanganService) {
-	ctrl := controller.NewClosingController(s, sapronakSvc)
+	ctrl := controller.NewClosingController(s, sapronakSvc, closingKeuanganSvc)
 
 	route := v1.Group("/closings")
 	route.Use(m.Auth(u))
@@ -34,5 +34,6 @@ func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService
 	route.Get("/:project_flock_id/:project_flock_kandang_id/expedition-hpp", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetExpeditionHPPByKandang)
 	route.Get("/:projectFlockId/production-data", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetClosingDataProduksi)
 	route.Get("/:projectFlockId/keuangan", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetClosingKeuangan)
+	route.Get("/:project_flock_id/:project_flock_kandang_id/keuangan", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetClosingKeuanganByKandang)
 
 }

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

@@ -40,7 +40,6 @@ type ClosingService interface {
 	GetClosingDataProduksi(ctx *fiber.Ctx, projectFlockID uint, kandangID *uint) (*dto.ClosingProductionReportDTO, error)
 	GetOverhead(ctx *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.OverheadListDTO, error)
 	GetClosingSapronak(ctx *fiber.Ctx, projectFlockID uint, params *validation.ClosingSapronakQuery) ([]dto.ClosingSapronakItemDTO, int64, error)
-	GetClosingKeuangan(ctx *fiber.Ctx, projectFlockID uint) (*dto.ReportResponse, error)
 	GetExpeditionHPP(ctx *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error)
 }
 
@@ -337,8 +336,10 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 	}
 
 	var projectFlockKandangIDs []uint
-	if params.Type == validation.SapronakTypeOutgoing {
+	if params.KandangID != nil && *params.KandangID > 0 {
-		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID, params.KandangID)
+		projectFlockKandangIDs = []uint{*params.KandangID}
+	} else if params.Type == validation.SapronakTypeOutgoing {
+		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID)
 		if err != nil {
 			s.Log.Errorf("Failed to fetch project flock kandang IDs for project flock %d: %+v", projectFlockID, err)
 			return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandang")
@@ -418,14 +419,11 @@ func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, proje
 	return ids, nil
 }
 
-func (s closingService) getProjectFlockKandangIDs(ctx context.Context, projectFlockID uint, kandangID *uint) ([]uint, error) {
+func (s closingService) getProjectFlockKandangIDs(ctx context.Context, projectFlockID uint) ([]uint, error) {
 	var ids []uint
 	query := s.Repository.DB().WithContext(ctx).
 		Model(&entity.ProjectFlockKandang{}).
 		Where("project_flock_id = ?", projectFlockID)
-	if kandangID != nil {
-		query = query.Where("kandang_id = ?", *kandangID)
-	}
 	err := query.Order("id ASC").Pluck("id", &ids).Error
 	if err != nil {
 		return nil, err
@@ -577,82 +575,6 @@ func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFl
 	return &result, nil
 }
 
-func (s closingService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID uint) (*dto.ReportResponse, error) {
-
-	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Project Flock", ID: &projectFlockID, Exists: s.ProjectFlockRepo.IdExists},
-	); err != nil {
-		return nil, err
-	}
-
-	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), projectFlockID, nil)
-	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
-	}
-
-	budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch budgets")
-	}
-
-	actualUsageRows, err := s.Repository.GetActualUsageCostByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch actual usage cost")
-	}
-
-	purchaseItems := s.convertActualUsageToPurchaseItems(c.Context(), actualUsageRows)
-
-	realizations, err := s.ExpenseRealizationRepo.GetByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch realizations")
-	}
-
-	deliveryProducts, err := s.MarketingDeliveryProductRepo.GetDeliveryProductsByProjectFlockID(c.Context(), projectFlockID, func(db *gorm.DB) *gorm.DB {
-		return db.Preload("MarketingProduct").
-			Preload("MarketingProduct.ProductWarehouse").
-			Preload("MarketingProduct.ProductWarehouse.Product")
-	})
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery products")
-	}
-
-	chickins, err := s.ChickinRepo.GetByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch chickins")
-	}
-
-	totalWeightProduced, _, err := s.RecordingRepo.GetProductionWeightAndQtyByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil {
-		s.Log.Warnf("GetProductionWeightAndQtyByProjectFlockID error: %v", err)
-	}
-
-	totalEggWeightKg, err := s.RecordingRepo.GetTotalEggProductionWeightByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil {
-		s.Log.Warnf("GetTotalEggProductionWeightByProjectFlockID error: %v", err)
-	}
-
-	totalDepletion, err := s.RecordingRepo.GetTotalDepletionByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil {
-		s.Log.Warnf("GetTotalDepletionByProjectFlockID error: %v", err)
-	}
-
-	input := dto.ClosingKeuanganInput{
-		ProjectFlockCategory: projectFlock.Category,
-		PurchaseItems:        purchaseItems,
-		Budgets:              budgets,
-		Realizations:         realizations,
-		DeliveryProducts:     deliveryProducts,
-		Chickins:             chickins,
-		TotalWeightProduced:  totalWeightProduced,
-		TotalEggWeightKg:     totalEggWeightKg,
-		TotalDepletion:       totalDepletion,
-	}
-
-	report := dto.ToClosingKeuanganReport(input)
-
-	return &report, nil
-}
-
 func (s closingService) GetExpeditionHPP(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error) {
 	if projectFlockID == 0 {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
@@ -690,11 +612,17 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
 	}
 
-	projectFlockKandangIDs, err := s.getProjectFlockKandangIDs(c.Context(), projectFlockID, kandangID)
+	var projectFlockKandangIDs []uint
+	if kandangID != nil && *kandangID > 0 {
+		projectFlockKandangIDs = []uint{*kandangID}
+	} else {
+		var err error
+		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID)
 		if err != nil {
 			s.Log.Errorf("Failed to fetch project flock kandangs for %d: %+v", projectFlockID, err)
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandangs")
 		}
+	}
 
 	if len(projectFlockKandangIDs) == 0 {
 		return nil, fiber.NewError(fiber.StatusNotFound, "No project flock kandang found")
@@ -954,16 +882,16 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		}
 		if !isGrowing {
 			if productionStandardDetail.TargetHenDayProduction != nil {
-				performance.HendayStd = productionStandardDetail.TargetHenDayProduction
+				performance.HendayStd = *productionStandardDetail.TargetHenDayProduction
 			}
 			if productionStandardDetail.TargetHenHouseProduction != nil {
-				performance.HenHouseStd = productionStandardDetail.TargetHenHouseProduction
+				performance.HenHouseStd = *productionStandardDetail.TargetHenHouseProduction
 			}
 			if productionStandardDetail.TargetEggWeight != nil {
-				performance.EggWeightStd = productionStandardDetail.TargetEggWeight
+				performance.EggWeightStd = *productionStandardDetail.TargetEggWeight
 			}
 			if productionStandardDetail.TargetEggMass != nil {
-				performance.EggMassStd = productionStandardDetail.TargetEggMass
+				performance.EggMassStd = *productionStandardDetail.TargetEggMass
 			}
 		}
 	}
@@ -1103,52 +1031,3 @@ func closestFcrValues(standards []entity.FcrStandard, averageWeight float64) (fl
 	return closest.Mortality, closest.FcrNumber
 }
 
-func (s closingService) convertActualUsageToPurchaseItems(ctx context.Context, actualUsageRows []repository.ActualUsageCostRow) []entity.PurchaseItem {
-	if len(actualUsageRows) == 0 {
-		return []entity.PurchaseItem{}
-	}
-
-	// Collect all product IDs
-	productIDs := make([]uint, len(actualUsageRows))
-	for i, row := range actualUsageRows {
-		productIDs[i] = row.ProductID
-	}
-
-	// Fetch products with flags from repository
-	products, err := s.Repository.GetProductsWithFlagsByIDs(ctx, productIDs)
-	if err != nil {
-		s.Log.Warnf("Failed to fetch products for actual usage: %v", err)
-		products = []entity.Product{}
-	}
-
-	// Create product map
-	productMap := make(map[uint]*entity.Product)
-	for i := range products {
-		productMap[products[i].Id] = &products[i]
-	}
-
-	// Convert to pseudo purchase items
-	purchaseItems := make([]entity.PurchaseItem, 0, len(actualUsageRows))
-	for _, row := range actualUsageRows {
-		product := productMap[row.ProductID]
-
-		// Skip if product not found
-		if product == nil {
-			s.Log.Warnf("Product ID %d not found for actual usage", row.ProductID)
-			continue
-		}
-
-		purchaseItem := entity.PurchaseItem{
-			Id:         0, // Pseudo item, no ID
-			ProductId:  row.ProductID,
-			TotalQty:   row.TotalQty,
-			TotalPrice: row.TotalPrice,
-			Price:      row.AveragePrice,
-			Product:    product,
-		}
-
-		purchaseItems = append(purchaseItems, purchaseItem)
-	}
-
-	return purchaseItems
-}

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

@@ -0,0 +1,640 @@
+package service
+
+import (
+	"errors"
+	"strings"
+
+	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/closings/dto"
+	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
+	expenseRealizationRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/repositories"
+	marketingDeliveryProductRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
+	chickinRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/chickins/repositories"
+	projectflockRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
+	recordingRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+	"github.com/gofiber/fiber/v2"
+	"github.com/sirupsen/logrus"
+	"gorm.io/gorm"
+)
+
+// ClosingKeuanganService handles closing keuangan business logic
+type ClosingKeuanganService interface {
+	GetClosingKeuangan(ctx *fiber.Ctx, projectFlockID uint) (*dto.ClosingKeuanganData, error)
+	GetClosingKeuanganByKandang(ctx *fiber.Ctx, projectFlockID uint, projectFlockKandangID uint) (*dto.ClosingKeuanganData, error)
+}
+
+type closingKeuanganService struct {
+	Log                          *logrus.Logger
+	ClosingKeuanganRepo          repository.ClosingKeuanganRepository
+	ProjectFlockRepo             projectflockRepository.ProjectflockRepository
+	ProjectFlockKandangRepo      projectflockRepository.ProjectFlockKandangRepository
+	MarketingDeliveryProductRepo marketingDeliveryProductRepository.MarketingDeliveryProductRepository
+	ExpenseRealizationRepo       expenseRealizationRepository.ExpenseRealizationRepository
+	ProjectBudgetRepo            projectflockRepository.ProjectBudgetRepository
+	ChickinRepo                  chickinRepository.ProjectChickinRepository
+	RecordingRepo                recordingRepository.RecordingRepository
+}
+
+func NewClosingKeuanganService(
+	closingKeuanganRepo repository.ClosingKeuanganRepository,
+	projectFlockRepo projectflockRepository.ProjectflockRepository,
+	projectFlockKandangRepo projectflockRepository.ProjectFlockKandangRepository,
+	marketingDeliveryProductRepo marketingDeliveryProductRepository.MarketingDeliveryProductRepository,
+	expenseRealizationRepo expenseRealizationRepository.ExpenseRealizationRepository,
+	projectBudgetRepo projectflockRepository.ProjectBudgetRepository,
+	chickinRepo chickinRepository.ProjectChickinRepository,
+	recordingRepo recordingRepository.RecordingRepository,
+) ClosingKeuanganService {
+	return &closingKeuanganService{
+		Log:                          utils.Log,
+		ClosingKeuanganRepo:          closingKeuanganRepo,
+		ProjectFlockRepo:             projectFlockRepo,
+		ProjectFlockKandangRepo:      projectFlockKandangRepo,
+		MarketingDeliveryProductRepo: marketingDeliveryProductRepo,
+		ExpenseRealizationRepo:       expenseRealizationRepo,
+		ProjectBudgetRepo:            projectBudgetRepo,
+		ChickinRepo:                  chickinRepo,
+		RecordingRepo:                recordingRepo,
+	}
+}
+
+func (s closingKeuanganService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID uint) (*dto.ClosingKeuanganData, error) {
+
+	if err := commonSvc.EnsureRelations(c.Context(),
+		commonSvc.RelationCheck{Name: "Project Flock", ID: &projectFlockID, Exists: s.ProjectFlockRepo.IdExists},
+	); err != nil {
+		return nil, err
+	}
+
+	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), projectFlockID, nil)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
+	}
+
+	budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch budgets")
+	}
+
+	// Preload Nonstock.Flags manually
+	var budgetIDs []uint
+	for _, b := range budgets {
+		budgetIDs = append(budgetIDs, b.Id)
+	}
+	if len(budgetIDs) > 0 {
+		err = s.ProjectBudgetRepo.DB().WithContext(c.Context()).
+			Preload("Nonstock.Flags").
+			Where("id IN ?", budgetIDs).
+			Find(&budgets).Error
+	}
+
+	// Get all kandang for this project flock
+	kandangs, err := s.ProjectFlockKandangRepo.GetByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch kandangs")
+	}
+
+	return s.calculateClosingKeuangan(c, projectFlock, budgets, kandangs, projectFlockID)
+}
+
+func (s closingKeuanganService) GetClosingKeuanganByKandang(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID uint) (*dto.ClosingKeuanganData, error) {
+
+	if err := commonSvc.EnsureRelations(c.Context(),
+		commonSvc.RelationCheck{Name: "Project Flock", ID: &projectFlockID, Exists: s.ProjectFlockRepo.IdExists},
+	); err != nil {
+		return nil, err
+	}
+
+	// Validate and fetch project flock kandang
+	kandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), projectFlockKandangID)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusNotFound, "Project flock kandang not found")
+	}
+	if kandang.ProjectFlockId != projectFlockID {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Project flock kandang does not belong to this project flock")
+	}
+
+	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), projectFlockID, nil)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
+	}
+
+	budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch budgets")
+	}
+
+	// Preload Nonstock.Flags manually
+	var budgetIDs []uint
+	for _, b := range budgets {
+		budgetIDs = append(budgetIDs, b.Id)
+	}
+	if len(budgetIDs) > 0 {
+		err = s.ProjectBudgetRepo.DB().WithContext(c.Context()).
+			Preload("Nonstock.Flags").
+			Where("id IN ?", budgetIDs).
+			Find(&budgets).Error
+	}
+
+	kandangs := []entity.ProjectFlockKandang{*kandang}
+
+	return s.calculateClosingKeuangan(c, projectFlock, budgets, kandangs, projectFlockID)
+}
+
+func (s closingKeuanganService) calculateClosingKeuangan(c *fiber.Ctx, projectFlock *entity.ProjectFlock, budgets []entity.ProjectBudget, kandangs []entity.ProjectFlockKandang, scopeID uint) (*dto.ClosingKeuanganData, error) {
+	// Define flag filters using constants
+	pakanFilters := []string{string(utils.FlagPakan), string(utils.FlagPreStarter), string(utils.FlagStarter), string(utils.FlagFinisher)}
+	ovkFilters := []string{string(utils.FlagOVK), string(utils.FlagObat), string(utils.FlagVitamin), string(utils.FlagKimia)}
+	ayamFilters := []string{string(utils.FlagDOC), string(utils.FlagPullet), string(utils.FlagLayer)}
+	allFilters := append(pakanFilters, ovkFilters...)
+	allFilters = append(allFilters, ayamFilters...)
+
+	var allProductUsageRows []repository.ProductUsageRow
+
+	// Get ALL product usage
+	for _, kandang := range kandangs {
+		rows, err := s.ClosingKeuanganRepo.GetAllProductUsageByProjectFlockKandangID(c.Context(), kandang.Id, allFilters)
+		if err == nil {
+			allProductUsageRows = append(allProductUsageRows, rows...)
+		}
+	}
+
+	// Classify into categories based on flag priority
+	var pakanProductUsageRows []repository.ProductUsageRow
+	var ovkProductUsageRows []repository.ProductUsageRow
+	var ayamProductUsageRows []repository.ProductUsageRow
+
+	for _, row := range allProductUsageRows {
+		// Parse flag names from comma-separated string
+		flagNames := strings.Split(row.FlagNames, ",")
+
+		hasPakanFlag := false
+		hasOvkFlag := false
+		hasAyamFlag := false
+
+		for _, flag := range flagNames {
+			flag = strings.TrimSpace(flag)
+			if containsItem(pakanFilters, flag) {
+				hasPakanFlag = true
+			}
+			if containsItem(ovkFilters, flag) {
+				hasOvkFlag = true
+			}
+			if containsItem(ayamFilters, flag) {
+				hasAyamFlag = true
+			}
+		}
+
+		// Priority: PAKAN > OVK > AYAM
+		if hasPakanFlag {
+			pakanProductUsageRows = append(pakanProductUsageRows, row)
+		} else if hasOvkFlag {
+			ovkProductUsageRows = append(ovkProductUsageRows, row)
+		} else if hasAyamFlag {
+			ayamProductUsageRows = append(ayamProductUsageRows, row)
+		} else {
+			continue
+		}
+	}
+
+
+	// Calculate total price for each category
+	var totalPakanPrice, totalOvkPrice, totalAyamPrice float64
+	for _, row := range pakanProductUsageRows {
+		totalPakanPrice += row.TotalPengeluaran
+	}
+	for _, row := range ovkProductUsageRows {
+		totalOvkPrice += row.TotalPengeluaran
+	}
+	for _, row := range ayamProductUsageRows {
+		totalAyamPrice += row.TotalPengeluaran
+	}
+
+	// Determine if this is per-kandang or per-project-flock scope
+	isPerKandang := len(kandangs) == 1
+	var projectFlockKandangID *uint
+	if isPerKandang {
+		kandangID := kandangs[0].Id
+		projectFlockKandangID = &kandangID
+	}
+
+	var err error
+
+	// Fetch realizations
+	var realizations []entity.ExpenseRealization
+	if isPerKandang && projectFlockKandangID != nil {
+		realizations, err = s.ExpenseRealizationRepo.GetClosingOverhead(c.Context(), projectFlock.Id, projectFlockKandangID)
+	} else {
+		realizations, err = s.ExpenseRealizationRepo.GetClosingOverhead(c.Context(), projectFlock.Id, nil)
+	}
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch realizations")
+	}
+
+	deliveryProducts, err := s.MarketingDeliveryProductRepo.GetDeliveryProductsByProjectFlockID(c.Context(), projectFlock.Id, func(db *gorm.DB) *gorm.DB {
+		db = db.Preload("MarketingProduct").
+			Preload("MarketingProduct.ProductWarehouse").
+			Preload("MarketingProduct.ProductWarehouse.Product")
+		return db
+	})
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery products")
+	}
+
+	// Filter by kandang if scope is per-kandang (manual filtering after fetch)
+	if isPerKandang && projectFlockKandangID != nil {
+		filteredProducts := make([]entity.MarketingDeliveryProduct, 0)
+		for _, dp := range deliveryProducts {
+			pfKandangID := dp.MarketingProduct.ProductWarehouse.ProjectFlockKandangId
+			if pfKandangID != nil && *pfKandangID == *projectFlockKandangID {
+				filteredProducts = append(filteredProducts, dp)
+			}
+		}
+		deliveryProducts = filteredProducts
+	}
+
+	// Fetch chickins
+	var chickins []entity.ProjectChickin
+	if isPerKandang && projectFlockKandangID != nil {
+		chickins, err = s.ChickinRepo.GetByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
+	} else {
+		chickins, err = s.ChickinRepo.GetByProjectFlockID(c.Context(), projectFlock.Id)
+	}
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch chickins")
+	}
+
+	// Get total depletion
+	var totalDepletion float64
+	if isPerKandang && projectFlockKandangID != nil {
+		totalDepletion, err = s.ClosingKeuanganRepo.GetTotalDepletionByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
+	} else {
+		totalDepletion, err = s.RecordingRepo.GetTotalDepletionByProjectFlockID(c.Context(), projectFlock.Id)
+	}
+	if err != nil {
+		totalDepletion = 0
+	}
+
+	totalWeightProduced, _, err := s.RecordingRepo.GetProductionWeightAndQtyByProjectFlockID(c.Context(), projectFlock.Id)
+	if err != nil {
+	}
+
+	// Try to get actual weight from uniformity data
+	var totalWeightFromUniformity float64
+	if isPerKandang && projectFlockKandangID != nil {
+		totalWeightFromUniformity, err = s.ClosingKeuanganRepo.GetTotalWeightProducedFromUniformityByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
+	} else {
+		totalWeightFromUniformity, err = s.RecordingRepo.GetTotalWeightProducedFromUniformityByProjectFlockID(c.Context(), projectFlock.Id)
+	}
+	if err != nil {
+	} else if totalWeightFromUniformity > 0 {
+		totalWeightProduced = totalWeightFromUniformity
+	}
+
+	// Fetch egg data only for Laying category
+	var totalEggWeightKg float64
+	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+		// TODO: Replace with actual method to get egg weight from RecordingRepo
+		// totalEggWeightKg, err = s.RecordingRepo.GetEggWeightByProjectFlockID(c.Context(), projectFlock.Id)
+		// For now, set to 0 as placeholder
+		totalEggWeightKg = 0
+	} else {
+		totalEggWeightKg = 0
+	}
+
+	// Build new DTO structure
+
+	// Calculate totals
+	var totalPopulation float64
+	for _, chickin := range chickins {
+		totalPopulation += chickin.UsageQty
+	}
+
+	// Calculate actual population (total population - depletion)
+	actualPopulation := totalPopulation - totalDepletion
+
+	// Calculate budget totals by category
+	calculateBudgetByFlag := func(flags []string) float64 {
+		var total float64
+		for _, budget := range budgets {
+			if budget.Nonstock != nil {
+				for _, nonstockFlag := range budget.Nonstock.Flags {
+					flagName := strings.ToUpper(nonstockFlag.Name)
+					for _, targetFlag := range flags {
+						if flagName == strings.ToUpper(targetFlag) {
+							total += budget.Price * budget.Qty
+							break
+						}
+					}
+				}
+			}
+		}
+		return total
+	}
+
+	// Budget per category
+	budgetPakan := calculateBudgetByFlag([]string{"PAKAN", "PRE-STARTER", "STARTER", "FINISHER"})
+	budgetOvk := calculateBudgetByFlag([]string{"OVK", "OBAT", "VITAMIN", "KIMIA"})
+	budgetAyam := calculateBudgetByFlag([]string{"DOC", "PULLET", "LAYER"})
+	budgetEkspedisi := calculateBudgetByFlag([]string{"EKSPEDISI"})
+
+	// Operational budget = total budget - pakan - ovk - ayam - ekspedisi
+	totalBudgetAmount := 0.0
+	for _, budget := range budgets {
+		totalBudgetAmount += budget.Price * budget.Qty
+	}
+	budgetOperational := totalBudgetAmount - budgetPakan - budgetOvk - budgetAyam - budgetEkspedisi
+
+
+	// Calculate realization totals
+	var totalRealizationAmount float64
+	var totalEkspedisiRealization float64
+	for _, realization := range realizations {
+		amount := realization.Price * realization.Qty
+		totalRealizationAmount += amount
+
+		// Check if this is ekspedisi (need to check nonstock flags)
+		if realization.ExpenseNonstock != nil && realization.ExpenseNonstock.Nonstock != nil {
+			for _, flag := range realization.ExpenseNonstock.Nonstock.Flags {
+				if flag.Name == "EKSPEDISI" {
+					totalEkspedisiRealization += amount
+					break
+				}
+			}
+		}
+	}
+
+	totalOperationalRealization := totalRealizationAmount - totalEkspedisiRealization
+
+	// Filter delivery products based on category
+	var filteredDeliveryProducts []entity.MarketingDeliveryProduct
+	for _, delivery := range deliveryProducts {
+		// Get product from delivery
+		if delivery.MarketingProduct.ProductWarehouse.Product.Id == 0 {
+			continue
+		}
+
+		product := delivery.MarketingProduct.ProductWarehouse.Product
+		isEggProduct := false
+		isChickenProduct := false
+
+		// Check product flags
+		for _, flag := range product.Flags {
+			flagName := strings.ToUpper(flag.Name)
+
+			// Egg product flags
+			if flagName == "TELUR" || flagName == "TELURUTUH" || flagName == "TELURPECAH" ||
+				flagName == "TELURPUTIH" || flagName == "TELURRETAK" {
+				isEggProduct = true
+			}
+
+			// Chicken product flags
+			if flagName == "AYAMAFKIR" || flagName == "AYAMCULLING" || flagName == "AYAMMATI" {
+				isChickenProduct = true
+			}
+		}
+
+		// Filter based on project flock category
+		if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+			// Laying: only egg products
+			if isEggProduct {
+				filteredDeliveryProducts = append(filteredDeliveryProducts, delivery)
+			}
+		} else {
+			// Growing/Contract Growing: only chicken products
+			if isChickenProduct || (!isEggProduct && !isChickenProduct) {
+				// Include if chicken product or if no specific flags (default to chicken)
+				filteredDeliveryProducts = append(filteredDeliveryProducts, delivery)
+			}
+		}
+	}
+
+
+	// Calculate total weight sold and sales amount from filtered products
+	var totalWeightSold float64
+	var totalSalesAmount float64
+	for _, delivery := range filteredDeliveryProducts {
+		totalWeightSold += delivery.TotalWeight
+		totalSalesAmount += delivery.TotalPrice
+	}
+
+
+	// Calculate metrics - always use kg ayam for rp_per_kg
+	calculateMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+		if actualPopulation > 0 {
+			rpPerBird = amount / actualPopulation  // Use actual population
+		}
+		if totalWeightProduced > 0 {
+			rpPerKg = amount / totalWeightProduced
+		}
+		return
+	}
+
+	// Calculate metrics for profit loss (use total population and total weight produced)
+	calculateProfitLossMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+		if totalPopulation > 0 {
+			rpPerBird = amount / totalPopulation
+		}
+		if totalWeightProduced > 0 {
+			rpPerKg = amount / totalWeightProduced
+		}
+		return
+	}
+
+	// Build HPP Items using constants
+	hppItems := []dto.HPPItem{}
+
+	// PAKAN item
+	pakanBudgetRpPerBird, pakanBudgetRpPerKg := calculateMetrics(budgetPakan)
+	pakanRealizationRpPerBird, pakanRealizationRpPerKg := calculateMetrics(totalPakanPrice)
+	hppItems = append(hppItems, dto.ToHPPItem(
+		1,
+		"purchase",
+		string(dto.HPPCodePakan),
+		"Pembelian Pakan",
+		dto.ToFinancialMetrics(pakanBudgetRpPerBird, pakanBudgetRpPerKg, budgetPakan),
+		dto.ToFinancialMetrics(pakanRealizationRpPerBird, pakanRealizationRpPerKg, totalPakanPrice),
+	))
+
+	// OVK item
+	ovkBudgetRpPerBird, ovkBudgetRpPerKg := calculateMetrics(budgetOvk)
+	ovkRealizationRpPerBird, ovkRealizationRpPerKg := calculateMetrics(totalOvkPrice)
+	hppItems = append(hppItems, dto.ToHPPItem(
+		2,
+		"purchase",
+		string(dto.HPPCodeOVK),
+		"Pembelian OVK",
+		dto.ToFinancialMetrics(ovkBudgetRpPerBird, ovkBudgetRpPerKg, budgetOvk),
+		dto.ToFinancialMetrics(ovkRealizationRpPerBird, ovkRealizationRpPerKg, totalOvkPrice),
+	))
+
+	// DOC/DEPRESIASI item
+	docCode := string(dto.HPPCodeDOC)
+	docLabel := "Pembelian DOC"
+	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+		docCode = string(dto.HPPCodeDepresiasi)
+		docLabel = "Depresiasi"
+	}
+	docBudgetRpPerBird, docBudgetRpPerKg := calculateMetrics(budgetAyam)
+	docRealizationRpPerBird, docRealizationRpPerKg := calculateMetrics(totalAyamPrice)
+	hppItems = append(hppItems, dto.ToHPPItem(
+		3,
+		"purchase",
+		docCode,
+		docLabel,
+		dto.ToFinancialMetrics(docBudgetRpPerBird, docBudgetRpPerKg, budgetAyam),
+		dto.ToFinancialMetrics(docRealizationRpPerBird, docRealizationRpPerKg, totalAyamPrice),
+	))
+
+	// OVERHEAD item
+	overheadBudgetRpPerBird, overheadBudgetRpPerKg := calculateMetrics(budgetOperational)
+	overheadRealizationRpPerBird, overheadRealizationRpPerKg := calculateMetrics(totalOperationalRealization)
+	hppItems = append(hppItems, dto.ToHPPItem(
+		4,
+		"overhead",
+		string(dto.HPPCodeOverhead),
+		"Pengeluaran Overhead",
+		dto.ToFinancialMetrics(overheadBudgetRpPerBird, overheadBudgetRpPerKg, budgetOperational),
+		dto.ToFinancialMetrics(overheadRealizationRpPerBird, overheadRealizationRpPerKg, totalOperationalRealization),
+	))
+
+	// EKSPEDISI item
+	ekspedisiBudgetRpPerBird, ekspedisiBudgetRpPerKg := calculateMetrics(budgetEkspedisi)
+	ekspedisiRealizationRpPerBird, ekspedisiRealizationRpPerKg := calculateMetrics(totalEkspedisiRealization)
+	hppItems = append(hppItems, dto.ToHPPItem(
+		5,
+		"overhead",
+		string(dto.HPPCodeEkspedisi),
+		"Beban Ekspedisi",
+		dto.ToFinancialMetrics(ekspedisiBudgetRpPerBird, ekspedisiBudgetRpPerKg, budgetEkspedisi),
+		dto.ToFinancialMetrics(ekspedisiRealizationRpPerBird, ekspedisiRealizationRpPerKg, totalEkspedisiRealization),
+	))
+
+	// HPP Summary
+	totalBudgetHpp := budgetPakan + budgetOvk + budgetAyam + budgetOperational + budgetEkspedisi
+	totalRealizationHpp := totalPakanPrice + totalOvkPrice + totalAyamPrice + totalOperationalRealization + totalEkspedisiRealization
+
+	hppBudgetRpPerBird, hppBudgetRpPerKg := calculateMetrics(totalBudgetHpp)
+	hppRealizationRpPerBird, hppRealizationRpPerKg := calculateMetrics(totalRealizationHpp)
+
+	var eggBudgeting, eggRealization *dto.FinancialMetrics
+	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) && totalEggWeightKg > 0 {
+		eggBudgetRpPerKg := totalBudgetHpp / totalEggWeightKg
+		eggRealizationRpPerKg := totalRealizationHpp / totalEggWeightKg
+		eggBudgeting = &dto.FinancialMetrics{
+			RpPerBird: 0,
+			RpPerKg:   eggBudgetRpPerKg,
+			Amount:    totalBudgetHpp,
+		}
+		eggRealization = &dto.FinancialMetrics{
+			RpPerBird: 0,
+			RpPerKg:   eggRealizationRpPerKg,
+			Amount:    totalRealizationHpp,
+		}
+	}
+
+	hppSummary := dto.ToHPPSummary(
+		"HPP",
+		dto.ToFinancialMetrics(hppBudgetRpPerBird, hppBudgetRpPerKg, totalBudgetHpp),
+		dto.ToFinancialMetrics(hppRealizationRpPerBird, hppRealizationRpPerKg, totalRealizationHpp),
+		eggBudgeting,
+		eggRealization,
+	)
+
+	hppSection := dto.ToHPPSection(hppItems, hppSummary)
+
+	// Build Profit Loss Items using constants
+	plItems := []dto.ProfitLossItem{}
+
+	// SALES item
+	salesRpPerBird, salesRpPerKg := calculateProfitLossMetrics(totalSalesAmount)
+	salesLabel := "Penjualan Ayam"
+	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+		salesLabel = "Penjualan Telur"
+	}
+	plItems = append(plItems, dto.ToProfitLossItem(
+		string(dto.PLCodeSales),
+		salesLabel,
+		"income",
+		salesRpPerBird,
+		salesRpPerKg,
+		totalSalesAmount,
+	))
+
+	// SAPRONAK item - combines DOC/Depresiasi + PAKAN + OVK
+	totalSapronakAmount := totalAyamPrice + totalPakanPrice + totalOvkPrice
+	sapronakRpPerBird := docRealizationRpPerBird + pakanRealizationRpPerBird + ovkRealizationRpPerBird
+	sapronakRpPerKg := docRealizationRpPerKg + pakanRealizationRpPerKg + ovkRealizationRpPerKg
+	sapronakLabel := "Pengeluaran Sapronak"
+	plItems = append(plItems, dto.ToProfitLossItem(
+		string(dto.PLCodeSapronak),
+		sapronakLabel,
+		"purchase",
+		sapronakRpPerBird,
+		sapronakRpPerKg,
+		totalSapronakAmount,
+	))
+
+	// OVERHEAD item
+	overheadRpPerBird, overheadRpPerKg := calculateMetrics(totalOperationalRealization)
+	plItems = append(plItems, dto.ToProfitLossItem(
+		string(dto.PLCodeOverhead),
+		"Overhead",
+		"overhead",
+		overheadRpPerBird,
+		overheadRpPerKg,
+		totalOperationalRealization,
+	))
+
+	// EKSPEDISI item
+	plItems = append(plItems, dto.ToProfitLossItem(
+		string(dto.PLCodeEkspedisi),
+		"Ekspedisi",
+		"overhead",
+		ekspedisiRealizationRpPerBird,
+		ekspedisiRealizationRpPerKg,
+		totalEkspedisiRealization,
+	))
+
+	// Profit Loss Summary
+	// Gross Profit = Sales - (DOC + PAKAN + OVK) only
+	// Gross Profit should NOT include overhead and ekspedisi
+	costOfGoodsSold := totalAyamPrice + totalPakanPrice + totalOvkPrice
+	costOfGoodsSoldRpPerBird := sapronakRpPerBird
+
+	grossProfit := totalSalesAmount - costOfGoodsSold
+	grossProfitRpPerBird := salesRpPerBird - costOfGoodsSoldRpPerBird
+
+	// Operating Expenses (Overhead + Ekspedisi)
+	totalOperatingExpenses := totalOperationalRealization + totalEkspedisiRealization
+	totalOperatingExpensesRpPerBird := overheadRpPerBird + ekspedisiRealizationRpPerBird
+
+	// Net Profit = Gross Profit - Operating Expenses
+	netProfit := grossProfit - totalOperatingExpenses
+	netProfitRpPerBird := grossProfitRpPerBird - totalOperatingExpensesRpPerBird
+
+	plSummary := dto.ToProfitLossSummary(
+		dto.ToFinancialMetrics(grossProfitRpPerBird, 0, grossProfit),
+		dto.ToFinancialMetrics(totalOperatingExpensesRpPerBird, 0, totalOperatingExpenses),
+		dto.ToFinancialMetrics(netProfitRpPerBird, 0, netProfit),
+	)
+
+	profitLossSection := dto.ToProfitLossSection(plItems, plSummary)
+
+	// Build complete response
+	data := dto.ToClosingKeuanganData(hppSection, profitLossSection)
+
+	return &data, nil
+}
+
+// containsItem checks if a string exists in a slice
+func containsItem(slice []string, item string) bool {
+	for _, s := range slice {
+		if strings.EqualFold(s, item) {
+			return true
+		}
+	}
+	return false
+}

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

@@ -3,7 +3,6 @@ package service
 import (
 	"context"
 	"strings"
-	"time"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -112,7 +111,7 @@ func (s sapronakService) computeSapronakReports(ctx context.Context, params *val
 		}
 
 		// We no longer filter by date for closing sapronak report; pass nil pointers.
-		items, groups, totalIncoming, totalUsage, err := s.buildSapronakItems(ctx, pfk, nil, nil, params.Flag)
+		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)
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to calculate sapronak report")
@@ -126,8 +125,6 @@ func (s sapronakService) computeSapronakReports(ctx context.Context, params *val
 			KandangName:           pfk.Kandang.Name,
 			Period:                pfk.Period,
 			Status:                status,
-			StartDate:             nil,
-			EndDate:               nil,
 			TotalIncomingValue:    totalIncoming,
 			TotalUsageValue:       totalUsage,
 			Items:                 items,
@@ -318,7 +315,7 @@ func buildSapronakDetails(
 	return result
 }
 
-func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.ProjectFlockKandang, start, end *time.Time, flagFilter string) ([]dto.SapronakItemDTO, []dto.SapronakGroupDTO, float64, float64, error) {
+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)
@@ -419,6 +416,22 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 		return groupMap[flag]
 	}
 
+	resolveFlagName := func(productID uint, details []dto.SapronakDetailDTO) (string, string) {
+		flag := ""
+		name := ""
+		if item, ok := itemMap[productID]; ok {
+			flag = item.Flag
+			name = item.ProductName
+		}
+		if flag == "" && len(details) > 0 {
+			flag = details[0].Flag
+		}
+		if name == "" && len(details) > 0 {
+			name = details[0].ProductName
+		}
+		return flag, name
+	}
+
 	for _, row := range incoming {
 		if !matchesFlag(row.Flag) {
 			continue
@@ -554,19 +567,18 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range incomingDetails {
-		flag := ""
+		flag, name := resolveFlagName(productID, details)
-		name := ""
-		if item, ok := itemMap[productID]; ok {
-			flag = item.Flag
-			name = item.ProductName
-		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
+			if d.Flag == "" {
 				d.Flag = flag
+			}
+			if d.ProductName == "" {
 				d.ProductName = name
+			}
 			group.Items = append(group.Items, d)
 			group.TotalMasuk += d.QtyMasuk
 			group.TotalNilai += d.Nilai
@@ -575,19 +587,18 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range adjIncoming {
-		flag := ""
+		flag, name := resolveFlagName(productID, details)
-		name := ""
-		if item, ok := itemMap[productID]; ok {
-			flag = item.Flag
-			name = item.ProductName
-		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
+			if d.Flag == "" {
 				d.Flag = flag
+			}
+			if d.ProductName == "" {
 				d.ProductName = name
+			}
 			group.Items = append(group.Items, d)
 			group.TotalMasuk += d.QtyMasuk
 			group.TotalNilai += d.Nilai
@@ -596,19 +607,18 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range usageDetails {
-		flag := ""
+		flag, name := resolveFlagName(productID, details)
-		name := ""
-		if item, ok := itemMap[productID]; ok {
-			flag = item.Flag
-			name = item.ProductName
-		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
+			if d.Flag == "" {
 				d.Flag = flag
+			}
+			if d.ProductName == "" {
 				d.ProductName = name
+			}
 			group.Items = append(group.Items, d)
 			group.TotalKeluar += d.QtyKeluar
 			group.SaldoAkhir -= d.QtyKeluar
@@ -616,19 +626,18 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range adjOutgoing {
-		flag := ""
+		flag, name := resolveFlagName(productID, details)
-		name := ""
-		if item, ok := itemMap[productID]; ok {
-			flag = item.Flag
-			name = item.ProductName
-		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
+			if d.Flag == "" {
 				d.Flag = flag
+			}
+			if d.ProductName == "" {
 				d.ProductName = name
+			}
 			group.Items = append(group.Items, d)
 			group.TotalKeluar += d.QtyKeluar
 			group.SaldoAkhir -= d.QtyKeluar
@@ -636,19 +645,18 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range transIncoming {
-		flag := ""
+		flag, name := resolveFlagName(productID, details)
-		name := ""
-		if item, ok := itemMap[productID]; ok {
-			flag = item.Flag
-			name = item.ProductName
-		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
+			if d.Flag == "" {
 				d.Flag = flag
+			}
+			if d.ProductName == "" {
 				d.ProductName = name
+			}
 			group.Items = append(group.Items, d)
 			group.TotalMasuk += d.QtyMasuk
 			group.TotalNilai += d.Nilai
@@ -657,19 +665,18 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range transOutgoing {
-		flag := ""
+		flag, name := resolveFlagName(productID, details)
-		name := ""
-		if item, ok := itemMap[productID]; ok {
-			flag = item.Flag
-			name = item.ProductName
-		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
+			if d.Flag == "" {
 				d.Flag = flag
+			}
+			if d.ProductName == "" {
 				d.ProductName = name
+			}
 			group.Items = append(group.Items, d)
 			group.TotalKeluar += d.QtyKeluar
 			group.SaldoAkhir -= d.QtyKeluar

internal/modules/daily-checklists/route.go

@@ -15,49 +15,49 @@ func DailyChecklistRoutes(v1 fiber.Router, u user.UserService, s dailyChecklist.
 	route := v1.Group("/daily-checklists")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
+	route.Get("/", m.RequirePermissions(m.P_DailyChecklistGetAll), ctrl.GetAll)
-	route.Get("/report", ctrl.GetReport)
+	route.Get("/report", m.RequirePermissions(m.P_DailyChecklistReports), ctrl.GetReport)
 
-	route.Get("/summary", ctrl.GetSummary)
+	route.Get("/summary", m.RequirePermissions(m.P_DailyChecklistDashboardList), ctrl.GetSummary)
 
-	route.Get("/report", ctrl.GetReport)
+	// route.Get("/report", ctrl.GetReport)
 
 	// upsert daily checklist
-	route.Post("/", ctrl.CreateOne)
+	route.Post("/", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.CreateOne)
 
 	// get detail data daily checklist by id
-	route.Get("/relation/:idDailyChecklist", ctrl.GetOne)
+	route.Get("/relation/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistGetOne), ctrl.GetOne)
 
 	// get phases by daily checklist id
-	route.Get("/phase/:idDailyChecklist", ctrl.GetPhaseByIdChecklist)
+	route.Get("/phase/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.GetPhaseByIdChecklist)
 
 	// create task
 	/*
 		ketika add phase
 	*/
-	route.Post("/phase/:idDailyChecklist", ctrl.CreateDailyChecklistPhase)
+	route.Post("/phase/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.CreateDailyChecklistPhase)
 
 	// create assigment
 	/*
 		ketika add ABK
 	*/
-	route.Post("/assignment/:idDailyChecklist", ctrl.CreateAssignment)
+	route.Post("/assignment/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.CreateAssignment)
 
 	// remove assignment
 	/*
 		ketika remove ABK
 	*/
-	route.Delete("/:idDailyChecklist/assignments/:idEmployee", ctrl.RemoveAssignment)
+	route.Delete("/:idDailyChecklist/assignments/:idEmployee", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.RemoveAssignment)
 
 	//get all tasks
-	route.Get("/tasks", ctrl.GetAllTasks)
+	route.Get("/tasks", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.GetAllTasks)
 
 	// update assignment
 	/*
 		ketika check dan uncheck tugas oleh ABK
 	*/
-	route.Post("/assignment", ctrl.UpdateAssignment)
+	route.Post("/assignment", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.UpdateAssignment)
 
-	route.Patch("/:idDailyChecklist", ctrl.UpdateOne)
+	route.Patch("/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.UpdateOne)
-	route.Delete("/:idDailyChecklist", ctrl.DeleteOne)
+	route.Delete("/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.DeleteOne)
 }

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

@@ -396,6 +396,10 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		updateBody["supplier_id"] = *req.SupplierID
 	}
 
+	if req.Notes != nil {
+		updateBody["notes"] = *req.Notes
+	}
+
 	if req.LocationID != nil {
 		locationID := uint(*req.LocationID)
 		updateBody["location_id"] = locationID
@@ -568,20 +572,28 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		if err != nil {
 			return fiber.NewError(fiber.StatusUnauthorized, "Failed to get actor ID from context")
 		}
-		if *latestApproval.Action != entity.ApprovalActionUpdated {
+
+		if *latestApproval.Action != entity.ApprovalActionUpdated && latestApproval.StepNumber > uint16(utils.ExpenseStepPengajuan) {
 
 			approvalAction := entity.ApprovalActionUpdated
 
+			previousStep := approvalutils.ApprovalStep(latestApproval.StepNumber) - 1
+
+			if previousStep < utils.ExpenseStepPengajuan {
+				previousStep = utils.ExpenseStepPengajuan
+			}
+
 			if _, err := approvalSvcTx.CreateApproval(
 				c.Context(),
 				utils.ApprovalWorkflowExpense,
 				id,
-				utils.ExpenseStepPengajuan,
+				previousStep,
 				&approvalAction,
 				actorID,
 				nil); err != nil {
 				return fiber.NewError(fiber.StatusInternalServerError, "Failed to reset approval step")
 			}
+
 		}
 
 		if s.DocumentSvc != nil && len(req.Documents) > 0 {

internal/modules/expenses/validations/expense.validation.go

@@ -31,6 +31,7 @@ type Update struct {
 	Category         *string                 `form:"category" json:"category" validate:"omitempty,oneof=BOP NON-BOP"`
 	SupplierID       *uint64                 `form:"supplier_id" json:"supplier_id" validate:"omitempty,gt=0"`
 	LocationID       *uint64                 `form:"location_id" json:"location_id" validate:"omitempty,gt=0"`
+	Notes            *string                 `form:"notes" json:"notes" validate:"omitempty,max=500"`
 	Documents        []*multipart.FileHeader `form:"documents" json:"documents" validate:"omitempty,dive"`
 	ExpenseNonstocks *[]ExpenseNonstock      `form:"expense_nonstocks" json:"expense_nonstocks" validate:"omitempty,min=1,dive"`
 }

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

@@ -4,20 +4,17 @@ import (
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	warehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
 	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
 )
 
 type TransferRelationDTO struct {
 	Id                   uint64                                `json:"id"`
+	MovementNumber       string                                `json:"movement_number"`
 	TransferReason       string                                `json:"transfer_reason"`
 	TransferDate         string                                `json:"transfer_date"`
-	SourceWarehouse      *WarehouseDetailDTO `json:"source_warehouse,omitempty"`
+	SourceWarehouse      *warehouseDTO.WarehouseRelationDTO    `json:"source_warehouse,omitempty"`
-	DestinationWarehouse *WarehouseDetailDTO `json:"destination_warehouse,omitempty"`
+	DestinationWarehouse *warehouseDTO.WarehouseRelationDTO    `json:"destination_warehouse,omitempty"`
-}
-
-type WarehouseSimpleDTO struct {
-	Id   uint   `json:"id"`
-	Name string `json:"name"`
 }
 
 type ProductSimpleDTO struct {
@@ -25,16 +22,6 @@ type ProductSimpleDTO struct {
 	Name string `json:"name"`
 }
 
-type AreaDTO struct {
-	Id   uint   `json:"id"`
-	Name string `json:"name"`
-}
-
-type LocationDTO struct {
-	Id   uint   `json:"id"`
-	Name string `json:"name"`
-}
-
 type SupplierSimpleDTO struct {
 	Id   uint   `json:"id"`
 	Name string `json:"name"`
@@ -48,13 +35,6 @@ type DocumentDTO struct {
 	Size float64 `json:"size"`
 }
 
-type WarehouseDetailDTO struct {
-	Id       uint         `json:"id"`
-	Name     string       `json:"name"`
-	Location *LocationDTO `json:"location"`
-	Area     *AreaDTO     `json:"area"`
-}
-
 type TransferListDTO struct {
 	TransferRelationDTO
 	CreatedUser *userDTO.UserRelationDTO `json:"created_user,omitempty"`
@@ -97,16 +77,19 @@ type TransferDeliveryItemDTO struct {
 }
 
 func ToTransferRelationDTO(e entity.StockTransfer) TransferRelationDTO {
-	var sourceWarehouse *WarehouseDetailDTO
+	var sourceWarehouse *warehouseDTO.WarehouseRelationDTO
 	if e.FromWarehouse != nil && e.FromWarehouse.Id != 0 {
-		sourceWarehouse = toWarehouseDetailDTO(e.FromWarehouse)
+		mapped := warehouseDTO.ToWarehouseRelationDTO(*e.FromWarehouse)
+		sourceWarehouse = &mapped
 	}
-	var destinationWarehouse *WarehouseDetailDTO
+	var destinationWarehouse *warehouseDTO.WarehouseRelationDTO
 	if e.ToWarehouse != nil && e.ToWarehouse.Id != 0 {
-		destinationWarehouse = toWarehouseDetailDTO(e.ToWarehouse)
+		mapped := warehouseDTO.ToWarehouseRelationDTO(*e.ToWarehouse)
+		destinationWarehouse = &mapped
 	}
 	return TransferRelationDTO{
 		Id:                   e.Id,
+		MovementNumber:       e.MovementNumber,
 		TransferReason:       e.Reason,
 		TransferDate:         e.CreatedAt.Format("2006-01-02"),
 		SourceWarehouse:      sourceWarehouse,
@@ -114,38 +97,6 @@ func ToTransferRelationDTO(e entity.StockTransfer) TransferRelationDTO {
 	}
 }
 
-func toAreaDTO(a *entity.Area) *AreaDTO {
-	if a == nil {
-		return nil
-	}
-	return &AreaDTO{
-		Id:   a.Id,
-		Name: a.Name,
-	}
-}
-
-func toLocationDTO(l *entity.Location) *LocationDTO {
-	if l == nil {
-		return nil
-	}
-	return &LocationDTO{
-		Id:   l.Id,
-		Name: l.Name,
-	}
-}
-
-func toWarehouseDetailDTO(w *entity.Warehouse) *WarehouseDetailDTO {
-	if w == nil {
-		return nil
-	}
-	return &WarehouseDetailDTO{
-		Id:       w.Id,
-		Name:     w.Name,
-		Location: toLocationDTO(w.Location),
-		Area:     toAreaDTO(&w.Area),
-	}
-}
-
 func ToTransferListDTO(e entity.StockTransfer) TransferListDTO {
 	var createdUser *userDTO.UserRelationDTO
 	if e.CreatedUser != nil {

internal/modules/inventory/transfers/route.go

@@ -15,8 +15,8 @@ func TransferRoutes(v1 fiber.Router, u user.UserService, s transfer.TransferServ
 	route := v1.Group("/transfers")
 	route.Use(m.Auth(u))
 
-	route.Get("/",m.RequirePermissions(m.P_TransferGetAll), ctrl.GetAll)
+	route.Get("/", m.RequirePermissions(m.P_TransferGetAll), ctrl.GetAll)
-	route.Post("/",m.RequirePermissions(m.P_TransferCreateOne), ctrl.CreateOne)
+	route.Post("/", m.RequirePermissions(m.P_TransferCreateOne), ctrl.CreateOne)
-	route.Get("/:id",m.RequirePermissions(m.P_TransferGetOne), ctrl.GetOne)
+	route.Get("/:id", m.RequirePermissions(m.P_TransferGetOne), ctrl.GetOne)
 
 }

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

@@ -99,7 +99,11 @@ func (s transferService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 	transfers, total, err := s.StockTransferRepo.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
 		if params.Search != "" {
-			db = db.Where("movement_number ILIKE ?", "%"+strings.TrimSpace(params.Search)+"%")
+			searchTerm := "%" + strings.TrimSpace(params.Search) + "%"
+			db = db.Joins("LEFT JOIN warehouses AS from_warehouses ON from_warehouses.id = stock_transfers.from_warehouse_id").
+				Joins("LEFT JOIN warehouses AS to_warehouses ON to_warehouses.id = stock_transfers.to_warehouse_id").
+				Where("movement_number ILIKE ? OR from_warehouses.name ILIKE ? OR to_warehouses.name ILIKE ?",
+					searchTerm, searchTerm, searchTerm)
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
@@ -118,9 +122,9 @@ func (s transferService) GetOne(c *fiber.Ctx, id uint) (*entity.StockTransfer, e
 	})
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fiber.NewError(fiber.StatusNotFound, "Transfer not found")
+			return nil, fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Transfer dengan ID %d tidak ditemukan", id))
 		}
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to get transfer")
+		return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data transfer dengan ID %d", id))
 	}
 
 	return transferPtr, nil
@@ -136,12 +140,12 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		)
 		if err != nil {
 			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d tidak tersedia di gudang asal", product.ProductID))
+				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk dengan ID %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, req.SourceWarehouseID))
 			}
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal cek stok produk di gudang asal")
+			return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengecek stok produk %d di gudang asal", product.ProductID))
 		}
 		if sourcePW.Quantity < product.ProductQty {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d di gudang asal tidak cukup", product.ProductID))
+			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d di gudang asal tidak mencukupi. Tersedia: %.2f, Diminta: %.2f", product.ProductID, sourcePW.Quantity, product.ProductQty))
 		}
 		pwIDs = append(pwIDs, sourcePW.Id)
 	}
@@ -161,10 +165,10 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 
 	projectFlockKandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), destPfkID)
 	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock")
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock untuk gudang tujuan")
 	}
 	if projectFlockKandang.ClosedAt != nil {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Project flock tujuan sudah closing")
+		return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Project flock untuk gudang tujuan sudah ditutup (closing) pada %s", projectFlockKandang.ClosedAt.Format("2006-01-02")))
 	}
 
 	actorID, err := m.ActorIDFromContext(c)
@@ -192,16 +196,16 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Supplier dengan ID %d tidak ditemukan", delivery.SupplierID))
 			}
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal cek data supplier")
+			return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data supplier dengan ID %d", delivery.SupplierID))
 		}
 		if supplier.Category != string(utils.SupplierCategoryBOP) {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Supplier dengan ID %d bukan kategori BOP", delivery.SupplierID))
+			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Supplier '%s' (ID: %d) bukan kategori BOP. Kategori saat ini: %s", supplier.Name, delivery.SupplierID, supplier.Category))
 		}
 	}
 
 	movementNumber, err := s.StockTransferRepo.GenerateMovementNumber(c.Context())
 	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to generate movement number")
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat nomor movement transfer")
 	}
 
 	transferDate, _ := utils.ParseDateString(req.TransferDate)
@@ -239,16 +243,16 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			)
 			if err != nil {
 				if errors.Is(err, gorm.ErrRecordNotFound) {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d tidak tersedia di gudang asal", product.ProductID))
+					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, req.SourceWarehouseID))
 				}
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data product warehouse source")
+				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data product warehouse untuk produk %d di gudang asal", product.ProductID))
 			}
 
 			destPW, err := productWarehouseRepoTX.GetProductWarehouseByProductAndWarehouseID(
 				c.Context(), uint(product.ProductID), uint(req.DestinationWarehouseID),
 			)
 			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data product warehouse destination")
+				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data product warehouse untuk produk %d di gudang tujuan", product.ProductID))
 			}
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				ctx := c.Context()
@@ -256,14 +260,21 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				if err != nil {
 					return err
 				}
+
+				// Set ProjectFlockKandangId hanya jika ada kandang
+				var pfkID *uint
+				if projectFlockKandangID > 0 {
+					pfkID = &projectFlockKandangID
+				}
+
 				destPW = &entity.ProductWarehouse{
 					ProductId:             uint(product.ProductID),
 					WarehouseId:           uint(req.DestinationWarehouseID),
 					Quantity:              0,
-					ProjectFlockKandangId: &projectFlockKandangID,
+					ProjectFlockKandangId: pfkID,
 				}
 				if err := productWarehouseRepoTX.CreateOne(c.Context(), destPW, nil); err != nil {
-					return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat product warehouse destination")
+					return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal membuat product warehouse untuk produk %d di gudang tujuan", product.ProductID))
 				}
 			}
 
@@ -309,7 +320,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			for _, prod := range item.Products {
 				detail, ok := detailMap[uint64(prod.ProductID)]
 				if !ok {
-					return fmt.Errorf("produk %d tidak ditemukan di detail", prod.ProductID)
+					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk %d tidak ditemukan dalam daftar transfer untuk delivery #%d", prod.ProductID, i+1))
 				}
 				deliveryItems = append(deliveryItems, &entity.StockTransferDeliveryItem{
 					StockTransferDeliveryId: delivery.Id,
@@ -372,7 +383,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				Tx:                 tx,
 			})
 			if err != nil {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak cukup di gudang asal untuk produk %d: %v", product.ProductID, err))
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
 			}
 
 			if err := tx.Model(&entity.StockTransferDetail{}).
@@ -381,7 +392,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 					"usage_qty":   consumeResult.UsageQuantity,
 					"pending_qty": consumeResult.PendingQuantity,
 				}).Error; err != nil {
-				return fmt.Errorf("gagal update usage tracking: %w", err)
+				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengupdate tracking usage untuk produk %d", product.ProductID))
 			}
 
 			note := fmt.Sprintf("Transfer #%s", entityTransfer.MovementNumber)
@@ -394,7 +405,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				Tx:                 tx,
 			})
 			if err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal menambah stok di gudang tujuan untuk produk %d: %v", product.ProductID, err))
+				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal menambah stok untuk produk %d di gudang tujuan. Error: %v", product.ProductID, err))
 			}
 
 			if err := tx.Model(&entity.StockTransferDetail{}).
@@ -402,7 +413,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				Updates(map[string]interface{}{
 					"total_qty": replenishResult.AddedQuantity,
 				}).Error; err != nil {
-				return fmt.Errorf("gagal update total tracking: %w", err)
+				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengupdate tracking total untuk produk %d", product.ProductID))
 			}
 		}
 
@@ -436,7 +447,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 	})
 
 	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to process transfer transaction: %v", err))
+		return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal memproses transfer. Error: %v", err))
 	}
 
 	result, err := s.GetOne(c, uint(entityTransfer.Id))
@@ -446,8 +457,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 
 	if len(expensePayloads) > 0 {
 		if err := s.notifyExpenseItemsDelivered(c, entityTransfer.Id, expensePayloads); err != nil {
-			s.Log.Errorf("Failed to sync expense for transfer %d: %+v", entityTransfer.Id, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal sinkronisasi data expense untuk transfer %s. Silakan cek manual di module expense", entityTransfer.MovementNumber))
-			return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to sync expense: %v", err))
 		}
 	}
 
@@ -461,32 +471,26 @@ func (s *transferService) notifyExpenseItemsDelivered(c *fiber.Ctx, transferID u
 	return s.ExpenseBridge.OnItemsDelivered(c, transferID, payloads)
 }
 
-func (s *transferService) notifyExpenseDetailsDeleted(ctx context.Context, transferID uint64, items []entity.StockTransferDetail) error {
-	if s.ExpenseBridge == nil || transferID == 0 || len(items) == 0 {
-		return nil
-	}
-	return s.ExpenseBridge.OnItemsDeleted(ctx, transferID, items)
-}
-
 func (s *transferService) getActiveProjectFlockKandangID(ctx context.Context, warehouseID uint) (uint, error) {
 	warehouse, err := s.WarehouseRepo.GetByID(ctx, warehouseID, nil)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return 0, fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Gudang dengan ID %d tidak ditemukan", warehouseID))
 		}
-		return 0, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data gudang")
+		return 0, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data gudang dengan ID %d", warehouseID))
 	}
 
+	// Jika warehouse tidak punya kandang_id, return 0 tanpa error
 	if warehouse.KandangId == nil || *warehouse.KandangId == 0 {
-		return 0, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Gudang %d belum terhubung ke kandang", warehouseID))
+		return 0, nil
 	}
 
 	projectFlockKandang, err := s.ProjectFlockKandangRepo.GetActiveByKandangID(ctx, uint(*warehouse.KandangId))
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return 0, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Kandang %d belum memiliki project flock aktif", *warehouse.KandangId))
+			return 0, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Tidak ada project flock aktif untuk kandang %d", *warehouse.KandangId))
 		}
-		return 0, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil project flock kandang")
+		return 0, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock kandang yang aktif")
 	}
 
 	return uint(projectFlockKandang.Id), nil

internal/modules/inventory/transfers/services/transfer_expense_bridge.go

@@ -140,13 +140,22 @@ func (b *transferExpenseBridge) markExpensesUpdated(ctx context.Context, expense
 	if actorID == 0 {
 		actorID = 1
 	}
-	svc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(b.db))
+	approvalRepo := commonRepo.NewApprovalRepository(b.db)
-	action := entity.ApprovalActionUpdated
+	svc := commonSvc.NewApprovalService(approvalRepo)
+	action := entity.ApprovalActionCreated
+
 	for id := range expenseIDs {
+		latestApproval, err := approvalRepo.LatestByTarget(ctx, string(utils.ApprovalWorkflowExpense), uint(id), nil)
+		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+			return err
+		}
+
+		if latestApproval == nil {
 			if _, err := svc.CreateApproval(ctx, utils.ApprovalWorkflowExpense, uint(id), utils.ExpenseStepFinance, &action, actorID, nil); err != nil {
 				return err
 			}
 		}
+	}
 	return nil
 }
 

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

@@ -140,7 +140,7 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		Joins("JOIN marketings ON marketings.id = marketing_products.marketing_id").
 		Where("marketing_delivery_products.delivery_date IS NOT NULL")
 
-	if filters.ProductId > 0 || filters.WarehouseId > 0 || filters.Search != "" || filters.MarketingType != "" {
+	if filters.ProductId > 0 || filters.WarehouseId > 0 || filters.AreaId > 0 || filters.LocationId > 0 || filters.Search != "" || filters.MarketingType != "" {
 		db = db.Joins("LEFT JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id")
 	}
 
@@ -148,18 +148,30 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		db = db.Joins("LEFT JOIN products ON products.id = product_warehouses.product_id")
 	}
 
-	if filters.WarehouseId > 0 {
+	if filters.WarehouseId > 0 || filters.Search != "" {
 		db = db.Joins("LEFT JOIN warehouses ON warehouses.id = product_warehouses.warehouse_id")
 	}
 
 	if filters.Search != "" {
 		db = db.Joins("LEFT JOIN customers ON customers.id = marketings.customer_id")
-	}
+		db = db.Joins("LEFT JOIN users AS sales_users ON sales_users.id = marketings.sales_person_id")
 
-	if filters.Search != "" {
 		searchPattern := "%" + filters.Search + "%"
-		db = db.Where("marketing_delivery_products.vehicle_number ILIKE ? OR marketings.so_number ILIKE ? OR customers.name ILIKE ? OR products.name ILIKE ?",
+		db = db.Where(`(
-			searchPattern, searchPattern, searchPattern, searchPattern)
+			marketing_delivery_products.vehicle_number ILIKE ? OR
+			customers.name ILIKE ? OR
+			warehouses.name ILIKE ? OR
+			products.name ILIKE ? OR
+			sales_users.name ILIKE ? OR
+			CONCAT(
+				marketings.so_number,
+				'-',
+				COALESCE(TO_CHAR(marketing_delivery_products.delivery_date, 'YYYYMMDD'), ''),
+				'-',
+				COALESCE(product_warehouses.warehouse_id::text, '')
+			) ILIKE ?
+		)`,
+			searchPattern, searchPattern, searchPattern, searchPattern, searchPattern, searchPattern)
 	}
 
 	if filters.CustomerId > 0 {
@@ -178,6 +190,19 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		db = db.Where("product_warehouses.warehouse_id = ?", filters.WarehouseId)
 	}
 
+	if filters.AreaId > 0 || filters.LocationId > 0 {
+		db = db.Joins("LEFT JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+			Joins("LEFT JOIN project_flocks ON project_flocks.id = project_flock_kandangs.project_flock_id")
+
+		if filters.AreaId > 0 {
+			db = db.Where("project_flocks.area_id = ?", filters.AreaId)
+		}
+
+		if filters.LocationId > 0 {
+			db = db.Where("project_flocks.location_id = ?", filters.LocationId)
+		}
+	}
+
 	if filters.MarketingType != "" {
 		db = db.Joins("LEFT JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
 			Group("marketing_delivery_products.id")
@@ -186,7 +211,6 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		case "ayam":
 			db = db.Where("flags.name IN (?)", []string{
 				string(utils.FlagDOC), string(utils.FlagPullet), string(utils.FlagLayer),
-				string(utils.FlagAyamAfkir), string(utils.FlagAyamCulling), string(utils.FlagAyamMati),
 			})
 		case "telur":
 			db = db.Where("flags.name IN (?)", []string{

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

@@ -249,7 +249,7 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 
 			// Hitung total_weight dan total_price otomatis
 			totalWeight := requestedProduct.Qty * requestedProduct.AvgWeight
-			totalPrice := requestedProduct.UnitPrice * requestedProduct.Qty
+			totalPrice := requestedProduct.UnitPrice * totalWeight
 
 			deliveryProduct.ProductWarehouseId = foundMarketingProduct.ProductWarehouseId
 			deliveryProduct.UnitPrice = requestedProduct.UnitPrice
@@ -363,7 +363,7 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 
 				// Hitung total_weight dan total_price otomatis
 				totalWeight := requestedProduct.Qty * requestedProduct.AvgWeight
-				totalPrice := requestedProduct.UnitPrice * requestedProduct.Qty
+				totalPrice := requestedProduct.UnitPrice * totalWeight
 
 				deliveryProduct.ProductWarehouseId = foundMarketingProduct.ProductWarehouseId
 				deliveryProduct.UnitPrice = requestedProduct.UnitPrice

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

@@ -294,7 +294,7 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 
 					// Hitung total_weight dan total_price otomatis
 					totalWeight := rp.Qty * rp.AvgWeight
-					totalPrice := rp.UnitPrice * rp.Qty
+					totalPrice := rp.UnitPrice * totalWeight
 
 					updateBody := map[string]any{
 						"product_warehouse_id": rp.ProductWarehouseId,
@@ -594,7 +594,7 @@ func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Cont
 
 	// Hitung total_weight dan total_price otomatis
 	totalWeight := rp.Qty * rp.AvgWeight
-	totalPrice := rp.UnitPrice * rp.Qty
+	totalPrice := rp.UnitPrice * totalWeight
 
 	marketingProduct := &entity.MarketingProduct{
 		MarketingId:        marketingId,

internal/modules/master/config-checklists/route.go

@@ -15,9 +15,9 @@ func ConfigChecklistRoutes(v1 fiber.Router, u user.UserService, s configChecklis
 	route := v1.Group("/config-checklists")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
+	route.Get("/", m.RequirePermissions(m.P_DailyChecklistActivityConfig), ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
+	route.Post("/", m.RequirePermissions(m.P_DailyChecklistActivityConfig), ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
+	route.Get("/:id", m.RequirePermissions(m.P_DailyChecklistActivityConfig), ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
+	route.Patch("/:id", m.RequirePermissions(m.P_DailyChecklistActivityConfig), ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Delete("/:id", m.RequirePermissions(m.P_DailyChecklistActivityConfig), ctrl.DeleteOne)
 }

internal/modules/master/customers/dto/customer.dto.go

@@ -14,6 +14,7 @@ type CustomerRelationDTO struct {
 	Name          string                   `json:"name"`
 	Type          string                   `json:"type"`
 	AccountNumber string                   `json:"account_number"`
+	Address       string                   `json:"address,omitempty"`
 	Balance       float64                  `json:"balance"`
 	Pic           *userDTO.UserRelationDTO `json:"pic,omitempty"`
 }
@@ -52,6 +53,8 @@ func ToCustomerRelationDTO(e entity.Customer) CustomerRelationDTO {
 		Name:          e.Name,
 		Type:          e.Type,
 		AccountNumber: e.AccountNumber,
+		Address:       e.Address,
+		Balance:       e.Balance,
 		Pic:           pic,
 	}
 }

internal/modules/master/employees/route.go

@@ -15,9 +15,9 @@ func EmployeesRoutes(v1 fiber.Router, u user.UserService, s employees.EmployeesS
 	route := v1.Group("/employees")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
+	route.Get("/", m.RequirePermissions(m.P_DailyChecklistEmployee), ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
+	route.Post("/", m.RequirePermissions(m.P_DailyChecklistEmployee), ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
+	route.Get("/:id", m.RequirePermissions(m.P_DailyChecklistEmployee), ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
+	route.Patch("/:id", m.RequirePermissions(m.P_DailyChecklistEmployee), ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Delete("/:id", m.RequirePermissions(m.P_DailyChecklistEmployee), ctrl.DeleteOne)
 }

internal/modules/master/nonstocks/dto/nonstock.dto.go

@@ -37,7 +37,6 @@ type NonstockSupplierDTO struct {
 	Name     string  `json:"name"`
 	Alias    string  `json:"alias"`
 	Category string  `json:"category"`
-	Price    float64 `json:"price"`
 }
 
 // === Mapper Functions ===
@@ -121,7 +120,6 @@ func toNonstockSupplierDTOs(relations []entity.NonstockSupplier) []NonstockSuppl
 			Name:     relation.Supplier.Name,
 			Alias:    relation.Supplier.Alias,
 			Category: relation.Supplier.Category,
-			Price:    relation.Price,
 		})
 	}
 

internal/modules/master/nonstocks/repositories/nonstock.repository.go

@@ -61,30 +61,20 @@ func (r *NonstockRepositoryImpl) SyncSuppliersDiff(ctx context.Context, tx *gorm
 		return err
 	}
 
-	existingMap := make(map[uint]entity.NonstockSupplier, len(existing))
+	existingMap := make(map[uint]struct{}, len(existing))
 	for _, rel := range existing {
-		existingMap[rel.SupplierId] = rel
+		existingMap[rel.SupplierId] = struct{}{}
 	}
 
 	incomingMap := make(map[uint]struct{}, len(suppliers))
 	for _, rel := range suppliers {
 		incomingMap[rel.SupplierId] = struct{}{}
-		if existingRel, exists := existingMap[rel.SupplierId]; exists {
+		if _, exists := existingMap[rel.SupplierId]; exists {
-			if existingRel.Price != rel.Price {
-				if err := db.WithContext(ctx).
-					Model(&entity.NonstockSupplier{}).
-					Where("nonstock_id = ? AND supplier_id = ?", nonstockID, rel.SupplierId).
-					Update("price", rel.Price).
-					Error; err != nil {
-					return err
-				}
-			}
 			continue
 		}
 		record := entity.NonstockSupplier{
 			NonstockId: nonstockID,
 			SupplierId: rel.SupplierId,
-			Price:      rel.Price,
 		}
 		if err := db.WithContext(ctx).Create(&record).Error; err != nil {
 			return err

internal/modules/master/nonstocks/services/nonstock.service.go

@@ -115,19 +115,18 @@ func (s *nonstockService) CreateOne(c *fiber.Ctx, req *validation.Create) (*enti
 		supplierLinks []entity.NonstockSupplier
 		supplierIDs   []uint
 	)
-	if len(req.Suppliers) > 0 {
+	if len(req.SupplierIDs) > 0 {
-		seen := make(map[uint]struct{}, len(req.Suppliers))
+		seen := make(map[uint]struct{}, len(req.SupplierIDs))
-		supplierLinks = make([]entity.NonstockSupplier, 0, len(req.Suppliers))
+		supplierLinks = make([]entity.NonstockSupplier, 0, len(req.SupplierIDs))
-		supplierIDs = make([]uint, 0, len(req.Suppliers))
+		supplierIDs = make([]uint, 0, len(req.SupplierIDs))
-		for _, supplier := range req.Suppliers {
+		for _, supplierID := range req.SupplierIDs {
-			if _, exists := seen[supplier.SupplierID]; exists {
+			if _, exists := seen[supplierID]; exists {
-				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Duplicate supplier_id %d", supplier.SupplierID))
+				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Duplicate supplier_id %d", supplierID))
 			}
-			seen[supplier.SupplierID] = struct{}{}
+			seen[supplierID] = struct{}{}
-			supplierIDs = append(supplierIDs, supplier.SupplierID)
+			supplierIDs = append(supplierIDs, supplierID)
 			supplierLinks = append(supplierLinks, entity.NonstockSupplier{
-				SupplierId: supplier.SupplierID,
+				SupplierId: supplierID,
-				Price:      supplier.Price,
 			})
 		}
 		supplierList, supplierErr := s.Repository.GetSuppliersByIDs(ctx, supplierIDs)
@@ -212,21 +211,20 @@ func (s nonstockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint
 
 	var supplierLinks []entity.NonstockSupplier
 	var supplierUpdate bool
-	if req.Suppliers != nil {
+	if req.SupplierIDs != nil {
 		supplierUpdate = true
-		if len(*req.Suppliers) > 0 {
+		if len(*req.SupplierIDs) > 0 {
-			seen := make(map[uint]struct{}, len(*req.Suppliers))
+			seen := make(map[uint]struct{}, len(*req.SupplierIDs))
-			supplierLinks = make([]entity.NonstockSupplier, 0, len(*req.Suppliers))
+			supplierLinks = make([]entity.NonstockSupplier, 0, len(*req.SupplierIDs))
-			supplierIDs := make([]uint, 0, len(*req.Suppliers))
+			supplierIDs := make([]uint, 0, len(*req.SupplierIDs))
-			for _, supplier := range *req.Suppliers {
+			for _, supplierID := range *req.SupplierIDs {
-				if _, exists := seen[supplier.SupplierID]; exists {
+				if _, exists := seen[supplierID]; exists {
-					return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Duplicate supplier_id %d", supplier.SupplierID))
+					return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Duplicate supplier_id %d", supplierID))
 				}
-				seen[supplier.SupplierID] = struct{}{}
+				seen[supplierID] = struct{}{}
-				supplierIDs = append(supplierIDs, supplier.SupplierID)
+				supplierIDs = append(supplierIDs, supplierID)
 				supplierLinks = append(supplierLinks, entity.NonstockSupplier{
-					SupplierId: supplier.SupplierID,
+					SupplierId: supplierID,
-					Price:      supplier.Price,
 				})
 			}
 

internal/modules/master/nonstocks/validations/nonstock.validation.go

@@ -1,21 +1,16 @@
 package validation
 
-type SupplierPrice struct {
-	SupplierID uint    `json:"supplier_id" validate:"required,gt=0"`
-	Price      float64 `json:"price" validate:"required,gte=0"`
-}
-
 type Create struct {
 	Name         string `json:"name" validate:"required_strict,min=3,max=50"`
 	UomID        uint   `json:"uom_id" validate:"required,gt=0"`
-	Suppliers   []SupplierPrice `json:"suppliers,omitempty" validate:"omitempty,dive"`
+	SupplierIDs  []uint `json:"supplier_ids,omitempty" validate:"omitempty,dive,gt=0"`
 	Flags        []string `json:"flags" validate:"dive,max=50"`
 }
 
 type Update struct {
 	Name         *string `json:"name,omitempty" validate:"omitempty,min=3,max=50"`
 	UomID        *uint   `json:"uom_id,omitempty" validate:"omitempty,gt=0"`
-	Suppliers   *[]SupplierPrice `json:"suppliers,omitempty" validate:"omitempty,dive"`
+	SupplierIDs  *[]uint `json:"supplier_ids,omitempty" validate:"omitempty,dive,gt=0"`
 	Flags        *[]string `json:"flags,omitempty" validate:"omitempty,dive,max=50"`
 }
 

internal/modules/master/phase-activities/route.go

@@ -15,9 +15,9 @@ func PhaseActivityRoutes(v1 fiber.Router, u user.UserService, s phaseActivity.Ph
 	route := v1.Group("/phase-activities")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
+	route.Get("/", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
+	route.Post("/", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
+	route.Get("/:id", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
+	route.Patch("/:id", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Delete("/:id", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.DeleteOne)
 }

internal/modules/master/phasess/route.go

@@ -15,9 +15,9 @@ func PhasesRoutes(v1 fiber.Router, u user.UserService, s phases.PhasesService) {
 	route := v1.Group("/phases")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
+	route.Get("/", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
+	route.Post("/", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
+	route.Get("/:id", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
+	route.Patch("/:id", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Delete("/:id", m.RequirePermissions(m.P_DailyChecklistActivity), ctrl.DeleteOne)
 }

internal/modules/master/suppliers/controllers/supplier.controller.go

@@ -28,6 +28,7 @@ func (u *SupplierController) GetAll(c *fiber.Ctx) error {
 		Limit:    c.QueryInt("limit", 10),
 		Search:   c.Query("search", ""),
 		Category: c.Query("category", ""),
+		Flag:     c.Query("flag", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

internal/modules/master/suppliers/dto/supplier_nonstock.dto.go

@@ -10,7 +10,6 @@ import (
 type SupplierNonstockDTO struct {
 	Id    uint                   `json:"id"`
 	Name  string                 `json:"name"`
-	Price float64                `json:"price"`
 	Uom   *uomDTO.UomRelationDTO `json:"uom,omitempty"`
 	Flags []string               `json:"flags"`
 }
@@ -43,7 +42,6 @@ func toSupplierNonstockDTOs(relations []entity.NonstockSupplier) []SupplierNonst
 		result = append(result, SupplierNonstockDTO{
 			Id:    Nonstock.Id,
 			Name:  Nonstock.Name,
-			Price: relation.Price,
 			Uom:   uomRef,
 			Flags: flags,
 		})

internal/modules/master/suppliers/services/supplier.service.go

@@ -47,6 +47,10 @@ func (s supplierService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("NonstockSuppliers.Nonstock.Flags")
 }
 
+func (s supplierService) withListRelations(db *gorm.DB) *gorm.DB {
+	return db.Preload("CreatedUser")
+}
+
 func (s supplierService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Supplier, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, err
@@ -63,7 +67,7 @@ func (s supplierService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 	offset := (params.Page - 1) * params.Limit
 
 	suppliers, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
-		db = s.withRelations(db)
+		db = s.withListRelations(db)
 		if params.Search != "" {
 			return db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -72,7 +76,23 @@ func (s supplierService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 			db = db.Where("category ILIKE ?", "%"+params.Category+"%")
 		}
 
-		return db.Order("created_at DESC").Order("updated_at DESC")
+		if params.Flag != "" {
+			flag := strings.ToUpper(params.Flag)
+			db = db.Where(`
+				EXISTS (
+					SELECT 1
+					FROM nonstock_suppliers nsup
+					JOIN nonstocks n ON n.id = nsup.nonstock_id
+					JOIN flags f ON f.flagable_id = n.id AND f.flagable_type = ?
+					WHERE nsup.supplier_id = suppliers.id
+					  AND UPPER(f.name) = ?
+				)`,
+				entity.FlagableTypeNonstock,
+				flag,
+			)
+		}
+
+		return db.Order("suppliers.created_at DESC").Order("suppliers.updated_at DESC")
 	})
 
 	if err != nil {

internal/modules/master/suppliers/validations/supplier.validation.go

@@ -32,7 +32,8 @@ type Update struct {
 
 type Query struct {
 	Page     int    `query:"page" validate:"omitempty,number,min=1"`
-	Limit    int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
+	Limit    int    `query:"limit" validate:"omitempty,number,min=1"`
+	Flag	 string `query:"flag" validate:"omitempty"`
 	Search   string `query:"search" validate:"omitempty,max=50"`
 	Category string `query:"category" validate:"omitempty,max=50"`
 }

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

@@ -110,7 +110,11 @@ func (s *warehouseService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 	}
 
 	typ := strings.ToUpper(req.Type)
-	if err := validateWarehouseTypeRequirements(typ, &req.AreaId, req.LocationId, req.KandangId); err != nil {
+	createValidationOpts := WarehouseTypeValidationOptions{
+		LocationProvided: req.LocationId != nil,
+		KandangProvided:  req.KandangId != nil,
+	}
+	if err := validateWarehouseTypeRequirements(typ, &req.AreaId, &req.LocationId, &req.KandangId, createValidationOpts); err != nil {
 		return nil, err
 	}
 
@@ -208,9 +212,22 @@ func (s warehouseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 		finalKandangId = req.KandangId
 	}
 
-	if err := validateWarehouseTypeRequirements(finalType, &finalAreaId, finalLocationId, finalKandangId); err != nil {
+	originalLocationId := finalLocationId
+	originalKandangId := finalKandangId
+	updateValidationOpts := WarehouseTypeValidationOptions{
+		AutoClear:        true,
+		LocationProvided: req.LocationId != nil,
+		KandangProvided:  req.KandangId != nil,
+	}
+	if err := validateWarehouseTypeRequirements(finalType, &finalAreaId, &finalLocationId, &finalKandangId, updateValidationOpts); err != nil {
 		return nil, err
 	}
+	if originalLocationId != finalLocationId {
+		updateBody["location_id"] = nil
+	}
+	if originalKandangId != finalKandangId {
+		updateBody["kandang_id"] = nil
+	}
 
 	if len(updateBody) == 0 {
 		return s.GetOne(c, id)
@@ -238,47 +255,65 @@ func (s warehouseService) DeleteOne(c *fiber.Ctx, id uint) error {
 	return nil
 }
 
-func validateWarehouseTypeRequirements(typ string, areaID *uint, locationID *uint, kandangID *uint) error {
+type WarehouseTypeValidationOptions struct {
+	AutoClear        bool
+	LocationProvided bool
+	KandangProvided  bool
+}
+
+func validateWarehouseTypeRequirements(typ string, areaID *uint, locationID **uint, kandangID **uint, opts WarehouseTypeValidationOptions) error {
 	switch utils.WarehouseType(typ) {
 	case utils.WarehouseTypeArea:
 		if areaID == nil || *areaID == 0 {
 			return fiber.NewError(fiber.StatusBadRequest, "area_id is required when type is AREA")
 		}
-		if locationID != nil {
+		if locationID != nil && *locationID != nil {
+			if opts.AutoClear && !opts.LocationProvided {
+				*locationID = nil
+			} else {
 				return fiber.NewError(fiber.StatusBadRequest, "location_id must not be provided when type is AREA")
 			}
-		if kandangID != nil {
+		}
+		if kandangID != nil && *kandangID != nil {
+			if opts.AutoClear && !opts.KandangProvided {
+				*kandangID = nil
+			} else {
 				return fiber.NewError(fiber.StatusBadRequest, "kandang_id must not be provided when type is AREA")
 			}
+		}
 		return nil
 	case utils.WarehouseTypeLokasi:
 		if areaID == nil || *areaID == 0 {
 			return fiber.NewError(fiber.StatusBadRequest, "area_id is required when type is LOCATION")
 		}
-		if locationID == nil {
+		if locationID == nil || *locationID == nil {
 			return fiber.NewError(fiber.StatusBadRequest, "location_id is required when type is LOCATION")
 		}
-		if *locationID == 0 {
+		if **locationID == 0 {
 			return fiber.NewError(fiber.StatusBadRequest, "location_id must be greater than 0 when type is LOCATION")
 		}
-		if kandangID != nil {
+		if kandangID != nil && *kandangID != nil {
+			if opts.AutoClear && !opts.KandangProvided {
+				*kandangID = nil
+			} else {
 				return fiber.NewError(fiber.StatusBadRequest, "kandang_id must not be provided when type is LOCATION")
 			}
+		}
 		return nil
 	case utils.WarehouseTypeKandang:
 		if areaID == nil || *areaID == 0 {
 			return fiber.NewError(fiber.StatusBadRequest, "area_id is required when type is KANDANG")
 		}
-		if locationID == nil {
+		if locationID == nil || *locationID == nil {
 			return fiber.NewError(fiber.StatusBadRequest, "location_id is required when type is KANDANG")
 		}
-		if *locationID == 0 {
+		if **locationID == 0 {
 			return fiber.NewError(fiber.StatusBadRequest, "location_id must be greater than 0 when type is KANDANG")
 		}
-		if kandangID == nil {
+		if kandangID == nil || *kandangID == nil {
 			return fiber.NewError(fiber.StatusBadRequest, "kandang_id is required when type is KANDANG")
 		}
-		if *kandangID == 0 {
+		if **kandangID == 0 {
 			return fiber.NewError(fiber.StatusBadRequest, "kandang_id must be greater than 0 when type is KANDANG")
 		}
 		return nil

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

@@ -200,9 +200,9 @@ func (s *chickinService) CreateOne(c *fiber.Ctx, req *validation.Create) ([]enti
 
 		newChikins = append(newChikins, newChickin)
 
-		totalPopulationQty, err := s.ProjectflockPopulationRepo.GetTotalQtyByProjectFlockKandangID(c.Context(), req.ProjectFlockKandangId)
+		totalPopulationQty, err := s.ProjectflockPopulationRepo.GetTotalQtyByProductWarehouseID(c.Context(), chickinReq.ProductWarehouseId)
 		if err != nil {
-			return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to get total population quantity for project_flock_kandang %d", req.ProjectFlockKandangId))
+			return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to get total population quantity for product warehouse %d", chickinReq.ProductWarehouseId))
 		}
 
 		availableQty := productWarehouse.Quantity - totalPopulationQty
@@ -584,7 +584,6 @@ func (s chickinService) Approval(c *fiber.Ctx, req *validation.Approve) ([]entit
 	return updated, nil
 }
 
-// autoAddFlagToProduct adds target flag to product if not already present (idempotent)
 func (s *chickinService) autoAddFlagToProduct(ctx context.Context, tx *gorm.DB, productID uint, targetFlag utils.FlagType) error {
 	if s.ProductRepo == nil {
 		return nil

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

@@ -1,6 +1,7 @@
 package dto
 
 import (
+	"strconv"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -53,6 +54,7 @@ type ProjectFlockKandangListDTO struct {
 	ProjectFlockKandangRelationDTO
 	ProjectFlock    *ProjectFlockDTO                 `json:"project_flock,omitempty"`
 	Kandang         *kandangDTO.KandangRelationDTO   `json:"kandang,omitempty"`
+	NameWithPeriod  string                           `json:"name_with_period"`
 	CreatedUser     *userDTO.UserRelationDTO         `json:"created_user,omitempty"`
 	CreatedAt       time.Time                        `json:"created_at"`
 	Approval        *approvalDTO.ApprovalRelationDTO `json:"approval,omitempty"`
@@ -104,6 +106,7 @@ func ToProjectFlockKandangDetailDTOWithAvailableQty(e entity.ProjectFlockKandang
 		ProjectFlockKandangRelationDTO: ToProjectFlockKandangRelationDTO(e),
 		ProjectFlock:                   toProjectFlockDTO(projectFlockSummary),
 		Kandang:                        toKandangRelation(e.Kandang),
+		NameWithPeriod:                 toNameWithPeriod(e.Kandang, e.Period),
 		CreatedAt:                      e.CreatedAt,
 		CreatedUser:                    toCreatedUserDTO(e.ProjectFlock),
 		Approval:                       toApprovalDTOSelector(e, func(x entity.ProjectFlockKandang) *entity.Approval { return x.LatestProjectFlockApproval }),
@@ -126,6 +129,16 @@ func toKandangRelation(kandang entity.Kandang) *kandangDTO.KandangRelationDTO {
 	return &mapped
 }
 
+func toNameWithPeriod(kandang entity.Kandang, period int) string {
+	if kandang.Name == "" {
+		return ""
+	}
+	if period == 0 {
+		return kandang.Name
+	}
+	return kandang.Name + " Period " + strconv.Itoa(period)
+}
+
 func toApprovalDTOSelector(
 	e entity.ProjectFlockKandang, selector func(entity.ProjectFlockKandang) *entity.Approval) *approvalDTO.ApprovalRelationDTO {
 	approval := selector(e)
@@ -147,6 +160,7 @@ func ToProjectFlockKandangListDTO(e entity.ProjectFlockKandang) ProjectFlockKand
 		ProjectFlockKandangRelationDTO: ToProjectFlockKandangRelationDTO(e),
 		ProjectFlock:                   toProjectFlockDTO(projectFlockSummary),
 		Kandang:                        toKandangRelation(e.Kandang),
+		NameWithPeriod:                 toNameWithPeriod(e.Kandang, e.Period),
 		CreatedAt:                      e.CreatedAt,
 		CreatedUser:                    toCreatedUserDTO(e.ProjectFlock),
 		Approval:                       toApprovalDTOSelector(e, func(x entity.ProjectFlockKandang) *entity.Approval { return x.LatestProjectFlockApproval }),

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

@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 
+	warehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/validations"
@@ -278,14 +279,22 @@ func (u *ProjectflockController) LookupProjectFlockKandang(c *fiber.Ctx) error {
 	if err != nil {
 		return err
 	}
+	_ = availableStock
 
 	dtoResult := dto.ToProjectFlockKandangDTO(*result)
-	dtoResult.AvailableQuantity = float64(availableStock)
+	if population, err := u.ProjectflockService.GetProjectFlockKandangPopulation(c, result.Id); err != nil {
-	if withPopulation {
-		population, err := u.ProjectflockService.GetProjectFlockKandangPopulation(c, result.Id)
-		if err != nil {
 		return err
+	} else {
+		dtoResult.AvailableQuantity = population
 	}
+	if warehouse, werr := u.ProjectflockService.GetWarehouseByKandangID(c, result.KandangId); werr != nil {
+		return werr
+	} else if warehouse != nil {
+		mapped := warehouseDTO.ToWarehouseRelationDTO(*warehouse)
+		dtoResult.Warehouse = &mapped
+	}
+	if withPopulation {
+		population := dtoResult.AvailableQuantity
 		dtoResult.Population = &population
 	}
 

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

@@ -7,6 +7,7 @@ import (
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
 	productionStandardDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/production-standards/dto"
+	warehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
 	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
 )
 
@@ -21,6 +22,7 @@ type ProjectFlockWithPivotDTO struct {
 	Category             string                                               `json:"category"`
 	Fcr                  *fcrDTO.FcrRelationDTO                               `json:"fcr,omitempty"`
 	ProductionStandard   *productionStandardDTO.ProductionStandardRelationDTO `json:"production_standard,omitempty"`
+	ProductionStandardId uint                                                 `json:"production_standard_id"`
 	Location             *locationDTO.LocationRelationDTO                     `json:"location,omitempty"`
 	Kandangs             []KandangWithPivotDTO                                `json:"kandangs,omitempty"`
 	CreatedUser          *userDTO.UserRelationDTO                             `json:"created_user,omitempty"`
@@ -32,6 +34,7 @@ type ProjectFlockKandangDTO struct {
 	ProjectFlockId        uint                               `json:"project_flock_id"`
 	KandangId             uint                               `json:"kandang_id"`
 	Kandang               *kandangDTO.KandangRelationDTO     `json:"kandang,omitempty"`
+	Warehouse             *warehouseDTO.WarehouseRelationDTO `json:"warehouse,omitempty"`
 	ProjectFlock          *ProjectFlockWithPivotDTO          `json:"project_flock,omitempty"`
 	AvailableQuantity     float64                            `json:"available_quantity"`
 	Population            *float64                           `json:"population,omitempty"`
@@ -54,6 +57,7 @@ func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangD
 				FlockName: e.ProjectFlock.FlockName,
 			},
 			Category:             e.ProjectFlock.Category,
+			ProductionStandardId: e.ProjectFlock.ProductionStandardId,
 		}
 
 		if e.ProjectFlock.Area.Id != 0 {

internal/modules/production/project_flocks/repositories/project_flock_population_repository.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"math"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -16,6 +17,7 @@ type ProjectFlockPopulationRepository interface {
 	GetTotalQtyByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error)
 	GetTotalQtyByProductWarehouseID(ctx context.Context, productWarehouseID uint) (float64, error)
 	GetAvailableQtyByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error)
+	GetTotalChickInByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (int64, error)
 
 	CreateOne(ctx context.Context, entity *entity.ProjectFlockPopulation, modifier func(*gorm.DB) *gorm.DB) error
 	PatchOne(ctx context.Context, id uint, updates map[string]any, modifier func(*gorm.DB) *gorm.DB) error
@@ -111,7 +113,7 @@ func (r *projectFlockPopulationRepositoryImpl) GetTotalQtyByProductWarehouseID(c
 	err := r.DB().WithContext(ctx).
 		Model(&entity.ProjectFlockPopulation{}).
 		Where("product_warehouse_id = ?", productWarehouseID).
-		Select("COALESCE(SUM(total_qty), 0)").
+		Select("COALESCE(SUM(total_qty - total_used_qty), 0)").
 		Scan(&total).Error
 	if err != nil {
 		return 0, err
@@ -135,3 +137,22 @@ func (r *projectFlockPopulationRepositoryImpl) GetAvailableQtyByProjectFlockKand
 	}
 	return total, nil
 }
+
+func (r *projectFlockPopulationRepositoryImpl) GetTotalChickInByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (int64, error) {
+	var total float64
+	err := r.DB().WithContext(ctx).
+		Table("project_flock_populations").
+		Select("COALESCE(SUM(project_flock_populations.total_qty - project_flock_populations.total_used_qty), 0) AS total_qty").
+		Joins("JOIN project_chickins ON project_chickins.id = project_flock_populations.project_chickin_id").
+		Where("project_chickins.project_flock_kandang_id = ?", projectFlockKandangID).
+		Scan(&total).Error
+	if err != nil {
+		return 0, err
+	}
+
+	if total < 0 {
+		total = 0
+	}
+
+	return int64(math.Round(total)), nil
+}

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

@@ -38,6 +38,7 @@ type ProjectflockService interface {
 	GetOne(ctx *fiber.Ctx, id uint) (*entity.ProjectFlock, *flockDTO.FlockRelationDTO, error)
 	CreateOne(ctx *fiber.Ctx, req *validation.Create) (*entity.ProjectFlock, error)
 	GetAvailableDocQuantity(ctx *fiber.Ctx, kandangID uint) (float64, error)
+	GetWarehouseByKandangID(ctx *fiber.Ctx, kandangID uint) (*entity.Warehouse, error)
 	DeleteOne(ctx *fiber.Ctx, id uint) error
 	GetProjectFlockKandangByProjectAndKandang(ctx *fiber.Ctx, projectFlockID uint, kandangID uint) (*entity.ProjectFlockKandang, float64, error)
 	GetProjectFlockKandangPopulation(ctx *fiber.Ctx, projectFlockKandangID uint) (float64, error)
@@ -518,6 +519,31 @@ func (s projectflockService) GetAvailableDocQuantity(ctx *fiber.Ctx, kandangID u
 	return total, nil
 }
 
+func (s projectflockService) GetWarehouseByKandangID(ctx *fiber.Ctx, kandangID uint) (*entity.Warehouse, error) {
+	if kandangID == 0 || s.WarehouseRepo == nil {
+		return nil, nil
+	}
+
+	var warehouse entity.Warehouse
+	err := s.WarehouseRepo.DB().WithContext(ctx.Context()).
+		Preload("Area").
+		Preload("Location").
+		Preload("Kandang").
+		Where("kandang_id = ?", kandangID).
+		Where("deleted_at IS NULL").
+		Order("id DESC").
+		First(&warehouse).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, nil
+	}
+	if err != nil {
+		s.Log.Errorf("Failed to fetch warehouse for kandang %d: %+v", kandangID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouse")
+	}
+
+	return &warehouse, nil
+}
+
 func (s projectflockService) GetProjectPeriods(c *fiber.Ctx, projectIDs []uint) (map[uint]int, error) {
 	if len(projectIDs) == 0 {
 		return map[uint]int{}, nil

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

@@ -82,11 +82,11 @@ type RecordingListDTO struct {
 	CreatedUser *userDTO.UserRelationDTO `json:"created_user,omitempty"`
 	CreatedAt   time.Time                `json:"created_at"`
 	UpdatedAt   time.Time                `json:"updated_at"`
+	Warehouse   *RecordingWarehouseDTO   `json:"warehouse,omitempty"`
 }
 
 type RecordingDetailDTO struct {
 	RecordingListDTO
-	Warehouse       *RecordingWarehouseDTO `json:"warehouse,omitempty"`
 	ProductCategory string                 `json:"product_category"`
 	Depletions      []RecordingDepletionDTO `json:"depletions"`
 	Stocks          []RecordingStockDTO     `json:"stocks"`
@@ -133,7 +133,6 @@ func ToRecordingDetailDTO(e entity.Recording) RecordingDetailDTO {
 
 	return RecordingDetailDTO{
 		RecordingListDTO: listDTO,
-		Warehouse:       recordingWarehouseDTO(e),
 		ProductCategory: recordingProductCategory(e),
 		Depletions:      ToRecordingDepletionDTOs(e.Depletions),
 		Stocks:          ToRecordingStockDTOs(e.Stocks),
@@ -203,6 +202,7 @@ func toRecordingListDTO(e entity.Recording) RecordingListDTO {
 		CreatedAt:            e.CreatedAt,
 		UpdatedAt:            e.UpdatedAt,
 		CreatedUser:          createdUser,
+		Warehouse:            recordingWarehouseDTO(e),
 	}
 }
 

internal/modules/production/recordings/module.go

@@ -43,6 +43,22 @@ func (RecordingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	)
 
 	fifoService := commonSvc.NewFifoService(db, stockAllocationRepo, productWarehouseRepo, utils.Log)
+	if err := fifoService.RegisterStockable(fifo.StockableConfig{
+		Key:   fifo.StockableKeyRecordingEgg,
+		Table: "recording_eggs",
+		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 {
+		if !strings.Contains(strings.ToLower(err.Error()), "already registered") {
+			panic(fmt.Sprintf("failed to register recording egg stockable workflow: %v", err))
+		}
+	}
 	if err := fifoService.RegisterUsable(fifo.UsableConfig{
 		Key:   fifo.UsableKeyRecordingStock,
 		Table: "recording_stocks",

internal/modules/production/recordings/repositories/recording.repository.go

@@ -44,6 +44,7 @@ type RecordingRepository interface {
 	GetEggSummaryByRecording(tx *gorm.DB, recordingID uint) (totalQty float64, totalWeightGrams float64, err error)
 	GetCumulativeEggQtyByProjectFlockKandang(tx *gorm.DB, projectFlockKandangId uint, recordTime time.Time) (float64, error)
 	GetFcrStandardNumber(tx *gorm.DB, fcrId uint, currentWeightKg float64) (float64, bool, error)
+	GetTotalWeightProducedFromUniformityByProjectFlockID(ctx context.Context, projectFlockID uint) (float64, error)
 	GetProductionWeightAndQtyByProjectFlockID(ctx context.Context, projectFlockID uint) (totalWeight float64, totalQty float64, err error)
 	GetTotalDepletionByProjectFlockID(ctx context.Context, projectFlockID uint) (totalDepletion float64, err error)
 	GetLatestAvgWeightByProjectFlockID(ctx context.Context, projectFlockID uint) (avgWeight float64, err error)
@@ -548,3 +549,30 @@ func nextRecordingDay(days []int) int {
 
 	return len(normalized) + 1
 }
+
+// GetTotalWeightProducedFromUniformityByProjectFlockID calculates total weight produced from uniformity data
+// It takes the latest uniformity record per kandang and calculates: SUM(mean_weight * chick_qty_of_weight / 1000)
+func (r *RecordingRepositoryImpl) GetTotalWeightProducedFromUniformityByProjectFlockID(ctx context.Context, projectFlockID uint) (float64, error) {
+	if projectFlockID == 0 {
+		return 0, nil
+	}
+
+	var result struct {
+		TotalWeight float64
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("project_flock_kandang_uniformity").
+		Select("COALESCE(SUM((mean_up / 1.10) * chick_qty_of_weight / 1000), 0) as total_weight").
+		Joins("JOIN ("+
+			"	SELECT pfku.project_flock_kandang_id, MAX(pfku.id) as latest_id "+
+			"	FROM project_flock_kandang_uniformity pfku "+
+			"	JOIN project_flock_kandangs pfk ON pfk.id = pfku.project_flock_kandang_id "+
+			"	WHERE pfk.project_flock_id = ? "+
+			"	GROUP BY pfku.project_flock_kandang_id "+
+			") latest ON latest.project_flock_kandang_id = project_flock_kandang_uniformity.project_flock_kandang_id "+
+			"AND project_flock_kandang_uniformity.id = latest.latest_id", projectFlockID).
+		Scan(&result).Error
+
+	return result.TotalWeight, err
+}

internal/modules/production/recordings/services/recording.service.go

@@ -290,8 +290,19 @@ func (s *recordingService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 			s.Log.Errorf("Failed to persist eggs: %+v", err)
 			return err
 		}
+		if s.FifoSvc != nil {
+			if err := s.replenishRecordingEggs(ctx, tx, mappedEggs); err != nil {
+				return err
+			}
+		}
 
-		if err := s.adjustProductWarehouseQuantities(ctx, tx, buildWarehouseDeltas(nil, mappedDepletions, nil, mappedEggs)); err != nil {
+		var warehouseDeltas map[uint]float64
+		if s.FifoSvc != nil {
+			warehouseDeltas = buildWarehouseDeltas(nil, mappedDepletions, nil, nil)
+		} else {
+			warehouseDeltas = buildWarehouseDeltas(nil, mappedDepletions, nil, mappedEggs)
+		}
+		if err := s.adjustProductWarehouseQuantities(ctx, tx, warehouseDeltas); err != nil {
 			s.Log.Errorf("Failed to adjust product warehouses: %+v", err)
 			return err
 		}
@@ -438,6 +449,16 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 		}
 
 		if hasEggChanges {
+			if s.FifoSvc != nil {
+				if err := ensureRecordingEggsUnused(existingEggs); err != nil {
+					return err
+				}
+				if err := s.adjustProductWarehouseQuantities(ctx, tx, buildWarehouseDeltas(nil, nil, existingEggs, nil)); err != nil {
+					s.Log.Errorf("Failed to adjust product warehouses for eggs: %+v", err)
+					return err
+				}
+			}
+
 			if err := s.Repository.DeleteEggs(tx, recordingEntity.Id); err != nil {
 				s.Log.Errorf("Failed to clear eggs: %+v", err)
 				return err
@@ -449,11 +470,17 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 				return err
 			}
 
+			if s.FifoSvc != nil {
+				if err := s.replenishRecordingEggs(ctx, tx, mappedEggs); err != nil {
+					return err
+				}
+			} else {
 				if err := s.adjustProductWarehouseQuantities(ctx, tx, buildWarehouseDeltas(nil, nil, existingEggs, mappedEggs)); err != nil {
 					s.Log.Errorf("Failed to adjust product warehouses for eggs: %+v", err)
 					return err
 				}
 			}
+		}
 
 		if hasStockChanges || hasDepletionChanges || hasEggChanges {
 			if err := s.computeAndUpdateMetrics(ctx, tx, recordingEntity); err != nil {
@@ -626,6 +653,11 @@ func (s recordingService) DeleteOne(c *fiber.Ctx, id uint) error {
 			s.Log.Errorf("Failed to list eggs before delete: %+v", err)
 			return err
 		}
+		if s.FifoSvc != nil {
+			if err := ensureRecordingEggsUnused(oldEggs); err != nil {
+				return err
+			}
+		}
 
 		oldStocks, err := s.Repository.ListStocks(tx, id)
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
@@ -802,6 +834,32 @@ func (s *recordingService) adjustProductWarehouseQuantities(ctx context.Context,
 	return s.ProductWarehouseRepo.AdjustQuantities(ctx, deltas, func(*gorm.DB) *gorm.DB { return tx })
 }
 
+func (s *recordingService) replenishRecordingEggs(ctx context.Context, tx *gorm.DB, eggs []entity.RecordingEgg) error {
+	if len(eggs) == 0 || s.FifoSvc == nil {
+		return nil
+	}
+
+	for _, egg := range eggs {
+		if egg.Id == 0 || egg.ProductWarehouseId == 0 || egg.Qty <= 0 {
+			continue
+		}
+		note := fmt.Sprintf("Recording egg #%d", egg.Id)
+		if _, err := s.FifoSvc.Replenish(ctx, commonSvc.StockReplenishRequest{
+			StockableKey:       fifo.StockableKeyRecordingEgg,
+			StockableID:        egg.Id,
+			ProductWarehouseID: egg.ProductWarehouseId,
+			Quantity:           float64(egg.Qty),
+			Note:               &note,
+			Tx:                 tx,
+		}); err != nil {
+			s.Log.Errorf("Failed to replenish FIFO stock for recording egg %d: %+v", egg.Id, err)
+			return err
+		}
+	}
+
+	return nil
+}
+
 type desiredStock struct {
 	Usage   float64
 	Pending float64
@@ -922,6 +980,14 @@ type eggTotals struct {
 	Weight float64
 }
 
+func ensureRecordingEggsUnused(eggs []entity.RecordingEgg) error {
+	for _, egg := range eggs {
+		if egg.TotalUsed > 0 {
+			return fiber.NewError(fiber.StatusBadRequest, "Recording egg sudah digunakan sehingga tidak dapat diubah")
+		}
+	}
+	return nil
+}
 
 func stocksMatch(existing []entity.RecordingStock, incoming []validation.Stock) bool {
 	hasPending := false

internal/modules/production/transfer_layings/controllers/transfer_laying.controller.go

@@ -27,6 +27,10 @@ func (u *TransferLayingController) GetAll(c *fiber.Ctx) error {
 	query := &validation.Query{
 		Page:             c.QueryInt("page", 1),
 		Limit:            c.QueryInt("limit", 10),
+		Search:           c.Query("search", ""),
+		TransferDate:     c.Query("transfer_date", ""),
+		FlockSource:      uint(c.QueryInt("flock_source", 0)),
+		FlockDestination: uint(c.QueryInt("flock_destination", 0)),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {
@@ -179,7 +183,6 @@ func (u *TransferLayingController) Approval(c *fiber.Ctx) error {
 		})
 }
 
-
 func (u *TransferLayingController) GetAvailableQtyPerKandang(c *fiber.Ctx) error {
 	projectFlockID, err := strconv.ParseUint(c.Params("project_flock_id"), 10, 32)
 	if err != nil {

internal/modules/production/transfer_layings/dto/transfer_laying.dto.go

@@ -162,9 +162,19 @@ func ToProductWarehouseSummaryDTO(pw *entity.ProductWarehouse) *ProductWarehouse
 }
 
 func ToLayingTransferSourceDTO(source entity.LayingTransferSource) LayingTransferSourceDTO {
+	// Tampilkan requested qty sebelum approve, consumed qty setelah approve
+	var displayQty float64
+	if source.UsageQty > 0 {
+		// Sudah di-approve dan di-consume, tampilkan actual consumed quantity
+		displayQty = source.UsageQty
+	} else {
+		// Belum di-approve, tampilkan requested quantity
+		displayQty = source.RequestedQty
+	}
+
 	return LayingTransferSourceDTO{
 		SourceProjectFlockKandang: ToProjectFlockKandangSummaryDTO(source.SourceProjectFlockKandang),
-		Qty:                       source.UsageQty, // Ambil dari UsageQty (FIFO consumed quantity)
+		Qty:                       displayQty,
 		ProductWarehouse:          ToProductWarehouseSummaryDTO(source.ProductWarehouse),
 		Note:                      source.Note,
 	}

internal/modules/production/transfer_layings/services/transfer_laying.service.go

@@ -110,8 +110,31 @@ func (s transferLayingService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 	offset := (params.Page - 1) * params.Limit
 
 	transferLayings, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
-		db = s.withRelations(db)
+		// Apply search and filters
+		if params.Search != "" {
+			searchPattern := "%" + params.Search + "%"
+			db = db.Joins("LEFT JOIN project_flocks AS pf_from ON laying_transfers.from_project_flock_id = pf_from.id").
+				Joins("LEFT JOIN project_flocks AS pf_to ON laying_transfers.to_project_flock_id = pf_to.id").
+				Where("laying_transfers.transfer_number ILIKE ? OR laying_transfers.notes ILIKE ? OR pf_from.flock_name ILIKE ? OR pf_to.flock_name ILIKE ?",
+					searchPattern, searchPattern, searchPattern, searchPattern)
+		}
+
+		if params.TransferDate != "" {
+			db = db.Where("transfer_date::date = ?::date", params.TransferDate)
+		}
+
+		if params.FlockSource > 0 {
+			db = db.Where("from_project_flock_id = ?", params.FlockSource)
+		}
+
+		if params.FlockDestination > 0 {
+			db = db.Where("to_project_flock_id = ?", params.FlockDestination)
+		}
+
 		db = db.Order("created_at DESC")
+
+		db = s.withRelations(db)
+
 		return db
 	})
 
@@ -216,7 +239,7 @@ func (s *transferLayingService) CreateOne(c *fiber.Ctx, req *validation.Create)
 
 	for _, sourceDetail := range req.SourceKandangs {
 		if sourceDetail.Quantity <= 0 {
-			return nil, fiber.NewError(fiber.StatusBadRequest, "Jumlah kandang sumber harus lebih dari 0")
+			continue
 		}
 		totalSourceQty += sourceDetail.Quantity
 
@@ -247,11 +270,18 @@ func (s *transferLayingService) CreateOne(c *fiber.Ctx, req *validation.Create)
 
 	for _, targetDetail := range req.TargetKandangs {
 		if targetDetail.Quantity <= 0 {
-			return nil, fiber.NewError(fiber.StatusBadRequest, "Jumlah kandang tujuan harus lebih dari 0")
+			continue
 		}
 		totalTargetQty += targetDetail.Quantity
 	}
 
+	if totalSourceQty == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Minimal harus ada 1 kandang sumber dengan jumlah lebih dari 0")
+	}
+	if totalTargetQty == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Minimal harus ada 1 kandang tujuan dengan jumlah lebih dari 0")
+	}
+
 	if totalSourceQty != totalTargetQty {
 		return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Jumlah total sumber (%.0f) harus sama dengan jumlah total tujuan (%.0f)", totalSourceQty, totalTargetQty))
 	}
@@ -279,11 +309,16 @@ func (s *transferLayingService) CreateOne(c *fiber.Ctx, req *validation.Create)
 		}
 
 		for _, sourceDetail := range req.SourceKandangs {
+			if sourceDetail.Quantity == 0 {
+				continue
+			}
+
 			productWarehouseId := sourceWarehouseMap[sourceDetail.ProjectFlockKandangId]
 
 			source := entity.LayingTransferSource{
 				LayingTransferId:            createBody.Id,
 				SourceProjectFlockKandangId: sourceDetail.ProjectFlockKandangId,
+				RequestedQty:                sourceDetail.Quantity, // Quantity yang diminta user
 				UsageQty:                    0,
 				PendingUsageQty:             0, // Di-set 0, biarkan FIFO Consume yang handle saat Approval
 				ProductWarehouseId:          &productWarehouseId,
@@ -295,6 +330,9 @@ func (s *transferLayingService) CreateOne(c *fiber.Ctx, req *validation.Create)
 		}
 
 		for _, targetDetail := range req.TargetKandangs {
+			if targetDetail.Quantity == 0 {
+				continue
+			}
 
 			targetprojectFlockKandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), targetDetail.ProjectFlockKandangId)
 			if err != nil {
@@ -463,8 +501,9 @@ func (s *transferLayingService) UpdateOne(c *fiber.Ctx, req *validation.Update,
 			source := entity.LayingTransferSource{
 				LayingTransferId:            id,
 				SourceProjectFlockKandangId: sourceDetail.ProjectFlockKandangId,
+				RequestedQty:                sourceDetail.Quantity, // Quantity yang diminta user
 				UsageQty:                    0,
-				PendingUsageQty:             sourceDetail.Quantity,
+				PendingUsageQty:             0, // Di-set 0, biarkan FIFO Consume yang handle saat Approval
 				ProductWarehouseId:          &productWarehouseId,
 			}
 			if err := sourceRepo.CreateOne(c.Context(), &source, nil); err != nil {
@@ -700,7 +739,7 @@ func (s transferLayingService) Approval(c *fiber.Ctx, req *validation.Approve) (
 						return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Target product warehouse tidak ditemukan untuk transfer %d", approvableID))
 					}
 
-					note := fmt.Sprintf("Transfer to Laying #%s - Target Kandang", transfer.TransferNumber)
+					note := fmt.Sprintf("Transfer to Laying #%s", transfer.TransferNumber)
 					replenishResult, err := s.FifoSvc.Replenish(c.Context(), commonSvc.StockReplenishRequest{
 						StockableKey:       fifo.StockableKeyTransferToLayingIn,
 						StockableID:        target.Id,
@@ -814,15 +853,15 @@ func (s transferLayingService) GetAvailableQtyPerKandang(ctx *fiber.Ctx, project
 
 	kandangAvailableQty := make(map[uint]float64)
 	for _, kandang := range kandangs {
-
+		// Gunakan fungsi repository yang sama dengan recording service
-		totalQty, err := s.ProjectFlockPopulationRepo.GetTotalQtyByProjectFlockKandangID(ctx.Context(), kandang.Id)
+		totalAvailable, err := s.ProjectFlockPopulationRepo.GetAvailableQtyByProjectFlockKandangID(ctx.Context(), kandang.Id)
 		if err != nil {
-			s.Log.Warnf("Failed to get total qty for kandang %d: %+v", kandang.Id, err)
+			s.Log.Warnf("Failed to get available qty for kandang %d: %+v", kandang.Id, err)
 			kandangAvailableQty[kandang.Id] = 0
 			continue
 		}
 
-		kandangAvailableQty[kandang.Id] = totalQty
+		kandangAvailableQty[kandang.Id] = totalAvailable
 	}
 
 	return pf, kandangAvailableQty, nil

internal/modules/production/transfer_layings/validations/transfer_laying.validation.go

@@ -2,12 +2,12 @@ package validation
 
 type SourceKandangDetail struct {
 	ProjectFlockKandangId uint    `json:"project_flock_kandang_id" validate:"required"`
-	Quantity              float64 `json:"quantity" validate:"required,gt=0"`
+	Quantity              float64 `json:"quantity"`
 }
 
 type TargetKandangDetail struct {
 	ProjectFlockKandangId uint    `json:"project_flock_kandang_id" validate:"required"`
-	Quantity              float64 `json:"quantity" validate:"required,gt=0"`
+	Quantity              float64 `json:"quantity"`
 }
 
 type Create struct {
@@ -31,6 +31,10 @@ type Update struct {
 type Query struct {
 	Page             int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
 	Limit            int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Search           string `query:"search" validate:"omitempty"`
+	TransferDate     string `query:"transfer_date" validate:"omitempty"`
+	FlockSource      uint   `query:"flock_source" validate:"omitempty,number"`
+	FlockDestination uint   `query:"flock_destination" validate:"omitempty,number"`
 }
 
 type Approve struct {

internal/modules/purchases/services/expense_bridge.go

@@ -36,6 +36,7 @@ type ExpenseReceivingPayload struct {
 	TransportPerItem *float64
 	ReceivedQty      float64
 	ReceivedDate     *time.Time
+	VehicleNumber    *string
 }
 
 type groupedItem struct {
@@ -166,13 +167,22 @@ func (b *expenseBridge) markExpensesUpdated(ctx context.Context, expenseIDs map[
 	if actorID == 0 {
 		actorID = 1
 	}
-	svc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(b.db))
+	approvalRepo := commonRepo.NewApprovalRepository(b.db)
-	action := entity.ApprovalActionUpdated
+	svc := commonSvc.NewApprovalService(approvalRepo)
+	action := entity.ApprovalActionCreated
+
 	for id := range expenseIDs {
+		latestApproval, err := approvalRepo.LatestByTarget(ctx, string(utils.ApprovalWorkflowExpense), uint(id), nil)
+		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+			return err
+		}
+
+		if latestApproval == nil {
 			if _, err := svc.CreateApproval(ctx, utils.ApprovalWorkflowExpense, uint(id), utils.ExpenseStepFinance, &action, actorID, nil); err != nil {
 				return err
 			}
 		}
+	}
 	return nil
 }
 
@@ -182,6 +192,22 @@ func (b *expenseBridge) OnItemsReceived(c *fiber.Ctx, purchaseID uint, updates [
 	}
 
 	ctx := c.Context()
+	filtered := make([]ExpenseReceivingPayload, 0, len(updates))
+	for _, upd := range updates {
+		if upd.SupplierID == 0 {
+			continue
+		}
+		if upd.TransportPerItem == nil || *upd.TransportPerItem <= 0 {
+			continue
+		}
+		if upd.VehicleNumber == nil || strings.TrimSpace(*upd.VehicleNumber) == "" {
+			continue
+		}
+		filtered = append(filtered, upd)
+	}
+	if len(filtered) == 0 {
+		return nil
+	}
 
 	// Load current links to decide whether to update in place or recreate.
 	type itemLink struct {
@@ -205,9 +231,9 @@ func (b *expenseBridge) OnItemsReceived(c *fiber.Ctx, purchaseID uint, updates [
 
 	itemLinks := make(map[uint]itemLink)
 	updatedExpenses := make(map[uint64]struct{})
-	if len(updates) > 0 {
+	if len(filtered) > 0 {
-		ids := make([]uint, 0, len(updates))
+		ids := make([]uint, 0, len(filtered))
-		for _, upd := range updates {
+		for _, upd := range filtered {
 			if upd.PurchaseItemID != 0 {
 				ids = append(ids, upd.PurchaseItemID)
 			}
@@ -252,7 +278,7 @@ func (b *expenseBridge) OnItemsReceived(c *fiber.Ctx, purchaseID uint, updates [
 
 	groups := make(map[string][]groupedItem)
 
-	for _, payload := range updates {
+	for _, payload := range filtered {
 		if payload.ReceivedDate == nil {
 			return fiber.NewError(fiber.StatusBadRequest, "received_date is required")
 		}

internal/modules/purchases/services/purchase.service.go

@@ -702,6 +702,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 		warehouseID       uint
 		supplierID        uint
 		transportPerItem  *float64
+		vehicleNumber     *string
 		overrideWarehouse bool
 		receivedQty       float64
 	}
@@ -756,7 +757,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 		}
 		visitedItems[payload.PurchaseItemID] = struct{}{}
 
-		supplierID := purchase.SupplierId
+		var supplierID uint
 		if payload.ExpeditionVendorID != nil && *payload.ExpeditionVendorID != 0 {
 			supplierID = *payload.ExpeditionVendorID
 		}
@@ -770,6 +771,15 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			transportPerItem = &val
 		}
 
+		var vehicleNumber *string
+		if payload.VehicleNumber != nil && strings.TrimSpace(*payload.VehicleNumber) != "" {
+			val := strings.TrimSpace(*payload.VehicleNumber)
+			vehicleNumber = &val
+		} else if item.VehicleNumber != nil && strings.TrimSpace(*item.VehicleNumber) != "" {
+			val := strings.TrimSpace(*item.VehicleNumber)
+			vehicleNumber = &val
+		}
+
 		prepared = append(prepared, preparedReceiving{
 			item:              item,
 			payload:           payload,
@@ -777,6 +787,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			warehouseID:       warehouseID,
 			supplierID:        supplierID,
 			transportPerItem:  transportPerItem,
+			vehicleNumber:     vehicleNumber,
 			overrideWarehouse: overrideWarehouse,
 			receivedQty:       receivedQty,
 		})
@@ -964,6 +975,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			TransportPerItem: prep.transportPerItem,
 			ReceivedQty:      prep.receivedQty,
 			ReceivedDate:     &date,
+			VehicleNumber:    prep.vehicleNumber,
 		}
 		receivingPayloads = append(receivingPayloads, payload)
 	}

internal/modules/repports/controllers/repport.controller.go

@@ -82,6 +82,8 @@ func (c *RepportController) GetMarketing(ctx *fiber.Ctx) error {
 		ProductId:     int64(ctx.QueryInt("product_id", 0)),
 		WarehouseId:   int64(ctx.QueryInt("warehouse_id", 0)),
 		SalesPersonId: int64(ctx.QueryInt("sales_person_id", 0)),
+		AreaId:        int64(ctx.QueryInt("area_id", 0)),
+		LocationId:    int64(ctx.QueryInt("location_id", 0)),
 		MarketingType: ctx.Query("marketing_type", ""),
 		FilterBy:      ctx.Query("filter_by", ""),
 		StartDate:     ctx.Query("start_date", ""),
@@ -242,6 +244,65 @@ func (c *RepportController) GetHppPerKandang(ctx *fiber.Ctx) error {
 	return ctx.Status(fiber.StatusOK).JSON(resp)
 }
 
+func (c *RepportController) GetCustomerPayment(ctx *fiber.Ctx) error {
+	var customerIDs []uint
+	if customerIDsStr := ctx.Query("customer_ids"); customerIDsStr != "" {
+		ids := strings.Split(customerIDsStr, ",")
+		for _, idStr := range ids {
+			idStr = strings.TrimSpace(idStr)
+			if idStr != "" {
+				if id, err := strconv.ParseUint(idStr, 10, 32); err == nil {
+					customerIDs = append(customerIDs, uint(id))
+				}
+			}
+		}
+	}
+
+	query := &validation.CustomerPaymentQuery{
+		Page:        ctx.QueryInt("page", 1),
+		Limit:       ctx.QueryInt("limit", 10),
+		CustomerIDs: customerIDs,
+		StartDate:   ctx.Query("start_date", ""),
+		EndDate:     ctx.Query("end_date", ""),
+	}
+
+	// Validate pagination
+	if len(customerIDs) == 0 && (query.Page < 1 || query.Limit < 1) {
+		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0 when customer_ids is not provided")
+	}
+
+	result, totalResults, err := c.RepportService.GetCustomerPayment(ctx, query)
+	if err != nil {
+		return err
+	}
+
+	// If single customer mode (only 1 customer ID), return without pagination
+	if len(customerIDs) == 1 {
+		return ctx.Status(fiber.StatusOK).
+			JSON(response.Success{
+				Code:    fiber.StatusOK,
+				Status:  "success",
+				Message: "Get customer payment report successfully",
+				Data:    result,
+			})
+	}
+
+	// Multiple customers mode with pagination
+	return ctx.Status(fiber.StatusOK).
+		JSON(response.SuccessWithPaginate[dto.CustomerPaymentReportItem]{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get customer payment report successfully",
+			Meta: response.Meta{
+				Page:         query.Page,
+				Limit:        query.Limit,
+				TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
+				TotalResults: totalResults,
+			},
+			Data: result,
+		})
+}
+
 func (c *RepportController) GetProductionResult(ctx *fiber.Ctx) error {
 	idParam := ctx.Params("idProjectFlockKandang")
 	if idParam == "" {

internal/modules/repports/dto/repportCustomerPayment.dto.go

@@ -0,0 +1,120 @@
+package dto
+
+import (
+	"strings"
+	"time"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/entities"
+	customerDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/dto"
+	repportRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/repositories"
+)
+
+type CustomerPaymentReportRow struct {
+	TransactionType string     `json:"transaction_type"`
+	TransactionID   int64      `json:"transaction_id"`
+	TransDate       time.Time  `json:"trans_date"`
+	DeliveryDate    *time.Time `json:"delivery_date"`
+	Reference       string     `json:"reference"`
+
+	Qty                float64  `json:"qty"`
+	Weight             float64  `json:"weight"`
+	AverageWeight      float64  `json:"average_weight"`
+	UnitPrice          float64  `json:"unit_price"`
+	FinalPrice         float64  `json:"final_price"`
+	TotalPrice         float64  `json:"total_price"`
+	PaymentAmount      float64  `json:"payment_amount"`
+	AccountsReceivable float64  `json:"accounts_receivable"`
+	AgingDay           *int     `json:"aging_day"`
+	Status             string   `json:"status"`
+	VehicleNumbers     []string `json:"vehicle_numbers"`
+	PickupInfo         []string `json:"pickup_info"`
+	SalesPerson        string   `json:"sales_person"`
+}
+
+type CustomerPaymentReportSummary struct {
+	TotalQty                float64 `json:"total_qty"`
+	TotalWeight             float64 `json:"total_weight"`
+	TotalFinalAmount        float64 `json:"total_final_amount"`
+	TotalGrandAmount        float64 `json:"total_grand_amount"`
+	TotalPayment            float64 `json:"total_payment"`
+	TotalAccountsReceivable float64 `json:"total_accounts_receivable"`
+}
+
+type CustomerPaymentReportItem struct {
+	Customer       customerDTO.CustomerRelationDTO `json:"customer"`
+	InitialBalance float64                         `json:"initial_balance"`
+	Rows           []CustomerPaymentReportRow      `json:"rows"`
+	Summary        CustomerPaymentReportSummary    `json:"summary"`
+}
+
+type CustomerPaymentReportResponse struct {
+	Data []CustomerPaymentReportItem `json:"data"`
+}
+
+func ToCustomerPaymentReportRow(tx repportRepo.CustomerPaymentTransaction) CustomerPaymentReportRow {
+	return CustomerPaymentReportRow{
+		TransactionType: tx.TransactionType,
+		TransactionID:   tx.TransactionID,
+		TransDate:       tx.TransDate,
+		DeliveryDate:    tx.DeliveryDate,
+		Reference:       tx.Reference,
+		Qty:             tx.Qty,
+		Weight:          tx.Weight,
+		AverageWeight:   tx.AverageWeight,
+		UnitPrice:       tx.Price,
+		FinalPrice:      tx.FinalPrice,
+		TotalPrice:      tx.TotalPrice,
+		PaymentAmount:   tx.PaymentAmount,
+		VehicleNumbers:  parseStringSlice(tx.VehicleNumbers),
+		PickupInfo:      parseStringSlice(tx.PickupInfo),
+		SalesPerson:     tx.SalesPerson,
+	}
+}
+
+func ToCustomerPaymentReportItem(customer entities.Customer, initialBalance float64, rows []CustomerPaymentReportRow, summary CustomerPaymentReportSummary) CustomerPaymentReportItem {
+	return CustomerPaymentReportItem{
+		Customer:       customerDTO.ToCustomerRelationDTO(customer),
+		InitialBalance: initialBalance,
+		Rows:           rows,
+		Summary:        summary,
+	}
+}
+
+func ToCustomerPaymentReportSummary(rows []CustomerPaymentReportRow, initialBalance float64) CustomerPaymentReportSummary {
+	summary := CustomerPaymentReportSummary{}
+
+	for _, row := range rows {
+		summary.TotalQty += row.Qty
+		summary.TotalWeight += row.Weight
+
+		if row.TransactionType == "SALES" {
+			summary.TotalFinalAmount += row.FinalPrice
+			summary.TotalGrandAmount += row.TotalPrice
+		} else if row.TransactionType == "PAYMENT" {
+			summary.TotalPayment += row.PaymentAmount
+		}
+	}
+
+	// Total AR = Initial Balance - Total Sales + Total Payment
+	summary.TotalAccountsReceivable = initialBalance - summary.TotalGrandAmount + summary.TotalPayment
+
+	return summary
+}
+
+func parseStringSlice(str string) []string {
+	str = strings.TrimSpace(str)
+	if str == "" || str == "-" {
+		return []string{}
+	}
+
+	parts := strings.Split(str, ",")
+	result := make([]string, 0, len(parts))
+	for _, part := range parts {
+		part = strings.TrimSpace(part)
+		if part != "" {
+			result = append(result, part)
+		}
+	}
+
+	return result
+}

internal/modules/repports/dto/repportHpp.dto.go

@@ -27,12 +27,13 @@ type HppPerKandangResponseData struct {
 type HppPerKandangRowDTO struct {
 	ID                  int                         `json:"id"`
 	Kandang             HppPerKandangRowKandangDTO  `json:"kandang"`
+	NameWithPeriode     string                      `json:"name_with_periode"`
 	WeightRange         HppPerKandangWeightRangeDTO `json:"weight_range"`
-	RemainingChickenBirds    int64                       `json:"remaining_chicken_birds"`
-	RemainingChickenWeightKg float64                     `json:"remaining_chicken_weight_kg"`
 	AvgWeightKg         float64                     `json:"avg_weight_kg"`
 	EggProductionPieces int64                       `json:"egg_production_pieces"`
 	EggProductionKg     float64                     `json:"egg_production_kg"`
+	// EggProductionTotalWeightKg float64                     `json:"egg_production_total_weight_kg"`
+	// EggProductionTotalPieces   int64                       `json:"egg_production_total_pieces"`
 	// FeedCostRp               float64                     `json:"feed_cost_rp"`
 	// OvkCostRp                float64                     `json:"ovk_cost_rp"`
 	EggHppRpPerKg     float64                    `json:"egg_hpp_rp_per_kg"`
@@ -40,8 +41,8 @@ type HppPerKandangRowDTO struct {
 	FeedSuppliers     []HppPerKandangSupplierDTO `json:"feed_suppliers"`
 	DocSuppliers      []HppPerKandangSupplierDTO `json:"doc_suppliers"`
 	AverageDocPriceRp int64                      `json:"average_doc_price_rp"`
-	HppRp             float64                    `json:"hpp_rp"`
+	// HppRp             float64                    `json:"hpp_rp"`
-	RemainingValueRp  int64                      `json:"remaining_value_rp"`
+	// RemainingValueRp  int64                      `json:"remaining_value_rp"`
 }
 
 type HppPerKandangRowKandangDTO struct {
@@ -83,8 +84,6 @@ type HppPerKandangSummaryWeightRangeDTO struct {
 	ID                  int                         `json:"id"`
 	WeightRange         HppPerKandangWeightRangeDTO `json:"weight_range"`
 	Label               string                      `json:"label"`
-	RemainingChickenBirds    int64                       `json:"remaining_chicken_birds"`
-	RemainingChickenWeightKg float64                     `json:"remaining_chicken_weight_kg"`
 	AvgWeightKg         float64                     `json:"avg_weight_kg"`
 	EggProductionPieces int64                       `json:"egg_production_pieces"`
 	EggProductionKg     float64                     `json:"egg_production_kg"`
@@ -98,15 +97,11 @@ type HppPerKandangSummaryWeightRangeDTO struct {
 }
 
 type HppPerKandangSummaryTotalDTO struct {
-	TotalRemainingChickenBirds    int64   `json:"total_remaining_chicken_birds"`
-	TotalRemainingChickenWeightKg float64 `json:"total_remaining_chicken_weight_kg"`
 	AverageWeightKg          float64 `json:"average_weight_kg"`
-	TotalRemainingValueRp         int64   `json:"total_remaining_value_rp"`
 	TotalEggProductionPieces int64   `json:"total_egg_production_pieces"`
 	TotalEggProductionKg     float64 `json:"total_egg_production_kg"`
 	AverageEggHppRpPerKg     float64 `json:"average_egg_hpp_rp_per_kg"`
 	TotalEggValueRp          int64   `json:"total_egg_value_rp"`
-	TotalHppRp                    float64 `json:"total_hpp_rp"`
 	TotalAverageDocPriceRp   float64 `json:"total_average_doc_price_rp"`
 }
 

internal/modules/repports/module.go

@@ -12,6 +12,8 @@ import (
 
 	expenseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/repositories"
 	marketingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
+	customerRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/repositories"
+	productionStandardRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/production-standards/repositories"
 	chickinRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/production/chickins/repositories"
 	recordingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
 	purchaseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/purchases/repositories"
@@ -34,10 +36,14 @@ func (RepportModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 	debtSupplierRepository := repportRepo.NewDebtSupplierRepository(db)
 	hppPerKandangRepository := repportRepo.NewHppPerKandangRepository(db)
 	productionResultRepository := repportRepo.NewProductionResultRepository(db)
+	customerPaymentRepository := repportRepo.NewCustomerPaymentRepository(db)
+	customerRepository := customerRepo.NewCustomerRepository(db)
+	standardGrowthDetailRepository := productionStandardRepo.NewStandardGrowthDetailRepository(db)
+	productionStandardDetailRepository := productionStandardRepo.NewProductionStandardDetailRepository(db)
 	userRepository := rUser.NewUserRepository(db)
 
 	approvalSvc := approvalService.NewApprovalService(approvalRepository)
-	repportService := sRepport.NewRepportService(validate, expenseRealizationRepository, marketingDeliveryProductRepository, purchaseRepository, chickinRepository, recordingRepository, approvalSvc, purchaseSupplierRepository, debtSupplierRepository, hppPerKandangRepository, productionResultRepository)
+	repportService := sRepport.NewRepportService(db, validate, expenseRealizationRepository, marketingDeliveryProductRepository, purchaseRepository, chickinRepository, recordingRepository, approvalSvc, purchaseSupplierRepository, debtSupplierRepository, hppPerKandangRepository, productionResultRepository, customerPaymentRepository, customerRepository, standardGrowthDetailRepository, productionStandardDetailRepository)
 	userService := sUser.NewUserService(userRepository, validate)
 
 	RepportRoutes(router, userService, repportService)

internal/modules/repports/repositories/customer_payment.repository.go

@@ -0,0 +1,195 @@
+package repositories
+
+import (
+	"context"
+
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type CustomerPaymentTransaction struct {
+	TransactionType string     `gorm:"column:transaction_type"`
+	TransactionID   int64      `gorm:"column:transaction_id"`
+	CustomerID      int64      `gorm:"column:customer_id"`
+	TransDate       time.Time  `gorm:"column:trans_date"`
+	DeliveryDate    *time.Time `gorm:"column:delivery_date"`
+	Reference       string     `gorm:"column:reference"`
+	VehicleNumbers  string     `gorm:"column:vehicle_numbers"`
+	Qty             float64    `gorm:"column:qty"`
+	Weight          float64    `gorm:"column:weight"`
+	AverageWeight   float64    `gorm:"column:average_weight"`
+	Price           float64    `gorm:"column:price"`
+	FinalPrice      float64    `gorm:"column:final_price"`
+	TotalPrice      float64    `gorm:"column:total_price"`
+	PaymentAmount   float64    `gorm:"column:payment_amount"`
+	PickupInfo      string     `gorm:"column:pickup_info"`
+	SalesPerson     string     `gorm:"column:sales_person"`
+}
+
+type CustomerPaymentRepository interface {
+	GetCustomerPaymentTransactions(ctx context.Context, customerID *uint) ([]CustomerPaymentTransaction, error)
+	GetInitialBalanceByCustomer(ctx context.Context, customerID uint) (float64, error)
+	GetCustomerIDsWithTransactions(ctx context.Context, limit, offset int) ([]uint, int64, error)
+}
+
+type customerPaymentRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewCustomerPaymentRepository(db *gorm.DB) CustomerPaymentRepository {
+	return &customerPaymentRepositoryImpl{db: db}
+}
+
+func (r *customerPaymentRepositoryImpl) GetCustomerPaymentTransactions(ctx context.Context, customerID *uint) ([]CustomerPaymentTransaction, error) {
+	salesQuery := r.db.WithContext(ctx).
+		Table("marketing_delivery_products mdp").
+		Select(`
+			'SALES' AS transaction_type,
+			mdp.id::BIGINT AS transaction_id,
+			c.id::BIGINT AS customer_id,
+			m.so_date::DATE AS trans_date,
+			mdp.delivery_date::DATE AS delivery_date,
+			m.so_number || '-' || TO_CHAR(mdp.delivery_date, 'YYYYMMDD') || '-' || CAST(pw.warehouse_id AS VARCHAR) AS reference,
+			COALESCE(mdp.vehicle_number, '') AS vehicle_numbers,
+
+			COALESCE(mdp.usage_qty, 0)::NUMERIC(15,3) AS qty,
+			COALESCE(mdp.total_weight, 0)::NUMERIC(15,3) AS weight,
+			COALESCE(mdp.avg_weight, 0)::NUMERIC(15,3) AS average_weight,
+			COALESCE(mdp.unit_price, 0)::NUMERIC(15,3) AS price,
+			COALESCE(mdp.total_price, 0)::NUMERIC(15,3) AS final_price,
+			COALESCE(mdp.total_price, 0)::NUMERIC(15,3) AS total_price,
+			0::NUMERIC(15,3) AS payment_amount,
+			w.name AS pickup_info,
+			u.name AS sales_person
+		`).
+		Joins("INNER JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
+		Joins("INNER JOIN marketings m ON m.id = mp.marketing_id").
+		Joins("INNER JOIN customers c ON c.id = m.customer_id").
+		Joins("INNER JOIN product_warehouses pw ON pw.id = mdp.product_warehouse_id").
+		Joins("INNER JOIN warehouses w ON w.id = pw.warehouse_id").
+		Joins("INNER JOIN users u ON u.id = m.sales_person_id").
+		Where("mdp.delivery_date IS NOT NULL").
+		Where("m.deleted_at IS NULL").
+		Where("c.deleted_at IS NULL")
+
+	if customerID != nil {
+		salesQuery = salesQuery.Where("c.id = ?", *customerID)
+	}
+
+	paymentQuery := r.db.WithContext(ctx).
+		Table("payments p").
+		Select(`
+			'PAYMENT' AS transaction_type,
+			p.id::BIGINT AS transaction_id,
+			c.id::BIGINT AS customer_id,
+			p.payment_date::DATE AS trans_date,
+			NULL AS delivery_date,
+			COALESCE(p.reference_number, p.payment_code) AS reference,
+			'-' AS vehicle_numbers,
+			0::NUMERIC(15,3) AS qty,
+			0::NUMERIC(15,3) AS weight,
+			0::NUMERIC(15,3) AS average_weight,
+			0::NUMERIC(15,3) AS price,
+			0::NUMERIC(15,3) AS final_price,
+			0::NUMERIC(15,3) AS total_price,
+			p.nominal::NUMERIC(15,3) AS payment_amount,
+			'-' AS pickup_info,
+			'-' AS sales_person
+		`).
+		Joins("INNER JOIN customers c ON c.id = p.party_id").
+		Where("p.party_type = ?", "CUSTOMER").
+		Where("p.direction = ?", "IN").
+		Where("p.transaction_type = ?", "PENJUALAN").
+		Where("p.deleted_at IS NULL").
+		Where("c.deleted_at IS NULL")
+
+	if customerID != nil {
+		paymentQuery = paymentQuery.Where("c.id = ?", *customerID)
+	}
+
+	var results []CustomerPaymentTransaction
+	err := r.db.WithContext(ctx).
+		Raw("? UNION ALL ? ORDER BY customer_id, trans_date, transaction_type DESC, transaction_id",
+			salesQuery,
+			paymentQuery,
+		).
+		Scan(&results).
+		Error
+
+	if err != nil {
+		return nil, err
+	}
+
+	return results, nil
+}
+
+func (r *customerPaymentRepositoryImpl) GetInitialBalanceByCustomer(ctx context.Context, customerID uint) (float64, error) {
+	var result struct {
+		Nominal float64
+	}
+
+	err := r.db.WithContext(ctx).
+		Table("payments").
+		Select("COALESCE(SUM(nominal), 0) as nominal").
+		Where("party_type = ?", "CUSTOMER").
+		Where("party_id = ?", customerID).
+		Where("transaction_type = ?", "SALDO_AWAL").
+		Where("deleted_at IS NULL").
+		Scan(&result).
+		Error
+
+	if err != nil {
+		return 0, err
+	}
+
+	return result.Nominal, nil
+}
+
+func (r *customerPaymentRepositoryImpl) GetCustomerIDsWithTransactions(ctx context.Context, limit, offset int) ([]uint, int64, error) {
+	subQuery := r.db.WithContext(ctx).
+		Table("(" +
+			"SELECT DISTINCT c.id as customer_id FROM marketing_delivery_products mdp " +
+			"INNER JOIN marketing_products mp ON mp.id = mdp.marketing_product_id " +
+			"INNER JOIN marketings m ON m.id = mp.marketing_id " +
+			"INNER JOIN customers c ON c.id = m.customer_id " +
+			"WHERE mdp.delivery_date IS NOT NULL AND m.deleted_at IS NULL AND c.deleted_at IS NULL " +
+			"UNION " +
+			"SELECT DISTINCT c.id as customer_id FROM payments p " +
+			"INNER JOIN customers c ON c.id = p.party_id " +
+			"WHERE p.party_type = 'CUSTOMER' AND p.direction = 'IN' " +
+			"AND p.transaction_type = 'PENJUALAN' AND p.deleted_at IS NULL AND c.deleted_at IS NULL" +
+			") as customer_ids")
+
+	var total int64
+	if err := subQuery.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	var customerIDs []uint
+	err := r.db.WithContext(ctx).
+		Table("("+
+			"SELECT DISTINCT c.id as customer_id FROM marketing_delivery_products mdp "+
+			"INNER JOIN marketing_products mp ON mp.id = mdp.marketing_product_id "+
+			"INNER JOIN marketings m ON m.id = mp.marketing_id "+
+			"INNER JOIN customers c ON c.id = m.customer_id "+
+			"WHERE mdp.delivery_date IS NOT NULL AND m.deleted_at IS NULL AND c.deleted_at IS NULL "+
+			"UNION "+
+			"SELECT DISTINCT c.id as customer_id FROM payments p "+
+			"INNER JOIN customers c ON c.id = p.party_id "+
+			"WHERE p.party_type = 'CUSTOMER' AND p.direction = 'IN' "+
+			"AND p.transaction_type = 'PENJUALAN' AND p.deleted_at IS NULL AND c.deleted_at IS NULL"+
+			") as customer_ids").
+		Select("customer_id").
+		Order("customer_id ASC").
+		Limit(limit).
+		Offset(offset).
+		Pluck("customer_id", &customerIDs).
+		Error
+
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return customerIDs, total, nil
+}

internal/modules/repports/repositories/hpp_per_kandang.repository.go

@@ -11,6 +11,8 @@ import (
 )
 
 type HppPerKandangRow struct {
+	ProjectFlockKandangID uint
+	ProjectFlockPeriod    int
 	KandangID             uint
 	KandangName           string
 	KandangStatus         string
@@ -18,14 +20,17 @@ type HppPerKandangRow struct {
 	LocationName          string
 	PicID                 uint
 	PicName               string
-	RemainingChickenBirds  float64
+	RecordingCount        int64
-	RemainingChickenWeight float64
+	// RemainingChickenBirds          float64
-	EggProductionWeightKg  float64
+	// RemainingChickenWeight         float64
-	EggProductionPieces    float64
+	EggProductionWeightKgRemaining float64
+	EggProductionPiecesRemaining   float64
+	EggProductionTotalWeightKg     float64
+	EggProductionTotalPieces       float64
 }
 
 type HppPerKandangCostRow struct {
-	KandangID   uint
+	ProjectFlockKandangID uint
 	FeedCost              float64
 	OvkCost               float64
 	DocCost               float64
@@ -35,7 +40,7 @@ type HppPerKandangCostRow struct {
 }
 
 type HppPerKandangSupplierRow struct {
-	KandangID     uint
+	ProjectFlockKandangID uint
 	SupplierID            uint
 	SupplierName          string
 	SupplierAlias         string
@@ -44,7 +49,8 @@ type HppPerKandangSupplierRow struct {
 
 type HppPerKandangRepository interface {
 	GetRowsByPeriod(ctx context.Context, start, end time.Time, areaIDs, locationIDs, kandangIDs []int64) ([]HppPerKandangRow, error)
-	GetFeedOvkDocCostByPeriod(ctx context.Context, start, end time.Time, areaIDs, locationIDs, kandangIDs []int64) ([]HppPerKandangCostRow, []HppPerKandangSupplierRow, error)
+	GetFeedOvkDocCostByPeriod(ctx context.Context, start, end time.Time, projectFlockKandangIDs []uint) ([]HppPerKandangCostRow, []HppPerKandangSupplierRow, error)
+	GetEggProductionByProjectFlockKandangIDs(ctx context.Context, start, end time.Time, projectFlockKandangIDs []uint) (map[uint]HppPerKandangRow, error)
 }
 
 type hppPerKandangRepository struct {
@@ -58,9 +64,32 @@ func NewHppPerKandangRepository(db *gorm.DB) HppPerKandangRepository {
 func (r *hppPerKandangRepository) GetRowsByPeriod(ctx context.Context, start, end time.Time, areaIDs, locationIDs, kandangIDs []int64) ([]HppPerKandangRow, error) {
 	var rows []HppPerKandangRow
 
-	query := r.db.WithContext(ctx).
+	latestApproval := r.db.WithContext(ctx).
+		Table("approvals AS a").
+		Select("a.approvable_id, a.action").
+		Joins(`
+			JOIN (
+				SELECT approvable_id, MAX(action_at) AS latest_action_at
+				FROM approvals
+				WHERE approvable_type = ?
+				GROUP BY approvable_id
+			) AS la ON la.approvable_id = a.approvable_id AND la.latest_action_at = a.action_at`,
+			string(utils.ApprovalWorkflowRecording),
+		)
+
+	validRecordings := r.db.WithContext(ctx).
 		Table("recordings AS r").
+		Select("r.id, r.project_flock_kandangs_id, r.total_chick_qty").
+		Joins("LEFT JOIN (?) AS la ON la.approvable_id = r.id", latestApproval).
+		Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
+		Where("r.deleted_at IS NULL").
+		Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected))
+
+	query := r.db.WithContext(ctx).
+		Table("project_flocks AS pf").
 		Select(`
+			pfk.id AS project_flock_kandang_id,
+			pfk.period AS project_flock_period,
 			k.id AS kandang_id,
 			k.name AS kandang_name,
 			k.status AS kandang_status,
@@ -68,23 +97,31 @@ func (r *hppPerKandangRepository) GetRowsByPeriod(ctx context.Context, start, en
 			loc.name AS location_name,
 			pic.id AS pic_id,
 			pic.name AS pic_name,
-			COALESCE(MAX(r.total_chick_qty), 0) AS remaining_chicken_birds,
+			COALESCE(COUNT(vr.id), 0) AS recording_count,
-			COALESCE(SUM(rbw.total_weight), 0) AS remaining_chicken_weight,
+			COALESCE(MAX(vr.total_chick_qty), 0) AS remaining_chicken_birds,
-			COALESCE(SUM(re.weight), 0) AS egg_production_weight_kg,
+			0 AS remaining_chicken_weight,
-			COALESCE(SUM(re.qty), 0) AS egg_production_pieces`).
+			0 AS egg_production_weight_kg,
-		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
+			0 AS egg_production_pieces,
+			0 AS egg_production_total_weight_kg,
+			0 AS egg_production_total_pieces`).
+		Joins("JOIN project_flock_kandangs AS pfk ON pfk.project_flock_id = pf.id").
+		Joins(`
+			LEFT JOIN (
+				SELECT project_flock_kandang_id, MIN(chick_in_date) AS chick_in_date
+				FROM project_chickins
+				GROUP BY project_flock_kandang_id
+			) AS pc ON pc.project_flock_kandang_id = pfk.id`).
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
 		Joins("JOIN users AS pic ON pic.id = k.pic_id").
-		Joins("LEFT JOIN recording_bws AS rbw ON rbw.recording_id = r.id").
+		Joins("LEFT JOIN (?) AS vr ON vr.project_flock_kandangs_id = pfk.id", validRecordings).
-		Joins("LEFT JOIN recording_eggs AS re ON re.recording_id = r.id").
+		Where("pf.category = ?", utils.ProjectFlockCategoryLaying).
-		Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
+		Where("(pfk.closed_at IS NULL OR ? BETWEEN pc.chick_in_date AND pfk.closed_at)", start)
-		Where("r.deleted_at IS NULL")
 
 	query = applyLocationFilters(query, areaIDs, locationIDs, kandangIDs)
 
-	query = query.Group("k.id, k.name, k.status, loc.id, loc.name, pic.id, pic.name").
+	query = query.Group("pfk.id, pfk.period, k.id, k.name, k.status, loc.id, loc.name, pic.id, pic.name").
-		Order("k.id ASC")
+		Order("pfk.id ASC")
 
 	if err := query.Scan(&rows).Error; err != nil {
 		return nil, err
@@ -93,41 +130,44 @@ func (r *hppPerKandangRepository) GetRowsByPeriod(ctx context.Context, start, en
 	return rows, nil
 }
 
-func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context, start, end time.Time, areaIDs, locationIDs, kandangIDs []int64) ([]HppPerKandangCostRow, []HppPerKandangSupplierRow, error) {
+func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context, start, end time.Time, projectFlockKandangIDs []uint) ([]HppPerKandangCostRow, []HppPerKandangSupplierRow, error) {
 	var rows []HppPerKandangCostRow
 
-	recordingPfk := r.db.WithContext(ctx).
-		Table("recordings AS r").
-		Select("DISTINCT pfk.id").
-		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
-		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
-		Joins("JOIN locations AS loc ON loc.id = k.location_id").
-		Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
-		Where("r.deleted_at IS NULL")
-	recordingPfk = applyLocationFilters(recordingPfk, areaIDs, locationIDs, kandangIDs)
-
 	purchaseStockableKey := fifo.StockableKeyPurchaseItems.String()
 	transferStockableKey := fifo.StockableKeyStockTransferIn.String()
 
+	latestApproval := r.db.WithContext(ctx).
+		Table("approvals AS a").
+		Select("a.approvable_id, a.action").
+		Joins(`
+			JOIN (
+				SELECT approvable_id, MAX(action_at) AS latest_action_at
+				FROM approvals
+				WHERE approvable_type = ?
+				GROUP BY approvable_id
+			) AS la ON la.approvable_id = a.approvable_id AND la.latest_action_at = a.action_at`,
+			string(utils.ApprovalWorkflowRecording),
+		)
+
 	query := r.db.WithContext(ctx).
 		Table("recordings AS r").
 		Select(`
-			k.id AS kandang_id,
+			pfk.id AS project_flock_kandang_id,
 			COALESCE(SUM(CASE
 				WHEN f.name = ? THEN COALESCE(sa.qty, 0) * COALESCE(pi.price, 0)
-				WHEN sa.stockable_type = ? AND tf.name = ? THEN COALESCE(std.quantity, 0) * COALESCE(tpi.price, 0)
+				WHEN sa.stockable_type = ? AND tf.name = ? THEN COALESCE(std.total_qty, 0) * COALESCE(tpi.price, 0)
 				ELSE 0
 			END), 0) AS feed_cost,
 			COALESCE(SUM(CASE
 				WHEN f.name = ? THEN COALESCE(sa.qty, 0) * COALESCE(pi.price, 0)
-				WHEN sa.stockable_type = ? AND tf.name = ? THEN COALESCE(std.quantity, 0) * COALESCE(tpi.price, 0)
+				WHEN sa.stockable_type = ? AND tf.name = ? THEN COALESCE(std.total_qty, 0) * COALESCE(tpi.price, 0)
 				ELSE 0
 			END), 0) AS ovk_cost`,
 			utils.FlagPakan, transferStockableKey, utils.FlagPakan,
 			utils.FlagOVK, transferStockableKey, utils.FlagOVK).
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
-		Joins("JOIN locations AS loc ON loc.id = k.location_id").
+		Joins("LEFT JOIN (?) AS la ON la.approvable_id = r.id", latestApproval).
 		Joins("LEFT JOIN recording_stocks AS rs ON rs.recording_id = r.id").
 		Joins("LEFT JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND sa.status = ?", fifo.UsableKeyRecordingStock.String(), entity.StockAllocationStatusActive).
 		Joins("LEFT JOIN purchase_items AS pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", purchaseStockableKey).
@@ -136,20 +176,19 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 		Joins("LEFT JOIN purchase_items AS tpi ON tpi.product_id = std.product_id AND tpi.warehouse_id = st.from_warehouse_id").
 		Joins("LEFT JOIN flags AS f ON f.flagable_id = pi.product_id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Joins("LEFT JOIN flags AS tf ON tf.flagable_id = std.product_id AND tf.flagable_type = ?", entity.FlagableTypeProduct).
-		Where("r.project_flock_kandangs_id IN (?)", recordingPfk.Session(&gorm.Session{NewDB: true})).
+		Where("r.project_flock_kandangs_id IN ?", projectFlockKandangIDs).
-		Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
+		Where("r.record_datetime < ?", end).
-		Where("r.deleted_at IS NULL")
+		Where("r.deleted_at IS NULL").
+		Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected))
 
-	query = applyLocationFilters(query, areaIDs, locationIDs, kandangIDs)
+	query = query.Group("pfk.id").Order("pfk.id ASC")
-
-	query = query.Group("k.id").Order("k.id ASC")
 
 	if err := query.Scan(&rows).Error; err != nil {
 		return nil, nil, err
 	}
 
 	docRows := make([]struct {
-		KandangID     uint
+		ProjectFlockKandangID uint
 		DocCost               float64
 		DocQty                float64
 		SupplierID            *uint
@@ -160,7 +199,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	docQuery := r.db.WithContext(ctx).
 		Table("project_chickins AS pc").
 		Select(`
-			pfk.kandang_id AS kandang_id,
+			pfk.id AS project_flock_kandang_id,
 			COALESCE(SUM(pc.usage_qty * COALESCE(pi.price, 0)), 0) AS doc_cost,
 			COALESCE(SUM(pc.usage_qty), 0) AS doc_qty,
 			s.id AS supplier_id,
@@ -172,9 +211,8 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 		Joins("LEFT JOIN purchase_items AS pi ON pi.product_warehouse_id = pc.product_warehouse_id").
 		Joins("LEFT JOIN purchases AS pur ON pur.id = pi.purchase_id").
 		Joins("LEFT JOIN suppliers AS s ON s.id = pur.supplier_id").
-		Where("pc.project_flock_kandang_id IN (?)", recordingPfk.Session(&gorm.Session{NewDB: true})).
+		Where("pc.project_flock_kandang_id IN ?", projectFlockKandangIDs).
-		Group("pfk.kandang_id, s.id, s.name, s.alias")
+		Group("pfk.id, s.id, s.name, s.alias")
-	docQuery = applyLocationFilters(docQuery, areaIDs, locationIDs, kandangIDs)
 
 	if err := docQuery.Scan(&docRows).Error; err != nil {
 		return nil, nil, err
@@ -183,28 +221,28 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	costMap := make(map[uint]*HppPerKandangCostRow, len(rows))
 	for i := range rows {
 		row := rows[i]
-		costMap[row.KandangID] = &rows[i]
+		costMap[row.ProjectFlockKandangID] = &rows[i]
 	}
 
 	docSuppliers := make([]HppPerKandangSupplierRow, 0)
 	docSeen := make(map[uint]map[uint]bool)
 	for _, doc := range docRows {
-		entry, ok := costMap[doc.KandangID]
+		entry, ok := costMap[doc.ProjectFlockKandangID]
 		if !ok {
 			rows = append(rows, HppPerKandangCostRow{
-				KandangID: doc.KandangID,
+				ProjectFlockKandangID: doc.ProjectFlockKandangID,
 			})
 			entry = &rows[len(rows)-1]
-			costMap[doc.KandangID] = entry
+			costMap[doc.ProjectFlockKandangID] = entry
 		}
 		entry.DocCost += doc.DocCost
 		entry.DocQty += doc.DocQty
 		if doc.SupplierID != nil {
-			if docSeen[doc.KandangID] == nil {
+			if docSeen[doc.ProjectFlockKandangID] == nil {
-				docSeen[doc.KandangID] = make(map[uint]bool)
+				docSeen[doc.ProjectFlockKandangID] = make(map[uint]bool)
 			}
-			if !docSeen[doc.KandangID][*doc.SupplierID] {
+			if !docSeen[doc.ProjectFlockKandangID][*doc.SupplierID] {
-				docSeen[doc.KandangID][*doc.SupplierID] = true
+				docSeen[doc.ProjectFlockKandangID][*doc.SupplierID] = true
 				supplierName := ""
 				if doc.SupplierName != nil {
 					supplierName = *doc.SupplierName
@@ -214,7 +252,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 					supplierAlias = *doc.SupplierAlias
 				}
 				docSuppliers = append(docSuppliers, HppPerKandangSupplierRow{
-					KandangID:     doc.KandangID,
+					ProjectFlockKandangID: doc.ProjectFlockKandangID,
 					SupplierID:            *doc.SupplierID,
 					SupplierName:          supplierName,
 					SupplierAlias:         supplierAlias,
@@ -225,7 +263,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	}
 
 	budgetRows := make([]struct {
-		KandangID  uint
+		ProjectFlockKandangID uint
 		BudgetCost            float64
 	}, 0)
 
@@ -247,63 +285,63 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	budgetQuery := r.db.WithContext(ctx).
 		Table("project_flock_kandangs AS pfk").
 		Select(`
-			k.id AS kandang_id,
+			pfk.id AS project_flock_kandang_id,
 			COALESCE(SUM((pb.qty * pb.price) * COALESCE(k_usage.kandang_usage_qty, 0) / NULLIF(p_usage.project_usage_qty, 0)), 0) AS budget_cost`).
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
 		Joins("JOIN project_budgets AS pb ON pb.project_flock_id = pfk.project_flock_id").
 		Joins("LEFT JOIN (?) AS k_usage ON k_usage.project_flock_kandang_id = pfk.id", pfkUsageSub).
 		Joins("LEFT JOIN (?) AS p_usage ON p_usage.project_flock_id = pfk.project_flock_id", projectUsageSub).
-		Where("pfk.id IN (?)", recordingPfk.Session(&gorm.Session{NewDB: true})).
+		Where("pfk.id IN (?)", projectFlockKandangIDs).
-		Group("k.id")
+		Group("pfk.id")
-	budgetQuery = applyLocationFilters(budgetQuery, areaIDs, locationIDs, kandangIDs)
+	// budgetQuery = applyLocationFilters(budgetQuery, areaIDs, locationIDs, kandangIDs)
 
 	if err := budgetQuery.Scan(&budgetRows).Error; err != nil {
 		return nil, nil, err
 	}
 
 	for _, budget := range budgetRows {
-		entry, ok := costMap[budget.KandangID]
+		entry, ok := costMap[budget.ProjectFlockKandangID]
 		if !ok {
 			rows = append(rows, HppPerKandangCostRow{
-				KandangID: budget.KandangID,
+				ProjectFlockKandangID: budget.ProjectFlockKandangID,
 			})
 			entry = &rows[len(rows)-1]
-			costMap[budget.KandangID] = entry
+			costMap[budget.ProjectFlockKandangID] = entry
 		}
 		entry.BudgetCost += budget.BudgetCost
 	}
 
 	expenseRows := make([]struct {
-		KandangID   uint
+		ProjectFlockKandangID uint
 		ExpenseCost           float64
 	}, 0)
 
 	expenseQuery := r.db.WithContext(ctx).
 		Table("project_flock_kandangs AS pfk").
 		Select(`
-			k.id AS kandang_id,
+			pfk.id AS project_flock_kandang_id,
 			COALESCE(SUM(er.qty * er.price), 0) AS expense_cost`).
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
 		Joins("JOIN expense_nonstocks AS en ON en.project_flock_kandang_id = pfk.id").
 		Joins("JOIN expense_realizations AS er ON er.expense_nonstock_id = en.id").
-		Where("pfk.id IN (?)", recordingPfk.Session(&gorm.Session{NewDB: true})).
+		Where("pfk.id IN (?)", projectFlockKandangIDs).
-		Group("k.id")
+		Group("pfk.id")
-	expenseQuery = applyLocationFilters(expenseQuery, areaIDs, locationIDs, kandangIDs)
+	// expenseQuery = applyLocationFilters(expenseQuery, areaIDs, locationIDs, kandangIDs)
 
 	if err := expenseQuery.Scan(&expenseRows).Error; err != nil {
 		return nil, nil, err
 	}
 
 	for _, exp := range expenseRows {
-		entry, ok := costMap[exp.KandangID]
+		entry, ok := costMap[exp.ProjectFlockKandangID]
 		if !ok {
 			rows = append(rows, HppPerKandangCostRow{
-				KandangID: exp.KandangID,
+				ProjectFlockKandangID: exp.ProjectFlockKandangID,
 			})
 			entry = &rows[len(rows)-1]
-			costMap[exp.KandangID] = entry
+			costMap[exp.ProjectFlockKandangID] = entry
 		}
 		entry.ExpenseCost += exp.ExpenseCost
 	}
@@ -312,7 +350,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 
 	feedQuery := r.db.WithContext(ctx).
 		Table("recordings AS r").
-		Select("DISTINCT k.id AS kandang_id, s.id AS supplier_id, s.name AS supplier_name, s.alias AS supplier_alias").
+		Select("DISTINCT pfk.id AS project_flock_kandang_id, s.id AS supplier_id, s.name AS supplier_name, s.alias AS supplier_alias").
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
@@ -323,21 +361,21 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 		Joins("LEFT JOIN suppliers AS s ON s.id = pur.supplier_id").
 		Joins("LEFT JOIN flags AS f ON f.flagable_id = pi.product_id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("f.name IN ?", []utils.FlagType{utils.FlagPakan, utils.FlagOVK}).
-		Where("r.project_flock_kandangs_id IN (?)", recordingPfk.Session(&gorm.Session{NewDB: true})).
+		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
-		Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
+		Where("r.record_datetime < ?", end).
 		Where("r.deleted_at IS NULL")
-	feedQuery = applyLocationFilters(feedQuery, areaIDs, locationIDs, kandangIDs)
+	// feedQuery = applyLocationFilters(feedQuery, areaIDs, locationIDs, kandangIDs)
 
 	if err := feedQuery.Scan(&feedSuppliers).Error; err != nil {
 		return nil, nil, err
 	}
 
 	for i := range feedSuppliers {
-		if _, exists := costMap[feedSuppliers[i].KandangID]; !exists {
+		if _, exists := costMap[feedSuppliers[i].ProjectFlockKandangID]; !exists {
 			rows = append(rows, HppPerKandangCostRow{
-				KandangID: feedSuppliers[i].KandangID,
+				ProjectFlockKandangID: feedSuppliers[i].ProjectFlockKandangID,
 			})
-			costMap[feedSuppliers[i].KandangID] = &rows[len(rows)-1]
+			costMap[feedSuppliers[i].ProjectFlockKandangID] = &rows[len(rows)-1]
 		}
 		feedSuppliers[i].Category = "FEED"
 	}
@@ -347,6 +385,67 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	return rows, supplierRows, nil
 }
 
+func (r *hppPerKandangRepository) GetEggProductionByProjectFlockKandangIDs(ctx context.Context, start, end time.Time, projectFlockKandangIDs []uint) (map[uint]HppPerKandangRow, error) {
+	if len(projectFlockKandangIDs) == 0 {
+		return map[uint]HppPerKandangRow{}, nil
+	}
+
+	latestApproval := r.db.WithContext(ctx).
+		Table("approvals AS a").
+		Select("a.approvable_id, a.action").
+		Joins(`
+			JOIN (
+				SELECT approvable_id, MAX(action_at) AS latest_action_at
+				FROM approvals
+				WHERE approvable_type = ?
+				GROUP BY approvable_id
+			) AS la ON la.approvable_id = a.approvable_id AND la.latest_action_at = a.action_at`,
+			string(utils.ApprovalWorkflowRecording),
+		)
+
+	type eggRow struct {
+		ProjectFlockKandangID          uint
+		EggProductionWeightKgRemaining float64
+		EggProductionPiecesRemaining   float64
+		EggProductionTotalWeightKg     float64
+		EggProductionTotalPieces       float64
+	}
+
+	eggRows := make([]eggRow, 0)
+	query := r.db.WithContext(ctx).
+		Table("recordings AS r").
+		Select(`
+			r.project_flock_kandangs_id AS project_flock_kandang_id,
+			COALESCE(SUM((re.total_qty - re.total_used) * re.weight / 1000), 0) AS egg_production_weight_kg_remaining,
+			COALESCE(SUM(re.total_qty - re.total_used), 0) AS egg_production_pieces_remaining,
+			COALESCE(SUM(re.weight / 1000), 0) AS egg_production_total_weight_kg,
+			COALESCE(SUM(re.total_qty), 0) AS egg_production_total_pieces`).
+		Joins("LEFT JOIN (?) AS la ON la.approvable_id = r.id", latestApproval).
+		Joins("LEFT JOIN recording_eggs AS re ON re.recording_id = r.id").
+		Where("r.project_flock_kandangs_id IN ?", projectFlockKandangIDs).
+		Where("r.record_datetime < ?", end).
+		Where("r.deleted_at IS NULL").
+		Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected)).
+		Group("r.project_flock_kandangs_id")
+
+	if err := query.Scan(&eggRows).Error; err != nil {
+		return nil, err
+	}
+
+	result := make(map[uint]HppPerKandangRow, len(eggRows))
+	for _, row := range eggRows {
+		result[row.ProjectFlockKandangID] = HppPerKandangRow{
+			ProjectFlockKandangID:          row.ProjectFlockKandangID,
+			EggProductionWeightKgRemaining: row.EggProductionWeightKgRemaining,
+			EggProductionPiecesRemaining:   row.EggProductionPiecesRemaining,
+			EggProductionTotalWeightKg:     row.EggProductionTotalWeightKg,
+			EggProductionTotalPieces:       row.EggProductionTotalPieces,
+		}
+	}
+
+	return result, nil
+}
+
 func applyLocationFilters(query *gorm.DB, areaIDs, locationIDs, kandangIDs []int64) *gorm.DB {
 	if len(areaIDs) > 0 {
 		query = query.Where("loc.area_id IN ?", areaIDs)
@@ -355,7 +454,7 @@ func applyLocationFilters(query *gorm.DB, areaIDs, locationIDs, kandangIDs []int
 		query = query.Where("k.location_id IN ?", locationIDs)
 	}
 	if len(kandangIDs) > 0 {
-		query = query.Where("k.id IN ?", kandangIDs)
+		query = query.Where("pfk.id IN ?", kandangIDs)
 	}
 	return query
 }

internal/modules/repports/repositories/production_result.repository.go

@@ -11,6 +11,7 @@ import (
 
 type ProductionResultRepository interface {
 	GetRecordingsByProjectFlockKandang(ctx context.Context, projectFlockKandangID uint, offset, limit int) ([]entity.Recording, int64, error)
+	GetProductionStandardIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (uint, error)
 }
 
 type productionResultRepositoryImpl struct {
@@ -76,3 +77,25 @@ func (r *productionResultRepositoryImpl) GetRecordingsByProjectFlockKandang(
 
 	return recordings, total, nil
 }
+
+func (r *productionResultRepositoryImpl) GetProductionStandardIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (uint, error) {
+	if projectFlockKandangID == 0 {
+		return 0, nil
+	}
+
+	var row struct {
+		ProductionStandardID uint `gorm:"column:production_standard_id"`
+	}
+
+	err := r.db.WithContext(ctx).
+		Table("project_flock_kandangs pfk").
+		Select("pf.production_standard_id").
+		Joins("JOIN project_flocks pf ON pf.id = pfk.project_flock_id").
+		Where("pfk.id = ?", projectFlockKandangID).
+		Take(&row).Error
+	if err != nil {
+		return 0, err
+	}
+
+	return row.ProductionStandardID, nil
+}

internal/modules/repports/route.go

@@ -21,5 +21,5 @@ func RepportRoutes(v1 fiber.Router, u user.UserService, s repport.RepportService
 	route.Get("/debt-supplier", m.RequirePermissions(m.P_ReportDebtSupplierGetAll), ctrl.GetDebtSupplier)
 	route.Get("/hpp-per-kandang", m.RequirePermissions(m.P_ReportHppPerKandangGetAll), ctrl.GetHppPerKandang)
 	route.Get("/production-result/:idProjectFlockKandang", m.RequirePermissions(m.P_ReportProductionResultGetAll), ctrl.GetProductionResult)
-
+	route.Get("/customer-payment", m.RequirePermissions(m.P_ReportCustomerPaymentGetAll), ctrl.GetCustomerPayment)
 }

internal/modules/repports/services/repport.service.go

@@ -2,6 +2,8 @@ package service
 
 import (
 	"context"
+	"encoding/json"
+	"errors"
 	"fmt"
 	"math"
 	"sort"
@@ -19,6 +21,8 @@ import (
 	expenseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/repositories"
 	marketingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
 	areaDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/areas/dto"
+	customerRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/repositories"
+	productionStandardRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/production-standards/repositories"
 	supplierDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/dto"
 	warehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
 	chickinRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/production/chickins/repositories"
@@ -40,11 +44,13 @@ type RepportService interface {
 	GetDebtSupplier(ctx *fiber.Ctx, params *validation.DebtSupplierQuery) ([]dto.DebtSupplierDTO, int64, error)
 	GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangResponseData, *dto.HppPerKandangMetaDTO, error)
 	GetProductionResult(ctx *fiber.Ctx, params *validation.ProductionResultQuery) ([]dto.ProductionResultDTO, int64, error)
+	GetCustomerPayment(ctx *fiber.Ctx, params *validation.CustomerPaymentQuery) ([]dto.CustomerPaymentReportItem, int64, error)
 }
 
 type repportService struct {
 	Log                          *logrus.Logger
 	Validate                     *validator.Validate
+	DB                           *gorm.DB
 	ExpenseRealizationRepo       expenseRepo.ExpenseRealizationRepository
 	MarketingDeliveryRepo        marketingRepo.MarketingDeliveryProductRepository
 	PurchaseRepo                 purchaseRepo.PurchaseRepository
@@ -55,6 +61,10 @@ type repportService struct {
 	DebtSupplierRepo             repportRepo.DebtSupplierRepository
 	HppPerKandangRepo            repportRepo.HppPerKandangRepository
 	ProductionResultRepo         repportRepo.ProductionResultRepository
+	CustomerPaymentRepo          repportRepo.CustomerPaymentRepository
+	CustomerRepo                 customerRepo.CustomerRepository
+	StandardGrowthDetailRepo     productionStandardRepository.StandardGrowthDetailRepository
+	ProductionStandardDetailRepo productionStandardRepository.ProductionStandardDetailRepository
 }
 
 type HppCostAggregate struct {
@@ -67,6 +77,7 @@ type HppCostAggregate struct {
 }
 
 func NewRepportService(
+	db *gorm.DB,
 	validate *validator.Validate,
 	expenseRealizationRepo expenseRepo.ExpenseRealizationRepository,
 	marketingDeliveryRepo marketingRepo.MarketingDeliveryProductRepository,
@@ -78,10 +89,15 @@ func NewRepportService(
 	debtSupplierRepo repportRepo.DebtSupplierRepository,
 	hppPerKandangRepo repportRepo.HppPerKandangRepository,
 	productionResultRepo repportRepo.ProductionResultRepository,
+	customerPaymentRepo repportRepo.CustomerPaymentRepository,
+	customerRepo customerRepo.CustomerRepository,
+	standardGrowthDetailRepo productionStandardRepository.StandardGrowthDetailRepository,
+	productionStandardDetailRepo productionStandardRepository.ProductionStandardDetailRepository,
 ) RepportService {
 	return &repportService{
 		Log:                          utils.Log,
 		Validate:                     validate,
+		DB:                           db,
 		ExpenseRealizationRepo:       expenseRealizationRepo,
 		MarketingDeliveryRepo:        marketingDeliveryRepo,
 		PurchaseRepo:                 purchaseRepo,
@@ -92,6 +108,10 @@ func NewRepportService(
 		DebtSupplierRepo:             debtSupplierRepo,
 		HppPerKandangRepo:            hppPerKandangRepo,
 		ProductionResultRepo:         productionResultRepo,
+		CustomerPaymentRepo:          customerPaymentRepo,
+		CustomerRepo:                 customerRepo,
+		StandardGrowthDetailRepo:     standardGrowthDetailRepo,
+		ProductionStandardDetailRepo: productionStandardDetailRepo,
 	}
 }
 
@@ -285,6 +305,30 @@ func (s *repportService) GetProductionResult(ctx *fiber.Ctx, params *validation.
 
 	weeklyResults := summarizeProductionResults(dailyResults, recordsPerWeek)
 
+	var productionStandardID uint
+	if s.ProductionResultRepo != nil {
+		standardID, err := s.ProductionResultRepo.GetProductionStandardIDByProjectFlockKandangID(ctx.Context(), params.ProjectFlockKandangID)
+		if err != nil {
+			if !errors.Is(err, gorm.ErrRecordNotFound) {
+				return nil, 0, err
+			}
+		} else {
+			productionStandardID = standardID
+		}
+	}
+
+	standardDetailCache := make(map[int]*entity.ProductionStandardDetail)
+	growthDetailCache := make(map[int]*entity.StandardGrowthDetail)
+
+	weeks := make([]int, len(weeklyResults))
+	for i := range weeklyResults {
+		weeks[i] = defaultStartWoa + i
+	}
+	uniformityMap, err := s.getUniformityByWeek(ctx.Context(), params.ProjectFlockKandangID, weeks)
+	if err != nil {
+		return nil, 0, err
+	}
+
 	var cumulativeButir int64
 	var cumulativeKg float64
 	for i := range weeklyResults {
@@ -294,12 +338,78 @@ func (s *repportService) GetProductionResult(ctx *fiber.Ctx, params *validation.
 		if weeklyResults[i].StdUniformity == "" {
 			weeklyResults[i].StdUniformity = defaultUniformText
 		}
+		if uniformity, ok := uniformityMap[defaultStartWoa+i]; ok {
+			weeklyResults[i].Uniformity = uniformity.Uniformity
+			if uniformity.AvgWeight != nil {
+				weeklyResults[i].Bw = *uniformity.AvgWeight
+			}
+		}
 
 		cumulativeButir += weeklyResults[i].ButiranJumlah
 		weeklyResults[i].TotalButir = cumulativeButir
 
 		cumulativeKg += weeklyResults[i].KgJumlah
 		weeklyResults[i].TotalKg = cumulativeKg
+
+		if productionStandardID == 0 {
+			continue
+		}
+
+		week := int(weeklyResults[i].Woa)
+		if s.ProductionStandardDetailRepo != nil {
+			detail, ok := standardDetailCache[week]
+			if !ok {
+				fetched, fetchErr := s.ProductionStandardDetailRepo.GetByStandardIDAndWeek(ctx.Context(), productionStandardID, week)
+				if fetchErr != nil {
+					if !errors.Is(fetchErr, gorm.ErrRecordNotFound) {
+						return nil, 0, fetchErr
+					}
+				} else {
+					detail = fetched
+				}
+				standardDetailCache[week] = detail
+			}
+
+			if detail != nil {
+				if detail.TargetHenDayProduction != nil {
+					weeklyResults[i].HdStd = *detail.TargetHenDayProduction
+				}
+				if detail.TargetHenHouseProduction != nil {
+					weeklyResults[i].HhStd = *detail.TargetHenHouseProduction
+				}
+				if detail.TargetEggWeight != nil {
+					weeklyResults[i].EwStd = *detail.TargetEggWeight
+				}
+				if detail.TargetEggMass != nil {
+					weeklyResults[i].EmStd = *detail.TargetEggMass
+				}
+				if detail.StandardFCR != nil {
+					weeklyResults[i].FcrStd = *detail.StandardFCR
+				}
+			}
+		}
+
+		if s.StandardGrowthDetailRepo != nil {
+			detail, ok := growthDetailCache[week]
+			if !ok {
+				fetched, fetchErr := s.StandardGrowthDetailRepo.GetByStandardIDAndWeek(ctx.Context(), productionStandardID, week)
+				if fetchErr != nil {
+					if !errors.Is(fetchErr, gorm.ErrRecordNotFound) {
+						return nil, 0, fetchErr
+					}
+				} else {
+					detail = fetched
+				}
+				growthDetailCache[week] = detail
+			}
+
+			if detail != nil && detail.FeedIntake != nil {
+				weeklyResults[i].FiStd = *detail.FeedIntake
+			}
+			if detail != nil && detail.TargetMeanBw != nil {
+				weeklyResults[i].StdBw = *detail.TargetMeanBw
+			}
+		}
 	}
 
 	totalWeeks := int64(math.Ceil(float64(totalRecordings) / float64(recordsPerWeek)))
@@ -307,6 +417,261 @@ func (s *repportService) GetProductionResult(ctx *fiber.Ctx, params *validation.
 	return weeklyResults, totalWeeks, nil
 }
 
+func (s *repportService) GetCustomerPayment(ctx *fiber.Ctx, params *validation.CustomerPaymentQuery) ([]dto.CustomerPaymentReportItem, int64, error) {
+	if err := s.Validate.Struct(params); err != nil {
+		return nil, 0, err
+	}
+
+	// Determine customer IDs to process
+	var customerIDs []uint
+	var totalCustomers int64
+
+	if len(params.CustomerIDs) > 0 {
+		// Specific customer IDs mode (no pagination)
+		customerIDs = params.CustomerIDs
+		totalCustomers = int64(len(customerIDs))
+
+		if len(customerIDs) == 0 {
+			return []dto.CustomerPaymentReportItem{}, 0, nil
+		}
+	} else {
+		// Multiple customers mode with pagination
+		page := params.Page
+		limit := params.Limit
+		if page < 1 {
+			page = 1
+		}
+		if limit < 1 {
+			limit = 10
+		}
+
+		offset := (page - 1) * limit
+
+		var err error
+		customerIDs, totalCustomers, err = s.CustomerPaymentRepo.GetCustomerIDsWithTransactions(ctx.Context(), limit, offset)
+		if err != nil {
+			return nil, 0, err
+		}
+
+		if len(customerIDs) == 0 {
+			return []dto.CustomerPaymentReportItem{}, 0, nil
+		}
+	}
+
+	var result []dto.CustomerPaymentReportItem
+	for _, customerID := range customerIDs {
+		item, err := s.processCustomerPayment(ctx.Context(), customerID, params)
+		if err != nil {
+			return nil, 0, err
+		}
+
+		if len(item.Rows) > 0 {
+			result = append(result, item)
+		}
+	}
+
+	totalCustomers = int64(len(result))
+	return result, totalCustomers, nil
+}
+
+func (s *repportService) processCustomerPayment(ctx context.Context, customerID uint, params *validation.CustomerPaymentQuery) (dto.CustomerPaymentReportItem, error) {
+
+	customer, err := s.CustomerRepo.GetByID(ctx, customerID, nil)
+	if err != nil {
+		return dto.CustomerPaymentReportItem{}, err
+	}
+
+	initialBalance, err := s.CustomerPaymentRepo.GetInitialBalanceByCustomer(ctx, customerID)
+	if err != nil {
+		return dto.CustomerPaymentReportItem{}, err
+	}
+
+	cid := customerID
+	transactions, err := s.CustomerPaymentRepo.GetCustomerPaymentTransactions(ctx, &cid)
+	if err != nil {
+		return dto.CustomerPaymentReportItem{}, err
+	}
+
+	rows := make([]dto.CustomerPaymentReportRow, 0, len(transactions))
+	runningBalance := initialBalance
+
+	for i, tx := range transactions {
+
+		previousBalance := runningBalance
+
+		row := dto.ToCustomerPaymentReportRow(tx)
+
+		if tx.TransactionType == "SALES" {
+			runningBalance -= tx.TotalPrice
+			status, paymentDate := s.determineSalesStatusAndPaymentDate(transactions, i, previousBalance, runningBalance)
+			row.Status = status
+
+			if status == "LUNAS" {
+				if paymentDate != nil {
+					days := int(paymentDate.Sub(tx.TransDate).Hours() / 24)
+					row.AgingDay = &days
+				} else {
+					days := 0
+					row.AgingDay = &days
+				}
+			} else {
+				days := int(time.Since(tx.TransDate).Hours() / 24)
+				row.AgingDay = &days
+			}
+		} else if tx.TransactionType == "PAYMENT" {
+			runningBalance += tx.PaymentAmount
+			row.Status = ""
+			row.AgingDay = nil
+		}
+
+		row.AccountsReceivable = runningBalance
+		rows = append(rows, row)
+	}
+
+	if params.StartDate != "" || params.EndDate != "" {
+		filteredRows := make([]dto.CustomerPaymentReportRow, 0, len(rows))
+		location, err := time.LoadLocation("Asia/Jakarta")
+		if err != nil {
+			return dto.CustomerPaymentReportItem{}, err
+		}
+
+		var startDate, endDate *time.Time
+		if params.StartDate != "" {
+			parsed, err := time.ParseInLocation("2006-01-02", params.StartDate, location)
+			if err != nil {
+				return dto.CustomerPaymentReportItem{}, err
+			}
+			startDate = &parsed
+		}
+		if params.EndDate != "" {
+			parsed, err := time.ParseInLocation("2006-01-02", params.EndDate, location)
+			if err != nil {
+				return dto.CustomerPaymentReportItem{}, err
+			}
+			endOfDay := time.Date(parsed.Year(), parsed.Month(), parsed.Day(), 23, 59, 59, 999999999, location)
+			endDate = &endOfDay
+		}
+
+		for _, row := range rows {
+			transDate := row.TransDate.In(location)
+			if startDate != nil && transDate.Before(*startDate) {
+				continue
+			}
+			if endDate != nil && transDate.After(*endDate) {
+				continue
+			}
+			filteredRows = append(filteredRows, row)
+		}
+
+		rows = filteredRows
+	}
+
+	summary := dto.ToCustomerPaymentReportSummary(rows, initialBalance)
+
+	return dto.ToCustomerPaymentReportItem(*customer, initialBalance, rows, summary), nil
+}
+
+func (s *repportService) determineSalesStatusAndPaymentDate(transactions []repportRepo.CustomerPaymentTransaction, currentIndex int, previousBalance, currentBalance float64) (string, *time.Time) {
+	currentSales := transactions[currentIndex]
+
+	// Status Logic:
+	// 1. LUNAS: previousBalance >= salesAmount (paid from deposit)
+	// 2. LUNAS: future payments make AR >= 0 (eventually paid)
+	// 3. DIBAYAR SEBAGIAN: has payment but not enough
+	// 4. BELUM LUNAS: no payment at all
+
+	if previousBalance >= currentSales.TotalPrice {
+		// Cari payment yang digunakan untuk melunasi sales ini dengan FIFO
+		// Track payment allocations that are consumed by previous sales
+		type paymentAllocation struct {
+			date     time.Time
+			amount   float64
+			consumed float64
+		}
+		allocations := []paymentAllocation{}
+		runningBalance := 0.0
+
+		// Process all transactions before current sales to build allocation map
+		for i := 0; i < currentIndex; i++ {
+			if transactions[i].TransactionType == "PAYMENT" {
+				allocations = append(allocations, paymentAllocation{
+					date:     transactions[i].TransDate,
+					amount:   transactions[i].PaymentAmount,
+					consumed: 0,
+				})
+				runningBalance += transactions[i].PaymentAmount
+			} else if transactions[i].TransactionType == "SALES" {
+				salesAmount := transactions[i].TotalPrice
+				remainingToConsume := salesAmount
+
+				// Consume from oldest allocations first (FIFO)
+				for j := range allocations {
+					if remainingToConsume <= 0 {
+						break
+					}
+					available := allocations[j].amount - allocations[j].consumed
+					if available > 0 {
+						consume := available
+						if consume > remainingToConsume {
+							consume = remainingToConsume
+						}
+						allocations[j].consumed += consume
+						remainingToConsume -= consume
+					}
+				}
+				runningBalance -= salesAmount
+			}
+		}
+
+		// Now find which allocation covers the current sales
+		amountNeeded := currentSales.TotalPrice
+		for _, alloc := range allocations {
+			available := alloc.amount - alloc.consumed
+			if available > 0 {
+				if amountNeeded <= available {
+					// This allocation fully covers the sales
+					return "LUNAS", &alloc.date
+				} else {
+					// This allocation partially covers, continue to next
+					amountNeeded -= available
+				}
+			}
+		}
+
+		// If we get here, use the oldest allocation
+		if len(allocations) > 0 {
+			return "LUNAS", &allocations[0].date
+		}
+		return "LUNAS", nil
+	}
+
+	hasPartialPaymentFromBalance := previousBalance > 0 && previousBalance < currentSales.TotalPrice
+
+	futureBalance := currentBalance
+	hasPayment := false
+	var paymentDateThatMadeItLunas *time.Time
+
+	for i := currentIndex + 1; i < len(transactions); i++ {
+		if transactions[i].TransactionType == "PAYMENT" {
+			futureBalance += transactions[i].PaymentAmount
+			hasPayment = true
+
+			if futureBalance >= 0 {
+				paymentDateThatMadeItLunas = &transactions[i].TransDate
+				return "LUNAS", paymentDateThatMadeItLunas
+			}
+		} else if transactions[i].TransactionType == "SALES" {
+			futureBalance -= transactions[i].TotalPrice
+		}
+	}
+
+	if hasPayment || hasPartialPaymentFromBalance {
+		return "DIBAYAR SEBAGIAN", nil
+	}
+
+	return "BELUM LUNAS", nil
+}
+
 func mapRecordingToProductionResultDTO(record entity.Recording) dto.ProductionResultDTO {
 	result := dto.ProductionResultDTO{
 		CreatedAt:     record.CreatedAt,
@@ -314,17 +679,17 @@ func mapRecordingToProductionResultDTO(record entity.Recording) dto.ProductionRe
 		StdUniformity: "90% up",
 		DepKum:        valueOrZero(record.CumDepletionRate),
 		DepStd:        valueOrZero(record.TotalDepletionQty),
+		Hd:            valueOrZero(record.HenDay),
+		Fi:            valueOrZero(record.FeedIntake),
 		Fcr:           valueOrZero(record.FcrValue),
-		Hh:            valueOrZero(record.TotalChickQty),
+		Hh:            valueOrZero(record.HenHouse),
+		Em:            valueOrZero(record.EggMass),
+		Ew:            valueOrZero(record.EggWeight),
 	}
 
 	if record.Day != nil {
 		result.Woa = float64(*record.Day)
 	}
-	if record.CumIntake != nil {
-		result.Fi = float64(*record.CumIntake)
-	}
-
 	// avgWeight := calculateAverageBodyWeight(record.BodyWeights)
 	avgWeight := 1.0
 	if avgWeight > 0 {
@@ -351,8 +716,6 @@ func mapRecordingToProductionResultDTO(record entity.Recording) dto.ProductionRe
 		result.PersenPutih = roundFloat((float64(result.ButiranPutih)/total)*100, 2)
 		result.PersenRetak = roundFloat((float64(result.ButiranRetak)/total)*100, 2)
 		result.PersenPecah = roundFloat((float64(result.ButiranPecah)/total)*100, 2)
-		result.Ew = (eggSummary.TotalKg * 1000) / total
-		result.Em = eggSummary.TotalKg
 	}
 
 	return result
@@ -453,6 +816,68 @@ func getEggFlagType(egg entity.RecordingEgg) (utils.FlagType, bool) {
 	return "", false
 }
 
+type uniformityWeekData struct {
+	Uniformity float64
+	AvgWeight  *float64
+}
+
+type uniformityChartPayload struct {
+	Statistics *uniformityChartStats `json:"statistics"`
+}
+
+type uniformityChartStats struct {
+	AverageWeight *float64 `json:"average_weight"`
+}
+
+func (s *repportService) getUniformityByWeek(ctx context.Context, projectFlockKandangID uint, weeks []int) (map[int]uniformityWeekData, error) {
+	result := make(map[int]uniformityWeekData, len(weeks))
+	if projectFlockKandangID == 0 || len(weeks) == 0 {
+		return result, nil
+	}
+
+	var rows []entity.ProjectFlockKandangUniformity
+	if err := s.DB.WithContext(ctx).
+		Model(&entity.ProjectFlockKandangUniformity{}).
+		Select("week, uniformity, uniform_date, id").
+		Where("project_flock_kandang_id = ?", projectFlockKandangID).
+		Where("week IN ?", weeks).
+		Order("uniform_date DESC").
+		Order("id DESC").
+		Find(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	for _, row := range rows {
+		if _, exists := result[row.Week]; exists {
+			continue
+		}
+		result[row.Week] = uniformityWeekData{
+			Uniformity: row.Uniformity,
+			AvgWeight:  extractAverageWeight(row.ChartData, s.Log),
+		}
+	}
+
+	return result, nil
+}
+
+func extractAverageWeight(raw json.RawMessage, log *logrus.Logger) *float64 {
+	if len(raw) == 0 {
+		return nil
+	}
+
+	var payload uniformityChartPayload
+	if err := json.Unmarshal(raw, &payload); err != nil {
+		if log != nil {
+			log.WithError(err).Warn("uniformity chart_data decode failed")
+		}
+		return nil
+	}
+	if payload.Statistics == nil {
+		return nil
+	}
+	return payload.Statistics.AverageWeight
+}
+
 func summarizeProductionResults(daily []dto.ProductionResultDTO, groupSize int) []dto.ProductionResultDTO {
 	if groupSize <= 0 || len(daily) == 0 {
 		return daily
@@ -464,13 +889,13 @@ func summarizeProductionResults(daily []dto.ProductionResultDTO, groupSize int)
 		if end > len(daily) {
 			end = len(daily)
 		}
-		result = append(result, aggregateProductionResultGroup(daily[i:end]))
+		result = append(result, aggregateProductionResultGroup(daily[i:end], groupSize))
 	}
 
 	return result
 }
 
-func aggregateProductionResultGroup(group []dto.ProductionResultDTO) dto.ProductionResultDTO {
+func aggregateProductionResultGroup(group []dto.ProductionResultDTO, groupSize int) dto.ProductionResultDTO {
 	count := len(group)
 	if count == 0 {
 		return dto.ProductionResultDTO{}
@@ -542,6 +967,10 @@ func aggregateProductionResultGroup(group []dto.ProductionResultDTO) dto.Product
 	if divider == 0 {
 		divider = 1
 	}
+	weeklyDivider := float64(groupSize)
+	if weeklyDivider == 0 {
+		weeklyDivider = divider
+	}
 
 	agg.Bw = sumBw / divider
 	agg.StdBw = sumStdBw / divider
@@ -570,17 +999,17 @@ func aggregateProductionResultGroup(group []dto.ProductionResultDTO) dto.Product
 		agg.PersenPecah = roundFloat(sumPersenPecah/percentDivider, 2)
 	}
 
-	agg.Hd = sumHd / divider
+	agg.Hd = roundFloat(sumHd/weeklyDivider, 2)
 	agg.HdStd = sumHdStd / divider
-	agg.Fi = sumFi / divider
+	agg.Fi = roundFloat(sumFi/weeklyDivider, 2)
 	agg.FiStd = sumFiStd / divider
-	agg.Em = sumEm / divider
+	agg.Em = group[count-1].Em
 	agg.EmStd = sumEmStd / divider
-	agg.Ew = sumEw / divider
+	agg.Ew = group[count-1].Ew
 	agg.EwStd = sumEwStd / divider
-	agg.Fcr = sumFcr / divider
+	agg.Fcr = roundFloat(sumFcr/weeklyDivider, 2)
 	agg.FcrStd = sumFcrStd / divider
-	agg.Hh = sumHh / divider
+	agg.Hh = roundFloat(sumHh/weeklyDivider, 2)
 	agg.HhStd = sumHhStd / divider
 
 	return agg
@@ -972,13 +1401,42 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 	if err != nil {
 		return nil, nil, err
 	}
-	costRows, supplierRows, err := s.HppPerKandangRepo.GetFeedOvkDocCostByPeriod(ctx.Context(), startOfDay, endOfDay, params.AreaIDs, params.LocationIDs, params.KandangIDs)
+
+	validPfkIDs := make([]uint, 0, len(repoRows))
+	pfkIndex := make(map[uint]int, len(repoRows))
+	for idx := range repoRows {
+		row := repoRows[idx]
+		pfkIndex[row.ProjectFlockKandangID] = idx
+		if row.RecordingCount > 0 {
+			validPfkIDs = append(validPfkIDs, row.ProjectFlockKandangID)
+		}
+	}
+
+	costRows := make([]repportRepo.HppPerKandangCostRow, 0)
+	supplierRows := make([]repportRepo.HppPerKandangSupplierRow, 0)
+	if len(validPfkIDs) > 0 {
+		costRows, supplierRows, err = s.HppPerKandangRepo.GetFeedOvkDocCostByPeriod(ctx.Context(), startOfDay, endOfDay, validPfkIDs)
 		if err != nil {
 			return nil, nil, err
 		}
+
+		eggMap, err := s.HppPerKandangRepo.GetEggProductionByProjectFlockKandangIDs(ctx.Context(), startOfDay, endOfDay, validPfkIDs)
+		if err != nil {
+			return nil, nil, err
+		}
+		for pfkID, egg := range eggMap {
+			if rowIdx, ok := pfkIndex[pfkID]; ok {
+				repoRows[rowIdx].EggProductionWeightKgRemaining = egg.EggProductionWeightKgRemaining
+				repoRows[rowIdx].EggProductionPiecesRemaining = egg.EggProductionPiecesRemaining
+				repoRows[rowIdx].EggProductionTotalWeightKg = egg.EggProductionTotalWeightKg
+				repoRows[rowIdx].EggProductionTotalPieces = egg.EggProductionTotalPieces
+			}
+		}
+	}
+
 	costMap := make(map[uint]HppCostAggregate, len(costRows))
 	for _, row := range costRows {
-		costMap[row.KandangID] = HppCostAggregate{
+		costMap[row.ProjectFlockKandangID] = HppCostAggregate{
 			FeedCost:    row.FeedCost,
 			OvkCost:     row.OvkCost,
 			DocCost:     row.DocCost,
@@ -1007,15 +1465,15 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 			category = "DOC"
 		}
 
-		if seen[sup.KandangID] == nil {
+		if seen[sup.ProjectFlockKandangID] == nil {
-			seen[sup.KandangID] = make(map[uint]bool)
+			seen[sup.ProjectFlockKandangID] = make(map[uint]bool)
 		}
-		if seen[sup.KandangID][sup.SupplierID] {
+		if seen[sup.ProjectFlockKandangID][sup.SupplierID] {
 			continue
 		}
-		seen[sup.KandangID][sup.SupplierID] = true
+		seen[sup.ProjectFlockKandangID][sup.SupplierID] = true
 
-		targetMap[sup.KandangID] = append(targetMap[sup.KandangID], dto.HppPerKandangSupplierDTO{
+		targetMap[sup.ProjectFlockKandangID] = append(targetMap[sup.ProjectFlockKandangID], dto.HppPerKandangSupplierDTO{
 			ID:       int64(sup.SupplierID),
 			Name:     sup.SupplierName,
 			Alias:    sup.SupplierAlias,
@@ -1029,47 +1487,74 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 	}
 	type weightRangeAggregate struct {
 		Summary           *dto.HppPerKandangSummaryWeightRangeDTO
+		RemainingBirds    int64
+		RemainingWeightKg float64
+		AvgWeightSum      float64
+		AvgWeightCount    int64
 		EggHppSum         float64
 		EggHppCount       int
+		FeedSuppliers     map[int64]dto.HppPerKandangSupplierDTO
+		DocSuppliers      map[int64]dto.HppPerKandangSupplierDTO
 	}
 
 	dataRows := make([]dto.HppPerKandangRowDTO, 0, len(repoRows))
 	perRangeMap := make(map[weightRangeKey]*weightRangeAggregate)
 	var totalBirds int64
-	var totalWeight float64
+	// var totalWeight float64
 	var totalEggPieces int64
 	var totalEggKg float64
-	var totalRemainingValueRp int64
+	// var totalRemainingValueRp int64
 	var totalEggValueRp int64
-	var totalHppSum float64
+	// var totalHppSum float64
 	var totalHppCount int
 	var totalDocPriceSum float64
 	var totalDocPriceCount int
 	var totalEggHppSum float64
 	var totalEggHppCount int
+	var totalAvgWeightSum float64
+	var totalAvgWeightCount int64
 
 	for _, row := range repoRows {
-		birdsFloat := row.RemainingChickenBirds
+		if !params.ShowUnrecorded && row.RecordingCount == 0 {
-		if math.IsNaN(birdsFloat) || math.IsInf(birdsFloat, 0) {
+			continue
-			birdsFloat = 0
 		}
-		weightFloat := row.RemainingChickenWeight
+
-		if math.IsNaN(weightFloat) || math.IsInf(weightFloat, 0) {
+		// birdsFloat := row.RemainingChickenBirds
-			weightFloat = 0
+		// if math.IsNaN(birdsFloat) || math.IsInf(birdsFloat, 0) {
+		// 	birdsFloat = 0
+		// }
+		// weightFloat := row.RemainingChickenWeight
+		// if math.IsNaN(weightFloat) || math.IsInf(weightFloat, 0) {
+		// 	weightFloat = 0
+		// }
+		eggPiecesFloatRemaining := row.EggProductionPiecesRemaining
+		if math.IsNaN(eggPiecesFloatRemaining) || math.IsInf(eggPiecesFloatRemaining, 0) {
+			eggPiecesFloatRemaining = 0
 		}
-		eggPiecesFloat := row.EggProductionPieces
+		eggTotalPiecesFloat := row.EggProductionTotalPieces
-		if math.IsNaN(eggPiecesFloat) || math.IsInf(eggPiecesFloat, 0) {
+		if math.IsNaN(eggTotalPiecesFloat) || math.IsInf(eggTotalPiecesFloat, 0) {
-			eggPiecesFloat = 0
+			eggTotalPiecesFloat = 0
 		}
-		eggWeightFloat := row.EggProductionWeightKg
+		eggRemainingWeightFloatRemaining := row.EggProductionWeightKgRemaining
+		if math.IsNaN(eggRemainingWeightFloatRemaining) || math.IsInf(eggRemainingWeightFloatRemaining, 0) {
+			eggRemainingWeightFloatRemaining = 0
+		}
+		eggWeightFloat := row.EggProductionTotalWeightKg
 		if math.IsNaN(eggWeightFloat) || math.IsInf(eggWeightFloat, 0) {
 			eggWeightFloat = 0
 		}
 
 		avgWeight := 0.0
-		if birdsFloat > 0 {
+		if eggTotalPiecesFloat > 0 {
-			avgWeight = weightFloat / birdsFloat
+			avgWeight = eggWeightFloat / eggTotalPiecesFloat
 		}
+		if params.WeightMin != nil && avgWeight < *params.WeightMin {
+			continue
+		}
+		if params.WeightMax != nil && avgWeight > *params.WeightMax {
+			continue
+		}
+
 		weightMin := math.Floor(avgWeight*10) / 10
 		if weightMin < 0 {
 			weightMin = 0
@@ -1077,28 +1562,30 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 		weightMax := weightMin + 0.09
 		rangeKey := weightRangeKey{Min: weightMin, Max: weightMax}
 
-		rowBirds := int64(math.Round(birdsFloat))
+		// rowBirds := int64(math.Round(birdsFloat))
-		costEntry := costMap[row.KandangID]
+		costEntry := costMap[row.ProjectFlockKandangID]
 		totalCost := costEntry.FeedCost + costEntry.OvkCost + costEntry.DocCost + costEntry.BudgetCost + costEntry.ExpenseCost
-		hppRp := 0.0
+		// hppRp := 0.0
-		if weightFloat > 0 {
+		// if weightFloat > 0 {
-			hppRp = totalCost / weightFloat
+		// 	hppRp = totalCost / weightFloat
-		}
+		// }
 		eggHpp := 0.0
 		if eggWeightFloat > 0 {
-			eggHpp = totalCost / eggWeightFloat
+			eggHpp = (totalCost / eggWeightFloat) / 1000
 		}
 
-		rowEggPieces := int64(math.Round(eggPiecesFloat))
+		rowEggPieces := int64(math.Round(eggPiecesFloatRemaining))
-		rowEggValue := int64(eggHpp * eggWeightFloat)
+		rowEggValue := int64(eggHpp * eggRemainingWeightFloatRemaining)
-		rowRemainingValue := int64(hppRp * weightFloat)
+		// rowRemainingValue := int64(hppRp * weightFloat)
 		avgDocPrice := int64(0)
 		if costEntry.DocQty > 0 {
 			avgDocPrice = int64(math.Round(costEntry.DocCost / costEntry.DocQty))
 		}
 
+		nameWithPeriod := fmt.Sprintf("%s Period %d", row.KandangName, row.ProjectFlockPeriod)
+
 		dataRows = append(dataRows, dto.HppPerKandangRowDTO{
-			ID: int(row.KandangID),
+			ID: int(row.ProjectFlockKandangID),
 			Kandang: dto.HppPerKandangRowKandangDTO{
 				ID:     int64(row.KandangID),
 				Name:   row.KandangName,
@@ -1116,32 +1603,35 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 				WeightMin: weightMin,
 				WeightMax: weightMax,
 			},
-			RemainingChickenBirds:    rowBirds,
-			RemainingChickenWeightKg: weightFloat,
 			AvgWeightKg:     avgWeight,
+			NameWithPeriode: nameWithPeriod,
 			// FeedCostRp:               costEntry.FeedCost,
 			// OvkCostRp:                costEntry.OvkCost,
-			DocSuppliers:        docSupplierMap[row.KandangID],
+			DocSuppliers:        docSupplierMap[row.ProjectFlockKandangID],
-			FeedSuppliers:       feedSupplierMap[row.KandangID],
+			FeedSuppliers:       feedSupplierMap[row.ProjectFlockKandangID],
-			EggProductionPieces: rowEggPieces,
+			EggProductionPieces: int64(math.Round(eggPiecesFloatRemaining)),
-			EggProductionKg:     eggWeightFloat,
+			EggProductionKg:     eggRemainingWeightFloatRemaining,
+			// EggProductionTotalWeightKg: eggWeightFloat,
+			// EggProductionTotalPieces:   int64(math.Round(eggTotalPiecesFloat)),
 			AverageDocPriceRp: avgDocPrice,
-			HppRp:               hppRp,
+			// HppRp:               hppRp,
 			EggHppRpPerKg: eggHpp,
-			RemainingValueRp:    rowRemainingValue,
+			// RemainingValueRp: rowRemainingValue,
 			EggValueRp: rowEggValue,
 		})
 
-		totalBirds += rowBirds
+		// totalBirds += rowBirds
-		totalWeight += weightFloat
+		// totalWeight += weightFloat
 		totalEggPieces += rowEggPieces
-		totalEggKg += eggWeightFloat
+		totalEggKg += eggRemainingWeightFloatRemaining
-		totalRemainingValueRp += rowRemainingValue
+		// totalRemainingValueRp += rowRemainingValue
 		totalEggValueRp += rowEggValue
-		if weightFloat > 0 {
+		totalAvgWeightSum += avgWeight
-			totalHppSum += hppRp
+		totalAvgWeightCount++
-			totalHppCount++
+		// if weightFloat > 0 {
-		}
+		// 	totalHppSum += hppRp
+		// 	totalHppCount++
+		// }
 		if avgDocPrice > 0 {
 			totalDocPriceSum += float64(avgDocPrice)
 			totalDocPriceCount++
@@ -1161,16 +1651,30 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 					},
 					Label: fmt.Sprintf("%.2f - %.2f", weightMin, weightMax),
 				},
+				FeedSuppliers: make(map[int64]dto.HppPerKandangSupplierDTO),
+				DocSuppliers:  make(map[int64]dto.HppPerKandangSupplierDTO),
 			}
 			perRangeMap[rangeKey] = rangeAgg
 		}
 
 		rangeSummary := rangeAgg.Summary
-		rangeSummary.RemainingChickenBirds += rowBirds
+		// rangeAgg.RemainingBirds += rowBirds
-		rangeSummary.RemainingChickenWeightKg += row.RemainingChickenWeight
+		// rangeAgg.RemainingWeightKg += row.RemainingChickenWeight
+		rangeAgg.AvgWeightSum += avgWeight
+		rangeAgg.AvgWeightCount++
+		for _, supplier := range feedSupplierMap[row.ProjectFlockKandangID] {
+			if _, ok := rangeAgg.FeedSuppliers[supplier.ID]; !ok {
+				rangeAgg.FeedSuppliers[supplier.ID] = supplier
+			}
+		}
+		for _, supplier := range docSupplierMap[row.ProjectFlockKandangID] {
+			if _, ok := rangeAgg.DocSuppliers[supplier.ID]; !ok {
+				rangeAgg.DocSuppliers[supplier.ID] = supplier
+			}
+		}
 		rangeSummary.EggProductionPieces += rowEggPieces
-		rangeSummary.EggProductionKg += eggWeightFloat
+		rangeSummary.EggProductionKg += eggRemainingWeightFloatRemaining
-		rangeSummary.RemainingValueRp += rowRemainingValue
+		// rangeSummary.RemainingValueRp += rowRemainingValue
 		rangeSummary.EggValueRp += rowEggValue
 		if eggWeightFloat > 0 {
 			rangeAgg.EggHppSum += eggHpp
@@ -1194,31 +1698,37 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 		agg := perRangeMap[key]
 		entry := agg.Summary
 		entry.ID = idx + 1
-		if entry.RemainingChickenBirds > 0 {
+		if agg.AvgWeightCount > 0 {
-			entry.AvgWeightKg = entry.RemainingChickenWeightKg / float64(entry.RemainingChickenBirds)
+			entry.AvgWeightKg = agg.AvgWeightSum / float64(agg.AvgWeightCount)
 		}
 		if agg.EggHppCount > 0 {
 			entry.EggHppRpPerKg = agg.EggHppSum / float64(agg.EggHppCount)
 		}
+		entry.FeedSuppliers = make([]dto.HppPerKandangSupplierDTO, 0, len(agg.FeedSuppliers))
+		for _, supplier := range agg.FeedSuppliers {
+			entry.FeedSuppliers = append(entry.FeedSuppliers, supplier)
+		}
+		entry.DocSuppliers = make([]dto.HppPerKandangSupplierDTO, 0, len(agg.DocSuppliers))
+		for _, supplier := range agg.DocSuppliers {
+			entry.DocSuppliers = append(entry.DocSuppliers, supplier)
+		}
 		perRangeSummary = append(perRangeSummary, *entry)
 	}
 
 	totalSummary := dto.HppPerKandangSummaryTotalDTO{
-		TotalRemainingChickenBirds:    totalBirds,
-		TotalRemainingChickenWeightKg: totalWeight,
 		TotalEggProductionPieces: totalEggPieces,
 		TotalEggProductionKg:     totalEggKg,
-		TotalRemainingValueRp:         totalRemainingValueRp,
 		TotalEggValueRp:          totalEggValueRp,
 	}
 	if totalBirds > 0 {
-		totalSummary.AverageWeightKg = totalWeight / float64(totalBirds)
+	}
+	if totalAvgWeightCount > 0 {
+		totalSummary.AverageWeightKg = totalAvgWeightSum / float64(totalAvgWeightCount)
 	}
 	if totalEggHppCount > 0 {
 		totalSummary.AverageEggHppRpPerKg = totalEggHppSum / float64(totalEggHppCount)
 	}
 	if totalHppCount > 0 {
-		totalSummary.TotalHppRp = totalHppSum / float64(totalHppCount)
 	}
 	if totalDocPriceCount > 0 {
 		totalSummary.TotalAverageDocPriceRp = totalDocPriceSum / float64(totalDocPriceCount)
@@ -1311,6 +1821,9 @@ func (s *repportService) parseHppPerKandangQuery(ctx *fiber.Ctx) (*validation.Hp
 	if err != nil {
 		return nil, dto.HppPerKandangFiltersDTO{}, fiber.NewError(fiber.StatusBadRequest, err.Error())
 	}
+	if weightMin != nil && weightMax != nil && *weightMin > *weightMax {
+		return nil, dto.HppPerKandangFiltersDTO{}, fiber.NewError(fiber.StatusBadRequest, "weight_min must be less than or equal to weight_max")
+	}
 
 	params := &validation.HppPerKandangQuery{
 		Page:           page,

internal/modules/repports/validations/repport.validation.go

@@ -17,12 +17,14 @@ type ExpenseQuery struct {
 
 type MarketingQuery struct {
 	Page          int    `query:"page" validate:"omitempty,min=1,gt=0"`
-	Limit         int    `query:"limit" validate:"omitempty,min=1,max=100,gt=0"`
+	Limit         int    `query:"limit" validate:"omitempty,min=1,gt=0"`
 	Search        string `query:"search" validate:"omitempty,max=100"`
 	CustomerId    int64  `query:"customer_id" validate:"omitempty"`
 	ProductId     int64  `query:"product_id" validate:"omitempty"`
 	WarehouseId   int64  `query:"warehouse_id" validate:"omitempty"`
 	SalesPersonId int64  `query:"sales_person_id" validate:"omitempty"`
+	AreaId        int64  `query:"area_id" validate:"omitempty"`
+	LocationId    int64  `query:"location_id" validate:"omitempty"`
 	MarketingType string `query:"marketing_type" validate:"omitempty,oneof=ayam telur trading"`
 	FilterBy      string `query:"filter_by" validate:"omitempty,oneof=so_date realization_date"`
 	StartDate     string `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
@@ -56,7 +58,7 @@ type DebtSupplierQuery struct {
 
 type HppPerKandangQuery struct {
 	Page           int      `query:"page" validate:"omitempty,min=1,gt=0"`
-	Limit          int      `query:"limit" validate:"omitempty,min=1,max=100,gt=0"`
+	Limit          int      `query:"limit" validate:"omitempty,min=1,max=1000,gt=0"`
 	Period         string   `query:"period" validate:"required"`
 	ShowUnrecorded bool     `query:"show_unrecorded"`
 	AreaIDs        []int64  `query:"-"`
@@ -68,6 +70,14 @@ type HppPerKandangQuery struct {
 
 type ProductionResultQuery struct {
 	Page                  int  `query:"page" validate:"omitempty,min=1,gt=0"`
-	Limit                 int  `query:"limit" validate:"omitempty,min=1,max=100,gt=0"`
+	Limit                 int  `query:"limit" validate:"omitempty,min=1,gt=0"`
 	ProjectFlockKandangID uint `query:"-" validate:"required,gt=0"`
 }
+
+type CustomerPaymentQuery struct {
+	Page        int    `query:"page" validate:"omitempty,min=1,gt=0"`
+	Limit       int    `query:"limit" validate:"omitempty,min=1,max=100,gt=0"`
+	CustomerIDs []uint `query:"customer_ids" validate:"omitempty,dive,gt=0"`
+	StartDate   string `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
+	EndDate     string `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
+}

internal/utils/fifo/constants.go

@@ -15,4 +15,5 @@ const (
 	StockableKeyAdjustmentIn        StockableKey = "ADJUSTMENT_IN"
 	StockableKeyPurchaseItems       StockableKey = "PURCHASE_ITEMS"
 	StockableKeyProjectFlockPopulation StockableKey = "PROJECT_FLOCK_POPULATION"
+	StockableKeyRecordingEgg        StockableKey = "RECORDING_EGG"
 )