normalize data po number to pr number and fix logic to fill field PO number

Feat/fifo ar

See merge request mbugroup/lti-api!567

internal/common/service/common.fifo_payment.service.go

@@ -0,0 +1,393 @@
+package service
+
+import (
+	"context"
+	"fmt"
+	"math"
+	"strings"
+	"time"
+
+	"github.com/sirupsen/logrus"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+	"gorm.io/gorm"
+)
+
+// ParentKind enumerasi parent yang punya grand_total dari SUM children.
+type ParentKind string
+
+const (
+	ParentKindPurchase  ParentKind = "PURCHASE"
+	ParentKindMarketing ParentKind = "MARKETING"
+	ParentKindExpense   ParentKind = "EXPENSE"
+)
+
+// AllocationKind enumerasi sub-row anak target FIFO allocation.
+type AllocationKind string
+
+const (
+	AllocKindPurchaseItem             AllocationKind = "PURCHASE_ITEM"
+	AllocKindMarketingDeliveryProduct AllocationKind = "MDP"
+	AllocKindExpenseRealization       AllocationKind = "EXPENSE_REALIZATION"
+)
+
+// fifoEpsilon untuk float comparison saat FIFO matching.
+const fifoEpsilon = 0.001
+
+// FifoPaymentService meng-orchestrate FIFO allocation antara payments dan
+// sub-row anak (purchase_items / marketing_delivery_products / expense_realizations).
+type FifoPaymentService interface {
+	// ReallocateForParty wipe allocations untuk semua payment party tsb,
+	// lalu re-FIFO dari history (sort children by date ASC, payments by payment_date ASC).
+	// Caller WAJIB pass tx untuk konsistensi dengan mutasi upstream.
+	ReallocateForParty(ctx context.Context, tx *gorm.DB, partyType string, partyID uint) error
+
+	// RecomputeGrandTotal refresh parent.grand_total = SUM children eligible amount.
+	RecomputeGrandTotal(ctx context.Context, tx *gorm.DB, kind ParentKind, parentID uint) error
+}
+
+type fifoPaymentService struct {
+	db     *gorm.DB
+	logger *logrus.Logger
+}
+
+func NewFifoPaymentService(db *gorm.DB, logger *logrus.Logger) FifoPaymentService {
+	if logger == nil {
+		logger = logrus.StandardLogger()
+	}
+	return &fifoPaymentService{db: db, logger: logger}
+}
+
+func (s *fifoPaymentService) txOrDB(tx *gorm.DB) *gorm.DB {
+	if tx != nil {
+		return tx
+	}
+	return s.db
+}
+
+type childRow struct {
+	Kind      AllocationKind
+	ChildID   uint64
+	Amount    float64
+	Remaining float64
+}
+
+type paymentRow struct {
+	ID      uint
+	Nominal float64
+	Date    time.Time
+}
+
+// ReallocateForParty acquire advisory lock then perform full re-FIFO.
+// Jika tx nil, function buka transaction sendiri (advisory lock harus dalam TX).
+func (s *fifoPaymentService) ReallocateForParty(ctx context.Context, tx *gorm.DB, partyType string, partyID uint) error {
+	if partyID == 0 {
+		return nil
+	}
+	party := strings.ToUpper(strings.TrimSpace(partyType))
+	if party != string(utils.PaymentPartyCustomer) && party != string(utils.PaymentPartySupplier) {
+		return fmt.Errorf("fifoPayment: invalid party_type %q", partyType)
+	}
+	if tx == nil {
+		return s.db.WithContext(ctx).Transaction(func(innerTx *gorm.DB) error {
+			return s.reallocateInTx(ctx, innerTx, party, partyID)
+		})
+	}
+	return s.reallocateInTx(ctx, tx, party, partyID)
+}
+
+func (s *fifoPaymentService) reallocateInTx(ctx context.Context, tx *gorm.DB, party string, partyID uint) error {
+	db := tx.WithContext(ctx)
+
+	// Advisory lock per (party_type, party_id) — 1-arg form (bigint).
+	// Postgres 2-arg form butuh kedua param int4, sedangkan party_id bisa lebih besar.
+	lockKey := fmt.Sprintf("payment_alloc:%s:%d", party, partyID)
+	if err := db.Exec("SELECT pg_advisory_xact_lock(hashtext(?)::bigint)", lockKey).Error; err != nil {
+		return fmt.Errorf("fifoPayment: advisory lock: %w", err)
+	}
+
+	// Wipe existing allocations untuk semua payment party tsb
+	if err := db.Exec(`
+		DELETE FROM payment_allocations
+		WHERE payment_id IN (
+			SELECT id FROM payments
+			WHERE party_type = ? AND party_id = ? AND deleted_at IS NULL
+		)
+	`, party, partyID).Error; err != nil {
+		return fmt.Errorf("fifoPayment: wipe allocations: %w", err)
+	}
+
+	children, err := s.fetchChildren(ctx, db, party, partyID)
+	if err != nil {
+		return err
+	}
+	if len(children) == 0 {
+		return nil
+	}
+
+	// Fetch SEMUA payments termasuk SALDO_AWAL agar allocation tercatat di DB
+	// (SaldoAwal opening credit harus consume oldest debts; tanpa allocation row,
+	// debt yang ter-cover SaldoAwal akan tampak "Belum Lunas" di report).
+	payments, err := s.fetchAllPayments(ctx, db, party, partyID)
+	if err != nil {
+		return err
+	}
+
+	// Greedy: per payment, alokasi ke children tertua dengan remaining > 0
+	allocs := make([]entity.PaymentAllocation, 0, len(payments))
+	now := time.Now()
+	for _, pay := range payments {
+		remaining := pay.Nominal
+		if remaining <= fifoEpsilon {
+			continue
+		}
+		for i := range children {
+			if remaining <= fifoEpsilon {
+				break
+			}
+			if children[i].Remaining <= fifoEpsilon {
+				continue
+			}
+			used := math.Min(remaining, children[i].Remaining)
+			children[i].Remaining -= used
+			remaining -= used
+
+			alloc := entity.PaymentAllocation{
+				PaymentId:   pay.ID,
+				Amount:      used,
+				AllocatedAt: now,
+			}
+			switch children[i].Kind {
+			case AllocKindPurchaseItem:
+				id := uint(children[i].ChildID)
+				alloc.PurchaseItemId = &id
+			case AllocKindMarketingDeliveryProduct:
+				id := uint(children[i].ChildID)
+				alloc.MarketingDeliveryProductId = &id
+			case AllocKindExpenseRealization:
+				id := children[i].ChildID
+				alloc.ExpenseRealizationId = &id
+			}
+			allocs = append(allocs, alloc)
+		}
+	}
+
+	if len(allocs) == 0 {
+		return nil
+	}
+	// Batch insert allocations
+	if err := db.CreateInBatches(&allocs, 500).Error; err != nil {
+		return fmt.Errorf("fifoPayment: insert allocations: %w", err)
+	}
+	return nil
+}
+
+// fetchChildren return eligible sub-rows sorted by date ASC, id ASC.
+func (s *fifoPaymentService) fetchChildren(ctx context.Context, db *gorm.DB, party string, partyID uint) ([]childRow, error) {
+	if party == string(utils.PaymentPartySupplier) {
+		return s.fetchSupplierChildren(ctx, db, partyID)
+	}
+	return s.fetchCustomerChildren(ctx, db, partyID)
+}
+
+func (s *fifoPaymentService) fetchSupplierChildren(ctx context.Context, db *gorm.DB, supplierID uint) ([]childRow, error) {
+	// purchase_items eligible: purchases approval latest step >= Receiving (4), action != REJECTED, received_date IS NOT NULL
+	var purchaseRows []chronoRow
+	purchaseSQL := `
+		SELECT 'PURCHASE_ITEM' AS kind,
+		       pi.id::BIGINT AS child_id,
+		       pi.total_price AS amount,
+		       pi.received_date AS sort_date,
+		       pi.id::BIGINT AS sort_id
+		FROM purchase_items pi
+		JOIN purchases p ON p.id = pi.purchase_id
+		JOIN LATERAL (
+			SELECT a.step_number, a.action
+			FROM approvals a
+			WHERE a.approvable_type = ? AND a.approvable_id = p.id
+			ORDER BY a.action_at DESC, a.id DESC
+			LIMIT 1
+		) la ON TRUE
+		WHERE p.supplier_id = ?
+		  AND p.deleted_at IS NULL
+		  AND pi.received_date IS NOT NULL
+		  AND la.step_number >= ?
+		  AND (la.action IS NULL OR la.action <> ?)
+		  AND pi.total_price > 0
+		ORDER BY pi.received_date ASC, pi.id ASC
+	`
+	if err := db.WithContext(ctx).Raw(purchaseSQL,
+		string(utils.ApprovalWorkflowPurchase),
+		supplierID,
+		uint16(utils.PurchaseStepReceiving),
+		string(entity.ApprovalActionRejected),
+	).Scan(&purchaseRows).Error; err != nil {
+		return nil, fmt.Errorf("fifoPayment: fetch purchase items: %w", err)
+	}
+
+	// expense_realizations via expense_nonstocks → expenses, approval latest step >= Realisasi (5)
+	// Sort pakai e.transaction_date (bukan realization_date) supaya FIFO match dengan tanggal yang
+	// dipakai report sebagai "tanggal dokumen" — user assume FIFO = lunasi yang transaction_date paling tua dulu.
+	var expenseRows []chronoRow
+	expenseSQL := `
+		SELECT 'EXPENSE_REALIZATION' AS kind,
+		       er.id::BIGINT AS child_id,
+		       (er.qty * er.price) AS amount,
+		       e.transaction_date AS sort_date,
+		       er.id::BIGINT AS sort_id
+		FROM expense_realizations er
+		JOIN expense_nonstocks en ON en.id = er.expense_nonstock_id
+		JOIN expenses e ON e.id = en.expense_id
+		JOIN LATERAL (
+			SELECT a.step_number, a.action
+			FROM approvals a
+			WHERE a.approvable_type = ? AND a.approvable_id = e.id
+			ORDER BY a.action_at DESC, a.id DESC
+			LIMIT 1
+		) la ON TRUE
+		WHERE e.supplier_id = ?
+		  AND e.deleted_at IS NULL
+		  AND la.step_number >= ?
+		  AND (la.action IS NULL OR la.action <> ?)
+		  AND (er.qty * er.price) > 0
+		ORDER BY e.transaction_date ASC, e.id ASC, er.id ASC
+	`
+	if err := db.WithContext(ctx).Raw(expenseSQL,
+		string(utils.ApprovalWorkflowExpense),
+		supplierID,
+		uint16(utils.ExpenseStepRealisasi),
+		string(entity.ApprovalActionRejected),
+	).Scan(&expenseRows).Error; err != nil {
+		return nil, fmt.Errorf("fifoPayment: fetch expense realizations: %w", err)
+	}
+
+	// Merge in chronological order (kedua list sudah sorted; merge stable)
+	merged := mergeSortedByDate(purchaseRows, expenseRows)
+	out := make([]childRow, 0, len(merged))
+	for _, r := range merged {
+		out = append(out, childRow{
+			Kind:      AllocationKind(r.Kind),
+			ChildID:   r.ChildID,
+			Amount:    r.Amount,
+			Remaining: r.Amount,
+		})
+	}
+	return out, nil
+}
+
+func (s *fifoPaymentService) fetchCustomerChildren(ctx context.Context, db *gorm.DB, customerID uint) ([]childRow, error) {
+	var mdpRows []chronoRow
+	sql := `
+		SELECT 'MDP' AS kind,
+		       mdp.id::BIGINT AS child_id,
+		       mdp.total_price AS amount,
+		       mdp.delivery_date AS sort_date,
+		       mdp.id::BIGINT AS sort_id
+		FROM marketing_delivery_products mdp
+		JOIN marketing_products mp ON mp.id = mdp.marketing_product_id
+		JOIN marketings m ON m.id = mp.marketing_id
+		WHERE m.customer_id = ?
+		  AND m.deleted_at IS NULL
+		  AND mdp.delivery_date IS NOT NULL
+		  AND mdp.total_price > 0
+		ORDER BY mdp.delivery_date ASC, mdp.id ASC
+	`
+	if err := db.WithContext(ctx).Raw(sql, customerID).Scan(&mdpRows).Error; err != nil {
+		return nil, fmt.Errorf("fifoPayment: fetch marketing delivery products: %w", err)
+	}
+	out := make([]childRow, 0, len(mdpRows))
+	for _, r := range mdpRows {
+		out = append(out, childRow{
+			Kind:      AllocationKind(r.Kind),
+			ChildID:   r.ChildID,
+			Amount:    r.Amount,
+			Remaining: r.Amount,
+		})
+	}
+	return out, nil
+}
+
+// fetchAllPayments return SEMUA payments (termasuk SALDO_AWAL) sort by payment_date ASC, id ASC.
+// SALDO_AWAL diperlakukan sebagai payment tertua agar opening credit otomatis consume oldest debts via FIFO.
+func (s *fifoPaymentService) fetchAllPayments(ctx context.Context, db *gorm.DB, party string, partyID uint) ([]paymentRow, error) {
+	var rows []paymentRow
+	sql := `
+		SELECT id, nominal, payment_date AS date
+		FROM payments
+		WHERE party_type = ? AND party_id = ?
+		  AND deleted_at IS NULL
+		  AND nominal > 0
+		ORDER BY payment_date ASC, id ASC
+	`
+	if err := db.WithContext(ctx).Raw(sql, party, partyID).Scan(&rows).Error; err != nil {
+		return nil, fmt.Errorf("fifoPayment: fetch payments: %w", err)
+	}
+	return rows, nil
+}
+
+// RecomputeGrandTotal refresh parent.grand_total dari SUM children eligible amount.
+func (s *fifoPaymentService) RecomputeGrandTotal(ctx context.Context, tx *gorm.DB, kind ParentKind, parentID uint) error {
+	db := s.txOrDB(tx).WithContext(ctx)
+	if parentID == 0 {
+		return nil
+	}
+	switch kind {
+	case ParentKindPurchase:
+		return db.Exec(`
+			UPDATE purchases p
+			SET grand_total = COALESCE((SELECT SUM(total_price) FROM purchase_items WHERE purchase_id = p.id), 0)
+			WHERE p.id = ?
+		`, parentID).Error
+	case ParentKindMarketing:
+		return db.Exec(`
+			UPDATE marketings m
+			SET grand_total = COALESCE((
+				SELECT SUM(mdp.total_price)
+				FROM marketing_delivery_products mdp
+				JOIN marketing_products mp ON mp.id = mdp.marketing_product_id
+				WHERE mp.marketing_id = m.id AND mdp.delivery_date IS NOT NULL
+			), 0)
+			WHERE m.id = ?
+		`, parentID).Error
+	case ParentKindExpense:
+		return db.Exec(`
+			UPDATE expenses e
+			SET grand_total = COALESCE((
+				SELECT SUM(er.qty * er.price)
+				FROM expense_realizations er
+				JOIN expense_nonstocks en ON en.id = er.expense_nonstock_id
+				WHERE en.expense_id = e.id
+			), 0)
+			WHERE e.id = ?
+		`, parentID).Error
+	default:
+		return fmt.Errorf("fifoPayment: unknown parent kind %q", kind)
+	}
+}
+
+// chronoRow row antara untuk merge sort children.
+type chronoRow struct {
+	Kind     string
+	ChildID  uint64
+	Amount   float64
+	SortDate time.Time
+	SortID   uint64
+}
+
+func mergeSortedByDate(a, b []chronoRow) []chronoRow {
+	out := make([]chronoRow, 0, len(a)+len(b))
+	i, j := 0, 0
+	for i < len(a) && j < len(b) {
+		if a[i].SortDate.Before(b[j].SortDate) ||
+			(a[i].SortDate.Equal(b[j].SortDate) && a[i].SortID < b[j].SortID) {
+			out = append(out, a[i])
+			i++
+		} else {
+			out = append(out, b[j])
+			j++
+		}
+	}
+	out = append(out, a[i:]...)
+	out = append(out, b[j:]...)
+	return out
+}

internal/database/migrations/20260522113148_fix_adjustment_stock_532_price.down.sql

@@ -0,0 +1,4 @@
+UPDATE adjustment_stocks
+SET price = 9535,
+    grand_total = ROUND(8700 * 9535, 3)
+WHERE id = 532 AND adj_number = 'ADJ-00507';

internal/database/migrations/20260522113148_fix_adjustment_stock_532_price.up.sql

@@ -0,0 +1,5 @@
+
+UPDATE adjustment_stocks
+SET price = 12635,
+    grand_total = ROUND(8700 * 12635, 3)
+WHERE id = 532 AND adj_number = 'ADJ-00507';

internal/database/migrations/20260523035647_consolidate_pullet_cikaum_locations.down.sql

@@ -0,0 +1,31 @@
+BEGIN;
+
+-- Rollback konsolidasi: kembalikan data ke loc 18 / 25 sesuai snapshot pre-migration.
+-- Order: un-soft-delete locations dulu agar FK tidak gagal saat UPDATE child.
+
+-- 1. Un-soft-delete locations
+UPDATE locations SET deleted_at = NULL WHERE id IN (18, 25);
+
+-- 2. project_flocks: PF 30 -> 18, PF 25 & 31 -> 25
+UPDATE project_flocks SET location_id = 18, updated_at = NOW() WHERE id = 30;
+UPDATE project_flocks SET location_id = 25, updated_at = NOW() WHERE id IN (25, 31);
+
+-- 3. kandangs: K9, K72, K117 -> 18; K10, K73, K116 -> 25
+UPDATE kandangs SET location_id = 18, updated_at = NOW() WHERE id IN (9, 72, 117);
+UPDATE kandangs SET location_id = 25, updated_at = NOW() WHERE id IN (10, 73, 116);
+
+-- 4. kandang_groups: KG 26, 68 -> 18; KG 27, 67 -> 25
+UPDATE kandang_groups SET location_id = 18, updated_at = NOW() WHERE id IN (26, 68);
+UPDATE kandang_groups SET location_id = 25, updated_at = NOW() WHERE id IN (27, 67);
+
+-- 5. warehouses: W27, W145, W152 -> 18; W3, W146, W153 -> 25
+UPDATE warehouses SET location_id = 18, updated_at = NOW() WHERE id IN (27, 145, 152);
+UPDATE warehouses SET location_id = 25, updated_at = NOW() WHERE id IN (3, 146, 153);
+
+-- 6. expenses: list eksplisit per location
+UPDATE expenses SET location_id = 18, updated_at = NOW()
+WHERE id IN (36, 345, 500, 501, 502, 503, 504, 505, 506, 507, 508);
+UPDATE expenses SET location_id = 25, updated_at = NOW()
+WHERE id IN (9, 37, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518);
+
+COMMIT;

internal/database/migrations/20260523035647_consolidate_pullet_cikaum_locations.up.sql

@@ -0,0 +1,34 @@
+BEGIN;
+
+-- Konsolidasi 3 lokasi "Pullet Cikaum" jadi 1.
+-- Pindahkan semua data di loc 18 (Pullet Cikaum 1) & 25 (Pullet Cikaum 2) ke loc 2 (Pullet Cikaum).
+-- Urutan wajib: semua UPDATE child harus selesai SEBELUM soft-delete locations,
+-- karena trigger trg_soft_delete_fk_locations akan RAISE EXCEPTION untuk FK
+-- RESTRICT (project_flocks, kandangs, kandang_groups, expenses) atau SET NULL
+-- untuk warehouses kalau masih ada child yang reference.
+
+-- 1. project_flocks (PF 25, 30, 31)
+UPDATE project_flocks SET location_id = 2, updated_at = NOW()
+WHERE location_id IN (18, 25);
+
+-- 2. kandangs (K9, K72, K117, K10, K73, K116)
+UPDATE kandangs SET location_id = 2, updated_at = NOW()
+WHERE location_id IN (18, 25);
+
+-- 3. kandang_groups (KG 26, 68, 27, 67)
+UPDATE kandang_groups SET location_id = 2, updated_at = NOW()
+WHERE location_id IN (18, 25);
+
+-- 4. warehouses (W3, W27, W145, W146, W152, W153)
+UPDATE warehouses SET location_id = 2, updated_at = NOW()
+WHERE location_id IN (18, 25);
+
+-- 5. expenses (23 row BOP)
+UPDATE expenses SET location_id = 2, updated_at = NOW()
+WHERE location_id IN (18, 25);
+
+-- 6. Soft-delete locations 18 & 25 (kosong, aman karena semua child sudah pindah)
+UPDATE locations SET deleted_at = NOW()
+WHERE id IN (18, 25) AND deleted_at IS NULL;
+
+COMMIT;

internal/database/migrations/20260528121631_normalize_warehouse_jamali_10_to_25.down.sql

@@ -0,0 +1,99 @@
+BEGIN;
+
+-- ============================================================
+-- Rollback dynamic via audit snapshots di schema `migration_audit.jamali_w10_*`.
+-- Semua reverse dibaca dari snapshot yang dibuat oleh UP migration —
+-- tidak ada IDs/qty yang hardcode. Robust terhadap data drift antara
+-- dump time dan UP apply time (misalnya row baru warehouse_id=10
+-- yang muncul setelah dump diambil).
+--
+-- LIMITASI: FK relinks di stock_logs / stock_allocations / recording_eggs /
+-- marketing_products / dll. TIDAK direverse di sini (skip audit per-row
+-- untuk hemat storage ~40MB). Setelah down, 9 PW W10 yang di-restore
+-- akan kosong dari child rows (semua child masih pointing ke W25 PW
+-- yang sebelumnya menerima merge). Untuk rollback penuh, restore DB
+-- dari backup pre-migration.
+-- ============================================================
+
+-- Guard: pastikan audit tables ada (kalau tidak, fail-loud)
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.tables
+    WHERE table_schema = 'migration_audit'
+      AND table_name = 'jamali_w10_pw_deleted_snapshot'
+  ) THEN
+    RAISE EXCEPTION 'Audit table migration_audit.jamali_w10_* tidak ditemukan. UP migration belum dijalankan atau audit sudah di-drop. Restore dari DB backup jika perlu.';
+  END IF;
+END $$;
+
+-- 1. Un-soft-delete warehouse 10 (kalau memang di-softdelete oleh UP)
+UPDATE warehouses w
+SET deleted_at = NULL, updated_at = NOW()
+FROM migration_audit.jamali_w10_warehouse_softdeleted a
+WHERE w.id = a.id;
+
+-- 2. Un-soft-delete stock_transfers self-loop yang disoft-delete UP step 7.1
+UPDATE stock_transfers st
+SET deleted_at = NULL, updated_at = NOW()
+FROM migration_audit.jamali_w10_st_softdeleted a
+WHERE st.id = a.id;
+
+-- 3. Reverse stock_transfers redirect (CASE-based dari snapshot was_from_w10/was_to_w10)
+UPDATE stock_transfers st
+SET from_warehouse_id = CASE WHEN a.was_from_w10 THEN 10 ELSE st.from_warehouse_id END,
+    to_warehouse_id   = CASE WHEN a.was_to_w10   THEN 10 ELSE st.to_warehouse_id   END,
+    updated_at = NOW()
+FROM migration_audit.jamali_w10_st_redirected a
+WHERE st.id = a.id;
+
+-- 3b. Self-loop transfers (W10<->W25 awal) juga punya from_warehouse_id=25 atau
+-- to_warehouse_id=25 setelah UP step 7.2. Karena snapshot jamali_w10_st_softdeleted
+-- punya kolom from_warehouse_id & to_warehouse_id asli, pakai itu untuk reverse.
+UPDATE stock_transfers st
+SET from_warehouse_id = 10, updated_at = NOW()
+FROM migration_audit.jamali_w10_st_softdeleted a
+WHERE st.id = a.id AND a.from_warehouse_id = 10;
+
+UPDATE stock_transfers st
+SET to_warehouse_id = 10, updated_at = NOW()
+FROM migration_audit.jamali_w10_st_softdeleted a
+WHERE st.id = a.id AND a.to_warehouse_id = 10;
+
+-- 4. Reverse purchase_items.warehouse_id 25 -> 10
+UPDATE purchase_items
+SET warehouse_id = 10
+WHERE id IN (SELECT id FROM migration_audit.jamali_w10_purchase_items);
+
+-- 5. Reverse W10-only PW (warehouse_id 25 -> 10, restore pfk asli dari snapshot)
+UPDATE product_warehouses pw
+SET warehouse_id = 10, project_flock_kandang_id = a.original_pfk
+FROM migration_audit.jamali_w10_pw_w10only_snapshot a
+WHERE pw.id = a.id;
+
+-- 6. Subtract qty dari W25 PW (reverse merge)
+-- WARNING: kalau W25 qty sudah dikonsumsi pasca-UP (sales/recording/dll),
+-- hasil bisa negatif. Tidak ada CHECK constraint di product_warehouses.qty,
+-- jadi silent. Operator harus verifikasi manual post-down:
+--   SELECT id, qty FROM product_warehouses WHERE qty < 0;
+UPDATE product_warehouses pw
+SET qty = pw.qty - a.merged_qty
+FROM migration_audit.jamali_w10_qty_merge a
+WHERE pw.id = a.target_pw_id;
+
+-- 7. Re-INSERT 9 W10 PW rows yang di-DELETE oleh UP (PK asli + qty asli)
+INSERT INTO product_warehouses (id, product_id, warehouse_id, qty, project_flock_kandang_id)
+SELECT id, product_id, 10, qty, project_flock_kandang_id
+FROM migration_audit.jamali_w10_pw_deleted_snapshot;
+
+-- 8. Cleanup audit tables (drop satu per satu, tidak wildcard untuk safety)
+DROP TABLE migration_audit.jamali_w10_pw_deleted_snapshot;
+DROP TABLE migration_audit.jamali_w10_qty_merge;
+DROP TABLE migration_audit.jamali_w10_pw_w10only_snapshot;
+DROP TABLE migration_audit.jamali_w10_st_softdeleted;
+DROP TABLE migration_audit.jamali_w10_st_redirected;
+DROP TABLE migration_audit.jamali_w10_purchase_items;
+DROP TABLE migration_audit.jamali_w10_warehouse_softdeleted;
+-- Schema migration_audit dipertahankan (bisa dipakai migration lain di masa depan)
+
+COMMIT;

internal/database/migrations/20260528121631_normalize_warehouse_jamali_10_to_25.up.sql

@@ -0,0 +1,241 @@
+BEGIN;
+
+-- ============================================================
+-- Normalisasi warehouse 10 (Jamali NON_AKTIF) -> 25 (Gudang Farm Jamali)
+-- Background: Dua warehouse LOKASI di area & lokasi sama (area_id=6,
+-- location_id=16). W10 sudah ditandai NON_AKTIF tapi masih punya 13
+-- product_warehouses, 3,590 stock_logs, ~790K stock_allocations,
+-- 332 marketing_products, 17 purchase_items, dan 14 stock_transfers.
+-- Migration ini konsolidasikan semua relasi ke W25 lalu soft-delete W10.
+--
+-- Klasifikasi data:
+-- A. 9 product_warehouses W10 overlap dengan W25 (sama product_id, pfk=NULL)
+--    -> merge qty ke W25, relink semua FK ke product_warehouses.id,
+--       lalu DELETE W10 PW rows.
+-- B. 4 product_warehouses W10-only -> UPDATE warehouse_id=25.
+--    Rows 1188/1189/1190 punya pfk=98 (anomali LOKASI, seharusnya NULL
+--    per aturan di CLAUDE.md [2026-05-06]) -> normalisasi sekalian.
+-- C. 17 purchase_items.warehouse_id=10 -> UPDATE 25 (no unique conflict).
+-- D. 3 stock_transfers W10<->W25 (PND-LTI-00107/00109/00119) akan jadi
+--    self-loop W25<->W25 setelah merge -> soft-delete.
+-- E. 12 stock_transfers EGG_FARM_CUTOVER to_warehouse_id=10 -> UPDATE 25.
+-- F. warehouse_id=10 sendiri -> soft-delete.
+--
+-- UP membuat 7 snapshot table di schema `migration_audit.jamali_w10_*`
+-- sebelum mutasi. DOWN baca snapshot itu untuk reverse dynamic (tidak
+-- hardcode IDs/qty), sehingga apapun yang ada di production saat UP
+-- dijalankan akan ter-audit dan ter-reverse. FK relinks
+-- (stock_logs/stock_allocations/dll) TIDAK di-audit (storage ~40MB)
+-- — limitation: tidak bisa di-reverse DOWN, full rollback = DB backup.
+-- ============================================================
+
+-- STEP -1: Buat schema audit + snapshot tables (idempotent rerun via DROP IF EXISTS)
+CREATE SCHEMA IF NOT EXISTS migration_audit;
+
+DROP TABLE IF EXISTS migration_audit.jamali_w10_pw_deleted_snapshot;
+DROP TABLE IF EXISTS migration_audit.jamali_w10_qty_merge;
+DROP TABLE IF EXISTS migration_audit.jamali_w10_pw_w10only_snapshot;
+DROP TABLE IF EXISTS migration_audit.jamali_w10_st_softdeleted;
+DROP TABLE IF EXISTS migration_audit.jamali_w10_st_redirected;
+DROP TABLE IF EXISTS migration_audit.jamali_w10_purchase_items;
+DROP TABLE IF EXISTS migration_audit.jamali_w10_warehouse_softdeleted;
+
+-- Snapshot 9 W10 PW yang akan di-DELETE (overlap dgn W25, pfk=NULL)
+CREATE TABLE migration_audit.jamali_w10_pw_deleted_snapshot AS
+SELECT pw10.id, pw10.product_id, pw10.qty, pw10.project_flock_kandang_id
+FROM product_warehouses pw10
+JOIN product_warehouses pw25
+  ON pw25.product_id = pw10.product_id
+ AND pw25.warehouse_id = 25
+ AND pw25.project_flock_kandang_id IS NULL
+WHERE pw10.warehouse_id = 10 AND pw10.project_flock_kandang_id IS NULL;
+
+-- Snapshot qty delta per W25 target (untuk reverse subtract)
+CREATE TABLE migration_audit.jamali_w10_qty_merge AS
+SELECT pw25.id AS target_pw_id, pw10.id AS source_pw_id, pw10.qty AS merged_qty
+FROM product_warehouses pw10
+JOIN product_warehouses pw25
+  ON pw25.product_id = pw10.product_id
+ AND pw25.warehouse_id = 25
+ AND pw25.project_flock_kandang_id IS NULL
+WHERE pw10.warehouse_id = 10 AND pw10.project_flock_kandang_id IS NULL;
+
+-- Snapshot W10-only PW (yang akan di-UPDATE warehouse_id 10->25)
+CREATE TABLE migration_audit.jamali_w10_pw_w10only_snapshot AS
+SELECT pw10.id, pw10.project_flock_kandang_id AS original_pfk
+FROM product_warehouses pw10
+WHERE pw10.warehouse_id = 10
+  AND pw10.id NOT IN (SELECT id FROM migration_audit.jamali_w10_pw_deleted_snapshot);
+
+-- Snapshot stock_transfers yang akan di-soft-delete (self-loop W10<->W25)
+-- Simpan from/to_warehouse_id asli supaya DOWN bisa reverse direction tepat
+CREATE TABLE migration_audit.jamali_w10_st_softdeleted AS
+SELECT id, movement_number, from_warehouse_id, to_warehouse_id
+FROM stock_transfers
+WHERE deleted_at IS NULL
+  AND ((from_warehouse_id = 10 AND to_warehouse_id = 25)
+    OR (from_warehouse_id = 25 AND to_warehouse_id = 10));
+
+-- Snapshot stock_transfers yang akan di-UPDATE (W10<->other, bukan self-loop)
+CREATE TABLE migration_audit.jamali_w10_st_redirected AS
+SELECT id,
+       (from_warehouse_id = 10) AS was_from_w10,
+       (to_warehouse_id = 10)   AS was_to_w10
+FROM stock_transfers
+WHERE deleted_at IS NULL
+  AND (from_warehouse_id = 10 OR to_warehouse_id = 10)
+  AND id NOT IN (SELECT id FROM migration_audit.jamali_w10_st_softdeleted);
+
+-- Snapshot purchase_items IDs (cheap, ~17 rows)
+CREATE TABLE migration_audit.jamali_w10_purchase_items AS
+SELECT id FROM purchase_items WHERE warehouse_id = 10;
+
+-- Snapshot warehouses soft-delete flag (1 row, kalau memang masih aktif)
+CREATE TABLE migration_audit.jamali_w10_warehouse_softdeleted AS
+SELECT id FROM warehouses WHERE id = 10 AND deleted_at IS NULL;
+
+-- STEP 0: Pre-check sanity (idempotent guards)
+DO $$
+DECLARE v_count INT;
+BEGIN
+  SELECT COUNT(*) INTO v_count FROM warehouses
+  WHERE id IN (10, 25) AND type = 'LOKASI' AND area_id = 6 AND location_id = 16;
+  IF v_count <> 2 THEN
+    RAISE EXCEPTION 'Pre-check: warehouse 10/25 schema mismatch (got % rows)', v_count;
+  END IF;
+
+  SELECT COUNT(*) INTO v_count FROM purchase_items a
+  JOIN purchase_items b ON a.purchase_id = b.purchase_id
+    AND a.product_id = b.product_id
+    AND a.id <> b.id
+  WHERE a.warehouse_id = 10 AND b.warehouse_id = 25;
+  IF v_count > 0 THEN
+    RAISE EXCEPTION 'Pre-check: % purchase_items unique conflict (purchase_id,product_id)', v_count;
+  END IF;
+END $$;
+
+-- STEP 1: Merge qty W10 -> W25 untuk overlap (pfk=NULL)
+UPDATE product_warehouses pw25
+SET qty = pw25.qty + pw10.qty
+FROM product_warehouses pw10
+WHERE pw10.warehouse_id = 10 AND pw10.project_flock_kandang_id IS NULL
+  AND pw25.warehouse_id = 25 AND pw25.project_flock_kandang_id IS NULL
+  AND pw25.product_id = pw10.product_id;
+
+-- STEP 2: Build temp mapping (W10 PW id -> W25 PW id) untuk overlap saja
+CREATE TEMP TABLE _pw_map ON COMMIT DROP AS
+SELECT pw10.id AS old_id, pw25.id AS new_id
+FROM product_warehouses pw10
+JOIN product_warehouses pw25
+  ON pw25.product_id = pw10.product_id
+ AND pw25.warehouse_id = 25
+ AND pw25.project_flock_kandang_id IS NULL
+WHERE pw10.warehouse_id = 10 AND pw10.project_flock_kandang_id IS NULL;
+
+CREATE INDEX ON _pw_map(old_id);
+
+-- STEP 3: Relink semua FK ke product_warehouses.id (hanya rows di _pw_map)
+UPDATE stock_logs SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE stock_logs.product_warehouse_id = m.old_id;
+
+UPDATE stock_allocations SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE stock_allocations.product_warehouse_id = m.old_id;
+
+UPDATE recording_eggs SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE recording_eggs.product_warehouse_id = m.old_id;
+
+UPDATE recording_stocks SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE recording_stocks.product_warehouse_id = m.old_id;
+
+UPDATE recording_depletions SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE recording_depletions.product_warehouse_id = m.old_id;
+UPDATE recording_depletions SET source_product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE recording_depletions.source_product_warehouse_id = m.old_id;
+
+UPDATE adjustment_stocks SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE adjustment_stocks.product_warehouse_id = m.old_id;
+
+UPDATE marketing_products SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE marketing_products.product_warehouse_id = m.old_id;
+
+UPDATE marketing_delivery_products SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE marketing_delivery_products.product_warehouse_id = m.old_id;
+
+UPDATE project_chickins SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE project_chickins.product_warehouse_id = m.old_id;
+
+UPDATE project_chickin_details SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE project_chickin_details.product_warehouse_id = m.old_id;
+
+UPDATE project_flock_populations SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE project_flock_populations.product_warehouse_id = m.old_id;
+
+UPDATE laying_transfers SET source_product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE laying_transfers.source_product_warehouse_id = m.old_id;
+
+UPDATE laying_transfer_sources SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE laying_transfer_sources.product_warehouse_id = m.old_id;
+
+UPDATE laying_transfer_targets SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE laying_transfer_targets.product_warehouse_id = m.old_id;
+
+UPDATE stock_transfer_details SET source_product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE stock_transfer_details.source_product_warehouse_id = m.old_id;
+UPDATE stock_transfer_details SET dest_product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE stock_transfer_details.dest_product_warehouse_id = m.old_id;
+
+UPDATE purchase_items SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE purchase_items.product_warehouse_id = m.old_id;
+
+-- FIFO v2 tables (kosong di dump 2026-05-25, defensive)
+UPDATE fifo_stock_v2_operation_log SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE fifo_stock_v2_operation_log.product_warehouse_id = m.old_id;
+UPDATE fifo_stock_v2_reflow_checkpoints SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE fifo_stock_v2_reflow_checkpoints.product_warehouse_id = m.old_id;
+UPDATE fifo_stock_v2_shadow_allocations SET product_warehouse_id = m.new_id
+  FROM _pw_map m WHERE fifo_stock_v2_shadow_allocations.product_warehouse_id = m.old_id;
+
+-- STEP 4: Hard-delete W10 PW yang sudah merged (9 rows expected)
+DELETE FROM product_warehouses WHERE id IN (SELECT old_id FROM _pw_map);
+
+-- STEP 5: Sisa W10 PW (4 rows: 1188/1189/1190/1196) -> warehouse_id=25,
+-- pfk dinormalisasi ke NULL sekalian (LOKASI rule)
+UPDATE product_warehouses
+SET warehouse_id = 25, project_flock_kandang_id = NULL
+WHERE warehouse_id = 10;
+
+-- STEP 6: purchase_items.warehouse_id (17 rows)
+UPDATE purchase_items SET warehouse_id = 25 WHERE warehouse_id = 10;
+
+-- STEP 7: stock_transfers
+-- 7.1 Soft-delete self-loop (W10<->W25 akan jadi W25<->W25)
+UPDATE stock_transfers
+SET deleted_at = NOW(), updated_at = NOW()
+WHERE deleted_at IS NULL
+  AND ((from_warehouse_id = 10 AND to_warehouse_id = 25)
+    OR (from_warehouse_id = 25 AND to_warehouse_id = 10));
+
+-- 7.2 Sisa W10<->other -> 25 (12 EGG_FARM_CUTOVER ke W10)
+UPDATE stock_transfers SET from_warehouse_id = 25, updated_at = NOW() WHERE from_warehouse_id = 10;
+UPDATE stock_transfers SET to_warehouse_id = 25, updated_at = NOW() WHERE to_warehouse_id = 10;
+
+-- STEP 8: Soft-delete warehouse 10 sendiri
+UPDATE warehouses SET deleted_at = NOW(), updated_at = NOW()
+WHERE id = 10 AND deleted_at IS NULL;
+
+-- STEP 9: Post-check (fail-fast jika ada residu)
+DO $$
+DECLARE v_count INT;
+BEGIN
+  SELECT COUNT(*) INTO v_count FROM product_warehouses WHERE warehouse_id = 10;
+  IF v_count <> 0 THEN RAISE EXCEPTION 'product_warehouses W10 residual %', v_count; END IF;
+
+  SELECT COUNT(*) INTO v_count FROM purchase_items WHERE warehouse_id = 10;
+  IF v_count <> 0 THEN RAISE EXCEPTION 'purchase_items W10 residual %', v_count; END IF;
+
+  SELECT COUNT(*) INTO v_count FROM stock_transfers
+  WHERE deleted_at IS NULL AND (from_warehouse_id = 10 OR to_warehouse_id = 10);
+  IF v_count <> 0 THEN RAISE EXCEPTION 'stock_transfers W10 residual %', v_count; END IF;
+END $$;
+
+COMMIT;

internal/database/migrations/20260528123243_fix_stock_log_drift_jamali_merge.down.sql

@@ -0,0 +1,29 @@
+BEGIN;
+
+-- ============================================================
+-- Rollback stock_log drift fix: DELETE corrective rows yang di-insert UP.
+-- IDs ditarik dari audit table `migration_audit.jamali_w10_stocklog_corrections`.
+-- Setelah delete, `last_stock_log.stock` kembali ke nilai pre-fix (drift muncul lagi).
+-- ============================================================
+
+-- Guard: audit table harus ada
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.tables
+    WHERE table_schema = 'migration_audit'
+      AND table_name = 'jamali_w10_stocklog_corrections'
+  ) THEN
+    RAISE EXCEPTION
+      'Audit table migration_audit.jamali_w10_stocklog_corrections tidak ditemukan. UP belum dijalankan atau audit sudah di-drop.';
+  END IF;
+END $$;
+
+-- DELETE corrective stock_logs yang di-insert oleh UP
+DELETE FROM stock_logs
+WHERE id IN (SELECT stock_log_id FROM migration_audit.jamali_w10_stocklog_corrections);
+
+-- Cleanup audit table
+DROP TABLE migration_audit.jamali_w10_stocklog_corrections;
+
+COMMIT;

internal/database/migrations/20260528123243_fix_stock_log_drift_jamali_merge.up.sql

@@ -0,0 +1,111 @@
+BEGIN;
+
+-- ============================================================
+-- Fix stock_log drift pasca-merge warehouse Jamali (NON_AKTIF) -> Gudang Farm Jamali.
+-- Follow-up migration setelah 20260528121631_normalize_warehouse_jamali_10_to_25.
+--
+-- Setelah merge, `stock_logs.stock` (running ledger) drift dari
+-- `product_warehouses.qty` karena: pre-existing drift di W10 + W25 sources,
+-- plus FIFO reflow yang trigger pasca-merge (Recording-Edit) recompute
+-- pw.qty tapi stock_logs tidak ikut update.
+--
+-- Migration ini insert 1 ADJUSTMENT stock_log corrective per PW yang drift
+-- supaya `last_stock_log.stock = pw.qty`. Logic ekivalen dengan
+-- `cmd/fix-stock-log-drift`.
+--
+-- Karakteristik dynamic:
+--   - Tidak hardcode PW IDs atau drift values
+--   - Iterate via merge target + W10-only kept PWs (data-driven dari snapshot)
+--   - Per PW: hitung drift runtime, skip kalau negligible (< 0.001) atau no logs
+--   - Track stock_log IDs yang di-insert untuk DOWN reverse
+-- ============================================================
+
+-- Guard: previous migration (normalisasi) audit harus ada
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.tables
+    WHERE table_schema = 'migration_audit'
+      AND table_name = 'jamali_w10_qty_merge'
+  ) THEN
+    RAISE EXCEPTION
+      'Migration 20260528121631 (normalize_warehouse_jamali) belum dijalankan atau audit-nya sudah di-drop. Apply UP-nya dulu sebelum migration ini.';
+  END IF;
+END $$;
+
+-- Audit table untuk track stock_log IDs yang di-insert (untuk DOWN reverse)
+DROP TABLE IF EXISTS migration_audit.jamali_w10_stocklog_corrections;
+CREATE TABLE migration_audit.jamali_w10_stocklog_corrections (
+  stock_log_id BIGINT NOT NULL PRIMARY KEY,
+  product_warehouse_id BIGINT NOT NULL,
+  drift NUMERIC(15,3) NOT NULL,
+  inserted_at TIMESTAMPTZ DEFAULT NOW()
+);
+
+-- Insert corrective ADJUSTMENT stock_log untuk tiap PW yang drift
+DO $$
+DECLARE
+  rec RECORD;
+  v_last_log_stock NUMERIC(15,3);
+  v_drift NUMERIC(15,3);
+  v_new_log_id BIGINT;
+  v_inserts INT := 0;
+BEGIN
+  FOR rec IN (
+    SELECT pw.id AS pw_id, pw.qty AS qty
+    FROM product_warehouses pw
+    WHERE pw.id IN (
+      -- Merge target W25 PWs (9 rows)
+      SELECT target_pw_id FROM migration_audit.jamali_w10_qty_merge
+      UNION
+      -- W10-only PWs yang di-update warehouse_id 10->25 (4 rows)
+      SELECT id FROM migration_audit.jamali_w10_pw_w10only_snapshot
+    )
+  ) LOOP
+    -- Ambil stock akhir di stock_logs ledger
+    SELECT stock INTO v_last_log_stock
+    FROM stock_logs
+    WHERE product_warehouse_id = rec.pw_id
+    ORDER BY id DESC
+    LIMIT 1;
+
+    -- PW tanpa stock_logs entry (mis. 1188/1189/1190 ayam) -> skip
+    IF v_last_log_stock IS NULL THEN
+      CONTINUE;
+    END IF;
+
+    v_drift := rec.qty - v_last_log_stock;
+
+    -- Drift negligible -> skip
+    IF ABS(v_drift) < 0.001 THEN
+      CONTINUE;
+    END IF;
+
+    -- Insert corrective ADJUSTMENT stock_log
+    INSERT INTO stock_logs (
+      product_warehouse_id, loggable_type, loggable_id,
+      notes, increase, decrease, stock, created_by, created_at
+    ) VALUES (
+      rec.pw_id,
+      'ADJUSTMENT',
+      0,
+      'Koreksi stock_log drift pasca-merge warehouse Jamali (migration 20260528123243)',
+      CASE WHEN v_drift > 0 THEN v_drift ELSE 0 END,
+      CASE WHEN v_drift < 0 THEN -v_drift ELSE 0 END,
+      rec.qty,
+      1,
+      NOW()
+    ) RETURNING id INTO v_new_log_id;
+
+    -- Track ke audit table untuk DOWN
+    INSERT INTO migration_audit.jamali_w10_stocklog_corrections (
+      stock_log_id, product_warehouse_id, drift
+    ) VALUES (v_new_log_id, rec.pw_id, v_drift);
+
+    v_inserts := v_inserts + 1;
+  END LOOP;
+
+  RAISE NOTICE 'Inserted % corrective stock_logs to align ledger with pw.qty', v_inserts;
+END $$;
+
+COMMIT;

internal/database/migrations/20260528175508_add_grand_total_to_marketings_expenses.down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE marketings DROP COLUMN IF EXISTS grand_total;
+ALTER TABLE expenses DROP COLUMN IF EXISTS grand_total;
+ALTER TABLE purchases DROP COLUMN IF EXISTS grand_total;

internal/database/migrations/20260528175508_add_grand_total_to_marketings_expenses.up.sql

@@ -0,0 +1,42 @@
+-- Marketing belum punya grand_total. Tambahkan dengan DEFAULT 0.
+ALTER TABLE marketings ADD COLUMN grand_total NUMERIC(15, 3) NOT NULL DEFAULT 0;
+
+-- Expense grand_total sebelumnya di-drop di migration 20251125055613. Re-add.
+ALTER TABLE expenses ADD COLUMN grand_total NUMERIC(15, 3) NOT NULL DEFAULT 0;
+
+ALTER TABLE purchases ADD COLUMN grand_total NUMERIC(15, 3) NOT NULL DEFAULT 0;
+
+-- Backfill nilai grand_total dari children:
+-- marketings.grand_total = SUM marketing_delivery_products.total_price (WHERE delivery_date IS NOT NULL)
+UPDATE marketings m
+SET grand_total = COALESCE(s.t, 0)
+FROM (
+    SELECT mp.marketing_id AS marketing_id, SUM(mdp.total_price) AS t
+    FROM marketing_delivery_products mdp
+    JOIN marketing_products mp ON mp.id = mdp.marketing_product_id
+    WHERE mdp.delivery_date IS NOT NULL
+    GROUP BY mp.marketing_id
+) s
+WHERE s.marketing_id = m.id;
+
+-- expenses.grand_total = SUM(expense_realizations.qty * expense_realizations.price) via expense_nonstocks
+UPDATE expenses e
+SET grand_total = COALESCE(s.t, 0)
+FROM (
+    SELECT en.expense_id AS expense_id, SUM(er.qty * er.price) AS t
+    FROM expense_realizations er
+    JOIN expense_nonstocks en ON en.id = er.expense_nonstock_id
+    GROUP BY en.expense_id
+) s
+WHERE s.expense_id = e.id;
+
+-- purchases.grand_total sudah ada sejak migration 20251104084555.
+-- Recompute juga untuk safety supaya konsisten dengan SUM purchase_items.total_price.
+UPDATE purchases p
+SET grand_total = COALESCE(s.t, 0)
+FROM (
+    SELECT purchase_id, SUM(total_price) AS t
+    FROM purchase_items
+    GROUP BY purchase_id
+) s
+WHERE s.purchase_id = p.id;

internal/database/migrations/20260528175642_create_payment_allocations.down.sql

@@ -0,0 +1,5 @@
+DROP INDEX IF EXISTS idx_payments_party_active;
+DROP INDEX IF EXISTS idx_mdp_delivery_date_partial;
+DROP INDEX IF EXISTS idx_purchase_items_received_date_partial;
+
+DROP TABLE IF EXISTS payment_allocations;

internal/database/migrations/20260528175642_create_payment_allocations.up.sql

@@ -0,0 +1,27 @@
+-- Tabel payment_allocations menyimpan hasil FIFO matching antara payment dengan
+-- sub-row anak (purchase_item / marketing_delivery_product / expense_realization).
+-- Setiap allocation row HARUS terhubung ke tepat 1 child via 3 nullable FK
+-- (polymorphic-via-multiple-nullable-FK; lebih aman dari single polymorphic kolom).
+CREATE TABLE IF NOT EXISTS payment_allocations (
+    id BIGSERIAL PRIMARY KEY,
+    payment_id BIGINT NOT NULL REFERENCES payments(id) ON DELETE CASCADE,
+    purchase_item_id BIGINT NULL REFERENCES purchase_items(id) ON DELETE CASCADE,
+    marketing_delivery_product_id BIGINT NULL REFERENCES marketing_delivery_products(id) ON DELETE CASCADE,
+    expense_realization_id BIGINT NULL REFERENCES expense_realizations(id) ON DELETE CASCADE,
+    amount NUMERIC(15, 3) NOT NULL CHECK (amount > 0),
+    allocated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    CONSTRAINT chk_payment_alloc_exactly_one CHECK (
+        num_nonnulls(purchase_item_id, marketing_delivery_product_id, expense_realization_id) = 1
+    )
+);
+
+CREATE INDEX IF NOT EXISTS idx_payment_alloc_payment ON payment_allocations (payment_id);
+CREATE INDEX IF NOT EXISTS idx_payment_alloc_purchase_item ON payment_allocations (purchase_item_id) WHERE purchase_item_id IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_payment_alloc_mdp ON payment_allocations (marketing_delivery_product_id) WHERE marketing_delivery_product_id IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_payment_alloc_realization ON payment_allocations (expense_realization_id) WHERE expense_realization_id IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_payment_alloc_allocated_at ON payment_allocations (allocated_at);
+
+-- Helper partial indexes untuk FIFO loop performance
+CREATE INDEX IF NOT EXISTS idx_purchase_items_received_date_partial ON purchase_items (received_date) WHERE received_date IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_mdp_delivery_date_partial ON marketing_delivery_products (delivery_date) WHERE delivery_date IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_payments_party_active ON payments (party_type, party_id, payment_date) WHERE deleted_at IS NULL;

internal/database/migrations/20260528175729_backfill_payment_allocations.down.sql

@@ -0,0 +1,4 @@
+-- Rollback backfill: hapus semua allocations dan drop function.
+TRUNCATE payment_allocations;
+
+DROP FUNCTION IF EXISTS fn_fifo_backfill_party(TEXT, BIGINT);

internal/database/migrations/20260528175729_backfill_payment_allocations.up.sql

@@ -0,0 +1,170 @@
+-- Backfill payment_allocations untuk data historis via FIFO simulation.
+-- Seluruh migration ini berjalan dalam 1 transaction (golang-migrate default).
+-- Jika ada party yang gagal di tengah loop, seluruh backfill ROLLBACK otomatis.
+
+-- Fungsi inti: FIFO greedy untuk 1 party (supplier/customer).
+-- Algoritma:
+--   1. Hapus payment_allocations existing untuk party tsb (idempotent).
+--   2. Kumpulkan eligible children sort by date ASC ke array (kind, id, amount, remaining).
+--   3. Konsumsi creditCarry (SUM payment SALDO_AWAL) ke children tertua — TIDAK insert allocation row.
+--   4. Loop payments (selain SALDO_AWAL) ORDER BY payment_date ASC: greedy alokasi ke child tertua dengan remaining > 0.
+--   5. Sisa nominal payment tidak insert row (otomatis credit balance untuk dokumen baru).
+CREATE OR REPLACE FUNCTION fn_fifo_backfill_party(
+    p_party_type TEXT,
+    p_party_id BIGINT
+) RETURNS VOID AS $func$
+DECLARE
+    v_party_type TEXT := UPPER(p_party_type);
+    v_payment RECORD;
+    v_child RECORD;
+    v_remaining NUMERIC(15, 3);
+    v_used NUMERIC(15, 3);
+    v_eps CONSTANT NUMERIC(15, 3) := 0.001;
+BEGIN
+    -- Acquire advisory lock untuk anti-race (1-arg form: hashtext returns int4, cast ke bigint)
+    PERFORM pg_advisory_xact_lock(hashtext('payment_alloc:' || v_party_type || ':' || p_party_id::text)::bigint);
+
+    -- Hapus allocations existing untuk party tsb (idempotent ulang-jalan)
+    DELETE FROM payment_allocations pa
+    USING payments p
+    WHERE pa.payment_id = p.id
+      AND p.party_type = v_party_type
+      AND p.party_id = p_party_id;
+
+    -- TEMP table untuk antrian children (sort sudah ada di INSERT...SELECT ORDER BY)
+    CREATE TEMP TABLE IF NOT EXISTS _children_queue (
+        seq BIGSERIAL PRIMARY KEY,
+        kind TEXT NOT NULL,           -- 'PURCHASE_ITEM' / 'MDP' / 'EXPENSE_REALIZATION'
+        child_id BIGINT NOT NULL,
+        amount NUMERIC(15, 3) NOT NULL,
+        remaining NUMERIC(15, 3) NOT NULL
+    ) ON COMMIT DROP;
+    TRUNCATE _children_queue;
+
+    IF v_party_type = 'SUPPLIER' THEN
+        -- purchase_items eligible: received_date IS NOT NULL, approval latest step >= 4 (Receiving), action != REJECTED
+        INSERT INTO _children_queue (kind, child_id, amount, remaining)
+        SELECT 'PURCHASE_ITEM', pi.id, pi.total_price, pi.total_price
+        FROM purchase_items pi
+        JOIN purchases p ON p.id = pi.purchase_id
+        JOIN LATERAL (
+            SELECT a.step_number, a.action
+            FROM approvals a
+            WHERE a.approvable_type = 'PURCHASES' AND a.approvable_id = p.id
+            ORDER BY a.action_at DESC, a.id DESC
+            LIMIT 1
+        ) la ON true
+        WHERE p.supplier_id = p_party_id
+          AND p.deleted_at IS NULL
+          AND pi.received_date IS NOT NULL
+          AND la.step_number >= 4
+          AND (la.action IS NULL OR la.action <> 'REJECTED')
+          AND pi.total_price > 0
+        ORDER BY pi.received_date ASC, pi.id ASC;
+
+        -- expense_realizations eligible: parent expense approval latest step >= 5 (Realisasi), action != REJECTED.
+        -- Sort pakai e.transaction_date supaya FIFO konsisten dengan tanggal yang di-display di report.
+        INSERT INTO _children_queue (kind, child_id, amount, remaining)
+        SELECT 'EXPENSE_REALIZATION', er.id, (er.qty * er.price), (er.qty * er.price)
+        FROM expense_realizations er
+        JOIN expense_nonstocks en ON en.id = er.expense_nonstock_id
+        JOIN expenses e ON e.id = en.expense_id
+        JOIN LATERAL (
+            SELECT a.step_number, a.action
+            FROM approvals a
+            WHERE a.approvable_type = 'EXPENSES' AND a.approvable_id = e.id
+            ORDER BY a.action_at DESC, a.id DESC
+            LIMIT 1
+        ) la ON true
+        WHERE e.supplier_id = p_party_id
+          AND e.deleted_at IS NULL
+          AND la.step_number >= 5
+          AND (la.action IS NULL OR la.action <> 'REJECTED')
+          AND (er.qty * er.price) > 0
+        ORDER BY e.transaction_date ASC, e.id ASC, er.id ASC;
+
+    ELSIF v_party_type = 'CUSTOMER' THEN
+        -- marketing_delivery_products eligible: delivery_date IS NOT NULL (match current report behavior, tidak filter approval)
+        INSERT INTO _children_queue (kind, child_id, amount, remaining)
+        SELECT 'MDP', mdp.id, mdp.total_price, mdp.total_price
+        FROM marketing_delivery_products mdp
+        JOIN marketing_products mp ON mp.id = mdp.marketing_product_id
+        JOIN marketings m ON m.id = mp.marketing_id
+        WHERE m.customer_id = p_party_id
+          AND m.deleted_at IS NULL
+          AND mdp.delivery_date IS NOT NULL
+          AND mdp.total_price > 0
+        ORDER BY mdp.delivery_date ASC, mdp.id ASC;
+    ELSE
+        RETURN;
+    END IF;
+
+    -- Skip jika tidak ada children eligible
+    IF NOT EXISTS (SELECT 1 FROM _children_queue) THEN
+        RETURN;
+    END IF;
+
+    -- Loop SEMUA payments termasuk SALDO_AWAL ORDER BY payment_date ASC, id ASC.
+    -- SALDO_AWAL diperlakukan sebagai payment tertua sehingga opening credit otomatis
+    -- consume oldest debts via FIFO. Tanpa allocation row, debt yang ter-cover SaldoAwal
+    -- akan tampak "Belum Lunas" di report.
+    FOR v_payment IN
+        SELECT id, nominal
+        FROM payments
+        WHERE party_type = v_party_type
+          AND party_id = p_party_id
+          AND deleted_at IS NULL
+          AND nominal > v_eps
+        ORDER BY payment_date ASC, id ASC
+    LOOP
+        v_remaining := v_payment.nominal;
+
+        -- Greedy alokasi ke children tertua dengan remaining > 0
+        FOR v_child IN
+            SELECT seq, kind, child_id, remaining
+            FROM _children_queue
+            WHERE remaining > v_eps
+            ORDER BY seq ASC
+        LOOP
+            EXIT WHEN v_remaining <= v_eps;
+
+            -- v_child.remaining is snapshot at cursor open; re-fetch latest to avoid drift in same payment iter
+            SELECT remaining INTO v_used FROM _children_queue WHERE seq = v_child.seq;
+            IF v_used <= v_eps THEN
+                CONTINUE;
+            END IF;
+
+            v_used := LEAST(v_remaining, v_used);
+            UPDATE _children_queue SET remaining = remaining - v_used WHERE seq = v_child.seq;
+            v_remaining := v_remaining - v_used;
+
+            IF v_child.kind = 'PURCHASE_ITEM' THEN
+                INSERT INTO payment_allocations (payment_id, purchase_item_id, amount, allocated_at)
+                VALUES (v_payment.id, v_child.child_id, v_used, NOW());
+            ELSIF v_child.kind = 'MDP' THEN
+                INSERT INTO payment_allocations (payment_id, marketing_delivery_product_id, amount, allocated_at)
+                VALUES (v_payment.id, v_child.child_id, v_used, NOW());
+            ELSIF v_child.kind = 'EXPENSE_REALIZATION' THEN
+                INSERT INTO payment_allocations (payment_id, expense_realization_id, amount, allocated_at)
+                VALUES (v_payment.id, v_child.child_id, v_used, NOW());
+            END IF;
+        END LOOP;
+    END LOOP;
+END;
+$func$ LANGUAGE plpgsql;
+
+-- Invoke per-party. Gagal di satu party → entire transaction ROLLBACK.
+DO $do$
+DECLARE
+    r RECORD;
+BEGIN
+    FOR r IN
+        SELECT DISTINCT party_type, party_id
+        FROM payments
+        WHERE deleted_at IS NULL
+          AND party_id IS NOT NULL
+    LOOP
+        PERFORM fn_fifo_backfill_party(r.party_type, r.party_id);
+    END LOOP;
+END;
+$do$;

internal/database/migrations/20260529085659_normalize_po_number_to_pr_pattern.down.sql

@@ -0,0 +1,8 @@
+-- IRREVERSIBLE migration: po_number lama (counter-based) tidak di-backup
+-- saat UP karena user secara eksplisit pilih "tanpa backup table".
+-- Down ini hanya raise notice supaya operator sadar harus restore dari
+-- DB-level backup terpisah kalau memang perlu rollback.
+DO $$
+BEGIN
+  RAISE NOTICE 'WARNING: Migration 20260529143940_normalize_po_number_to_pr_pattern is irreversible. Original counter-based PO numbers were not backed up. Restore from DB-level backup if rollback is required.';
+END $$;

internal/database/migrations/20260529085659_normalize_po_number_to_pr_pattern.up.sql

@@ -0,0 +1,87 @@
+BEGIN;
+
+-- ============================================================
+-- Normalize purchases.po_number agar mengikuti pr_number (swap prefix).
+-- Contoh: pr_number='PR-LTI-0050' -> po_number='PO-LTI-0050'
+--
+-- Konteks: sebelumnya pr_number dan po_number punya counter sequential
+-- terpisah (lihat purchase.repository.go NextPrNumber / NextPoNumber yang
+-- dihapus seiring migration ini), sehingga selalu diverge. Setelah
+-- perubahan code (ApproveManagerPurchase derive PO dari PR), historis
+-- perlu di-backfill supaya konsisten.
+--
+-- Juga update expenses.po_number (snapshot dari expense_bridge.go)
+-- supaya konsisten dengan purchases.
+--
+-- Constraint uq_purchases_po_number adalah NOT DEFERRABLE (per-row check),
+-- jadi single UPDATE bulk gagal di swap-conflict (contoh: row A mau jadi
+-- 'PO-LTI-0700' tapi row B masih punya 'PO-LTI-0700' -> error 23505).
+-- Solusi: capture target ke temp table, NULL dulu, baru set nilai derived.
+--
+-- IRREVERSIBLE: nilai po_number lama (counter-based) tidak di-backup.
+-- Kalau ada kegagalan di tengah, COMMIT tidak terjadi -> ROLLBACK otomatis.
+-- ============================================================
+
+-- 1. Capture target IDs (snapshot rencana update — sebelum perubahan apapun)
+CREATE TEMP TABLE _purchases_po_normalize_ids ON COMMIT DROP AS
+SELECT id
+FROM purchases
+WHERE po_number IS NOT NULL
+  AND pr_number LIKE 'PR-LTI-%'
+  AND po_number <> REPLACE(pr_number, 'PR-LTI-', 'PO-LTI-');
+
+-- 2. Update expenses DULU — join via current po_number masih valid sebelum step 3-4
+UPDATE expenses e
+SET po_number = REPLACE(p.pr_number, 'PR-LTI-', 'PO-LTI-')
+FROM purchases p
+JOIN _purchases_po_normalize_ids n ON n.id = p.id
+WHERE e.po_number = p.po_number
+  AND e.po_number IS NOT NULL
+  AND e.po_number <> '';
+
+-- 3. NULL-kan purchases.po_number untuk target — lepas constraint conflict
+UPDATE purchases
+SET po_number = NULL
+WHERE id IN (SELECT id FROM _purchases_po_normalize_ids);
+
+-- 4. Set nilai derived dari pr_number (sekarang aman karena slot lama sudah NULL)
+UPDATE purchases p
+SET po_number = REPLACE(p.pr_number, 'PR-LTI-', 'PO-LTI-')
+FROM _purchases_po_normalize_ids n
+WHERE p.id = n.id;
+
+-- 5. Sanity check — fail (auto-rollback) kalau masih ada mismatch
+DO $$
+DECLARE
+  v_mismatch_purchases INT;
+  v_mismatch_expenses INT;
+  v_target_count INT;
+BEGIN
+  SELECT COUNT(*) INTO v_target_count FROM _purchases_po_normalize_ids;
+
+  SELECT COUNT(*) INTO v_mismatch_purchases
+  FROM purchases
+  WHERE po_number IS NOT NULL
+    AND pr_number LIKE 'PR-LTI-%'
+    AND po_number <> REPLACE(pr_number, 'PR-LTI-', 'PO-LTI-');
+
+  IF v_mismatch_purchases > 0 THEN
+    RAISE EXCEPTION 'Normalize failed: % purchases rows still have mismatched po_number', v_mismatch_purchases;
+  END IF;
+
+  SELECT COUNT(*) INTO v_mismatch_expenses
+  FROM expenses e
+  JOIN purchases p ON e.po_number = p.po_number
+  WHERE p.pr_number LIKE 'PR-LTI-%'
+    AND e.po_number IS NOT NULL
+    AND e.po_number <> ''
+    AND e.po_number <> REPLACE(p.pr_number, 'PR-LTI-', 'PO-LTI-');
+
+  IF v_mismatch_expenses > 0 THEN
+    RAISE EXCEPTION 'Normalize failed: % expenses rows still have mismatched po_number', v_mismatch_expenses;
+  END IF;
+
+  RAISE NOTICE 'Normalize complete: % purchases rows updated', v_target_count;
+END $$;
+
+COMMIT;

internal/entities/expense.go

@@ -18,6 +18,7 @@ type Expense struct {
 	TransactionDate         time.Time      `gorm:"type:date;not null"`
 	Notes                   string         `gorm:"type:text;column:notes"`
 	IsPaid                  bool           `gorm:"column:is_paid;not null;default:false"`
+	GrandTotal              float64        `gorm:"column:grand_total;type:numeric(15,3);not null;default:0"`
 	CreatedBy               uint64         `gorm:""`
 	CreatedAt               time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt               time.Time      `gorm:"autoUpdateTime"`

internal/entities/marketing.go

@@ -15,6 +15,7 @@ type Marketing struct {
 	SalesPersonId uint           `gorm:"not null"`
 	Notes         string         `gorm:"type:text"`
 	MarketingType string         `gorm:"type:varchar(50)"`
+	GrandTotal    float64        `gorm:"column:grand_total;type:numeric(15,3);not null;default:0"`
 	CreatedBy     uint           `gorm:"not null"`
 	CreatedAt     time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt     time.Time      `gorm:"autoUpdateTime"`

internal/entities/payment_allocation.go

@@ -0,0 +1,23 @@
+package entities
+
+import (
+	"time"
+)
+
+// PaymentAllocation merepresentasikan hasil FIFO matching dari 1 payment ke
+// tepat 1 sub-row anak (purchase_item / marketing_delivery_product /
+// expense_realization). DB constraint memastikan hanya satu FK yang non-null.
+type PaymentAllocation struct {
+	Id                         uint64    `gorm:"primaryKey;autoIncrement"`
+	PaymentId                  uint      `gorm:"not null;index"`
+	PurchaseItemId             *uint     `gorm:"column:purchase_item_id"`
+	MarketingDeliveryProductId *uint     `gorm:"column:marketing_delivery_product_id"`
+	ExpenseRealizationId       *uint64   `gorm:"column:expense_realization_id"`
+	Amount                     float64   `gorm:"type:numeric(15,3);not null"`
+	AllocatedAt                time.Time `gorm:"type:timestamptz;not null;default:NOW()"`
+
+	Payment                  *Payment                  `gorm:"foreignKey:PaymentId;references:Id"`
+	PurchaseItem             *PurchaseItem             `gorm:"foreignKey:PurchaseItemId;references:Id"`
+	MarketingDeliveryProduct *MarketingDeliveryProduct `gorm:"foreignKey:MarketingDeliveryProductId;references:Id"`
+	ExpenseRealization       *ExpenseRealization       `gorm:"foreignKey:ExpenseRealizationId;references:Id"`
+}

internal/entities/purchase.go

@@ -12,6 +12,7 @@ type Purchase struct {
 	SupplierId uint `gorm:"not null"`
 	CreditTerm int  `gorm:"column:credit_term;not null;default:0"`
 	DueDate    *time.Time
+	GrandTotal float64 `gorm:"column:grand_total;type:numeric(15,3);not null;default:0"`
 	Notes      *string
 	CreatedAt  time.Time  `gorm:"autoCreateTime"`
 	UpdatedAt  time.Time  `gorm:"autoUpdateTime"`

internal/modules/expenses/module.go

@@ -45,7 +45,8 @@ func (ExpenseModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 		panic(fmt.Sprintf("failed to register expense approval workflow: %v", err))
 	}
 
-	expenseService := sExpense.NewExpenseService(expenseRepo, supplierRepo, nonstockRepo, approvalSvc, realizationRepo, projectFlockKandangRepo, documentSvc, validate)
+	fifoPaymentSvc := commonSvc.NewFifoPaymentService(db, utils.Log)
+	expenseService := sExpense.NewExpenseService(expenseRepo, supplierRepo, nonstockRepo, approvalSvc, realizationRepo, projectFlockKandangRepo, documentSvc, fifoPaymentSvc, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	ExpenseRoutes(router, userService, expenseService)

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

@@ -98,6 +98,7 @@ func (r *ExpenseRealizationRepositoryImpl) GetAllWithFilters(ctx context.Context
 			return db.
 				Preload("Expense").
 				Preload("Expense.Supplier").
+				Preload("Expense.Location").
 				Preload("Kandang").
 				Preload("Kandang.Location").
 				Preload("Nonstock").

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

@@ -54,9 +54,10 @@ type expenseService struct {
 	RealizationRepository   repository.ExpenseRealizationRepository
 	ProjectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository
 	DocumentSvc             commonSvc.DocumentService
+	FifoPaymentSvc          commonSvc.FifoPaymentService
 }
 
-func NewExpenseService(repo repository.ExpenseRepository, supplierRepo supplierRepo.SupplierRepository, nonstockRepo nonstockRepo.NonstockRepository, approvalSvc commonSvc.ApprovalService, realizationRepo repository.ExpenseRealizationRepository, projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, documentSvc commonSvc.DocumentService, validate *validator.Validate) ExpenseService {
+func NewExpenseService(repo repository.ExpenseRepository, supplierRepo supplierRepo.SupplierRepository, nonstockRepo nonstockRepo.NonstockRepository, approvalSvc commonSvc.ApprovalService, realizationRepo repository.ExpenseRealizationRepository, projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, documentSvc commonSvc.DocumentService, fifoPaymentSvc commonSvc.FifoPaymentService, validate *validator.Validate) ExpenseService {
 	return &expenseService{
 		Log:                     utils.Log,
 		Validate:                validate,
@@ -67,6 +68,23 @@ func NewExpenseService(repo repository.ExpenseRepository, supplierRepo supplierR
 		RealizationRepository:   realizationRepo,
 		ProjectFlockKandangRepo: projectFlockKandangRepo,
 		DocumentSvc:             documentSvc,
+		FifoPaymentSvc:          fifoPaymentSvc,
+	}
+}
+
+// reallocateAfterRealization called after expense realization changes that may
+// affect supplier debt: recompute grand_total + reallocate FIFO.
+func (s *expenseService) reallocateAfterRealization(ctx context.Context, expenseID uint, supplierID uint64) {
+	if s.FifoPaymentSvc == nil {
+		return
+	}
+	if err := s.FifoPaymentSvc.RecomputeGrandTotal(ctx, nil, commonSvc.ParentKindExpense, expenseID); err != nil {
+		s.Log.Warnf("Failed to recompute grand_total for expense %d: %+v", expenseID, err)
+	}
+	if supplierID > 0 {
+		if err := s.FifoPaymentSvc.ReallocateForParty(ctx, nil, string(utils.PaymentPartySupplier), uint(supplierID)); err != nil {
+			s.Log.Warnf("Failed to reallocate payments for supplier %d: %+v", supplierID, err)
+		}
 	}
 }
 
@@ -1078,6 +1096,9 @@ func (s *expenseService) CreateRealization(c *fiber.Ctx, expenseID uint, req *va
 	}
 	invalidateFromDate := commonSvc.MinNonZeroDateOnlyUTC(expense.TransactionDate, realizationDate, expense.RealizationDate)
 	s.invalidateDepreciationSnapshotsByExpense(c.Context(), nil, expenseID, invalidateFromDate, nil)
+
+	s.reallocateAfterRealization(c.Context(), expenseID, expense.SupplierId)
+
 	return responseDTO, nil
 }
 
@@ -1522,6 +1543,9 @@ func (s *expenseService) UpdateRealization(c *fiber.Ctx, expenseID uint, req *va
 		return nil, err
 	}
 	s.invalidateDepreciationSnapshotsByExpense(c.Context(), nil, expenseID, invalidateFromDate, nil)
+
+	s.reallocateAfterRealization(c.Context(), expenseID, expense.SupplierId)
+
 	return responseDTO, nil
 }
 

internal/modules/finance/payments/module.go

@@ -29,7 +29,9 @@ func (PaymentModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 		panic(fmt.Sprintf("failed to register payment approval workflow: %v", err))
 	}
 
-	paymentService := sPayment.NewPaymentService(paymentRepo, approvalService, validate)
+	fifoPaymentService := commonSvc.NewFifoPaymentService(db, nil)
+
+	paymentService := sPayment.NewPaymentService(paymentRepo, approvalService, fifoPaymentService, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	PaymentRoutes(router, userService, paymentService)

internal/modules/finance/payments/services/payment.service.go

@@ -32,12 +32,14 @@ type paymentService struct {
 	Validate         *validator.Validate
 	Repository       repository.PaymentRepository
 	ApprovalSvc      commonSvc.ApprovalService
+	FifoPaymentSvc   commonSvc.FifoPaymentService
 	approvalWorkflow approvalutils.ApprovalWorkflowKey
 }
 
 func NewPaymentService(
 	repo repository.PaymentRepository,
 	approvalSvc commonSvc.ApprovalService,
+	fifoPaymentSvc commonSvc.FifoPaymentService,
 	validate *validator.Validate,
 ) PaymentService {
 	return &paymentService{
@@ -45,6 +47,7 @@ func NewPaymentService(
 		Validate:         validate,
 		Repository:       repo,
 		ApprovalSvc:      approvalSvc,
+		FifoPaymentSvc:   fifoPaymentSvc,
 		approvalWorkflow: utils.ApprovalWorkflowPayment,
 	}
 }
@@ -159,6 +162,12 @@ func (s *paymentService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
 			}
 		}
 
+		if s.FifoPaymentSvc != nil {
+			if err := s.FifoPaymentSvc.ReallocateForParty(c.Context(), dbTransaction, createBody.PartyType, createBody.PartyId); err != nil {
+				return err
+			}
+		}
+
 		return nil
 	})
 	if err != nil {
@@ -251,7 +260,46 @@ func (s paymentService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		return s.GetOne(c, id)
 	}
 
-	if err := s.Repository.PatchOne(c.Context(), id, updateBody, nil); err != nil {
+	// Snapshot party lama untuk reallocate kalau party baru berbeda.
+	existing, err := s.Repository.GetByID(c.Context(), id, nil)
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusNotFound, "Payment not found")
+	}
+	if err != nil {
+		s.Log.Errorf("Failed get payment for update: %+v", err)
+		return nil, err
+	}
+	oldPartyType := existing.PartyType
+	oldPartyID := existing.PartyId
+
+	newPartyType := oldPartyType
+	newPartyID := oldPartyID
+	if v, ok := updateBody["party_type"].(string); ok {
+		newPartyType = v
+	}
+	if v, ok := updateBody["party_id"].(uint); ok {
+		newPartyID = v
+	}
+
+	err = s.Repository.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
+		paymentRepoTx := repository.NewPaymentRepository(tx)
+		if err := paymentRepoTx.PatchOne(c.Context(), id, updateBody, nil); err != nil {
+			return err
+		}
+
+		if s.FifoPaymentSvc != nil {
+			if err := s.FifoPaymentSvc.ReallocateForParty(c.Context(), tx, newPartyType, newPartyID); err != nil {
+				return err
+			}
+			if oldPartyType != newPartyType || oldPartyID != newPartyID {
+				if err := s.FifoPaymentSvc.ReallocateForParty(c.Context(), tx, oldPartyType, oldPartyID); err != nil {
+					return err
+				}
+			}
+		}
+		return nil
+	})
+	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, fiber.NewError(fiber.StatusNotFound, "Payment not found")
 		}

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

@@ -5,6 +5,7 @@ import (
 	"strconv"
 	"strings"
 
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/finance/transactions/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/finance/transactions/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/finance/transactions/validations"
@@ -13,6 +14,8 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
+const transactionExcelExportFetchLimit = 99999999
+
 type TransactionController struct {
 	TransactionService service.TransactionService
 }
@@ -107,6 +110,14 @@ func (u *TransactionController) GetAll(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
 	}
 
+	if isTransactionExcelExportRequest(c) {
+		results, err := u.getAllTransactionsForExcel(c, query)
+		if err != nil {
+			return err
+		}
+		return exportTransactionListExcel(c, results)
+	}
+
 	result, totalResults, err := u.TransactionService.GetAll(c, query)
 	if err != nil {
 		return err
@@ -149,6 +160,32 @@ func (u *TransactionController) GetOne(c *fiber.Ctx) error {
 		})
 }
 
+func isTransactionExcelExportRequest(c *fiber.Ctx) bool {
+	return strings.EqualFold(strings.TrimSpace(c.Query("export")), "excel")
+}
+
+func (u *TransactionController) getAllTransactionsForExcel(c *fiber.Ctx, baseQuery *validation.Query) ([]entity.Payment, error) {
+	query := *baseQuery
+	query.Page = 1
+	query.Limit = transactionExcelExportFetchLimit
+	results := make([]entity.Payment, 0)
+	for {
+		pageResults, total, err := u.TransactionService.GetAll(c, &query)
+		if err != nil {
+			return nil, err
+		}
+		if len(pageResults) == 0 || total == 0 {
+			break
+		}
+		results = append(results, pageResults...)
+		if int64(len(results)) >= total {
+			break
+		}
+		query.Page++
+	}
+	return results, nil
+}
+
 func (u *TransactionController) DeleteOne(c *fiber.Ctx) error {
 	param := c.Params("id")
 

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

@@ -0,0 +1,307 @@
+package controller
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/xuri/excelize/v2"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+)
+
+const transactionExportSheetName = "Transaksi"
+
+func exportTransactionListExcel(c *fiber.Ctx, payments []entity.Payment) error {
+	content, err := buildTransactionExportWorkbook(payments)
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to generate excel file")
+	}
+
+	filename := fmt.Sprintf("transaksi_%s.xlsx", time.Now().Format("20060102_150405"))
+	c.Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+	return c.Status(fiber.StatusOK).Send(content)
+}
+
+func buildTransactionExportWorkbook(payments []entity.Payment) ([]byte, error) {
+	file := excelize.NewFile()
+	defer file.Close()
+
+	defaultSheet := file.GetSheetName(file.GetActiveSheetIndex())
+	if defaultSheet != transactionExportSheetName {
+		if err := file.SetSheetName(defaultSheet, transactionExportSheetName); err != nil {
+			return nil, err
+		}
+	}
+
+	if err := setTransactionExportColumns(file); err != nil {
+		return nil, err
+	}
+	if err := setTransactionExportHeaders(file); err != nil {
+		return nil, err
+	}
+	if err := setTransactionExportRows(file, payments); err != nil {
+		return nil, err
+	}
+	if err := file.SetPanes(transactionExportSheetName, &excelize.Panes{
+		Freeze:      true,
+		YSplit:      1,
+		TopLeftCell: "A2",
+		ActivePane:  "bottomLeft",
+	}); err != nil {
+		return nil, err
+	}
+
+	buffer, err := file.WriteToBuffer()
+	if err != nil {
+		return nil, err
+	}
+
+	return buffer.Bytes(), nil
+}
+
+func setTransactionExportColumns(file *excelize.File) error {
+	columnWidths := map[string]float64{
+		"A": 20,
+		"B": 22,
+		"C": 18,
+		"D": 25,
+		"E": 14,
+		"F": 16,
+		"G": 16,
+		"H": 22,
+		"I": 22,
+		"J": 18,
+		"K": 18,
+		"L": 18,
+		"M": 30,
+		"N": 22,
+		"O": 20,
+	}
+
+	sheet := transactionExportSheetName
+	for col, width := range columnWidths {
+		if err := file.SetColWidth(sheet, col, col, width); err != nil {
+			return err
+		}
+	}
+
+	return file.SetRowHeight(sheet, 1, 24)
+}
+
+func setTransactionExportHeaders(file *excelize.File) error {
+	sheet := transactionExportSheetName
+	headers := []string{
+		"Kode Pembayaran",
+		"No. Referensi",
+		"Tipe Transaksi",
+		"Pihak",
+		"Tipe Pihak",
+		"Tanggal Bayar",
+		"Metode Bayar",
+		"Bank",
+		"No. Rekening Bank",
+		"Pemasukan",
+		"Pengeluaran",
+		"Nominal",
+		"Catatan",
+		"Dibuat Oleh",
+		"Status",
+	}
+
+	for i, header := range headers {
+		colName, err := excelize.ColumnNumberToName(i + 1)
+		if err != nil {
+			return err
+		}
+		if err := file.SetCellValue(sheet, colName+"1", header); err != nil {
+			return err
+		}
+	}
+
+	headerStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Bold: true, Color: "1F2937"},
+		Fill:      excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"DCEBFA"}},
+		Alignment: &excelize.Alignment{Horizontal: "center", Vertical: "center"},
+		Border: []excelize.Border{
+			{Type: "left", Color: "D1D5DB", Style: 1},
+			{Type: "top", Color: "D1D5DB", Style: 1},
+			{Type: "bottom", Color: "D1D5DB", Style: 1},
+			{Type: "right", Color: "D1D5DB", Style: 1},
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	return file.SetCellStyle(sheet, "A1", "O1", headerStyle)
+}
+
+func setTransactionExportRows(file *excelize.File, payments []entity.Payment) error {
+	if len(payments) == 0 {
+		return nil
+	}
+
+	sheet := transactionExportSheetName
+	for i, p := range payments {
+		row := strconv.Itoa(i + 2)
+		if err := writeTransactionExportRow(file, sheet, row, p); err != nil {
+			return err
+		}
+	}
+
+	lastRow := strconv.Itoa(len(payments) + 1)
+
+	dataStyle, err := file.NewStyle(&excelize.Style{
+		Alignment: &excelize.Alignment{Horizontal: "left", Vertical: "center", WrapText: true},
+		Border: []excelize.Border{
+			{Type: "left", Color: "D1D5DB", Style: 1},
+			{Type: "top", Color: "D1D5DB", Style: 1},
+			{Type: "bottom", Color: "D1D5DB", Style: 1},
+			{Type: "right", Color: "D1D5DB", Style: 1},
+		},
+	})
+	if err != nil {
+		return err
+	}
+	if err := file.SetCellStyle(sheet, "A2", "O"+lastRow, dataStyle); err != nil {
+		return err
+	}
+
+	numericStyle, err := file.NewStyle(&excelize.Style{
+		Alignment: &excelize.Alignment{Horizontal: "right", Vertical: "center"},
+		Border: []excelize.Border{
+			{Type: "left", Color: "D1D5DB", Style: 1},
+			{Type: "top", Color: "D1D5DB", Style: 1},
+			{Type: "bottom", Color: "D1D5DB", Style: 1},
+			{Type: "right", Color: "D1D5DB", Style: 1},
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	return file.SetCellStyle(sheet, "J2", "L"+lastRow, numericStyle)
+}
+
+func writeTransactionExportRow(file *excelize.File, sheet, row string, p entity.Payment) error {
+	incomeAmount, expenseAmount := txAmounts(p.Direction, p.Nominal)
+
+	values := []interface{}{
+		safeTxText(p.PaymentCode),
+		safeTxRefNumber(p.ReferenceNumber),
+		safeTxText(txTransactionType(p)),
+		safeTxText(txPartyName(p)),
+		safeTxText(p.PartyType),
+		formatTxDate(p.PaymentDate),
+		safeTxText(p.PaymentMethod),
+		safeTxBank(p),
+		safeTxBankAccount(p),
+		incomeAmount,
+		expenseAmount,
+		p.Nominal,
+		safeTxText(p.Notes),
+		safeTxText(txCreatedBy(p)),
+		formatTxStatus(p),
+	}
+
+	for colIdx, val := range values {
+		colName, err := excelize.ColumnNumberToName(colIdx + 1)
+		if err != nil {
+			return err
+		}
+		if err := file.SetCellValue(sheet, colName+row, val); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func safeTxText(s string) string {
+	trimmed := strings.TrimSpace(s)
+	if trimmed == "" {
+		return "-"
+	}
+	return trimmed
+}
+
+func safeTxRefNumber(s *string) string {
+	if s == nil {
+		return "-"
+	}
+	return safeTxText(*s)
+}
+
+func safeTxBank(p entity.Payment) string {
+	if p.BankWarehouse.Id == 0 {
+		return "-"
+	}
+	return safeTxText(p.BankWarehouse.Name)
+}
+
+func safeTxBankAccount(p entity.Payment) string {
+	if p.BankWarehouse.Id == 0 {
+		return "-"
+	}
+	return safeTxText(p.BankWarehouse.AccountNumber)
+}
+
+func formatTxDate(t time.Time) string {
+	if t.IsZero() {
+		return "-"
+	}
+	loc, err := time.LoadLocation("Asia/Jakarta")
+	if err == nil {
+		t = t.In(loc)
+	}
+	return t.Format("02-01-2006")
+}
+
+func formatTxStatus(p entity.Payment) string {
+	if p.LatestApproval == nil {
+		return "-"
+	}
+	return safeTxText(p.LatestApproval.StepName)
+}
+
+func txTransactionType(p entity.Payment) string {
+	if p.TransactionType != "" {
+		return p.TransactionType
+	}
+	return p.Direction
+}
+
+func txPartyName(p entity.Payment) string {
+	switch p.PartyType {
+	case "CUSTOMER":
+		if p.Customer != nil && p.Customer.Id != 0 {
+			return p.Customer.Name
+		}
+	case "SUPPLIER":
+		if p.Supplier != nil && p.Supplier.Id != 0 {
+			return p.Supplier.Name
+		}
+	}
+	return ""
+}
+
+func txCreatedBy(p entity.Payment) string {
+	if p.CreatedUser.Id == 0 {
+		return ""
+	}
+	return p.CreatedUser.Name
+}
+
+func txAmounts(direction string, nominal float64) (income, expense float64) {
+	switch strings.ToUpper(direction) {
+	case "IN":
+		return nominal, 0
+	case "OUT":
+		return 0, nominal
+	default:
+		return 0, 0
+	}
+}

internal/modules/finance/transactions/module.go

@@ -35,7 +35,8 @@ func (TransactionModule) RegisterRoutes(router fiber.Router, db *gorm.DB, valida
 		panic(fmt.Sprintf("failed to register injection approval workflow: %v", err))
 	}
 
-	transactionService := sTransaction.NewTransactionService(transactionRepo, approvalService, validate)
+	fifoPaymentService := commonSvc.NewFifoPaymentService(db, utils.Log)
+	transactionService := sTransaction.NewTransactionService(transactionRepo, approvalService, fifoPaymentService, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	TransactionRoutes(router, userService, transactionService)

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

@@ -30,19 +30,22 @@ type transactionService struct {
 	Validate          *validator.Validate
 	Repository        repository.TransactionRepository
 	ApprovalSvc       commonSvc.ApprovalService
+	FifoPaymentSvc    commonSvc.FifoPaymentService
 	approvalWorkflows map[string]approvalutils.ApprovalWorkflowKey
 }
 
 func NewTransactionService(
 	repo repository.TransactionRepository,
 	approvalSvc commonSvc.ApprovalService,
+	fifoPaymentSvc commonSvc.FifoPaymentService,
 	validate *validator.Validate,
 ) TransactionService {
 	return &transactionService{
-		Log:         utils.Log,
+		Log:            utils.Log,
-		Validate:    validate,
+		Validate:       validate,
-		Repository:  repo,
+		Repository:     repo,
-		ApprovalSvc: approvalSvc,
+		ApprovalSvc:    approvalSvc,
+		FifoPaymentSvc: fifoPaymentSvc,
 		approvalWorkflows: map[string]approvalutils.ApprovalWorkflowKey{
 			string(utils.TransactionTypeSaldoAwal): utils.ApprovalWorkflowInitial,
 			string(utils.TransactionTypeInjection): utils.ApprovalWorkflowInjection,
@@ -182,6 +185,19 @@ func (s transactionService) GetOne(c *fiber.Ctx, id uint) (*entity.Payment, erro
 }
 
 func (s transactionService) DeleteOne(c *fiber.Ctx, id uint) error {
+	// Snapshot party SEBELUM delete supaya bisa re-FIFO setelah trigger DB
+	// (`trg_soft_delete_fk_payments`) CASCADE hard-DELETE allocations.
+	existing, err := s.Repository.GetByID(c.Context(), id, nil)
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return fiber.NewError(fiber.StatusNotFound, "Transaction not found")
+		}
+		s.Log.Errorf("Failed to load transaction before delete: %+v", err)
+		return err
+	}
+	partyType := existing.PartyType
+	partyID := existing.PartyId
+
 	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "Transaction not found")
@@ -189,6 +205,14 @@ func (s transactionService) DeleteOne(c *fiber.Ctx, id uint) error {
 		s.Log.Errorf("Failed to delete transaction: %+v", err)
 		return err
 	}
+
+	// Re-FIFO setelah delete agar payment lain yang masih punya unallocated nominal
+	// otomatis reflow ke MDP/purchase_item/expense_realization yang kekurangan paid.
+	if s.FifoPaymentSvc != nil && partyID > 0 {
+		if err := s.FifoPaymentSvc.ReallocateForParty(c.Context(), nil, partyType, partyID); err != nil {
+			s.Log.Warnf("Failed to reallocate payments after delete (party=%s id=%d): %+v", partyType, partyID, err)
+		}
+	}
 	return nil
 }
 

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

@@ -10,7 +10,7 @@ type Update struct {
 
 type Query struct {
 	Page             int      `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit            int      `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Limit            int      `query:"limit" validate:"omitempty,number,min=1,gt=0"`
 	Search           string   `query:"search" validate:"omitempty,max=50"`
 	TransactionTypes []string `query:"transaction_types" validate:"omitempty,dive,max=50"`
 	BankIDs          []uint   `query:"bank_ids" validate:"omitempty,dive,gt=0"`

internal/modules/inventory/transfers/module.go

@@ -65,6 +65,7 @@ func (TransferModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 		expenseRealizationRepo,
 		projectFlockKandangRepo,
 		documentSvc,
+		commonSvc.NewFifoPaymentService(db, utils.Log),
 		validate,
 	)
 

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

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"fmt"
-	"math"
 	"strconv"
 	"strings"
 	"time"
@@ -76,9 +75,18 @@ func setMarketingExportColumns(file *excelize.File, sheet string) error {
 		"B": 14,
 		"C": 18,
 		"D": 20,
-		"E": 18,
+		"E": 14,
-		"F": 60,
+		"F": 40,
-		"G": 24,
+		"G": 10,
+		"H": 12,
+		"I": 12,
+		"J": 12,
+		"K": 16,
+		"L": 16,
+		"M": 18,
+		"N": 18,
+		"O": 18,
+		"P": 24,
 	}
 
 	for col, width := range columnWidths {
@@ -96,13 +104,22 @@ func setMarketingExportColumns(file *excelize.File, sheet string) error {
 
 func setMarketingExportHeaders(file *excelize.File, sheet string) error {
 	headers := []string{
-		"No. Order",
+		"No. Order",    // A
-		"Tanggal",
+		"Tanggal",      // B
-		"Status",
+		"Status",       // C
-		"Customer",
+		"Customer",     // D
-		"Grand Total",
+		"Tipe",         // E
-		"Products",
+		"Nama Produk",  // F
-		"Notes",
+		"Week",         // G
+		"Jumlah",       // H
+		"Satuan",       // I
+		"Qty Peti",     // J
+		"Berat Rata-rata (kg)", // K
+		"Total Berat (kg)",     // L
+		"Harga Satuan", // M
+		"Total Harga",  // N
+		"Grand Total",  // O
+		"Catatan",      // P
 	}
 
 	for i, header := range headers {
@@ -131,7 +148,7 @@ func setMarketingExportHeaders(file *excelize.File, sheet string) error {
 		return err
 	}
 
-	return file.SetCellStyle(sheet, "A1", "G1", headerStyle)
+	return file.SetCellStyle(sheet, "A1", "P1", headerStyle)
 }
 
 func setMarketingExportRows(file *excelize.File, sheet string, items []dto.MarketingListDTO) error {
@@ -139,70 +156,154 @@ func setMarketingExportRows(file *excelize.File, sheet string, items []dto.Marke
 		return nil
 	}
 
-	for i, item := range items {
+	row := 1
-		rowNumber := i + 2
+	for _, item := range items {
-		if err := file.SetCellValue(sheet, "A"+strconv.Itoa(rowNumber), safeMarketingExportText(item.SoNumber)); err != nil {
+		soNumber := safeMarketingExportText(item.SoNumber)
-			return err
+		soDate := formatMarketingExportDate(item.SoDate)
+		status := formatMarketingExportStatus(item)
+		customer := safeMarketingExportText(item.Customer.Name)
+		grandTotal := sumMarketingGrandTotal(item.SalesOrder)
+		notes := safeMarketingExportText(item.Notes)
+
+		if len(item.SalesOrder) == 0 {
+			row++
+			r := strconv.Itoa(row)
+			vals := map[string]interface{}{
+				"A": soNumber, "B": soDate, "C": status, "D": customer,
+				"E": "-", "F": "-", "G": "-", "H": "-", "I": "-", "J": "-",
+				"K": "-", "L": "-", "M": "-", "N": "-",
+				"O": grandTotal, "P": notes,
+			}
+			for col, val := range vals {
+				if err := file.SetCellValue(sheet, col+r, val); err != nil {
+					return err
+				}
+			}
+			continue
 		}
-		if err := file.SetCellValue(sheet, "B"+strconv.Itoa(rowNumber), formatMarketingExportDate(item.SoDate)); err != nil {
+
-			return err
+		for _, prod := range item.SalesOrder {
-		}
+			row++
-		if err := file.SetCellValue(sheet, "C"+strconv.Itoa(rowNumber), formatMarketingExportStatus(item)); err != nil {
+			r := strconv.Itoa(row)
-			return err
+
-		}
+			productName := "-"
-		if err := file.SetCellValue(sheet, "D"+strconv.Itoa(rowNumber), safeMarketingExportText(item.Customer.Name)); err != nil {
+			if prod.ProductWarehouse != nil && prod.ProductWarehouse.Product != nil {
-			return err
+				if n := strings.TrimSpace(prod.ProductWarehouse.Product.Name); n != "" {
-		}
+					productName = n
-		if err := file.SetCellValue(sheet, "E"+strconv.Itoa(rowNumber), formatMarketingRupiah(sumMarketingGrandTotal(item.SalesOrder))); err != nil {
+				}
-			return err
+			}
-		}
+
-		if err := file.SetCellValue(sheet, "F"+strconv.Itoa(rowNumber), formatMarketingProducts(item.SalesOrder)); err != nil {
+			week := "-"
-			return err
+			if prod.Week != nil {
-		}
+				week = strconv.Itoa(*prod.Week)
-		if err := file.SetCellValue(sheet, "G"+strconv.Itoa(rowNumber), safeMarketingExportText(item.Notes)); err != nil {
+			}
-			return err
+
+			satuan := "-"
+			if prod.ConvertionUnit != nil && strings.TrimSpace(*prod.ConvertionUnit) != "" {
+				satuan = *prod.ConvertionUnit
+			}
+
+			if err := file.SetCellValue(sheet, "A"+r, soNumber); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "B"+r, soDate); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "C"+r, status); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "D"+r, customer); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "E"+r, safeMarketingExportText(prod.MarketingType)); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "F"+r, productName); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "G"+r, week); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "H"+r, prod.Qty); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "I"+r, satuan); err != nil {
+				return err
+			}
+			if prod.TotalPeti != nil {
+				if err := file.SetCellValue(sheet, "J"+r, *prod.TotalPeti); err != nil {
+					return err
+				}
+			} else {
+				if err := file.SetCellValue(sheet, "J"+r, "-"); err != nil {
+					return err
+				}
+			}
+			if err := file.SetCellValue(sheet, "K"+r, prod.AvgWeight); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "L"+r, prod.TotalWeight); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "M"+r, prod.UnitPrice); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "N"+r, prod.TotalPrice); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "O"+r, grandTotal); err != nil {
+				return err
+			}
+			if err := file.SetCellValue(sheet, "P"+r, notes); err != nil {
+				return err
+			}
 		}
 	}
 
-	lastRow := len(items) + 1
+	lastRow := row
+	lastRowStr := strconv.Itoa(lastRow)
+	border := []excelize.Border{
+		{Type: "left", Color: "D1D5DB", Style: 1},
+		{Type: "top", Color: "D1D5DB", Style: 1},
+		{Type: "bottom", Color: "D1D5DB", Style: 1},
+		{Type: "right", Color: "D1D5DB", Style: 1},
+	}
+
 	dataStyle, err := file.NewStyle(&excelize.Style{
-		Alignment: &excelize.Alignment{
+		Alignment: &excelize.Alignment{Horizontal: "left", Vertical: "center", WrapText: true},
-			Horizontal: "left",
+		Border:    border,
-			Vertical:   "center",
-			WrapText:   true,
-		},
-		Border: []excelize.Border{
-			{Type: "left", Color: "D1D5DB", Style: 1},
-			{Type: "top", Color: "D1D5DB", Style: 1},
-			{Type: "bottom", Color: "D1D5DB", Style: 1},
-			{Type: "right", Color: "D1D5DB", Style: 1},
-		},
 	})
 	if err != nil {
 		return err
 	}
-
+	if err := file.SetCellStyle(sheet, "A2", "P"+lastRowStr, dataStyle); err != nil {
-	if err := file.SetCellStyle(sheet, "A2", "G"+strconv.Itoa(lastRow), dataStyle); err != nil {
 		return err
 	}
 
-	moneyStyle, err := file.NewStyle(&excelize.Style{
+	numberStyle, err := file.NewStyle(&excelize.Style{
-		Alignment: &excelize.Alignment{
+		Alignment: &excelize.Alignment{Horizontal: "right", Vertical: "center"},
-			Horizontal: "right",
+		Border:    border,
-			Vertical:   "center",
-		},
-		Border: []excelize.Border{
-			{Type: "left", Color: "D1D5DB", Style: 1},
-			{Type: "top", Color: "D1D5DB", Style: 1},
-			{Type: "bottom", Color: "D1D5DB", Style: 1},
-			{Type: "right", Color: "D1D5DB", Style: 1},
-		},
 	})
 	if err != nil {
 		return err
 	}
+	if err := file.SetCellStyle(sheet, "K2", "O"+lastRowStr, numberStyle); err != nil {
+		return err
+	}
 
-	return file.SetCellStyle(sheet, "E2", "E"+strconv.Itoa(lastRow), moneyStyle)
+	centerStyle, err := file.NewStyle(&excelize.Style{
+		Alignment: &excelize.Alignment{Horizontal: "center", Vertical: "center"},
+		Border:    border,
+	})
+	if err != nil {
+		return err
+	}
+	for _, col := range []string{"G", "H", "J"} {
+		if err := file.SetCellStyle(sheet, col+"2", col+lastRowStr, centerStyle); err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 func formatMarketingExportDate(value time.Time) string {
@@ -226,36 +327,6 @@ func formatMarketingExportStatus(item dto.MarketingListDTO) string {
 	return safeMarketingExportText(item.LatestApproval.StepName)
 }
 
-func formatMarketingProducts(items []dto.DeliveryMarketingProductDTO) string {
-	if len(items) == 0 {
-		return "-"
-	}
-
-	seen := make(map[string]struct{})
-	names := make([]string, 0, len(items))
-	for _, item := range items {
-		if item.ProductWarehouse == nil || item.ProductWarehouse.Product == nil {
-			continue
-		}
-
-		name := strings.TrimSpace(item.ProductWarehouse.Product.Name)
-		if name == "" {
-			continue
-		}
-
-		if _, exists := seen[name]; exists {
-			continue
-		}
-		seen[name] = struct{}{}
-		names = append(names, name)
-	}
-
-	if len(names) == 0 {
-		return "-"
-	}
-
-	return strings.Join(names, ", ")
-}
 
 func sumMarketingGrandTotal(items []dto.DeliveryMarketingProductDTO) float64 {
 	total := 0.0
@@ -266,40 +337,6 @@ func sumMarketingGrandTotal(items []dto.DeliveryMarketingProductDTO) float64 {
 	return total
 }
 
-func formatMarketingRupiah(value float64) string {
-	if math.IsNaN(value) || math.IsInf(value, 0) {
-		return "Rp 0"
-	}
-
-	rounded := int64(math.Round(value))
-	sign := ""
-	if rounded < 0 {
-		sign = "-"
-		rounded = -rounded
-	}
-
-	raw := strconv.FormatInt(rounded, 10)
-	if raw == "" {
-		raw = "0"
-	}
-
-	var grouped strings.Builder
-	rem := len(raw) % 3
-	if rem > 0 {
-		grouped.WriteString(raw[:rem])
-		if len(raw) > rem {
-			grouped.WriteString(".")
-		}
-	}
-	for i := rem; i < len(raw); i += 3 {
-		grouped.WriteString(raw[i : i+3])
-		if i+3 < len(raw) {
-			grouped.WriteString(".")
-		}
-	}
-
-	return "Rp " + sign + grouped.String()
-}
 
 func safeMarketingExportText(value string) string {
 	trimmed := strings.TrimSpace(value)

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

@@ -29,6 +29,7 @@ type MarketingListDTO struct {
 	SalesPerson    userDTO.UserRelationDTO         `json:"sales_person"`
 	SoDocs         string                          `json:"so_docs"`
 	SalesOrder     []DeliveryMarketingProductDTO   `json:"sales_order"`
+	DeliveryOrder  []DeliveryGroupDTO              `json:"delivery_order"`
 	CreatedUser    userDTO.UserRelationDTO         `json:"created_user"`
 	CreatedAt      time.Time                       `json:"created_at"`
 	UpdatedAt      time.Time                       `json:"updated_at"`
@@ -203,6 +204,7 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M
 		SalesPerson:          salesPerson,
 		SoDocs:               marketing.SoDocs,
 		SalesOrder:           salesOrderProducts,
+		DeliveryOrder:        extractDeliveryGroupsFromProducts(marketing),
 		CreatedUser:          createdUser,
 		CreatedAt:            marketing.CreatedAt,
 		UpdatedAt:            marketing.UpdatedAt,
@@ -376,6 +378,23 @@ func GenerateDeliveryOrderNumber(soNumber string, deliveryDate *time.Time, wareh
 	return numberPrefix
 }
 
+func extractDeliveryGroupsFromProducts(marketing *entity.Marketing) []DeliveryGroupDTO {
+	var dps []MarketingDeliveryProductDTO
+	for _, product := range marketing.Products {
+		if product.DeliveryProduct == nil || product.DeliveryProduct.DeliveryDate == nil {
+			continue
+		}
+		dp := ToMarketingDeliveryProductDTO(*product.DeliveryProduct)
+		if product.ProductWarehouse.Id != 0 {
+			mapped := productwarehouseDTO.ToProductWarehouseNestedDTO(product.ProductWarehouse)
+			dp.ProductWarehouse = &mapped
+		}
+		dp.ConvertionUnit = product.ConvertionUnit
+		dps = append(dps, dp)
+	}
+	return groupDeliveryProducts(dps, marketing.SoNumber)
+}
+
 func collectDoNumbers(marketing *entity.Marketing) []string {
 	if marketing == nil || len(marketing.Products) == 0 {
 		return nil

internal/modules/marketing/module.go

@@ -35,6 +35,7 @@ func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	stockLogRepo := rShared.NewStockLogRepository(db)
 
 	fifoStockV2Service := commonSvc.NewFifoStockV2Service(db, utils.Log)
+	fifoPaymentService := commonSvc.NewFifoPaymentService(db, utils.Log)
 
 	approvalRepo := commonRepo.NewApprovalRepository(db)
 	approvalSvc := commonSvc.NewApprovalService(approvalRepo)
@@ -47,7 +48,7 @@ func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	projectFlockKandangRepo := rProjectFlockKandang.NewProjectFlockKandangRepository(db)
 
 	salesOrdersService := service.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, fifoStockV2Service, warehouseRepo, projectFlockKandangRepo, validate)
-	deliveryOrdersService := service.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, stockLogRepo, productWarehouseRepo, projectFlockPopulationRepo, approvalSvc, fifoStockV2Service, validate)
+	deliveryOrdersService := service.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, stockLogRepo, productWarehouseRepo, projectFlockPopulationRepo, approvalSvc, fifoStockV2Service, fifoPaymentService, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	RegisterRoutes(router, userService, salesOrdersService, deliveryOrdersService)

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

@@ -48,6 +48,7 @@ type deliveryOrdersService struct {
 	ProjectFlockPopulationRepo   rProjectFlock.ProjectFlockPopulationRepository
 	ApprovalSvc                  commonSvc.ApprovalService
 	FifoStockV2Svc               commonSvc.FifoStockV2Service
+	FifoPaymentSvc               commonSvc.FifoPaymentService
 }
 
 func NewDeliveryOrdersService(
@@ -59,6 +60,7 @@ func NewDeliveryOrdersService(
 	projectFlockPopulationRepo rProjectFlock.ProjectFlockPopulationRepository,
 	approvalSvc commonSvc.ApprovalService,
 	fifoStockV2Svc commonSvc.FifoStockV2Service,
+	fifoPaymentSvc commonSvc.FifoPaymentService,
 	validate *validator.Validate,
 ) DeliveryOrdersService {
 	return &deliveryOrdersService{
@@ -71,6 +73,22 @@ func NewDeliveryOrdersService(
 		ProjectFlockPopulationRepo:   projectFlockPopulationRepo,
 		ApprovalSvc:                  approvalSvc,
 		FifoStockV2Svc:               fifoStockV2Svc,
+		FifoPaymentSvc:               fifoPaymentSvc,
+	}
+}
+
+// reallocateAfterDelivery refresh marketing.grand_total + reallocate FIFO untuk customer.
+func (s *deliveryOrdersService) reallocateAfterDelivery(ctx context.Context, marketingID uint, customerID uint) {
+	if s.FifoPaymentSvc == nil {
+		return
+	}
+	if err := s.FifoPaymentSvc.RecomputeGrandTotal(ctx, nil, commonSvc.ParentKindMarketing, marketingID); err != nil {
+		utils.Log.Warnf("Failed to recompute grand_total for marketing %d: %+v", marketingID, err)
+	}
+	if customerID > 0 {
+		if err := s.FifoPaymentSvc.ReallocateForParty(ctx, nil, string(utils.PaymentPartyCustomer), customerID); err != nil {
+			utils.Log.Warnf("Failed to reallocate payments for customer %d: %+v", customerID, err)
+		}
 	}
 }
 
@@ -418,6 +436,7 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Delivery order already exists for this marketing")
 	}
 
+	var capturedCustomerID uint
 	err = s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
 		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
 		marketingDeliveryProductRepositoryTx := marketingRepo.NewMarketingDeliveryProductRepository(dbTransaction)
@@ -428,6 +447,7 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 		if err != nil {
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
 		}
+		capturedCustomerID = marketing.CustomerId
 
 		allMarketingProducts, err := marketingProductRepositoryTx.GetByMarketingID(c.Context(), req.MarketingId)
 		if err != nil {
@@ -519,6 +539,8 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to create delivery order")
 	}
 
+	s.reallocateAfterDelivery(c.Context(), req.MarketingId, capturedCustomerID)
+
 	return s.getMarketingWithDeliveries(c, req.MarketingId)
 }
 
@@ -547,6 +569,7 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to check approval status")
 	}
 
+	var capturedCustomerID uint
 	err = s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
 		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
 		marketingDeliveryProductRepositoryTx := marketingRepo.NewMarketingDeliveryProductRepository(dbTransaction)
@@ -557,6 +580,7 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 		if err != nil {
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
 		}
+		capturedCustomerID = marketing.CustomerId
 
 		allMarketingProducts, err := marketingProductRepositoryTx.GetByMarketingID(c.Context(), id)
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
@@ -662,6 +686,8 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery order")
 	}
 
+	s.reallocateAfterDelivery(c.Context(), id, capturedCustomerID)
+
 	return s.getMarketingWithDeliveries(c, id)
 }
 

internal/modules/purchases/controllers/purchase.controller.go

@@ -91,11 +91,9 @@ func buildPurchaseQuery(c *fiber.Ctx) *validation.Query {
 		Limit:                 c.QueryInt("limit", 10),
 		Search:                strings.TrimSpace(c.Query("search")),
 		ApprovalStatus:        strings.TrimSpace(c.Query("approval_status")),
-		PoDate:                strings.TrimSpace(c.Query("po_date")),
+		StartDate:             strings.TrimSpace(c.Query("start_date")),
-		PoDateFrom:            strings.TrimSpace(c.Query("po_date_from")),
+		EndDate:               strings.TrimSpace(c.Query("end_date")),
-		PoDateTo:              strings.TrimSpace(c.Query("po_date_to")),
+		FilterBy:              strings.TrimSpace(c.Query("filter_by")),
-		CreatedFrom:           strings.TrimSpace(c.Query("created_from")),
-		CreatedTo:             strings.TrimSpace(c.Query("created_to")),
 		SupplierID:            uint(c.QueryInt("supplier_id", 0)),
 		AreaID:                uint(c.QueryInt("area_id", 0)),
 		LocationID:            uint(c.QueryInt("location_id", 0)),

internal/modules/purchases/controllers/purchase.export.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"fmt"
-	"math"
 	"strconv"
 	"strings"
 	"time"
@@ -43,15 +42,13 @@ func buildPurchaseExportWorkbook(purchases []entity.Purchase) ([]byte, error) {
 		}
 	}
 
-	grandTotals := buildPurchaseGrandTotalMap(purchases)
-
 	if err := setPurchaseExportColumns(file, purchaseExportSheetName); err != nil {
 		return nil, err
 	}
 	if err := setPurchaseExportHeaders(file, purchaseExportSheetName); err != nil {
 		return nil, err
 	}
-	if err := setPurchaseExportRows(file, purchaseExportSheetName, purchases, grandTotals); err != nil {
+	if err := setPurchaseExportRows(file, purchaseExportSheetName, purchases); err != nil {
 		return nil, err
 	}
 	if err := file.SetPanes(purchaseExportSheetName, &excelize.Panes{
@@ -80,9 +77,17 @@ func setPurchaseExportColumns(file *excelize.File, sheet string) error {
 		"F": 22,
 		"G": 22,
 		"H": 32,
-		"I": 18,
+		"I": 10,
-		"J": 18,
+		"J": 12,
-		"K": 24,
+		"K": 16,
+		"L": 16,
+		"M": 22,
+		"N": 12,
+		"O": 16,
+		"P": 16,
+		"Q": 18,
+		"R": 18,
+		"S": 24,
 	}
 
 	for col, width := range columnWidths {
@@ -99,17 +104,25 @@ func setPurchaseExportColumns(file *excelize.File, sheet string) error {
 
 func setPurchaseExportHeaders(file *excelize.File, sheet string) error {
 	headers := []string{
-		"PR Number",
+		"PR Number",       // A
-		"PO Number",
+		"PO Number",       // B
-		"Tanggal PO",
+		"Tanggal PO",      // C
-		"Tanggal Terima",
+		"Tanggal Terima",  // D
-		"Supplier",
+		"Supplier",        // E
-		"Lokasi",
+		"Lokasi",          // F
-		"Gudang",
+		"Gudang",          // G
-		"Product",
+		"Product",         // H
-		"Status",
+		"Qty",             // I
-		"Grand Total",
+		"Satuan",          // J
-		"Notes",
+		"Price",           // K
+		"Total Produk",    // L
+		"Vendor Ekspedisi",// M
+		"Qty Ekspedisi",   // N
+		"Price Ekspedisi", // O
+		"Total Ekspedisi", // P
+		"Grand Total All", // Q
+		"Status",          // R
+		"Notes",           // S
 	}
 
 	for i, header := range headers {
@@ -137,34 +150,36 @@ func setPurchaseExportHeaders(file *excelize.File, sheet string) error {
 		return err
 	}
 
-	return file.SetCellStyle(sheet, "A1", "K1", headerStyle)
+	return file.SetCellStyle(sheet, "A1", "S1", headerStyle)
 }
 
-func setPurchaseExportRows(file *excelize.File, sheet string, purchases []entity.Purchase, grandTotals map[uint]float64) error {
+func setPurchaseExportRows(file *excelize.File, sheet string, purchases []entity.Purchase) error {
 	if len(purchases) == 0 {
 		return nil
 	}
 
+	var sumL, sumP, sumQ float64
+
 	rowIdx := 2
 	for p := range purchases {
 		purchase := &purchases[p]
-		total := grandTotals[purchase.Id]
 		if len(purchase.Items) == 0 {
-			if err := writePurchaseExportRow(file, sheet, rowIdx, purchase, nil, total); err != nil {
+			if err := writePurchaseExportRow(file, sheet, rowIdx, purchase, nil, &sumL, &sumP, &sumQ); err != nil {
 				return err
 			}
 			rowIdx++
 			continue
 		}
 		for it := range purchase.Items {
-			if err := writePurchaseExportRow(file, sheet, rowIdx, purchase, &purchase.Items[it], total); err != nil {
+			if err := writePurchaseExportRow(file, sheet, rowIdx, purchase, &purchase.Items[it], &sumL, &sumP, &sumQ); err != nil {
 				return err
 			}
 			rowIdx++
 		}
 	}
 
-	lastRow := rowIdx - 1
+	lastDataRow := rowIdx - 1
+
 	dataStyle, err := file.NewStyle(&excelize.Style{
 		Alignment: &excelize.Alignment{
 			Horizontal: "left",
@@ -181,7 +196,7 @@ func setPurchaseExportRows(file *excelize.File, sheet string, purchases []entity
 	if err != nil {
 		return err
 	}
-	if err := file.SetCellStyle(sheet, "A2", "K"+strconv.Itoa(lastRow), dataStyle); err != nil {
+	if err := file.SetCellStyle(sheet, "A2", "S"+strconv.Itoa(lastDataRow), dataStyle); err != nil {
 		return err
 	}
 
@@ -200,14 +215,17 @@ func setPurchaseExportRows(file *excelize.File, sheet string, purchases []entity
 	if err != nil {
 		return err
 	}
+	if err := file.SetCellStyle(sheet, "K2", "Q"+strconv.Itoa(lastDataRow), moneyStyle); err != nil {
+		return err
+	}
 
-	return file.SetCellStyle(sheet, "J2", "J"+strconv.Itoa(lastRow), moneyStyle)
+	return addPurchaseExportSumRow(file, sheet, rowIdx, sumL, sumP, sumQ)
 }
 
-func writePurchaseExportRow(file *excelize.File, sheet string, rowIdx int, purchase *entity.Purchase, item *entity.PurchaseItem, grandTotal float64) error {
+func writePurchaseExportRow(file *excelize.File, sheet string, rowIdx int, purchase *entity.Purchase, item *entity.PurchaseItem, sumL, sumP, sumQ *float64) error {
 	row := strconv.Itoa(rowIdx)
 
-	// Purchase-level columns (repeat across rows of the same purchase)
+	// Purchase-level columns (repeat for every item row of the same purchase)
 	if err := file.SetCellValue(sheet, "A"+row, safePurchaseExportText(purchase.PrNumber)); err != nil {
 		return err
 	}
@@ -220,26 +238,40 @@ func writePurchaseExportRow(file *excelize.File, sheet string, rowIdx int, purch
 	if err := file.SetCellValue(sheet, "E"+row, safePurchaseExportEntitySupplierName(purchase)); err != nil {
 		return err
 	}
-	if err := file.SetCellValue(sheet, "I"+row, formatPurchaseExportEntityStatus(purchase)); err != nil {
+	if err := file.SetCellValue(sheet, "R"+row, formatPurchaseExportEntityStatus(purchase)); err != nil {
 		return err
 	}
-	if err := file.SetCellValue(sheet, "J"+row, formatPurchaseRupiah(grandTotal)); err != nil {
+	if err := file.SetCellValue(sheet, "S"+row, safePurchaseExportPointerText(purchase.Notes)); err != nil {
-		return err
-	}
-	if err := file.SetCellValue(sheet, "K"+row, safePurchaseExportPointerText(purchase.Notes)); err != nil {
 		return err
 	}
 
-	// Item-level columns
 	if item == nil {
-		for _, col := range []string{"D", "F", "G", "H"} {
+		for _, col := range []string{"D", "F", "G", "H", "J", "M"} {
 			if err := file.SetCellValue(sheet, col+row, "-"); err != nil {
 				return err
 			}
 		}
+		for _, col := range []string{"I", "K", "L", "N", "O", "P", "Q"} {
+			if err := file.SetCellValue(sheet, col+row, 0); err != nil {
+				return err
+			}
+		}
 		return nil
 	}
 
+	// Item-level columns
+	var expeditionQty, expeditionPrice, expeditionTotal float64
+	if item.ExpenseNonstock != nil {
+		expeditionQty = item.ExpenseNonstock.Qty
+		expeditionPrice = item.ExpenseNonstock.Price
+		expeditionTotal = expeditionQty * expeditionPrice
+	}
+	itemGrandTotal := item.TotalPrice + expeditionTotal
+
+	*sumL += item.TotalPrice
+	*sumP += expeditionTotal
+	*sumQ += itemGrandTotal
+
 	if err := file.SetCellValue(sheet, "D"+row, formatPurchaseExportDate(item.ReceivedDate)); err != nil {
 		return err
 	}
@@ -252,20 +284,96 @@ func writePurchaseExportRow(file *excelize.File, sheet string, rowIdx int, purch
 	if err := file.SetCellValue(sheet, "H"+row, safePurchaseItemProductName(item)); err != nil {
 		return err
 	}
+	if err := file.SetCellValue(sheet, "I"+row, item.TotalQty); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "J"+row, safePurchaseItemUomName(item)); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "K"+row, item.Price); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "L"+row, item.TotalPrice); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "M"+row, safePurchaseItemExpeditionVendorName(item)); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "N"+row, expeditionQty); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "O"+row, expeditionPrice); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "P"+row, expeditionTotal); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "Q"+row, itemGrandTotal); err != nil {
+		return err
+	}
 
 	return nil
 }
 
-func buildPurchaseGrandTotalMap(items []entity.Purchase) map[uint]float64 {
+func addPurchaseExportSumRow(file *excelize.File, sheet string, rowIdx int, sumL, sumP, sumQ float64) error {
-	result := make(map[uint]float64, len(items))
+	row := strconv.Itoa(rowIdx)
-	for i := range items {
+
-		total := 0.0
+	sumStyle, err := file.NewStyle(&excelize.Style{
-		for j := range items[i].Items {
+		Font: &excelize.Font{Bold: true, Color: "1F2937"},
-			total += items[i].Items[j].TotalPrice
+		Fill: excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"FEF3C7"}},
-		}
+		Alignment: &excelize.Alignment{
-		result[items[i].Id] = total
+			Horizontal: "left",
+			Vertical:   "center",
+		},
+		Border: []excelize.Border{
+			{Type: "left", Color: "D1D5DB", Style: 1},
+			{Type: "top", Color: "D1D5DB", Style: 2},
+			{Type: "bottom", Color: "D1D5DB", Style: 1},
+			{Type: "right", Color: "D1D5DB", Style: 1},
+		},
+	})
+	if err != nil {
+		return err
 	}
-	return result
+
+	sumMoneyStyle, err := file.NewStyle(&excelize.Style{
+		Font: &excelize.Font{Bold: true, Color: "1F2937"},
+		Fill: excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"FEF3C7"}},
+		Alignment: &excelize.Alignment{
+			Horizontal: "right",
+			Vertical:   "center",
+		},
+		Border: []excelize.Border{
+			{Type: "left", Color: "D1D5DB", Style: 1},
+			{Type: "top", Color: "D1D5DB", Style: 2},
+			{Type: "bottom", Color: "D1D5DB", Style: 1},
+			{Type: "right", Color: "D1D5DB", Style: 1},
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	if err := file.SetCellStyle(sheet, "A"+row, "S"+row, sumStyle); err != nil {
+		return err
+	}
+	if err := file.SetCellStyle(sheet, "L"+row, "L"+row, sumMoneyStyle); err != nil {
+		return err
+	}
+	if err := file.SetCellStyle(sheet, "P"+row, "Q"+row, sumMoneyStyle); err != nil {
+		return err
+	}
+
+	if err := file.SetCellValue(sheet, "A"+row, "TOTAL"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "L"+row, sumL); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "P"+row, sumP); err != nil {
+		return err
+	}
+	return file.SetCellValue(sheet, "Q"+row, sumQ)
 }
 
 func safePurchaseExportEntitySupplierName(purchase *entity.Purchase) string {
@@ -296,6 +404,24 @@ func safePurchaseItemProductName(item *entity.PurchaseItem) string {
 	return safePurchaseExportText(item.Product.Name)
 }
 
+func safePurchaseItemUomName(item *entity.PurchaseItem) string {
+	if item.Product == nil || item.Product.Uom.Id == 0 {
+		return "-"
+	}
+	return safePurchaseExportText(item.Product.Uom.Name)
+}
+
+func safePurchaseItemExpeditionVendorName(item *entity.PurchaseItem) string {
+	if item.ExpenseNonstock == nil || item.ExpenseNonstock.Expense == nil {
+		return "-"
+	}
+	exp := item.ExpenseNonstock.Expense
+	if exp.Supplier == nil || exp.Supplier.Id == 0 {
+		return "-"
+	}
+	return safePurchaseExportText(exp.Supplier.Name)
+}
+
 func formatPurchaseExportEntityStatus(purchase *entity.Purchase) string {
 	if purchase.LatestApproval == nil {
 		return "-"
@@ -309,6 +435,21 @@ func formatPurchaseExportEntityStatus(purchase *entity.Purchase) string {
 	return safePurchaseExportText(purchase.LatestApproval.StepName)
 }
 
+var purchaseIndonesianMonths = map[time.Month]string{
+	time.January:   "Jan",
+	time.February:  "Feb",
+	time.March:     "Mar",
+	time.April:     "Apr",
+	time.May:       "Mei",
+	time.June:      "Jun",
+	time.July:      "Jul",
+	time.August:    "Ags",
+	time.September: "Sep",
+	time.October:   "Okt",
+	time.November:  "Nov",
+	time.December:  "Des",
+}
+
 func formatPurchaseExportDate(value *time.Time) string {
 	if value == nil || value.IsZero() {
 		return "-"
@@ -320,7 +461,8 @@ func formatPurchaseExportDate(value *time.Time) string {
 		t = t.In(location)
 	}
 
-	return t.Format("02-01-2006")
+	month := purchaseIndonesianMonths[t.Month()]
+	return fmt.Sprintf("%d-%s-%02d", t.Day(), month, t.Year()%100)
 }
 
 func safePurchaseExportPointerText(value *string) string {
@@ -338,37 +480,3 @@ func safePurchaseExportText(value string) string {
 	return trimmed
 }
 
-func formatPurchaseRupiah(value float64) string {
-	if math.IsNaN(value) || math.IsInf(value, 0) {
-		return "Rp 0"
-	}
-
-	rounded := int64(math.Round(value))
-	sign := ""
-	if rounded < 0 {
-		sign = "-"
-		rounded = -rounded
-	}
-
-	raw := strconv.FormatInt(rounded, 10)
-	if raw == "" {
-		raw = "0"
-	}
-
-	var grouped strings.Builder
-	rem := len(raw) % 3
-	if rem > 0 {
-		grouped.WriteString(raw[:rem])
-		if len(raw) > rem {
-			grouped.WriteString(".")
-		}
-	}
-	for i := rem; i < len(raw); i += 3 {
-		grouped.WriteString(raw[i : i+3])
-		if i+3 < len(raw) {
-			grouped.WriteString(".")
-		}
-	}
-
-	return "Rp " + sign + grouped.String()
-}

internal/modules/purchases/controllers/purchase.export_test.go

@@ -22,9 +22,8 @@ func TestBuildPurchaseExportWorkbookHeadersAndRows(t *testing.T) {
 			nil,
 			"catatan",
 			[]entity.PurchaseItem{
-				buildPurchaseItemForExportTest(11, "Pakan Starter", 1000000, "Location A"),
+				buildPurchaseItemForExportTest(11, "Pakan Starter", 500, 2, 1000000, "Location A", "kg"),
-				buildPurchaseItemForExportTest(12, "Vitamin A", 350000, "Location B"),
+				buildPurchaseItemForExportTest(12, "Vitamin A", 350, 1, 350000, "Location B", "botol"),
-				buildPurchaseItemForExportTest(11, "Pakan Starter", 0, ""),
 			},
 		),
 		buildPurchaseForExportTest(
@@ -37,7 +36,7 @@ func TestBuildPurchaseExportWorkbookHeadersAndRows(t *testing.T) {
 			ptrApprovalAction(entity.ApprovalActionRejected),
 			"",
 			[]entity.PurchaseItem{
-				buildPurchaseItemForExportTest(21, "Obat X", 75000, ""),
+				buildPurchaseItemForExportTest(21, "Obat X", 75000, 1, 75000, "", ""),
 			},
 		),
 	})
@@ -51,16 +50,27 @@ func TestBuildPurchaseExportWorkbookHeadersAndRows(t *testing.T) {
 	}
 	defer file.Close()
 
+	// Verify all 19 headers
 	expectedHeaders := map[string]string{
 		"A1": "PR Number",
 		"B1": "PO Number",
 		"C1": "Tanggal PO",
-		"D1": "Supplier",
+		"D1": "Tanggal Terima",
-		"E1": "Lokasi",
+		"E1": "Supplier",
-		"F1": "Status",
+		"F1": "Lokasi",
-		"G1": "Grand Total",
+		"G1": "Gudang",
-		"H1": "Products",
+		"H1": "Product",
-		"I1": "Notes",
+		"I1": "Qty",
+		"J1": "Satuan",
+		"K1": "Price",
+		"L1": "Total Produk",
+		"M1": "Vendor Ekspedisi",
+		"N1": "Qty Ekspedisi",
+		"O1": "Price Ekspedisi",
+		"P1": "Total Ekspedisi",
+		"Q1": "Grand Total All",
+		"R1": "Status",
+		"S1": "Notes",
 	}
 	for cell, expected := range expectedHeaders {
 		got, err := file.GetCellValue(purchaseExportSheetName, cell)
@@ -72,24 +82,46 @@ func TestBuildPurchaseExportWorkbookHeadersAndRows(t *testing.T) {
 		}
 	}
 
+	// Row 2: Purchase 1, Item 1 (Pakan Starter)
 	assertPurchaseCellEquals(t, file, "A2", "PR-00011")
 	assertPurchaseCellEquals(t, file, "B2", "PO-00011")
 	assertPurchaseCellEquals(t, file, "C2", "22-04-2026")
-	assertPurchaseCellEquals(t, file, "D2", "Supplier A")
+	assertPurchaseCellEquals(t, file, "E2", "Supplier A")
-	assertPurchaseCellEquals(t, file, "E2", "Location A")
+	assertPurchaseCellEquals(t, file, "F2", "Location A")
-	assertPurchaseCellEquals(t, file, "F2", "Manager Purchase")
+	assertPurchaseCellEquals(t, file, "H2", "Pakan Starter")
-	assertPurchaseCellEquals(t, file, "G2", "Rp 1.350.000")
+	assertPurchaseCellEquals(t, file, "J2", "kg")
-	assertPurchaseCellEquals(t, file, "H2", "Pakan Starter, Vitamin A")
+	assertPurchaseCellEquals(t, file, "K2", "500")
-	assertPurchaseCellEquals(t, file, "I2", "catatan")
+	assertPurchaseCellEquals(t, file, "L2", "1000000")
+	assertPurchaseCellEquals(t, file, "M2", "-")
+	assertPurchaseCellEquals(t, file, "P2", "0")
+	assertPurchaseCellEquals(t, file, "Q2", "1000000")
+	assertPurchaseCellEquals(t, file, "R2", "Manager Purchase")
+	assertPurchaseCellEquals(t, file, "S2", "catatan")
 
-	assertPurchaseCellEquals(t, file, "A3", "PR-00012")
+	// Row 3: Purchase 1, Item 2 (Vitamin A)
-	assertPurchaseCellEquals(t, file, "B3", "-")
+	assertPurchaseCellEquals(t, file, "A3", "PR-00011")
-	assertPurchaseCellEquals(t, file, "C3", "-")
+	assertPurchaseCellEquals(t, file, "H3", "Vitamin A")
-	assertPurchaseCellEquals(t, file, "E3", "-")
+	assertPurchaseCellEquals(t, file, "J3", "botol")
-	assertPurchaseCellEquals(t, file, "F3", "Ditolak")
+	assertPurchaseCellEquals(t, file, "L3", "350000")
-	assertPurchaseCellEquals(t, file, "G3", "Rp 75.000")
+	assertPurchaseCellEquals(t, file, "Q3", "350000")
-	assertPurchaseCellEquals(t, file, "H3", "Obat X")
+
-	assertPurchaseCellEquals(t, file, "I3", "-")
+	// Row 4: Purchase 2, Item 1 (Obat X) — no location, rejected
+	assertPurchaseCellEquals(t, file, "A4", "PR-00012")
+	assertPurchaseCellEquals(t, file, "B4", "-")
+	assertPurchaseCellEquals(t, file, "C4", "-")
+	assertPurchaseCellEquals(t, file, "F4", "-")
+	assertPurchaseCellEquals(t, file, "H4", "Obat X")
+	assertPurchaseCellEquals(t, file, "J4", "-")
+	assertPurchaseCellEquals(t, file, "L4", "75000")
+	assertPurchaseCellEquals(t, file, "Q4", "75000")
+	assertPurchaseCellEquals(t, file, "R4", "Ditolak")
+	assertPurchaseCellEquals(t, file, "S4", "-")
+
+	// Row 5: SUM row — total produk=1425000, ekspedisi=0, grand total all=1425000
+	assertPurchaseCellEquals(t, file, "A5", "TOTAL")
+	assertPurchaseCellEquals(t, file, "L5", "1425000")
+	assertPurchaseCellEquals(t, file, "P5", "0")
+	assertPurchaseCellEquals(t, file, "Q5", "1425000")
 }
 
 func assertPurchaseCellEquals(t *testing.T, file *excelize.File, cell, expected string) {
@@ -144,13 +176,20 @@ func buildPurchaseForExportTest(
 	}
 }
 
-func buildPurchaseItemForExportTest(productID uint, productName string, totalPrice float64, locationName string) entity.PurchaseItem {
+func buildPurchaseItemForExportTest(productID uint, productName string, price, totalQty, totalPrice float64, locationName, uomName string) entity.PurchaseItem {
+	uomID := uint(0)
+	if uomName != "" {
+		uomID = productID + 2000
+	}
 	item := entity.PurchaseItem{
 		ProductId:  productID,
+		Price:      price,
+		TotalQty:   totalQty,
 		TotalPrice: totalPrice,
 		Product: &entity.Product{
 			Id:   productID,
 			Name: productName,
+			Uom:  entity.Uom{Id: uomID, Name: uomName},
 		},
 	}
 

internal/modules/purchases/dto/purchase.dto.go

@@ -32,12 +32,15 @@ type PurchaseListDTO struct {
 	RequesterName  string                           `json:"requester_name"`
 	PoExpedition   []PoExpeditionDTO                `json:"po_expedition"`
 	Items          []PurchaseItemDTO                `json:"items"`
-	Products       []productDTO.ProductRelationDTO  `json:"products"`
+	Products        []productDTO.ProductRelationDTO  `json:"products"`
-	Location       *locationDTO.LocationRelationDTO `json:"location"`
+	Location        *locationDTO.LocationRelationDTO `json:"location"`
-	Area           *areaDTO.AreaRelationDTO         `json:"area"`
+	Area            *areaDTO.AreaRelationDTO         `json:"area"`
-	CreatedAt      time.Time                        `json:"created_at"`
+	CreatedAt       time.Time                        `json:"created_at"`
-	UpdatedAt      time.Time                        `json:"updated_at"`
+	UpdatedAt       time.Time                        `json:"updated_at"`
-	LatestApproval *approvalDTO.ApprovalRelationDTO `json:"latest_approval"`
+	LatestApproval  *approvalDTO.ApprovalRelationDTO `json:"latest_approval"`
+	ProductsTotal   float64                          `json:"products_total"`
+	ExpeditionTotal float64                          `json:"expedition_total"`
+	GrandTotalAll   float64                          `json:"grand_total_all"`
 }
 
 type PurchaseDetailDTO struct {
@@ -69,6 +72,8 @@ type PurchaseItemDTO struct {
 	VehicleNumber      *string                            `json:"vehicle_number"`
 	TransportPerItem   *float64                           `json:"transport_per_item,omitempty"`
 	ExpeditionVendor   *supplierDTO.SupplierRelationDTO   `json:"expedition_vendor,omitempty"`
+	ExpeditionQty      float64                            `json:"expedition_qty"`
+	ExpeditionTotal    float64                            `json:"expedition_total"`
 	HasChickin         bool                               `json:"has_chickin"`
 }
 
@@ -127,6 +132,8 @@ func ToPurchaseItemDTO(item entity.PurchaseItem) PurchaseItemDTO {
 	if item.ExpenseNonstock != nil {
 		priceCopy := item.ExpenseNonstock.Price
 		dto.TransportPerItem = &priceCopy
+		dto.ExpeditionQty = item.ExpenseNonstock.Qty
+		dto.ExpeditionTotal = item.ExpenseNonstock.Qty * item.ExpenseNonstock.Price
 
 		if item.ExpenseNonstock.Expense != nil {
 			exp := item.ExpenseNonstock.Expense
@@ -173,15 +180,21 @@ func ToPurchaseListDTO(p entity.Purchase) PurchaseListDTO {
 	}
 
 	var (
-		poExpedition = make([]PoExpeditionDTO, 0)
+		poExpedition    = make([]PoExpeditionDTO, 0)
-		location     *locationDTO.LocationRelationDTO
+		location        *locationDTO.LocationRelationDTO
-		area         *areaDTO.AreaRelationDTO
+		area            *areaDTO.AreaRelationDTO
-		receivedDate *time.Time
+		receivedDate    *time.Time
+		productsTotal   float64
+		expeditionTotal float64
 	)
 	productMap := make(map[uint]productDTO.ProductRelationDTO)
 	expeditionRefSet := make(map[uint64]struct{})
 	for i := range p.Items {
 		item := p.Items[i]
+		productsTotal += item.TotalPrice
+		if item.ExpenseNonstock != nil {
+			expeditionTotal += item.ExpenseNonstock.Qty * item.ExpenseNonstock.Price
+		}
 		if item.Product != nil && item.Product.Id != 0 {
 			if _, exists := productMap[item.Product.Id]; !exists {
 				productMap[item.Product.Id] = productDTO.ToProductRelationDTO(*item.Product)
@@ -235,6 +248,9 @@ func ToPurchaseListDTO(p entity.Purchase) PurchaseListDTO {
 		CreatedAt:           p.CreatedAt,
 		UpdatedAt:           p.UpdatedAt,
 		LatestApproval:      latestApproval,
+		ProductsTotal:       productsTotal,
+		ExpeditionTotal:     expeditionTotal,
+		GrandTotalAll:       productsTotal + expeditionTotal,
 	}
 }
 

internal/modules/purchases/module.go

@@ -61,6 +61,7 @@ func (PurchaseModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 		expenseRealizationRepo,
 		projectFlockKandangRepository,
 		documentSvc,
+		commonSvc.NewFifoPaymentService(db, utils.Log),
 		validate,
 	)
 	expenseBridge := service.NewExpenseBridge(
@@ -72,6 +73,7 @@ func (PurchaseModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	)
 
 	fifoStockV2Service := commonSvc.NewFifoStockV2Service(db, utils.Log)
+	fifoPaymentService := commonSvc.NewFifoPaymentService(db, utils.Log)
 
 	purchaseService := service.NewPurchaseService(
 		validate,
@@ -84,6 +86,7 @@ func (PurchaseModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 		approvalService,
 		expenseBridge,
 		fifoStockV2Service,
+		fifoPaymentService,
 		documentSvc,
 	)
 

internal/modules/purchases/repositories/purchase.repository.go

@@ -24,7 +24,6 @@ type PurchaseRepository interface {
 	UpdateReceivingDetails(ctx context.Context, purchaseID uint, updates []PurchaseReceivingUpdate) error
 	DeleteItems(ctx context.Context, purchaseID uint, itemIDs []uint) error
 	NextPrNumber(ctx context.Context, tx *gorm.DB) (string, error)
-	NextPoNumber(ctx context.Context, tx *gorm.DB) (string, error)
 	BackfillProjectFlockKandang(ctx context.Context, purchaseID uint) error
 	SoftDeleteByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) error
 	GetItemsByProjectFlockID(ctx context.Context, projectFlockID uint) ([]entity.PurchaseItem, error)
@@ -369,9 +368,8 @@ func (r *PurchaseRepositoryImpl) NextPrNumber(ctx context.Context, tx *gorm.DB)
 	return r.generateSequentialNumber(ctx, tx, "pr_number", utils.PurchasePRNumberPrefix, utils.PurchaseNumberPadding)
 }
 
-func (r *PurchaseRepositoryImpl) NextPoNumber(ctx context.Context, tx *gorm.DB) (string, error) {
+// NOTE: NextPoNumber dihapus per migration 20260529143940 — po_number sekarang
-	return r.generateSequentialNumber(ctx, tx, "po_number", utils.PurchasePONumberPrefix, utils.PurchaseNumberPadding)
+// di-derive dari pr_number (swap prefix) via derivePoFromPr di purchase.service.go.
-}
 
 func (r *PurchaseRepositoryImpl) generateSequentialNumber(ctx context.Context, tx *gorm.DB, column, prefix string, padding int) (string, error) {
 	db := tx

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

@@ -64,6 +64,7 @@ type purchaseService struct {
 	ApprovalSvc             commonSvc.ApprovalService
 	ExpenseBridge           PurchaseExpenseBridge
 	FifoStockV2Svc          commonSvc.FifoStockV2Service
+	FifoPaymentSvc          commonSvc.FifoPaymentService
 	DocumentSvc             commonSvc.DocumentService
 	approvalWorkflow        approvalutils.ApprovalWorkflowKey
 }
@@ -91,6 +92,7 @@ func NewPurchaseService(
 	approvalSvc commonSvc.ApprovalService,
 	expenseBridge PurchaseExpenseBridge,
 	fifoStockV2Svc commonSvc.FifoStockV2Service,
+	fifoPaymentSvc commonSvc.FifoPaymentService,
 	documentSvc commonSvc.DocumentService,
 ) PurchaseService {
 	return &purchaseService{
@@ -105,6 +107,7 @@ func NewPurchaseService(
 		ApprovalSvc:             approvalSvc,
 		ExpenseBridge:           expenseBridge,
 		FifoStockV2Svc:          fifoStockV2Svc,
+		FifoPaymentSvc:          fifoPaymentSvc,
 		DocumentSvc:             documentSvc,
 		approvalWorkflow:        utils.ApprovalWorkflowPurchase,
 	}
@@ -145,33 +148,16 @@ func (s *purchaseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 
 	offset := (params.Page - 1) * params.Limit
 
-	createdFrom, createdTo, err := utils.ParseDateRangeForQuery(params.CreatedFrom, params.CreatedTo)
-	if err != nil {
-		return nil, 0, utils.BadRequest(err.Error())
-	}
-
 	productCategoryIDs, err := parseUintCSVFilter(params.ProductCategoryID, "product_category_id")
 	if err != nil {
 		return nil, 0, utils.BadRequest(err.Error())
 	}
 
-	var poDateStart *time.Time
+	dateStart, dateEnd, err := parsePurchaseDateRangeForQuery(params.StartDate, params.EndDate, "date")
-	var poDateEnd *time.Time
+	if err != nil {
-
+		return nil, 0, utils.BadRequest(err.Error())
-	if strings.TrimSpace(params.PoDate) != "" {
-		poDate, parseErr := utils.ParseDateString(strings.TrimSpace(params.PoDate))
-		if parseErr != nil {
-			return nil, 0, utils.BadRequest("po_date must use format YYYY-MM-DD")
-		}
-		poDateStart = &poDate
-		poDateEndValue := poDate.AddDate(0, 0, 1)
-		poDateEnd = &poDateEndValue
-	} else {
-		poDateStart, poDateEnd, err = parsePoDateRangeForQuery(params.PoDateFrom, params.PoDateTo)
-		if err != nil {
-			return nil, 0, utils.BadRequest(err.Error())
-		}
 	}
+	filterBy := strings.TrimSpace(params.FilterBy)
 
 	search := strings.ToLower(strings.TrimSpace(params.Search))
 	approvalStatuses := parseStringCSVFilter(params.ApprovalStatus)
@@ -187,23 +173,41 @@ func (s *purchaseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 			db = db.Where("supplier_id = ?", params.SupplierID)
 		}
 
-		if createdFrom != nil {
+		switch filterBy {
-			db = db.Where("created_at >= ?", *createdFrom)
+		case "po_date":
-		}
+			if dateStart != nil {
-
+				db = db.Where("purchases.po_date >= ?", *dateStart)
-		if createdTo != nil {
+			}
-			db = db.Where("created_at < ?", *createdTo)
+			if dateEnd != nil {
-		}
+				db = db.Where("purchases.po_date < ?", *dateEnd)
-		if poDateStart != nil {
+			}
-			db = db.Where("purchases.po_date >= ?", *poDateStart)
+		case "due_date":
-		}
+			if dateStart != nil {
-
+				db = db.Where("purchases.due_date >= ?", *dateStart)
-		if poDateStart != nil {
+			}
-			db = db.Where("purchases.po_date >= ?", *poDateStart)
+			if dateEnd != nil {
-		}
+				db = db.Where("purchases.due_date < ?", *dateEnd)
-
+			}
-		if poDateEnd != nil {
+		case "received_date":
-			db = db.Where("purchases.po_date < ?", *poDateEnd)
+			if dateStart != nil {
+				db = db.Where(
+					`EXISTS (SELECT 1 FROM purchase_items pi WHERE pi.purchase_id = purchases.id AND pi.received_date >= ?)`,
+					*dateStart,
+				)
+			}
+			if dateEnd != nil {
+				db = db.Where(
+					`EXISTS (SELECT 1 FROM purchase_items pi WHERE pi.purchase_id = purchases.id AND pi.received_date < ?)`,
+					*dateEnd,
+				)
+			}
+		default:
+			if dateStart != nil {
+				db = db.Where("purchases.created_at >= ?", *dateStart)
+			}
+			if dateEnd != nil {
+				db = db.Where("purchases.created_at < ?", *dateEnd)
+			}
 		}
 
 		if scope.Restrict {
@@ -263,6 +267,14 @@ func (s *purchaseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 
 		sortBy := strings.TrimSpace(params.SortBy)
 		sortOrder := strings.ToUpper(strings.TrimSpace(params.SortOrder))
+
+		if sortBy == "" && (filterBy == "po_date" || filterBy == "due_date" || filterBy == "received_date" || filterBy == "created_at") {
+			sortBy = filterBy
+			if sortOrder == "" {
+				sortOrder = "ASC"
+			}
+		}
+
 		if sortOrder == "" {
 			sortOrder = "DESC"
 		}
@@ -767,8 +779,7 @@ func (s *purchaseService) ApproveManagerPurchase(c *fiber.Ctx, id uint, req *val
 	transactionErr := s.PurchaseRepo.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
 		updateData := map[string]any{}
 		if !hasExistingPO {
-			repoTx := rPurchase.NewPurchaseRepository(tx)
+			code, err := derivePoFromPr(purchase.PrNumber)
-			code, err := repoTx.NextPoNumber(c.Context(), tx)
 			if err != nil {
 				return err
 			}
@@ -1397,6 +1408,16 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 		return nil, err
 	}
 
+	// Refresh purchase.grand_total + reallocate payment FIFO untuk supplier (new debt baru emerges).
+	if s.FifoPaymentSvc != nil && receivingAction == entity.ApprovalActionApproved {
+		if err := s.FifoPaymentSvc.RecomputeGrandTotal(c.Context(), nil, commonSvc.ParentKindPurchase, purchase.Id); err != nil {
+			s.Log.Warnf("Failed to recompute grand_total for purchase %d: %+v", purchase.Id, err)
+		}
+		if err := s.FifoPaymentSvc.ReallocateForParty(c.Context(), nil, string(utils.PaymentPartySupplier), uint(purchase.SupplierId)); err != nil {
+			s.Log.Warnf("Failed to reallocate payments for supplier %d: %+v", purchase.SupplierId, err)
+		}
+	}
+
 	return updated, nil
 }
 
@@ -2238,30 +2259,36 @@ func (s *purchaseService) attachLatestApprovals(ctx context.Context, items []ent
 	return nil
 }
 
-func parsePoDateRangeForQuery(fromStr, toStr string) (*time.Time, *time.Time, error) {
+func parsePurchaseDateRangeForQuery(fromStr, toStr, fieldName string) (*time.Time, *time.Time, error) {
+	jakartaLoc, err := time.LoadLocation("Asia/Jakarta")
+	if err != nil {
+		jakartaLoc = time.FixedZone("WIB", 7*60*60)
+	}
+
 	var fromPtr *time.Time
 	var toPtr *time.Time
 
 	if strings.TrimSpace(fromStr) != "" {
 		parsed, err := utils.ParseDateString(strings.TrimSpace(fromStr))
 		if err != nil {
-			return nil, nil, errors.New("po_date_from must use format YYYY-MM-DD")
+			return nil, nil, errors.New(fieldName + "_from must use format YYYY-MM-DD")
 		}
-		fromValue := parsed
+		t := time.Date(parsed.Year(), parsed.Month(), parsed.Day(), 0, 0, 0, 0, jakartaLoc)
-		fromPtr = &fromValue
+		fromPtr = &t
 	}
 
 	if strings.TrimSpace(toStr) != "" {
 		parsed, err := utils.ParseDateString(strings.TrimSpace(toStr))
 		if err != nil {
-			return nil, nil, errors.New("po_date_to must use format YYYY-MM-DD")
+			return nil, nil, errors.New(fieldName + "_to must use format YYYY-MM-DD")
 		}
-		nextDay := parsed.AddDate(0, 0, 1)
+		t := time.Date(parsed.Year(), parsed.Month(), parsed.Day(), 0, 0, 0, 0, jakartaLoc)
+		nextDay := t.AddDate(0, 0, 1)
 		toPtr = &nextDay
 	}
 
 	if fromPtr != nil && toPtr != nil && fromPtr.After(*toPtr) {
-		return nil, nil, errors.New("po_date_from must be earlier than po_date_to")
+		return nil, nil, errors.New(fieldName + "_from must be earlier than " + fieldName + "_to")
 	}
 
 	return fromPtr, toPtr, nil
@@ -2485,6 +2512,18 @@ func parseApprovalActionInput(raw string) (entity.ApprovalAction, error) {
 	}
 }
 
+// derivePoFromPr menghasilkan po_number dari pr_number dengan swap prefix.
+// Contoh: "PR-LTI-0050" -> "PO-LTI-0050". Mengembalikan error kalau pr_number
+// tidak diawali prefix standar — caller harus memastikan PR sudah valid.
+func derivePoFromPr(prNumber string) (string, error) {
+	trimmed := strings.TrimSpace(prNumber)
+	if !strings.HasPrefix(trimmed, utils.PurchasePRNumberPrefix) {
+		return "", fmt.Errorf("invalid pr_number %q: missing prefix %q", trimmed, utils.PurchasePRNumberPrefix)
+	}
+	suffix := strings.TrimPrefix(trimmed, utils.PurchasePRNumberPrefix)
+	return utils.PurchasePONumberPrefix + suffix, nil
+}
+
 func (s *purchaseService) rejectAndReload(
 	c *fiber.Ctx,
 	step approvalutils.ApprovalStep,

internal/modules/purchases/validations/purchase.validation.go

@@ -75,12 +75,10 @@ type Query struct {
 	ProjectFlockKandangID uint   `query:"project_flock_kandang_id" validate:"omitempty,gt=0"`
 	ProductCategoryID     string `query:"product_category_id" validate:"omitempty,max=500"`
 	ApprovalStatus        string `query:"approval_status" validate:"omitempty,max=500"`
-	PoDate                string `query:"po_date" validate:"omitempty,datetime=2006-01-02"`
+	StartDate             string `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
-	PoDateFrom            string `query:"po_date_from" validate:"omitempty,datetime=2006-01-02"`
+	EndDate               string `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
-	PoDateTo              string `query:"po_date_to" validate:"omitempty,datetime=2006-01-02"`
+	FilterBy              string `query:"filter_by" validate:"omitempty,oneof=po_date due_date received_date created_at"`
 	Search                string `query:"search" validate:"omitempty,max=100"`
-	CreatedFrom           string `query:"created_from" validate:"omitempty,datetime=2006-01-02"`
-	CreatedTo             string `query:"created_to" validate:"omitempty,datetime=2006-01-02"`
 	SortBy                string `query:"sort_by" validate:"omitempty,oneof=po_expedition supplier requester_name products location po_date received_date due_date status created_at po_number"`
 	SortOrder             string `query:"sort_order" validate:"omitempty,oneof=asc desc ASC DESC"`
 }

internal/modules/repports/controllers/repport.balance_monitoring.export.go

@@ -0,0 +1,286 @@
+package controller
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/xuri/excelize/v2"
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/repports/dto"
+)
+
+func isBalanceMonitoringExcelExportRequest(c *fiber.Ctx) bool {
+	return strings.EqualFold(strings.TrimSpace(c.Query("export")), "excel")
+}
+
+func exportBalanceMonitoringExcel(c *fiber.Ctx, items []dto.BalanceMonitoringRowDTO, totals dto.BalanceMonitoringTotalsDTO) error {
+	content, err := buildBalanceMonitoringWorkbook(items, totals)
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to generate excel file")
+	}
+
+	filename := fmt.Sprintf("laporan-balance-monitoring-%s.xlsx", time.Now().Format("2006-01-02-1504"))
+	c.Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+	return c.Status(fiber.StatusOK).Send(content)
+}
+
+func buildBalanceMonitoringWorkbook(items []dto.BalanceMonitoringRowDTO, totals dto.BalanceMonitoringTotalsDTO) ([]byte, error) {
+	file := excelize.NewFile()
+	defer file.Close()
+
+	const sheet = "Balance Monitoring"
+	defaultSheet := file.GetSheetName(file.GetActiveSheetIndex())
+	if defaultSheet != sheet {
+		if err := file.SetSheetName(defaultSheet, sheet); err != nil {
+			return nil, err
+		}
+	}
+
+	if err := setBalanceMonitoringColumns(file, sheet); err != nil {
+		return nil, err
+	}
+	if err := setBalanceMonitoringHeaders(file, sheet); err != nil {
+		return nil, err
+	}
+	if err := writeBalanceMonitoringRows(file, sheet, items, totals); err != nil {
+		return nil, err
+	}
+	if err := file.SetPanes(sheet, &excelize.Panes{
+		Freeze:      true,
+		YSplit:      2,
+		TopLeftCell: "A3",
+		ActivePane:  "bottomLeft",
+	}); err != nil {
+		return nil, err
+	}
+
+	buf, err := file.WriteToBuffer()
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+var bmColumnWidths = map[string]float64{
+	"A": 5,
+	"B": 28,
+	"C": 18,
+	"D": 12,
+	"E": 12,
+	"F": 20,
+	"G": 12,
+	"H": 12,
+	"I": 20,
+	"J": 20,
+	"K": 18,
+	"L": 12,
+	"M": 16,
+	"N": 20,
+}
+
+func setBalanceMonitoringColumns(file *excelize.File, sheet string) error {
+	for col, width := range bmColumnWidths {
+		if err := file.SetColWidth(sheet, col, col, width); err != nil {
+			return err
+		}
+	}
+	if err := file.SetRowHeight(sheet, 1, 24); err != nil {
+		return err
+	}
+	return file.SetRowHeight(sheet, 2, 24)
+}
+
+func setBalanceMonitoringHeaders(file *excelize.File, sheet string) error {
+	borderStyle := []excelize.Border{
+		{Type: "left", Color: "000000", Style: 1},
+		{Type: "top", Color: "000000", Style: 1},
+		{Type: "bottom", Color: "000000", Style: 1},
+		{Type: "right", Color: "000000", Style: 1},
+	}
+	headerStyle, err := file.NewStyle(&excelize.Style{
+		Font: &excelize.Font{Bold: true, Color: "FFFFFF", Family: "Arial", Size: 10},
+		Fill: excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"4472C4"}},
+		Alignment: &excelize.Alignment{
+			Horizontal: "center",
+			Vertical:   "center",
+			WrapText:   true,
+		},
+		Border: borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	// Single-column headers: merge rows 1 and 2 vertically
+	singleColHeaders := map[string]string{
+		"A": "No",
+		"B": "Customer",
+		"C": "Saldo Awal",
+		"J": "Penjualan Trading",
+		"K": "Pembayaran",
+		"L": "Aging",
+		"M": "Aging Rata-Rata",
+		"N": "Saldo Akhir",
+	}
+	for col, header := range singleColHeaders {
+		if err := file.SetCellValue(sheet, col+"1", header); err != nil {
+			return err
+		}
+		if err := file.MergeCell(sheet, col+"1", col+"2"); err != nil {
+			return err
+		}
+	}
+
+	// Group headers: merge columns horizontally in row 1
+	if err := file.SetCellValue(sheet, "D1", "Penjualan Ayam"); err != nil {
+		return err
+	}
+	if err := file.MergeCell(sheet, "D1", "F1"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "G1", "Penjualan Telur"); err != nil {
+		return err
+	}
+	if err := file.MergeCell(sheet, "G1", "I1"); err != nil {
+		return err
+	}
+
+	// Sub-column headers in row 2
+	subHeaders := map[string]string{
+		"D": "Ekor",
+		"E": "Kg",
+		"F": "Nominal",
+		"G": "Butir",
+		"H": "Kg",
+		"I": "Nominal",
+	}
+	for col, header := range subHeaders {
+		if err := file.SetCellValue(sheet, col+"2", header); err != nil {
+			return err
+		}
+	}
+
+	return file.SetCellStyle(sheet, "A1", "N2", headerStyle)
+}
+
+func writeBalanceMonitoringRows(file *excelize.File, sheet string, items []dto.BalanceMonitoringRowDTO, totals dto.BalanceMonitoringTotalsDTO) error {
+	borderStyle := []excelize.Border{
+		{Type: "left", Color: "000000", Style: 1},
+		{Type: "top", Color: "000000", Style: 1},
+		{Type: "bottom", Color: "000000", Style: 1},
+		{Type: "right", Color: "000000", Style: 1},
+	}
+
+	dataStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Color: "000000", Family: "Arial", Size: 10},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	totalStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Bold: true, Color: "000000", Family: "Arial", Size: 10},
+		Fill:      excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"E2EFDA"}},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	redDataStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Color: "FF0000", Family: "Arial", Size: 10},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	redTotalStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Bold: true, Color: "FF0000", Family: "Arial", Size: 10},
+		Fill:      excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"E2EFDA"}},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	for i, row := range items {
+		rowNum := i + 3
+		rowStr := strconv.Itoa(rowNum)
+
+		cells := map[string]interface{}{
+			"A": i + 1,
+			"B": row.Customer.Name,
+			"C": row.SaldoAwal,
+			"D": row.PenjualanAyam.Ekor,
+			"E": row.PenjualanAyam.Kg,
+			"F": row.PenjualanAyam.Nominal,
+			"G": row.PenjualanTelur.Butir,
+			"H": row.PenjualanTelur.Kg,
+			"I": row.PenjualanTelur.Nominal,
+			"J": row.PenjualanTrading.Nominal,
+			"K": row.Pembayaran,
+			"L": fmt.Sprintf("%d hari", row.Aging),
+			"M": formatBMAging(row.AgingRataRata),
+			"N": row.SaldoAkhir,
+		}
+		for col, val := range cells {
+			if err := file.SetCellValue(sheet, col+rowStr, val); err != nil {
+				return err
+			}
+		}
+		if err := file.SetCellStyle(sheet, "A"+rowStr, "N"+rowStr, dataStyle); err != nil {
+			return err
+		}
+		if row.SaldoAkhir < 0 {
+			if err := file.SetCellStyle(sheet, "N"+rowStr, "N"+rowStr, redDataStyle); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Totals row
+	totalRowStr := strconv.Itoa(len(items) + 3)
+	totalCells := map[string]interface{}{
+		"A": "Total",
+		"C": totals.SaldoAwal,
+		"D": totals.PenjualanAyam.Ekor,
+		"E": totals.PenjualanAyam.Kg,
+		"F": totals.PenjualanAyam.Nominal,
+		"G": totals.PenjualanTelur.Butir,
+		"H": totals.PenjualanTelur.Kg,
+		"I": totals.PenjualanTelur.Nominal,
+		"J": totals.PenjualanTrading.Nominal,
+		"K": totals.Pembayaran,
+		"N": totals.SaldoAkhir,
+	}
+	for col, val := range totalCells {
+		if err := file.SetCellValue(sheet, col+totalRowStr, val); err != nil {
+			return err
+		}
+	}
+	if err := file.SetCellStyle(sheet, "A"+totalRowStr, "N"+totalRowStr, totalStyle); err != nil {
+		return err
+	}
+	if totals.SaldoAkhir < 0 {
+		if err := file.SetCellStyle(sheet, "N"+totalRowStr, "N"+totalRowStr, redTotalStyle); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func formatBMAging(v float64) string {
+	s := strconv.FormatFloat(v, 'f', 2, 64)
+	s = strings.ReplaceAll(s, ".", ",")
+	return s + " hari"
+}

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

@@ -324,6 +324,13 @@ func (c *RepportController) GetPurchaseSupplier(ctx *fiber.Ctx) error {
 		return err
 	}
 
+	if isPurchaseSupplierExcelExportRequest(ctx) {
+		return exportPurchaseSupplierExcel(ctx, result)
+	}
+	if isPurchaseSupplierExcelAllExportRequest(ctx) {
+		return exportPurchaseSupplierExcelAll(ctx, result)
+	}
+
 	filters := map[string]interface{}{
 		"area_id":             query.AreaIDs,
 		"supplier_id":         query.SupplierIDs,
@@ -485,6 +492,13 @@ func (c *RepportController) GetCustomerPayment(ctx *fiber.Ctx) error {
 		return err
 	}
 
+	if isCustomerPaymentExcelExportRequest(ctx) {
+		return exportCustomerPaymentExcel(ctx, result)
+	}
+	if isCustomerPaymentExcelAllExportRequest(ctx) {
+		return exportCustomerPaymentExcelAll(ctx, result)
+	}
+
 	// If single customer mode (only 1 customer ID), return without pagination
 	if len(customerIDs) == 1 {
 		return ctx.Status(fiber.StatusOK).
@@ -548,6 +562,10 @@ func (c *RepportController) GetBalanceMonitoring(ctx *fiber.Ctx) error {
 		return err
 	}
 
+	if isBalanceMonitoringExcelExportRequest(ctx) {
+		return exportBalanceMonitoringExcel(ctx, result, totals)
+	}
+
 	limit := query.Limit
 	if limit < 1 {
 		limit = 10

internal/modules/repports/controllers/repport.customer_payment.export.go

@@ -0,0 +1,576 @@
+package controller
+
+import (
+	"fmt"
+	"math"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/xuri/excelize/v2"
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/repports/dto"
+)
+
+func isCustomerPaymentExcelExportRequest(c *fiber.Ctx) bool {
+	return strings.EqualFold(strings.TrimSpace(c.Query("export")), "excel")
+}
+
+func isCustomerPaymentExcelAllExportRequest(c *fiber.Ctx) bool {
+	return strings.EqualFold(strings.TrimSpace(c.Query("export")), "excel-all")
+}
+
+func exportCustomerPaymentExcel(c *fiber.Ctx, items []dto.CustomerPaymentReportItem) error {
+	content, err := buildCustomerPaymentWorkbook(items)
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to generate excel file")
+	}
+
+	filename := fmt.Sprintf("laporan-kontrol-pembayaran-customer-%s.xlsx", time.Now().Format("2006-01-02-1504"))
+	c.Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+	return c.Status(fiber.StatusOK).Send(content)
+}
+
+func exportCustomerPaymentExcelAll(c *fiber.Ctx, items []dto.CustomerPaymentReportItem) error {
+	content, err := buildCustomerPaymentAllWorkbook(items)
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to generate excel file")
+	}
+
+	filename := fmt.Sprintf("laporan-kontrol-pembayaran-customer-all-%s.xlsx", time.Now().Format("2006-01-02-1504"))
+	c.Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+	return c.Status(fiber.StatusOK).Send(content)
+}
+
+func buildCustomerPaymentWorkbook(items []dto.CustomerPaymentReportItem) ([]byte, error) {
+	file := excelize.NewFile()
+	defer file.Close()
+
+	defaultSheet := file.GetSheetName(file.GetActiveSheetIndex())
+
+	if len(items) == 0 {
+		if err := writeCustomerPaymentSheet(file, defaultSheet, dto.CustomerPaymentReportItem{}); err != nil {
+			return nil, err
+		}
+		buf, err := file.WriteToBuffer()
+		if err != nil {
+			return nil, err
+		}
+		return buf.Bytes(), nil
+	}
+
+	for idx, item := range items {
+		sheetName := sanitizeCustomerPaymentSheetName(customerPaymentName(item))
+		if sheetName == "" {
+			sheetName = fmt.Sprintf("Customer %d", idx+1)
+		}
+
+		if idx == 0 {
+			if defaultSheet != sheetName {
+				if err := file.SetSheetName(defaultSheet, sheetName); err != nil {
+					return nil, err
+				}
+			}
+		} else {
+			if _, err := file.NewSheet(sheetName); err != nil {
+				return nil, err
+			}
+		}
+
+		if err := writeCustomerPaymentSheet(file, sheetName, item); err != nil {
+			return nil, err
+		}
+	}
+
+	buf, err := file.WriteToBuffer()
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+func buildCustomerPaymentAllWorkbook(items []dto.CustomerPaymentReportItem) ([]byte, error) {
+	file := excelize.NewFile()
+	defer file.Close()
+
+	const sheet = "Kontrol Pembayaran Customer"
+	defaultSheet := file.GetSheetName(file.GetActiveSheetIndex())
+	if defaultSheet != sheet {
+		if err := file.SetSheetName(defaultSheet, sheet); err != nil {
+			return nil, err
+		}
+	}
+
+	if err := setCustomerPaymentAllColumns(file, sheet); err != nil {
+		return nil, err
+	}
+	if err := setCustomerPaymentAllHeaders(file, sheet); err != nil {
+		return nil, err
+	}
+	if err := writeCustomerPaymentAllRows(file, sheet, items); err != nil {
+		return nil, err
+	}
+	if err := file.SetPanes(sheet, &excelize.Panes{
+		Freeze:      true,
+		YSplit:      1,
+		TopLeftCell: "A2",
+		ActivePane:  "bottomLeft",
+	}); err != nil {
+		return nil, err
+	}
+
+	buf, err := file.WriteToBuffer()
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+var cpSheetHeaders = []string{
+	"No",
+	"Tanggal DO/Bayar",
+	"Tanggal Realisasi",
+	"Aging",
+	"Referensi",
+	"Nomor Polisi",
+	"Ekor/Qty",
+	"Berat (Kg)",
+	"AVG",
+	"Harga/Unit (Rp)",
+	"Harga Akhir (Rp)",
+	"Total (Rp)",
+	"Pembayaran (Rp)",
+	"Saldo Piutang (Rp)",
+	"Keterangan",
+	"Pengambilan",
+	"Sales/Marketing",
+}
+
+var cpAllSheetHeaders = append([]string{"Customer"}, cpSheetHeaders...)
+
+var cpSheetColumnWidths = map[string]float64{
+	"A": 5,
+	"B": 15,
+	"C": 12,
+	"D": 8,
+	"E": 12,
+	"F": 15,
+	"G": 10,
+	"H": 12,
+	"I": 10,
+	"J": 15,
+	"K": 15,
+	"L": 15,
+	"M": 15,
+	"N": 15,
+	"O": 20,
+	"P": 15,
+	"Q": 20,
+}
+
+var cpAllSheetColumnWidths = map[string]float64{
+	"A": 22,
+	"B": 6,
+	"C": 15,
+	"D": 15,
+	"E": 8,
+	"F": 12,
+	"G": 15,
+	"H": 10,
+	"I": 12,
+	"J": 10,
+	"K": 15,
+	"L": 15,
+	"M": 15,
+	"N": 15,
+	"O": 15,
+	"P": 20,
+	"Q": 15,
+	"R": 20,
+}
+
+func writeCustomerPaymentSheet(file *excelize.File, sheet string, item dto.CustomerPaymentReportItem) error {
+	for col, width := range cpSheetColumnWidths {
+		if err := file.SetColWidth(sheet, col, col, width); err != nil {
+			return err
+		}
+	}
+
+	// Row 1: headers
+	for i, h := range cpSheetHeaders {
+		col, _ := excelize.ColumnNumberToName(i + 1)
+		if err := file.SetCellValue(sheet, col+"1", h); err != nil {
+			return err
+		}
+	}
+
+	redStyle, err := file.NewStyle(&excelize.Style{
+		Font: &excelize.Font{Color: "FF0000"},
+	})
+	if err != nil {
+		return err
+	}
+
+	// Row 2: saldo awal
+	if err := file.SetCellValue(sheet, "N2", item.InitialBalance); err != nil {
+		return err
+	}
+	if item.InitialBalance < 0 {
+		if err := file.SetCellStyle(sheet, "N2", "N2", redStyle); err != nil {
+			return err
+		}
+	}
+
+	// Rows 3+: data rows
+	for i, row := range item.Rows {
+		rowNum := i + 3
+		rowStr := fmt.Sprintf("%d", rowNum)
+
+		cells := customerPaymentRowCells(row, i+1)
+		for colIdx, val := range cells {
+			col, _ := excelize.ColumnNumberToName(colIdx + 1)
+			if err := file.SetCellValue(sheet, col+rowStr, val); err != nil {
+				return err
+			}
+		}
+
+		if row.AccountsReceivable < 0 {
+			if err := file.SetCellStyle(sheet, "N"+rowStr, "N"+rowStr, redStyle); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Total row
+	totalRowNum := len(item.Rows) + 3
+	totalRowStr := fmt.Sprintf("%d", totalRowNum)
+
+	totalCells := map[string]interface{}{
+		"A": "Total",
+		"G": formatCPIDInteger(item.Summary.TotalQty),
+		"H": formatCPIDInteger(item.Summary.TotalWeight),
+		"K": item.Summary.TotalFinalAmount,
+		"L": item.Summary.TotalGrandAmount,
+		"M": item.Summary.TotalPayment,
+		"N": item.Summary.TotalAccountsReceivable,
+	}
+	for col, val := range totalCells {
+		if err := file.SetCellValue(sheet, col+totalRowStr, val); err != nil {
+			return err
+		}
+	}
+	if item.Summary.TotalAccountsReceivable < 0 {
+		if err := file.SetCellStyle(sheet, "N"+totalRowStr, "N"+totalRowStr, redStyle); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func setCustomerPaymentAllColumns(file *excelize.File, sheet string) error {
+	for col, width := range cpAllSheetColumnWidths {
+		if err := file.SetColWidth(sheet, col, col, width); err != nil {
+			return err
+		}
+	}
+	return file.SetRowHeight(sheet, 1, 24)
+}
+
+func setCustomerPaymentAllHeaders(file *excelize.File, sheet string) error {
+	borderStyle := []excelize.Border{
+		{Type: "left", Color: "000000", Style: 1},
+		{Type: "top", Color: "000000", Style: 1},
+		{Type: "bottom", Color: "000000", Style: 1},
+		{Type: "right", Color: "000000", Style: 1},
+	}
+	headerStyle, err := file.NewStyle(&excelize.Style{
+		Font: &excelize.Font{Bold: true, Color: "FFFFFF", Family: "Arial", Size: 10},
+		Fill: excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"4472C4"}},
+		Alignment: &excelize.Alignment{
+			Horizontal: "center",
+			Vertical:   "center",
+			WrapText:   true,
+		},
+		Border: borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	for i, h := range cpAllSheetHeaders {
+		col, _ := excelize.ColumnNumberToName(i + 1)
+		if err := file.SetCellValue(sheet, col+"1", h); err != nil {
+			return err
+		}
+	}
+
+	lastCol, _ := excelize.ColumnNumberToName(len(cpAllSheetHeaders))
+	return file.SetCellStyle(sheet, "A1", lastCol+"1", headerStyle)
+}
+
+func writeCustomerPaymentAllRows(file *excelize.File, sheet string, items []dto.CustomerPaymentReportItem) error {
+	borderStyle := []excelize.Border{
+		{Type: "left", Color: "000000", Style: 1},
+		{Type: "top", Color: "000000", Style: 1},
+		{Type: "bottom", Color: "000000", Style: 1},
+		{Type: "right", Color: "000000", Style: 1},
+	}
+
+	dataStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Color: "000000", Family: "Arial", Size: 10},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	totalStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Bold: true, Color: "000000", Family: "Arial", Size: 10},
+		Fill:      excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"E2EFDA"}},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	redDataStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Color: "FF0000", Family: "Arial", Size: 10},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	redTotalStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Bold: true, Color: "FF0000", Family: "Arial", Size: 10},
+		Fill:      excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"E2EFDA"}},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	lastHeaderCol, _ := excelize.ColumnNumberToName(len(cpAllSheetHeaders))
+	currentRow := 2
+
+	for _, item := range items {
+		name := customerPaymentName(item)
+
+		// Saldo awal row
+		saldoStr := fmt.Sprintf("%d", currentRow)
+		if err := file.SetCellValue(sheet, "A"+saldoStr, name); err != nil {
+			return err
+		}
+		if err := file.SetCellValue(sheet, "O"+saldoStr, item.InitialBalance); err != nil {
+			return err
+		}
+		if err := file.SetCellStyle(sheet, "A"+saldoStr, lastHeaderCol+saldoStr, dataStyle); err != nil {
+			return err
+		}
+		if item.InitialBalance < 0 {
+			if err := file.SetCellStyle(sheet, "O"+saldoStr, "O"+saldoStr, redDataStyle); err != nil {
+				return err
+			}
+		}
+		currentRow++
+
+		// Data rows
+		for seq, row := range item.Rows {
+			rowStr := fmt.Sprintf("%d", currentRow)
+			if err := file.SetCellValue(sheet, "A"+rowStr, name); err != nil {
+				return err
+			}
+			cells := customerPaymentRowCells(row, seq+1)
+			for colIdx, val := range cells {
+				col, _ := excelize.ColumnNumberToName(colIdx + 2)
+				if err := file.SetCellValue(sheet, col+rowStr, val); err != nil {
+					return err
+				}
+			}
+			if err := file.SetCellStyle(sheet, "A"+rowStr, lastHeaderCol+rowStr, dataStyle); err != nil {
+				return err
+			}
+			if row.AccountsReceivable < 0 {
+				if err := file.SetCellStyle(sheet, "O"+rowStr, "O"+rowStr, redDataStyle); err != nil {
+					return err
+				}
+			}
+			currentRow++
+		}
+
+		// Total row
+		totalStr := fmt.Sprintf("%d", currentRow)
+		totalCells := map[string]interface{}{
+			"A": name,
+			"B": "Total",
+			"H": formatCPIDInteger(item.Summary.TotalQty),
+			"I": formatCPIDInteger(item.Summary.TotalWeight),
+			"L": item.Summary.TotalFinalAmount,
+			"M": item.Summary.TotalGrandAmount,
+			"N": item.Summary.TotalPayment,
+			"O": item.Summary.TotalAccountsReceivable,
+		}
+		for col, val := range totalCells {
+			if err := file.SetCellValue(sheet, col+totalStr, val); err != nil {
+				return err
+			}
+		}
+		if err := file.SetCellStyle(sheet, "A"+totalStr, lastHeaderCol+totalStr, totalStyle); err != nil {
+			return err
+		}
+		if item.Summary.TotalAccountsReceivable < 0 {
+			if err := file.SetCellStyle(sheet, "O"+totalStr, "O"+totalStr, redTotalStyle); err != nil {
+				return err
+			}
+		}
+		currentRow++
+
+		// Empty separator row
+		currentRow++
+	}
+
+	return nil
+}
+
+// customerPaymentRowCells returns 17 cell values for cols A..Q.
+func customerPaymentRowCells(row dto.CustomerPaymentReportRow, seq int) []interface{} {
+	return []interface{}{
+		seq,
+		formatCPDate(row.TransDate),
+		formatCPOptionalDate(row.DeliveryDate),
+		formatCPAging(row.AgingDay),
+		safeCPText(row.Reference),
+		joinCPStrings(row.VehicleNumbers),
+		formatCPIDInteger(row.Qty),
+		formatCPIDInteger(row.Weight),
+		formatCPAvg(row.AverageWeight),
+		row.UnitPrice,
+		row.FinalPrice,
+		row.TotalPrice,
+		row.PaymentAmount,
+		row.AccountsReceivable,
+		safeCPText(row.Status),
+		joinCPStrings(row.PickupInfo),
+		safeCPText(row.SalesPerson),
+	}
+}
+
+func customerPaymentName(item dto.CustomerPaymentReportItem) string {
+	name := strings.TrimSpace(item.Customer.Name)
+	if name == "" {
+		return "Customer"
+	}
+	return name
+}
+
+func sanitizeCustomerPaymentSheetName(name string) string {
+	replacer := strings.NewReplacer(
+		":", " ", "\\", " ", "/", " ",
+		"?", " ", "*", " ", "[", " ", "]", " ",
+	)
+	sanitized := strings.TrimSpace(replacer.Replace(name))
+	if sanitized == "" {
+		return "Sheet"
+	}
+	runes := []rune(sanitized)
+	if len(runes) > 31 {
+		return string(runes[:31])
+	}
+	return sanitized
+}
+
+var cpIndonesianMonths = [12]string{
+	"Jan", "Feb", "Mar", "Apr", "Mei", "Jun",
+	"Jul", "Agu", "Sep", "Okt", "Nov", "Des",
+}
+
+func formatCPDate(t time.Time) string {
+	if t.IsZero() {
+		return "-"
+	}
+	loc, err := time.LoadLocation("Asia/Jakarta")
+	if err == nil {
+		t = t.In(loc)
+	}
+	return fmt.Sprintf("%02d %s %d", t.Day(), cpIndonesianMonths[t.Month()-1], t.Year())
+}
+
+func formatCPOptionalDate(t *time.Time) string {
+	if t == nil || t.IsZero() {
+		return "-"
+	}
+	return formatCPDate(*t)
+}
+
+func formatCPAging(v *int) string {
+	if v == nil {
+		return "-"
+	}
+	return strconv.Itoa(*v)
+}
+
+func formatCPIDInteger(v float64) string {
+	n := int64(math.Round(v))
+	if n == 0 {
+		return "0"
+	}
+	negative := n < 0
+	abs := n
+	if negative {
+		abs = -n
+	}
+	s := strconv.FormatInt(abs, 10)
+	// insert dots as thousand separators
+	var b strings.Builder
+	start := len(s) % 3
+	if start == 0 {
+		start = 3
+	}
+	b.WriteString(s[:start])
+	for i := start; i < len(s); i += 3 {
+		b.WriteByte('.')
+		b.WriteString(s[i : i+3])
+	}
+	if negative {
+		return "-" + b.String()
+	}
+	return b.String()
+}
+
+
+func formatCPAvg(v float64) string {
+	if v == 0 {
+		return "0"
+	}
+	s := strconv.FormatFloat(v, 'f', 2, 64)
+	return strings.ReplaceAll(s, ".", ",")
+}
+
+func safeCPText(s string) string {
+	t := strings.TrimSpace(s)
+	if t == "" {
+		return "-"
+	}
+	return t
+}
+
+func joinCPStrings(ss []string) string {
+	var parts []string
+	for _, s := range ss {
+		s = strings.TrimSpace(s)
+		if s != "" {
+			parts = append(parts, s)
+		}
+	}
+	if len(parts) == 0 {
+		return "-"
+	}
+	return strings.Join(parts, "\n")
+}

internal/modules/repports/controllers/repport.marketing.export.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"fmt"
-	"math"
 	"strconv"
 	"strings"
 	"time"
@@ -197,9 +196,9 @@ func setMarketingReportRows(file *excelize.File, items []dto.RepportMarketingIte
 			item.Qty,
 			item.AverageWeightKg,
 			item.TotalWeightKg,
-			formatMarketingRupiah(item.SalesPricePerKg),
+			item.SalesPricePerKg,
-			formatMarketingRupiah(item.HppPricePerKg),
+			item.HppPricePerKg,
-			formatMarketingRupiah(item.SalesAmount),
+			item.SalesAmount,
 		}
 
 		for colIdx, val := range values {
@@ -229,13 +228,13 @@ func setMarketingReportRows(file *excelize.File, items []dto.RepportMarketingIte
 		if err := file.SetCellValue(sheet, "N"+totalRow, summary.TotalWeightKg); err != nil {
 			return err
 		}
-		if err := file.SetCellValue(sheet, "O"+totalRow, formatMarketingRupiah(summary.AverageSalesPrice)); err != nil {
+		if err := file.SetCellValue(sheet, "O"+totalRow, summary.AverageSalesPrice); err != nil {
 			return err
 		}
-		if err := file.SetCellValue(sheet, "P"+totalRow, formatMarketingRupiah(summary.TotalHppPricePerKg)); err != nil {
+		if err := file.SetCellValue(sheet, "P"+totalRow, summary.TotalHppPricePerKg); err != nil {
 			return err
 		}
-		if err := file.SetCellValue(sheet, "Q"+totalRow, formatMarketingRupiah(float64(summary.TotalSalesAmount))); err != nil {
+		if err := file.SetCellValue(sheet, "Q"+totalRow, float64(summary.TotalSalesAmount)); err != nil {
 			return err
 		}
 	}
@@ -333,30 +332,3 @@ func safeMarketingExportText(value string) string {
 	return trimmed
 }
 
-// formatMarketingRupiah formats a float64 as Indonesian Rupiah string.
-// e.g. 1000000 → "Rp 1.000.000"
-func formatMarketingRupiah(value float64) string {
-	rounded := int64(math.Round(value))
-
-	negative := rounded < 0
-	abs := rounded
-	if negative {
-		abs = -rounded
-	}
-
-	numStr := strconv.FormatInt(abs, 10)
-	n := len(numStr)
-
-	var b strings.Builder
-	for i, c := range numStr {
-		if i > 0 && (n-i)%3 == 0 {
-			b.WriteByte('.')
-		}
-		b.WriteRune(c)
-	}
-
-	if negative {
-		return "Rp -" + b.String()
-	}
-	return "Rp " + b.String()
-}

internal/modules/repports/controllers/repport.purchase_supplier.export.go

@@ -0,0 +1,415 @@
+package controller
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/xuri/excelize/v2"
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/repports/dto"
+)
+
+func isPurchaseSupplierExcelExportRequest(c *fiber.Ctx) bool {
+	return strings.EqualFold(strings.TrimSpace(c.Query("export")), "excel")
+}
+
+func isPurchaseSupplierExcelAllExportRequest(c *fiber.Ctx) bool {
+	return strings.EqualFold(strings.TrimSpace(c.Query("export")), "excel-all")
+}
+
+func exportPurchaseSupplierExcel(c *fiber.Ctx, items []dto.PurchaseSupplierDTO) error {
+	content, err := buildPurchaseSupplierWorkbook(items)
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to generate excel file")
+	}
+
+	filename := fmt.Sprintf("laporan-pembelian-supplier-%s.xlsx", time.Now().Format("2006-01-02-1504"))
+	c.Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+	return c.Status(fiber.StatusOK).Send(content)
+}
+
+func exportPurchaseSupplierExcelAll(c *fiber.Ctx, items []dto.PurchaseSupplierDTO) error {
+	content, err := buildPurchaseSupplierAllWorkbook(items)
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to generate excel file")
+	}
+
+	filename := fmt.Sprintf("laporan-pembelian-supplier-all-%s.xlsx", time.Now().Format("2006-01-02-1504"))
+	c.Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+	return c.Status(fiber.StatusOK).Send(content)
+}
+
+// buildPurchaseSupplierWorkbook creates a workbook with one sheet per supplier.
+func buildPurchaseSupplierWorkbook(items []dto.PurchaseSupplierDTO) ([]byte, error) {
+	file := excelize.NewFile()
+	defer file.Close()
+
+	defaultSheet := file.GetSheetName(file.GetActiveSheetIndex())
+
+	if len(items) == 0 {
+		if err := writePurchaseSupplierSheet(file, defaultSheet, dto.PurchaseSupplierDTO{}); err != nil {
+			return nil, err
+		}
+		buf, err := file.WriteToBuffer()
+		if err != nil {
+			return nil, err
+		}
+		return buf.Bytes(), nil
+	}
+
+	for idx, item := range items {
+		sheetName := sanitizePurchaseSupplierSheetName(purchaseSupplierName(item))
+		if sheetName == "" {
+			sheetName = fmt.Sprintf("Supplier %d", idx+1)
+		}
+
+		if idx == 0 {
+			if defaultSheet != sheetName {
+				if err := file.SetSheetName(defaultSheet, sheetName); err != nil {
+					return nil, err
+				}
+			}
+		} else {
+			if _, err := file.NewSheet(sheetName); err != nil {
+				return nil, err
+			}
+		}
+
+		if err := writePurchaseSupplierSheet(file, sheetName, item); err != nil {
+			return nil, err
+		}
+	}
+
+	buf, err := file.WriteToBuffer()
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+// buildPurchaseSupplierAllWorkbook creates a single-sheet workbook with all suppliers.
+func buildPurchaseSupplierAllWorkbook(items []dto.PurchaseSupplierDTO) ([]byte, error) {
+	file := excelize.NewFile()
+	defer file.Close()
+
+	const sheet = "Rekap Pembelian Supplier"
+	defaultSheet := file.GetSheetName(file.GetActiveSheetIndex())
+	if defaultSheet != sheet {
+		if err := file.SetSheetName(defaultSheet, sheet); err != nil {
+			return nil, err
+		}
+	}
+
+	if err := setPurchaseSupplierAllColumns(file, sheet); err != nil {
+		return nil, err
+	}
+	if err := setPurchaseSupplierAllHeaders(file, sheet); err != nil {
+		return nil, err
+	}
+	if err := writePurchaseSupplierAllRows(file, sheet, items); err != nil {
+		return nil, err
+	}
+	if err := file.SetPanes(sheet, &excelize.Panes{
+		Freeze:      true,
+		YSplit:      1,
+		TopLeftCell: "A2",
+		ActivePane:  "bottomLeft",
+	}); err != nil {
+		return nil, err
+	}
+
+	buf, err := file.WriteToBuffer()
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+var purchaseSupplierSheetHeaders = []string{
+	"No",
+	"Tanggal Terima",
+	"Tanggal PO",
+	"No. Referensi",
+	"Nama Produk",
+	"Tujuan",
+	"QTY",
+	"Harga Beli (Rp)",
+	"Value Harga Beli (Rp)",
+	"Transport (Rp)",
+	"Value Transport (Rp)",
+	"Jumlah (Rp)",
+	"Ekspedisi",
+	"Surat Jalan",
+}
+
+var purchaseSupplierAllSheetHeaders = append([]string{"Supplier"}, purchaseSupplierSheetHeaders...)
+
+var purchaseSupplierSheetColumnWidths = map[string]float64{
+	"A": 5,
+	"B": 14,
+	"C": 12,
+	"D": 16,
+	"E": 20,
+	"F": 20,
+	"G": 10,
+	"H": 20,
+	"I": 20,
+	"J": 22,
+	"K": 22,
+	"L": 16,
+	"M": 20,
+	"N": 20,
+}
+
+var purchaseSupplierAllSheetColumnWidths = map[string]float64{
+	"A": 24,
+	"B": 6,
+	"C": 14,
+	"D": 12,
+	"E": 16,
+	"F": 20,
+	"G": 20,
+	"H": 10,
+	"I": 20,
+	"J": 20,
+	"K": 22,
+	"L": 22,
+	"M": 16,
+	"N": 20,
+	"O": 20,
+}
+
+func writePurchaseSupplierSheet(file *excelize.File, sheet string, item dto.PurchaseSupplierDTO) error {
+	for col, width := range purchaseSupplierSheetColumnWidths {
+		if err := file.SetColWidth(sheet, col, col, width); err != nil {
+			return err
+		}
+	}
+
+	for i, h := range purchaseSupplierSheetHeaders {
+		col, _ := excelize.ColumnNumberToName(i + 1)
+		if err := file.SetCellValue(sheet, col+"1", h); err != nil {
+			return err
+		}
+	}
+
+	for i, row := range item.Rows {
+		rowNum := i + 2
+		rowStr := fmt.Sprintf("%d", rowNum)
+
+		values := purchaseSupplierRowCells(row, i+1)
+		for colIdx, val := range values {
+			col, _ := excelize.ColumnNumberToName(colIdx + 1)
+			if err := file.SetCellValue(sheet, col+rowStr, val); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Summary row
+	totalRowNum := len(item.Rows) + 2
+	totalRowStr := fmt.Sprintf("%d", totalRowNum)
+	totalCells := map[string]interface{}{
+		"A": "Total",
+		"G": item.Summary.TotalQty,
+		"H": item.Summary.TotalUnitPrice,
+		"I": item.Summary.TotalPurchaseValue,
+		"J": item.Summary.TotalTransportUnitPrice,
+		"K": item.Summary.TotalTransportValue,
+		"L": item.Summary.TotalAmount,
+	}
+	for col, val := range totalCells {
+		if err := file.SetCellValue(sheet, col+totalRowStr, val); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func setPurchaseSupplierAllColumns(file *excelize.File, sheet string) error {
+	for col, width := range purchaseSupplierAllSheetColumnWidths {
+		if err := file.SetColWidth(sheet, col, col, width); err != nil {
+			return err
+		}
+	}
+	if err := file.SetRowHeight(sheet, 1, 24); err != nil {
+		return err
+	}
+	return nil
+}
+
+func setPurchaseSupplierAllHeaders(file *excelize.File, sheet string) error {
+	headerStyle, err := file.NewStyle(&excelize.Style{
+		Font: &excelize.Font{Bold: true, Color: "FFFFFF", Family: "Arial", Size: 10},
+		Fill: excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"4472C4"}},
+		Alignment: &excelize.Alignment{
+			Horizontal: "center",
+			Vertical:   "center",
+			WrapText:   true,
+		},
+		Border: []excelize.Border{
+			{Type: "left", Color: "000000", Style: 1},
+			{Type: "top", Color: "000000", Style: 1},
+			{Type: "bottom", Color: "000000", Style: 1},
+			{Type: "right", Color: "000000", Style: 1},
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	for i, h := range purchaseSupplierAllSheetHeaders {
+		col, _ := excelize.ColumnNumberToName(i + 1)
+		if err := file.SetCellValue(sheet, col+"1", h); err != nil {
+			return err
+		}
+	}
+
+	lastCol, _ := excelize.ColumnNumberToName(len(purchaseSupplierAllSheetHeaders))
+	return file.SetCellStyle(sheet, "A1", lastCol+"1", headerStyle)
+}
+
+func writePurchaseSupplierAllRows(file *excelize.File, sheet string, items []dto.PurchaseSupplierDTO) error {
+	borderStyle := []excelize.Border{
+		{Type: "left", Color: "000000", Style: 1},
+		{Type: "top", Color: "000000", Style: 1},
+		{Type: "bottom", Color: "000000", Style: 1},
+		{Type: "right", Color: "000000", Style: 1},
+	}
+
+	dataStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Color: "000000", Family: "Arial", Size: 10},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	totalStyle, err := file.NewStyle(&excelize.Style{
+		Font:      &excelize.Font{Bold: true, Color: "000000", Family: "Arial", Size: 10},
+		Fill:      excelize.Fill{Type: "pattern", Pattern: 1, Color: []string{"E2EFDA"}},
+		Alignment: &excelize.Alignment{Vertical: "center", WrapText: true},
+		Border:    borderStyle,
+	})
+	if err != nil {
+		return err
+	}
+
+	lastHeaderCol, _ := excelize.ColumnNumberToName(len(purchaseSupplierAllSheetHeaders))
+
+	currentRow := 2
+	for _, item := range items {
+		supplierName := purchaseSupplierName(item)
+
+		// Data rows
+		for seq, row := range item.Rows {
+			rowStr := fmt.Sprintf("%d", currentRow)
+			if err := file.SetCellValue(sheet, "A"+rowStr, supplierName); err != nil {
+				return err
+			}
+			values := purchaseSupplierRowCells(row, seq+1)
+			for colIdx, val := range values {
+				col, _ := excelize.ColumnNumberToName(colIdx + 2)
+				if err := file.SetCellValue(sheet, col+rowStr, val); err != nil {
+					return err
+				}
+			}
+			if err := file.SetCellStyle(sheet, "A"+rowStr, lastHeaderCol+rowStr, dataStyle); err != nil {
+				return err
+			}
+			currentRow++
+		}
+
+		// Summary row
+		totalRowStr := fmt.Sprintf("%d", currentRow)
+		totalCells := map[string]interface{}{
+			"A": supplierName,
+			"B": "Total",
+			"H": item.Summary.TotalQty,
+			"I": item.Summary.TotalUnitPrice,
+			"J": item.Summary.TotalPurchaseValue,
+			"K": item.Summary.TotalTransportUnitPrice,
+			"L": item.Summary.TotalTransportValue,
+			"M": item.Summary.TotalAmount,
+		}
+		for col, val := range totalCells {
+			if err := file.SetCellValue(sheet, col+totalRowStr, val); err != nil {
+				return err
+			}
+		}
+		if err := file.SetCellStyle(sheet, "A"+totalRowStr, lastHeaderCol+totalRowStr, totalStyle); err != nil {
+			return err
+		}
+		currentRow++
+
+		// Empty separator row
+		currentRow++
+	}
+
+	return nil
+}
+
+// purchaseSupplierRowCells returns cell values for one data row.
+func purchaseSupplierRowCells(row dto.PurchaseSupplierRowDTO, seq int) []interface{} {
+	productName := "-"
+	if row.Product != nil && strings.TrimSpace(row.Product.Name) != "" {
+		productName = row.Product.Name
+	}
+	warehouseName := "-"
+	if row.Warehouse != nil && strings.TrimSpace(row.Warehouse.Name) != "" {
+		warehouseName = row.Warehouse.Name
+	}
+
+	return []interface{}{
+		seq,
+		safePurchaseSupplierText(row.ReceiveDate),
+		safePurchaseSupplierText(row.PoDate),
+		safePurchaseSupplierText(row.PoNumber),
+		productName,
+		warehouseName,
+		row.Qty,
+		row.UnitPrice,
+		row.PurchaseValue,
+		row.TransportUnitPrice,
+		row.TransportValue,
+		row.TotalAmount,
+		safePurchaseSupplierText(row.Expedition),
+		safePurchaseSupplierText(row.DeliveryNumber),
+	}
+}
+
+func purchaseSupplierName(item dto.PurchaseSupplierDTO) string {
+	if item.Supplier != nil && strings.TrimSpace(item.Supplier.Name) != "" {
+		return item.Supplier.Name
+	}
+	return "Supplier"
+}
+
+func sanitizePurchaseSupplierSheetName(name string) string {
+	replacer := strings.NewReplacer(
+		":", " ", "\\", " ", "/", " ",
+		"?", " ", "*", " ", "[", " ", "]", " ",
+	)
+	sanitized := strings.TrimSpace(replacer.Replace(name))
+	if sanitized == "" {
+		return "Sheet"
+	}
+	runes := []rune(sanitized)
+	if len(runes) > 31 {
+		return string(runes[:31])
+	}
+	return sanitized
+}
+
+func safePurchaseSupplierText(s string) string {
+	t := strings.TrimSpace(s)
+	if t == "" {
+		return "-"
+	}
+	return t
+}

internal/modules/repports/dto/repportBalanceMonitoring.dto.go

@@ -0,0 +1,71 @@
+package dto
+
+import (
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	customerDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/dto"
+)
+
+type BalanceMonitoringAyamDTO struct {
+	Ekor    float64 `json:"ekor"`
+	Kg      float64 `json:"kg"`
+	Nominal float64 `json:"nominal"`
+}
+
+type BalanceMonitoringTelurDTO struct {
+	Butir   float64 `json:"butir"`
+	Kg      float64 `json:"kg"`
+	Nominal float64 `json:"nominal"`
+}
+
+type BalanceMonitoringTradingDTO struct {
+	Qty     float64 `json:"qty"`
+	Kg      float64 `json:"kg"`
+	Nominal float64 `json:"nominal"`
+}
+
+type BalanceMonitoringRowDTO struct {
+	Customer         customerDTO.CustomerRelationDTO `json:"customer"`
+	SaldoAwal        float64                         `json:"saldo_awal"`
+	PenjualanAyam    BalanceMonitoringAyamDTO        `json:"penjualan_ayam"`
+	PenjualanTelur   BalanceMonitoringTelurDTO       `json:"penjualan_telur"`
+	PenjualanTrading BalanceMonitoringTradingDTO     `json:"penjualan_trading"`
+	Pembayaran       float64                         `json:"pembayaran"`
+	Aging            int                             `json:"aging"`
+	AgingRataRata    float64                         `json:"aging_rata_rata"`
+	SaldoAkhir       float64                         `json:"saldo_akhir"`
+}
+
+type BalanceMonitoringTotalsDTO struct {
+	SaldoAwal        float64                     `json:"saldo_awal"`
+	PenjualanAyam    BalanceMonitoringAyamDTO    `json:"penjualan_ayam"`
+	PenjualanTelur   BalanceMonitoringTelurDTO   `json:"penjualan_telur"`
+	PenjualanTrading BalanceMonitoringTradingDTO `json:"penjualan_trading"`
+	Pembayaran       float64                     `json:"pembayaran"`
+	Aging            int                         `json:"aging"`
+	AgingRataRata    float64                     `json:"aging_rata_rata"`
+	SaldoAkhir       float64                     `json:"saldo_akhir"`
+}
+
+func ToBalanceMonitoringRowDTO(
+	customer entity.Customer,
+	saldoAwal float64,
+	ayam BalanceMonitoringAyamDTO,
+	telur BalanceMonitoringTelurDTO,
+	trading BalanceMonitoringTradingDTO,
+	pembayaran float64,
+	aging int,
+	agingRataRata float64,
+) BalanceMonitoringRowDTO {
+	saldoAkhir := saldoAwal + pembayaran - (ayam.Nominal + telur.Nominal + trading.Nominal)
+	return BalanceMonitoringRowDTO{
+		Customer:         customerDTO.ToCustomerRelationDTO(customer),
+		SaldoAwal:        saldoAwal,
+		PenjualanAyam:    ayam,
+		PenjualanTelur:   telur,
+		PenjualanTrading: trading,
+		Pembayaran:       pembayaran,
+		Aging:            aging,
+		AgingRataRata:    agingRataRata,
+		SaldoAkhir:       saldoAkhir,
+	}
+}

internal/modules/repports/dto/repportExpense.dto.go

@@ -6,6 +6,7 @@ import (
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	approvalDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/approvals/dto"
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
+	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
 	nonstockDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/nonstocks/dto"
 	supplierDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/dto"
 )
@@ -48,6 +49,7 @@ type RepportExpenseRealisasiDTO struct {
 
 type RepportExpenseListDTO struct {
 	RepportExpenseBaseDTO
+	Location       *locationDTO.LocationRelationDTO `json:"location,omitempty"`
 	Kandang        *kandangDTO.KandangRelationDTO   `json:"kandang,omitempty"`
 	Pengajuan      RepportExpensePengajuanDTO       `json:"pengajuan"`
 	Realisasi      RepportExpenseRealisasiDTO       `json:"realisasi"`
@@ -133,6 +135,15 @@ func ToRepportExpenseListDTO(baseDTO RepportExpenseBaseDTO, ns *entity.ExpenseNo
 		totalRealisasi = ns.Realization.Qty * ns.Realization.Price
 	}
 
+	var location *locationDTO.LocationRelationDTO
+	if ns.Expense != nil && ns.Expense.Location != nil && ns.Expense.Location.Id != 0 {
+		mapped := locationDTO.ToLocationRelationDTO(*ns.Expense.Location)
+		location = &mapped
+	} else if ns.Kandang != nil && ns.Kandang.Location.Id != 0 {
+		mapped := locationDTO.ToLocationRelationDTO(ns.Kandang.Location)
+		location = &mapped
+	}
+
 	// Get kandang data at the main level
 	var kandang *kandangDTO.KandangRelationDTO
 	if ns.Kandang != nil && ns.Kandang.Id != 0 {
@@ -142,6 +153,7 @@ func ToRepportExpenseListDTO(baseDTO RepportExpenseBaseDTO, ns *entity.ExpenseNo
 
 	return RepportExpenseListDTO{
 		RepportExpenseBaseDTO: baseDTO,
+		Location:              location,
 		Kandang:               kandang,
 		Pengajuan:             ToRepportExpensePengajuanDTO(ns),
 		Realisasi:             realisasi,

internal/modules/repports/module.go

@@ -40,6 +40,7 @@ func (RepportModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 	expenseDepreciationRepository := repportRepo.NewExpenseDepreciationRepository(db)
 	productionResultRepository := repportRepo.NewProductionResultRepository(db)
 	customerPaymentRepository := repportRepo.NewCustomerPaymentRepository(db)
+	balanceMonitoringRepository := repportRepo.NewBalanceMonitoringRepository(db)
 	customerRepository := customerRepo.NewCustomerRepository(db)
 	standardGrowthDetailRepository := productionStandardRepo.NewStandardGrowthDetailRepository(db)
 	productionStandardDetailRepository := productionStandardRepo.NewProductionStandardDetailRepository(db)
@@ -66,6 +67,7 @@ func (RepportModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 		hppPerKandangRepository,
 		productionResultRepository,
 		customerPaymentRepository,
+		balanceMonitoringRepository,
 		customerRepository,
 		standardGrowthDetailRepository,
 		productionStandardDetailRepository,

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

@@ -0,0 +1,550 @@
+package repositories
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+
+	"gorm.io/gorm"
+)
+
+type BalanceMonitoringCategoryRow struct {
+	CustomerID     uint    `gorm:"column:customer_id"`
+	AyamQty        float64 `gorm:"column:ayam_qty"`
+	AyamKg         float64 `gorm:"column:ayam_kg"`
+	AyamNominal    float64 `gorm:"column:ayam_nominal"`
+	TelurQty       float64 `gorm:"column:telur_qty"`
+	TelurKg        float64 `gorm:"column:telur_kg"`
+	TelurNominal   float64 `gorm:"column:telur_nominal"`
+	TradingQty     float64 `gorm:"column:trading_qty"`
+	TradingKg      float64 `gorm:"column:trading_kg"`
+	TradingNominal float64 `gorm:"column:trading_nominal"`
+}
+
+type BalanceMonitoringAgingRow struct {
+	CustomerID    uint    `gorm:"column:customer_id"`
+	AgingMax      int     `gorm:"column:aging_max"`
+	AgingRataRata float64 `gorm:"column:aging_rata_rata"`
+}
+
+type BalanceMonitoringGrandTotalsRow struct {
+	SaldoAwalLifetime float64 `gorm:"column:saldo_awal_lifetime"`
+	SalesBeforeStart  float64 `gorm:"column:sales_before_start"`
+	PaymentBeforeStart float64 `gorm:"column:payment_before_start"`
+	AyamQty           float64 `gorm:"column:ayam_qty"`
+	AyamKg            float64 `gorm:"column:ayam_kg"`
+	AyamNominal       float64 `gorm:"column:ayam_nominal"`
+	TelurQty          float64 `gorm:"column:telur_qty"`
+	TelurKg           float64 `gorm:"column:telur_kg"`
+	TelurNominal      float64 `gorm:"column:telur_nominal"`
+	TradingQty        float64 `gorm:"column:trading_qty"`
+	TradingKg         float64 `gorm:"column:trading_kg"`
+	TradingNominal    float64 `gorm:"column:trading_nominal"`
+	PaymentInPeriod   float64 `gorm:"column:payment_in_period"`
+	AgingMax          int     `gorm:"column:aging_max"`
+	AgingRataRata     float64 `gorm:"column:aging_rata_rata"`
+}
+
+type BalanceMonitoringRepository interface {
+	GetCustomerIDsForBalanceMonitoring(ctx context.Context, offset, limit int, filters *validation.BalanceMonitoringQuery) ([]uint, int64, error)
+	GetAllFilteredCustomerIDs(ctx context.Context, filters *validation.BalanceMonitoringQuery) ([]uint, error)
+	GetSaldoAwalLifetime(ctx context.Context, customerIDs []uint) (map[uint]float64, error)
+	GetSalesTotalsBeforeDate(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]float64, error)
+	GetPaymentTotalsBeforeDate(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]float64, error)
+	GetSalesByCategoryInPeriod(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]BalanceMonitoringCategoryRow, error)
+	GetPaymentTotalsInPeriod(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]float64, error)
+	GetAgingPerCustomer(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]BalanceMonitoringAgingRow, error)
+	GetGrandTotals(ctx context.Context, filters *validation.BalanceMonitoringQuery) (BalanceMonitoringGrandTotalsRow, error)
+}
+
+type balanceMonitoringRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewBalanceMonitoringRepository(db *gorm.DB) BalanceMonitoringRepository {
+	return &balanceMonitoringRepositoryImpl{db: db}
+}
+
+func resolveBalanceMonitoringDateColumn(filterBy string) string {
+	switch strings.ToLower(strings.TrimSpace(filterBy)) {
+	case "realized_at":
+		return "mdp.delivery_date"
+	case "sold_at", "":
+		return "m.so_date"
+	default:
+		return "m.so_date"
+	}
+}
+
+func resolveBalanceMonitoringDateRange(filters *validation.BalanceMonitoringQuery) (time.Time, time.Time, error) {
+	var startDate time.Time
+	var endDate time.Time
+	var err error
+
+	if strings.TrimSpace(filters.StartDate) != "" {
+		startDate, err = utils.ParseDateString(filters.StartDate)
+		if err != nil {
+			return time.Time{}, time.Time{}, err
+		}
+	} else {
+		startDate = time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC)
+	}
+
+	if strings.TrimSpace(filters.EndDate) != "" {
+		endDate, err = utils.ParseDateString(filters.EndDate)
+		if err != nil {
+			return time.Time{}, time.Time{}, err
+		}
+	} else {
+		endDate = time.Now()
+	}
+
+	return startDate, endDate, nil
+}
+
+func resolveBalanceMonitoringSortClause(filters *validation.BalanceMonitoringQuery) string {
+	direction := "ASC"
+	if strings.EqualFold(strings.TrimSpace(filters.SortOrder), "desc") {
+		direction = "DESC"
+	}
+	switch strings.ToLower(strings.TrimSpace(filters.SortBy)) {
+	case "customer":
+		return "customers.name " + direction
+	default:
+		return "customers.name ASC"
+	}
+}
+
+func (r *balanceMonitoringRepositoryImpl) baseCustomerQuery(ctx context.Context, filters *validation.BalanceMonitoringQuery) *gorm.DB {
+	db := r.db.WithContext(ctx).
+		Model(&entity.Customer{}).
+		Where("customers.deleted_at IS NULL")
+
+	if len(filters.CustomerIDs) > 0 {
+		db = db.Where("customers.id IN ?", filters.CustomerIDs)
+	}
+
+	if len(filters.SalesIDs) > 0 {
+		db = db.Where("EXISTS (SELECT 1 FROM marketings m WHERE m.customer_id = customers.id AND m.deleted_at IS NULL AND m.sales_person_id IN ?)", filters.SalesIDs)
+	}
+
+	if filters.AllowedAreaIDs != nil || filters.AllowedLocationIDs != nil {
+		scopeSub := r.db.WithContext(ctx).
+			Table("marketings m").
+			Select("1").
+			Joins("JOIN marketing_products mp ON mp.marketing_id = m.id").
+			Joins("JOIN marketing_delivery_products mdp ON mdp.marketing_product_id = mp.id").
+			Joins("JOIN product_warehouses pw ON pw.id = mdp.product_warehouse_id").
+			Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+			Where("m.customer_id = customers.id").
+			Where("m.deleted_at IS NULL").
+			Where("mdp.delivery_date IS NOT NULL")
+
+		if filters.AllowedAreaIDs != nil {
+			if len(filters.AllowedAreaIDs) == 0 {
+				db = db.Where("1 = 0")
+			} else {
+				scopeSub = scopeSub.Where("w.area_id IN ?", filters.AllowedAreaIDs)
+			}
+		}
+		if filters.AllowedLocationIDs != nil {
+			if len(filters.AllowedLocationIDs) == 0 {
+				db = db.Where("1 = 0")
+			} else {
+				scopeSub = scopeSub.Where("w.location_id IN ?", filters.AllowedLocationIDs)
+			}
+		}
+
+		db = db.Where("EXISTS (?)", scopeSub)
+	}
+
+	return db
+}
+
+func (r *balanceMonitoringRepositoryImpl) GetCustomerIDsForBalanceMonitoring(ctx context.Context, offset, limit int, filters *validation.BalanceMonitoringQuery) ([]uint, int64, error) {
+	var total int64
+	if err := r.baseCustomerQuery(ctx, filters).Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+	if total == 0 {
+		return []uint{}, 0, nil
+	}
+
+	if offset < 0 {
+		offset = 0
+	}
+
+	var customerIDs []uint
+	err := r.baseCustomerQuery(ctx, filters).
+		Order(resolveBalanceMonitoringSortClause(filters)).
+		Limit(limit).
+		Offset(offset).
+		Pluck("customers.id", &customerIDs).
+		Error
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return customerIDs, total, nil
+}
+
+func (r *balanceMonitoringRepositoryImpl) GetAllFilteredCustomerIDs(ctx context.Context, filters *validation.BalanceMonitoringQuery) ([]uint, error) {
+	var customerIDs []uint
+	if err := r.baseCustomerQuery(ctx, filters).Pluck("customers.id", &customerIDs).Error; err != nil {
+		return nil, err
+	}
+	return customerIDs, nil
+}
+
+func (r *balanceMonitoringRepositoryImpl) GetSaldoAwalLifetime(ctx context.Context, customerIDs []uint) (map[uint]float64, error) {
+	if len(customerIDs) == 0 {
+		return map[uint]float64{}, nil
+	}
+
+	type row struct {
+		CustomerID uint    `gorm:"column:customer_id"`
+		Total      float64 `gorm:"column:total"`
+	}
+	rows := make([]row, 0)
+	err := r.db.WithContext(ctx).
+		Model(&entity.Payment{}).
+		Select("party_id AS customer_id, COALESCE(SUM(nominal), 0) AS total").
+		Where("party_type = ?", string(utils.PaymentPartyCustomer)).
+		Where("transaction_type = ?", string(utils.TransactionTypeSaldoAwal)).
+		Where("party_id IN ?", customerIDs).
+		Group("party_id").
+		Scan(&rows).Error
+	if err != nil {
+		return nil, err
+	}
+
+	result := make(map[uint]float64, len(rows))
+	for _, r := range rows {
+		result[r.CustomerID] = r.Total
+	}
+	return result, nil
+}
+
+func (r *balanceMonitoringRepositoryImpl) GetSalesTotalsBeforeDate(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]float64, error) {
+	if len(customerIDs) == 0 {
+		return map[uint]float64{}, nil
+	}
+
+	startDate, _, err := resolveBalanceMonitoringDateRange(filters)
+	if err != nil {
+		return map[uint]float64{}, nil
+	}
+
+	type row struct {
+		CustomerID uint    `gorm:"column:customer_id"`
+		Total      float64 `gorm:"column:total"`
+	}
+	rows := make([]row, 0)
+
+	var db *gorm.DB
+	if strings.ToLower(strings.TrimSpace(filters.FilterBy)) == "realized_at" {
+		// realized_at: gunakan data DO (mdp.total_price), filter by delivery_date < startDate
+		db = r.db.WithContext(ctx).
+			Table("marketing_delivery_products mdp").
+			Select("m.customer_id AS customer_id, COALESCE(SUM(mdp.total_price), 0) AS total").
+			Joins("INNER JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
+			Joins("INNER JOIN marketings m ON m.id = mp.marketing_id").
+			Where("m.customer_id IN ?", customerIDs).
+			Where("m.deleted_at IS NULL").
+			Where("mdp.delivery_date IS NOT NULL").
+			Where("DATE(mdp.delivery_date) < ?", startDate)
+	} else {
+		// sold_at: SO-date sebelum startDate DAN approval terbaru sudah DO — gunakan data DO (mdp.total_price)
+		db = r.db.WithContext(ctx).
+			Table("marketing_products mp").
+			Select("m.customer_id AS customer_id, COALESCE(SUM(mdp.total_price), 0) AS total").
+			Joins("INNER JOIN marketings m ON m.id = mp.marketing_id").
+			Joins("INNER JOIN marketing_delivery_products mdp ON mdp.marketing_product_id = mp.id").
+			Where("m.customer_id IN ?", customerIDs).
+			Where("m.deleted_at IS NULL").
+			Where("DATE(m.so_date) < ?", startDate).
+			Where("(SELECT step_number FROM approvals WHERE approvable_type = 'MARKETINGS' AND approvable_id = mp.marketing_id ORDER BY id DESC LIMIT 1) >= ?", uint16(utils.MarketingDeliveryOrder))
+	}
+
+	if len(filters.SalesIDs) > 0 {
+		db = db.Where("m.sales_person_id IN ?", filters.SalesIDs)
+	}
+
+	if err := db.Group("m.customer_id").Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	result := make(map[uint]float64, len(rows))
+	for _, rr := range rows {
+		result[rr.CustomerID] = rr.Total
+	}
+	return result, nil
+}
+
+func (r *balanceMonitoringRepositoryImpl) GetPaymentTotalsBeforeDate(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]float64, error) {
+	if len(customerIDs) == 0 {
+		return map[uint]float64{}, nil
+	}
+
+	startDate, _, err := resolveBalanceMonitoringDateRange(filters)
+	if err != nil {
+		return map[uint]float64{}, nil
+	}
+
+	type row struct {
+		CustomerID uint    `gorm:"column:customer_id"`
+		Total      float64 `gorm:"column:total"`
+	}
+	rows := make([]row, 0)
+	err = r.db.WithContext(ctx).
+		Model(&entity.Payment{}).
+		Select("party_id AS customer_id, COALESCE(SUM(nominal), 0) AS total").
+		Where("party_type = ?", string(utils.PaymentPartyCustomer)).
+		Where("transaction_type = ?", string(utils.TransactionTypePenjualan)).
+		Where("direction = ?", "IN").
+		Where("party_id IN ?", customerIDs).
+		Where("DATE(payment_date) < ?", startDate).
+		Group("party_id").
+		Scan(&rows).Error
+	if err != nil {
+		return nil, err
+	}
+
+	result := make(map[uint]float64, len(rows))
+	for _, rr := range rows {
+		result[rr.CustomerID] = rr.Total
+	}
+	return result, nil
+}
+
+func (r *balanceMonitoringRepositoryImpl) GetSalesByCategoryInPeriod(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]BalanceMonitoringCategoryRow, error) {
+	if len(customerIDs) == 0 {
+		return map[uint]BalanceMonitoringCategoryRow{}, nil
+	}
+
+	startDate, endDate, err := resolveBalanceMonitoringDateRange(filters)
+	if err != nil {
+		return map[uint]BalanceMonitoringCategoryRow{}, nil
+	}
+
+	// Gunakan data DO (mdp) bukan SO (mp) agar nominal/qty/kg mencerminkan nilai aktual DO
+	const selectCols = `m.customer_id AS customer_id,
+		COALESCE(SUM(CASE WHEN m.marketing_type IN ('AYAM','AYAM_PULLET') THEN (mdp.usage_qty + mdp.pending_qty) ELSE 0 END), 0) AS ayam_qty,
+		COALESCE(SUM(CASE WHEN m.marketing_type IN ('AYAM','AYAM_PULLET') THEN mdp.total_weight  ELSE 0 END), 0) AS ayam_kg,
+		COALESCE(SUM(CASE WHEN m.marketing_type IN ('AYAM','AYAM_PULLET') THEN mdp.total_price   ELSE 0 END), 0) AS ayam_nominal,
+		COALESCE(SUM(CASE WHEN m.marketing_type = 'TELUR' THEN (mdp.usage_qty + mdp.pending_qty) ELSE 0 END), 0) AS telur_qty,
+		COALESCE(SUM(CASE WHEN m.marketing_type = 'TELUR' THEN mdp.total_weight  ELSE 0 END), 0) AS telur_kg,
+		COALESCE(SUM(CASE WHEN m.marketing_type = 'TELUR' THEN mdp.total_price   ELSE 0 END), 0) AS telur_nominal,
+		COALESCE(SUM(CASE WHEN m.marketing_type = 'TRADING' THEN (mdp.usage_qty + mdp.pending_qty) ELSE 0 END), 0) AS trading_qty,
+		COALESCE(SUM(CASE WHEN m.marketing_type = 'TRADING' THEN mdp.total_weight  ELSE 0 END), 0) AS trading_kg,
+		COALESCE(SUM(CASE WHEN m.marketing_type = 'TRADING' THEN mdp.total_price   ELSE 0 END), 0) AS trading_nominal`
+
+	rows := make([]BalanceMonitoringCategoryRow, 0)
+
+	var db *gorm.DB
+	if strings.ToLower(strings.TrimSpace(filters.FilterBy)) == "realized_at" {
+		// realized_at: FROM mdp langsung, filter by delivery_date in period — data DO
+		db = r.db.WithContext(ctx).
+			Table("marketing_delivery_products mdp").
+			Select(selectCols).
+			Joins("INNER JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
+			Joins("INNER JOIN marketings m ON m.id = mp.marketing_id").
+			Where("m.customer_id IN ?", customerIDs).
+			Where("m.deleted_at IS NULL").
+			Where("mdp.delivery_date IS NOT NULL").
+			Where("DATE(mdp.delivery_date) >= ?", startDate).
+			Where("DATE(mdp.delivery_date) <= ?", endDate)
+	} else {
+		// sold_at: SO-date dalam period DAN approval terbaru DO — JOIN mdp untuk data DO
+		db = r.db.WithContext(ctx).
+			Table("marketing_products mp").
+			Select(selectCols).
+			Joins("INNER JOIN marketings m ON m.id = mp.marketing_id").
+			Joins("INNER JOIN marketing_delivery_products mdp ON mdp.marketing_product_id = mp.id").
+			Where("m.customer_id IN ?", customerIDs).
+			Where("m.deleted_at IS NULL").
+			Where("DATE(m.so_date) >= ?", startDate).
+			Where("DATE(m.so_date) <= ?", endDate).
+			Where("(SELECT step_number FROM approvals WHERE approvable_type = 'MARKETINGS' AND approvable_id = mp.marketing_id ORDER BY id DESC LIMIT 1) >= ?", uint16(utils.MarketingDeliveryOrder))
+	}
+
+	if len(filters.SalesIDs) > 0 {
+		db = db.Where("m.sales_person_id IN ?", filters.SalesIDs)
+	}
+
+	if err := db.Group("m.customer_id").Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	result := make(map[uint]BalanceMonitoringCategoryRow, len(rows))
+	for _, rr := range rows {
+		result[rr.CustomerID] = rr
+	}
+	return result, nil
+}
+
+func (r *balanceMonitoringRepositoryImpl) GetPaymentTotalsInPeriod(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]float64, error) {
+	if len(customerIDs) == 0 {
+		return map[uint]float64{}, nil
+	}
+
+	startDate, endDate, err := resolveBalanceMonitoringDateRange(filters)
+	if err != nil {
+		return map[uint]float64{}, nil
+	}
+
+	type row struct {
+		CustomerID uint    `gorm:"column:customer_id"`
+		Total      float64 `gorm:"column:total"`
+	}
+	rows := make([]row, 0)
+	err = r.db.WithContext(ctx).
+		Model(&entity.Payment{}).
+		Select("party_id AS customer_id, COALESCE(SUM(nominal), 0) AS total").
+		Where("party_type = ?", string(utils.PaymentPartyCustomer)).
+		Where("transaction_type = ?", string(utils.TransactionTypePenjualan)).
+		Where("direction = ?", "IN").
+		Where("party_id IN ?", customerIDs).
+		Where("DATE(payment_date) >= ?", startDate).
+		Where("DATE(payment_date) <= ?", endDate).
+		Group("party_id").
+		Scan(&rows).Error
+	if err != nil {
+		return nil, err
+	}
+
+	result := make(map[uint]float64, len(rows))
+	for _, rr := range rows {
+		result[rr.CustomerID] = rr.Total
+	}
+	return result, nil
+}
+
+func (r *balanceMonitoringRepositoryImpl) GetAgingPerCustomer(ctx context.Context, customerIDs []uint, filters *validation.BalanceMonitoringQuery) (map[uint]BalanceMonitoringAgingRow, error) {
+	if len(customerIDs) == 0 {
+		return map[uint]BalanceMonitoringAgingRow{}, nil
+	}
+
+	startDate, endDate, err := resolveBalanceMonitoringDateRange(filters)
+	if err != nil {
+		return map[uint]BalanceMonitoringAgingRow{}, nil
+	}
+
+	dateColumn := resolveBalanceMonitoringDateColumn(filters.FilterBy)
+
+	rows := make([]BalanceMonitoringAgingRow, 0)
+	db := r.db.WithContext(ctx).
+		Table("marketing_delivery_products mdp").
+		Select(`m.customer_id AS customer_id,
+			COALESCE(MAX(GREATEST(CURRENT_DATE - DATE(mdp.delivery_date), 0)), 0) AS aging_max,
+			COALESCE(
+				SUM(mdp.total_price * GREATEST(CURRENT_DATE - DATE(mdp.delivery_date), 0))::numeric
+				/ NULLIF(SUM(mdp.total_price), 0),
+				0
+			)::numeric(15,2) AS aging_rata_rata`).
+		Joins("INNER JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
+		Joins("INNER JOIN marketings m ON m.id = mp.marketing_id").
+		Where("m.customer_id IN ?", customerIDs).
+		Where("m.deleted_at IS NULL").
+		Where("mdp.delivery_date IS NOT NULL").
+		Where(fmt.Sprintf("DATE(%s) >= ?", dateColumn), startDate).
+		Where(fmt.Sprintf("DATE(%s) <= ?", dateColumn), endDate)
+
+	if len(filters.SalesIDs) > 0 {
+		db = db.Where("m.sales_person_id IN ?", filters.SalesIDs)
+	}
+
+	if err := db.Group("m.customer_id").Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	result := make(map[uint]BalanceMonitoringAgingRow, len(rows))
+	for _, rr := range rows {
+		result[rr.CustomerID] = rr
+	}
+	return result, nil
+}
+
+func (r *balanceMonitoringRepositoryImpl) GetGrandTotals(ctx context.Context, filters *validation.BalanceMonitoringQuery) (BalanceMonitoringGrandTotalsRow, error) {
+	customerIDs, err := r.GetAllFilteredCustomerIDs(ctx, filters)
+	if err != nil {
+		return BalanceMonitoringGrandTotalsRow{}, err
+	}
+	if len(customerIDs) == 0 {
+		return BalanceMonitoringGrandTotalsRow{}, nil
+	}
+
+	saldoAwalLifetimeMap, err := r.GetSaldoAwalLifetime(ctx, customerIDs)
+	if err != nil {
+		return BalanceMonitoringGrandTotalsRow{}, err
+	}
+	salesBeforeMap, err := r.GetSalesTotalsBeforeDate(ctx, customerIDs, filters)
+	if err != nil {
+		return BalanceMonitoringGrandTotalsRow{}, err
+	}
+	paymentBeforeMap, err := r.GetPaymentTotalsBeforeDate(ctx, customerIDs, filters)
+	if err != nil {
+		return BalanceMonitoringGrandTotalsRow{}, err
+	}
+	categoryMap, err := r.GetSalesByCategoryInPeriod(ctx, customerIDs, filters)
+	if err != nil {
+		return BalanceMonitoringGrandTotalsRow{}, err
+	}
+	paymentInPeriodMap, err := r.GetPaymentTotalsInPeriod(ctx, customerIDs, filters)
+	if err != nil {
+		return BalanceMonitoringGrandTotalsRow{}, err
+	}
+	agingMap, err := r.GetAgingPerCustomer(ctx, customerIDs, filters)
+	if err != nil {
+		return BalanceMonitoringGrandTotalsRow{}, err
+	}
+
+	totals := BalanceMonitoringGrandTotalsRow{}
+	for _, total := range saldoAwalLifetimeMap {
+		totals.SaldoAwalLifetime += total
+	}
+	for _, total := range salesBeforeMap {
+		totals.SalesBeforeStart += total
+	}
+	for _, total := range paymentBeforeMap {
+		totals.PaymentBeforeStart += total
+	}
+	for _, cat := range categoryMap {
+		totals.AyamQty += cat.AyamQty
+		totals.AyamKg += cat.AyamKg
+		totals.AyamNominal += cat.AyamNominal
+		totals.TelurQty += cat.TelurQty
+		totals.TelurKg += cat.TelurKg
+		totals.TelurNominal += cat.TelurNominal
+		totals.TradingQty += cat.TradingQty
+		totals.TradingKg += cat.TradingKg
+		totals.TradingNominal += cat.TradingNominal
+	}
+	for _, total := range paymentInPeriodMap {
+		totals.PaymentInPeriod += total
+	}
+
+	for _, aging := range agingMap {
+		totals.AgingMax += aging.AgingMax
+	}
+
+	weightedSum := 0.0
+	weightTotal := 0.0
+	for cid, cat := range categoryMap {
+		nominal := cat.AyamNominal + cat.TelurNominal + cat.TradingNominal
+		if aging, ok := agingMap[cid]; ok && nominal > 0 {
+			weightedSum += nominal * aging.AgingRataRata
+			weightTotal += nominal
+		}
+	}
+	if weightTotal > 0 {
+		totals.AgingRataRata = weightedSum / weightTotal
+	}
+
+	return totals, nil
+}

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

@@ -15,13 +15,16 @@ import (
 
 type DebtSupplierRepository interface {
 	GetSuppliersWithPurchases(ctx context.Context, offset, limit int, filters *validation.DebtSupplierQuery) ([]entity.Supplier, int64, error)
+	GetSuppliersWithDebts(ctx context.Context, offset, limit int, filters *validation.DebtSupplierQuery) ([]entity.Supplier, int64, error)
 	GetPurchasesBySuppliers(ctx context.Context, supplierIDs []uint, filters *validation.DebtSupplierQuery) ([]entity.Purchase, error)
+	GetExpensesBySuppliers(ctx context.Context, supplierIDs []uint, filters *validation.DebtSupplierQuery) ([]entity.Expense, error)
 	GetPaymentsBySuppliers(ctx context.Context, supplierIDs []uint, filters *validation.DebtSupplierQuery) ([]entity.Payment, error)
 	GetPaymentTotalsByReferences(ctx context.Context, supplierIDs []uint, references []string) (map[string]float64, error)
 	GetPaymentSummariesByReferences(ctx context.Context, supplierIDs []uint, references []string) (map[string]PaymentReferenceSummary, error)
 	GetInitialBalanceTotals(ctx context.Context, supplierIDs []uint) (map[uint]float64, error)
 	GetPurchaseTotalsBeforeDate(ctx context.Context, supplierIDs []uint, filters *validation.DebtSupplierQuery) (map[uint]float64, error)
 	GetPaymentTotalsBeforeDate(ctx context.Context, supplierIDs []uint, filters *validation.DebtSupplierQuery) (map[uint]float64, error)
+	GetExpenseTotalsBeforeDate(ctx context.Context, supplierIDs []uint, filters *validation.DebtSupplierQuery) (map[uint]float64, error)
 }
 
 type debtSupplierRepositoryImpl struct {
@@ -490,3 +493,218 @@ func (r *debtSupplierRepositoryImpl) GetPaymentTotalsBeforeDate(ctx context.Cont
 
 	return result, nil
 }
+
+func (r *debtSupplierRepositoryImpl) latestExpenseApproval(ctx context.Context) *gorm.DB {
+	return r.db.WithContext(ctx).
+		Table("approvals AS a").
+		Select("a.approvable_id, a.step_number, 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.ApprovalWorkflowExpense),
+		)
+}
+
+func (r *debtSupplierRepositoryImpl) baseExpenseSupplierIDs(ctx context.Context, filters *validation.DebtSupplierQuery) *gorm.DB {
+	db := r.db.WithContext(ctx).
+		Table("expenses").
+		Select("DISTINCT expenses.supplier_id").
+		Joins("JOIN (?) AS la ON la.approvable_id = expenses.id", r.latestExpenseApproval(ctx)).
+		Where("la.step_number >= ?", uint16(utils.ExpenseStepRealisasi)).
+		Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected)).
+		Where("expenses.deleted_at IS NULL")
+
+	if len(filters.SupplierIDs) > 0 {
+		db = db.Where("expenses.supplier_id IN ?", filters.SupplierIDs)
+	}
+
+	if filters.AllowedLocationIDs != nil {
+		if len(filters.AllowedLocationIDs) == 0 {
+			db = db.Where("1 = 0")
+		} else {
+			db = db.Where("expenses.location_id IN ?", filters.AllowedLocationIDs)
+		}
+	}
+
+	if filters.AllowedAreaIDs != nil {
+		if len(filters.AllowedAreaIDs) == 0 {
+			db = db.Where("1 = 0")
+		} else {
+			db = db.Joins("JOIN locations exp_loc ON exp_loc.id = expenses.location_id").
+				Where("exp_loc.area_id IN ?", filters.AllowedAreaIDs)
+		}
+	}
+
+	if filters.StartDate != "" {
+		if dateFrom, err := utils.ParseDateString(filters.StartDate); err == nil {
+			db = db.Where("DATE(expenses.transaction_date) >= ?", dateFrom)
+		}
+	}
+
+	if filters.EndDate != "" {
+		if dateTo, err := utils.ParseDateString(filters.EndDate); err == nil {
+			db = db.Where("DATE(expenses.transaction_date) <= ?", dateTo)
+		}
+	}
+
+	return db
+}
+
+func (r *debtSupplierRepositoryImpl) GetSuppliersWithDebts(ctx context.Context, offset, limit int, filters *validation.DebtSupplierQuery) ([]entity.Supplier, int64, error) {
+	purchaseSubquery := r.baseSupplierQuery(ctx, filters).
+		Select("suppliers.id")
+
+	expenseSubquery := r.baseExpenseSupplierIDs(ctx, filters)
+
+	db := r.db.WithContext(ctx).
+		Model(&entity.Supplier{}).
+		Where("suppliers.id IN (? UNION ?) AND suppliers.deleted_at IS NULL",
+			purchaseSubquery, expenseSubquery)
+
+	var totalSuppliers int64
+	if err := db.Distinct("suppliers.id").Count(&totalSuppliers).Error; err != nil {
+		return nil, 0, err
+	}
+	if totalSuppliers == 0 {
+		return []entity.Supplier{}, 0, nil
+	}
+
+	if offset < 0 {
+		offset = 0
+	}
+
+	type supplierIDResult struct {
+		ID   uint   `gorm:"column:id"`
+		Name string `gorm:"column:name"`
+	}
+	var idResults []supplierIDResult
+	if err := r.db.WithContext(ctx).
+		Model(&entity.Supplier{}).
+		Where("suppliers.id IN (? UNION ?) AND suppliers.deleted_at IS NULL",
+			purchaseSubquery, expenseSubquery).
+		Select("suppliers.id, suppliers.name").
+		Group("suppliers.id, suppliers.name").
+		Order(resolveDebtSupplierSortClause(filters)).
+		Offset(offset).
+		Limit(limit).
+		Scan(&idResults).Error; err != nil {
+		return nil, 0, err
+	}
+
+	supplierIDs := make([]uint, 0, len(idResults))
+	for _, r := range idResults {
+		supplierIDs = append(supplierIDs, r.ID)
+	}
+	if len(supplierIDs) == 0 {
+		return []entity.Supplier{}, totalSuppliers, nil
+	}
+
+	var suppliers []entity.Supplier
+	if err := r.db.WithContext(ctx).
+		Where("id IN ?", supplierIDs).
+		Order(resolveDebtSupplierSortClause(filters)).
+		Find(&suppliers).Error; err != nil {
+		return nil, 0, err
+	}
+
+	return suppliers, totalSuppliers, nil
+}
+
+func (r *debtSupplierRepositoryImpl) GetExpensesBySuppliers(ctx context.Context, supplierIDs []uint, filters *validation.DebtSupplierQuery) ([]entity.Expense, error) {
+	if len(supplierIDs) == 0 {
+		return []entity.Expense{}, nil
+	}
+
+	db := r.db.WithContext(ctx).
+		Model(&entity.Expense{}).
+		Joins("JOIN (?) AS la ON la.approvable_id = expenses.id", r.latestExpenseApproval(ctx)).
+		Where("expenses.supplier_id IN ?", supplierIDs).
+		Where("la.step_number >= ?", uint16(utils.ExpenseStepRealisasi)).
+		Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected)).
+		Where("expenses.deleted_at IS NULL")
+
+	if filters.AllowedLocationIDs != nil {
+		if len(filters.AllowedLocationIDs) == 0 {
+			db = db.Where("1 = 0")
+		} else {
+			db = db.Where("expenses.location_id IN ?", filters.AllowedLocationIDs)
+		}
+	}
+
+	if filters.AllowedAreaIDs != nil {
+		if len(filters.AllowedAreaIDs) == 0 {
+			db = db.Where("1 = 0")
+		} else {
+			db = db.Joins("JOIN locations exp_loc ON exp_loc.id = expenses.location_id").
+				Where("exp_loc.area_id IN ?", filters.AllowedAreaIDs)
+		}
+	}
+
+	if filters.StartDate != "" {
+		if dateFrom, err := utils.ParseDateString(filters.StartDate); err == nil {
+			db = db.Where("DATE(expenses.transaction_date) >= ?", dateFrom)
+		}
+	}
+
+	if filters.EndDate != "" {
+		if dateTo, err := utils.ParseDateString(filters.EndDate); err == nil {
+			db = db.Where("DATE(expenses.transaction_date) <= ?", dateTo)
+		}
+	}
+
+	var expenses []entity.Expense
+	if err := db.
+		Preload("Supplier").
+		Preload("Nonstocks").
+		Preload("Location").
+		Preload("Location.Area").
+		Order("expenses.transaction_date ASC, expenses.id ASC").
+		Find(&expenses).Error; err != nil {
+		return nil, err
+	}
+
+	return expenses, nil
+}
+
+func (r *debtSupplierRepositoryImpl) GetExpenseTotalsBeforeDate(ctx context.Context, supplierIDs []uint, filters *validation.DebtSupplierQuery) (map[uint]float64, error) {
+	if len(supplierIDs) == 0 || strings.TrimSpace(filters.StartDate) == "" {
+		return map[uint]float64{}, nil
+	}
+
+	dateFrom, err := utils.ParseDateString(filters.StartDate)
+	if err != nil {
+		return map[uint]float64{}, nil
+	}
+
+	type expenseTotalRow struct {
+		SupplierID uint    `gorm:"column:supplier_id"`
+		Total      float64 `gorm:"column:total"`
+	}
+
+	rows := make([]expenseTotalRow, 0)
+	if err := r.db.WithContext(ctx).
+		Table("expenses").
+		Select("expenses.supplier_id AS supplier_id, SUM(en.qty * en.price) AS total").
+		Joins("JOIN expense_nonstocks en ON en.expense_id = expenses.id").
+		Joins("JOIN (?) AS la ON la.approvable_id = expenses.id", r.latestExpenseApproval(ctx)).
+		Where("expenses.supplier_id IN ?", supplierIDs).
+		Where("la.step_number >= ?", uint16(utils.ExpenseStepRealisasi)).
+		Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected)).
+		Where("expenses.deleted_at IS NULL").
+		Where("DATE(expenses.transaction_date) < ?", dateFrom).
+		Group("expenses.supplier_id").
+		Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	result := make(map[uint]float64, len(rows))
+	for _, row := range rows {
+		result[row.SupplierID] = row.Total
+	}
+
+	return result, nil
+}

internal/modules/repports/route.go

@@ -26,4 +26,5 @@ func RepportRoutes(v1 fiber.Router, u user.UserService, s repport.RepportService
 	route.Get("/hpp-v2-breakdown", m.RequirePermissions(m.P_ReportHppPerKandangGetAll), ctrl.GetHppV2Breakdown)
 	route.Get("/production-result/:idProjectFlockKandang", m.RequirePermissions(m.P_ReportProductionResultGetAll), ctrl.GetProductionResult)
 	route.Get("/customer-payment", m.RequirePermissions(m.P_ReportCustomerPaymentGetAll), ctrl.GetCustomerPayment)
+	route.Get("/balance-monitoring", m.RequirePermissions(m.P_ReportCustomerPaymentGetAll), ctrl.GetBalanceMonitoring)
 }

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

@@ -52,6 +52,7 @@ type RepportService interface {
 	GetHppV2Breakdown(ctx *fiber.Ctx, params *validation.HppV2BreakdownQuery) (*approvalService.HppV2Breakdown, error)
 	GetProductionResult(ctx *fiber.Ctx, params *validation.ProductionResultQuery) ([]dto.ProductionResultDTO, int64, error)
 	GetCustomerPayment(ctx *fiber.Ctx, params *validation.CustomerPaymentQuery) ([]dto.CustomerPaymentReportItem, int64, error)
+	GetBalanceMonitoring(ctx *fiber.Ctx, params *validation.BalanceMonitoringQuery) ([]dto.BalanceMonitoringRowDTO, dto.BalanceMonitoringTotalsDTO, int64, error)
 	DB() *gorm.DB
 }
 
@@ -74,6 +75,7 @@ type repportService struct {
 	HppPerKandangRepo            repportRepo.HppPerKandangRepository
 	ProductionResultRepo         repportRepo.ProductionResultRepository
 	CustomerPaymentRepo          repportRepo.CustomerPaymentRepository
+	BalanceMonitoringRepo        repportRepo.BalanceMonitoringRepository
 	CustomerRepo                 customerRepo.CustomerRepository
 	StandardGrowthDetailRepo     productionStandardRepository.StandardGrowthDetailRepository
 	ProductionStandardDetailRepo productionStandardRepository.ProductionStandardDetailRepository
@@ -106,6 +108,7 @@ func NewRepportService(
 	hppPerKandangRepo repportRepo.HppPerKandangRepository,
 	productionResultRepo repportRepo.ProductionResultRepository,
 	customerPaymentRepo repportRepo.CustomerPaymentRepository,
+	balanceMonitoringRepo repportRepo.BalanceMonitoringRepository,
 	customerRepo customerRepo.CustomerRepository,
 	standardGrowthDetailRepo productionStandardRepository.StandardGrowthDetailRepository,
 	productionStandardDetailRepo productionStandardRepository.ProductionStandardDetailRepository,
@@ -129,6 +132,7 @@ func NewRepportService(
 		HppPerKandangRepo:            hppPerKandangRepo,
 		ProductionResultRepo:         productionResultRepo,
 		CustomerPaymentRepo:          customerPaymentRepo,
+		BalanceMonitoringRepo:        balanceMonitoringRepo,
 		CustomerRepo:                 customerRepo,
 		StandardGrowthDetailRepo:     standardGrowthDetailRepo,
 		ProductionStandardDetailRepo: productionStandardDetailRepo,
@@ -746,37 +750,28 @@ func (s *repportService) GetMarketing(c *fiber.Ctx, params *validation.Marketing
 		customerGroups[customerID] = append(customerGroups[customerID], dp)
 	}
 
+	// Aging untuk setiap MDP berdasarkan payment_allocations: LUNAS pakai last_payment_date,
+	// else pakai today.
 	agingMap := make(map[int]int)
-	for customerID := range customerGroups {
+	allMdpIDsForAging := make([]uint, 0)
-		transactions, err := s.CustomerPaymentRepo.GetCustomerPaymentTransactions(c.Context(), &customerID)
+	for _, dp := range deliveryProducts {
-		if err != nil {
+		allMdpIDsForAging = append(allMdpIDsForAging, dp.Id)
-			continue
+	}
-		}
+	mdpAllocSummaryForMarketing, err := s.fetchMdpAllocationSummary(c.Context(), allMdpIDsForAging)
-
+	if err != nil {
-		initialBalance, err := s.CustomerPaymentRepo.GetInitialBalanceByCustomer(c.Context(), customerID)
+		return nil, 0, err
-		if err != nil {
+	}
-			initialBalance = 0
+	for _, dp := range deliveryProducts {
-		}
+		summary := mdpAllocSummaryForMarketing[dp.Id]
-
+		soDate := dp.MarketingProduct.Marketing.SoDate
-		runningBalance := initialBalance
+		if customerPaymentStatusFromAllocation(dp.TotalPrice, summary.PaidAmount) == "LUNAS" && !summary.LastPaymentDate.IsZero() {
-		for i, tx := range transactions {
+			days := int(summary.LastPaymentDate.Sub(soDate).Hours() / 24)
-			if tx.TransactionType == "SALES" {
+			if days < 0 {
-				previousBalance := runningBalance
+				days = 0
-				runningBalance -= tx.TotalPrice
-				currentBalance := runningBalance
-
-				_, paymentDate := s.determineSalesStatusAndPaymentDate(transactions, i, previousBalance, currentBalance)
-
-				if paymentDate != nil {
-					agingDays := int(paymentDate.Sub(tx.TransDate).Hours() / 24)
-					agingMap[int(tx.TransactionID)] = agingDays
-				} else {
-					agingDays := int(time.Since(tx.TransDate).Hours() / 24)
-					agingMap[int(tx.TransactionID)] = agingDays
-				}
-			} else if tx.TransactionType == "PAYMENT" {
-				runningBalance += tx.PaymentAmount
 			}
+			agingMap[int(dp.Id)] = days
+		} else {
+			agingMap[int(dp.Id)] = int(time.Since(soDate).Hours() / 24)
 		}
 	}
 
@@ -1165,28 +1160,39 @@ func (s *repportService) processCustomerPayment(ctx context.Context, customerID
 		return dto.CustomerPaymentReportItem{}, err
 	}
 
+	// Batch fetch payment allocation summaries untuk semua SALES rows (per MDP).
+	mdpIDs := make([]uint, 0)
+	for _, tx := range transactions {
+		if tx.TransactionType == "SALES" && tx.TransactionID > 0 {
+			mdpIDs = append(mdpIDs, uint(tx.TransactionID))
+		}
+	}
+	mdpAllocSummary, err := s.fetchMdpAllocationSummary(ctx, mdpIDs)
+	if err != nil {
+		return dto.CustomerPaymentReportItem{}, err
+	}
+
 	rows := make([]dto.CustomerPaymentReportRow, 0, len(transactions))
 	runningBalance := initialBalance
 
-	for i, tx := range transactions {
+	for _, tx := range transactions {
-
-		previousBalance := runningBalance
 
 		row := dto.ToCustomerPaymentReportRow(tx)
 
 		if tx.TransactionType == "SALES" {
 			runningBalance -= tx.TotalPrice
-			status, paymentDate := s.determineSalesStatusAndPaymentDate(transactions, i, previousBalance, runningBalance)
+			summary := mdpAllocSummary[uint(tx.TransactionID)]
-			row.Status = status
+			row.Status = customerPaymentStatusFromAllocation(tx.TotalPrice, summary.PaidAmount)
 
-			if status == "LUNAS" {
+			if row.Status == "LUNAS" && !summary.LastPaymentDate.IsZero() {
-				if paymentDate != nil {
+				days := int(summary.LastPaymentDate.Sub(tx.TransDate).Hours() / 24)
-					days := int(paymentDate.Sub(tx.TransDate).Hours() / 24)
+				if days < 0 {
-					row.AgingDay = &days
+					days = 0
-				} else {
-					days := 0
-					row.AgingDay = &days
 				}
+				row.AgingDay = &days
+			} else if row.Status == "LUNAS" {
+				zero := 0
+				row.AgingDay = &zero
 			} else {
 				days := int(time.Since(tx.TransDate).Hours() / 24)
 				row.AgingDay = &days
@@ -1258,91 +1264,19 @@ func (s *repportService) processCustomerPayment(ctx context.Context, customerID
 	return dto.ToCustomerPaymentReportItem(*customer, initialBalance, rows, summary), nil
 }
 
-func (s *repportService) determineSalesStatusAndPaymentDate(transactions []repportRepo.CustomerPaymentTransaction, currentIndex int, previousBalance, currentBalance float64) (string, *time.Time) {
+// customerPaymentStatusFromAllocation menentukan status per-MDP berdasarkan
-	currentSales := transactions[currentIndex]
+// SUM(payment_allocations.amount) vs MDP total_price.
-
+func customerPaymentStatusFromAllocation(totalPrice, paidAmount float64) string {
-	if previousBalance >= currentSales.TotalPrice {
+	if totalPrice <= fifoAllocationEpsilon {
-		type paymentAllocation struct {
+		return "LUNAS"
-			date     time.Time
-			amount   float64
-			consumed float64
-		}
-		allocations := []paymentAllocation{}
-		runningBalance := 0.0
-
-		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
-
-				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
-			}
-		}
-
-		amountNeeded := currentSales.TotalPrice
-		for _, alloc := range allocations {
-			available := alloc.amount - alloc.consumed
-			if available > 0 {
-				if amountNeeded <= available {
-					return "LUNAS", &alloc.date
-				} else {
-					amountNeeded -= available
-				}
-			}
-		}
-
-		if len(allocations) > 0 {
-			return "LUNAS", &allocations[0].date
-		}
-		return "LUNAS", nil
 	}
-
+	if paidAmount+fifoAllocationEpsilon >= totalPrice {
-	hasPartialPaymentFromBalance := previousBalance > 0 && previousBalance < currentSales.TotalPrice
+		return "LUNAS"
-
-	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 paidAmount > fifoAllocationEpsilon {
-	if hasPayment || hasPartialPaymentFromBalance {
+		return "DIBAYAR SEBAGIAN"
-		return "DIBAYAR SEBAGIAN", nil
 	}
-
+	return "BELUM LUNAS"
-	return "BELUM LUNAS", nil
 }
 
 func mapRecordingToProductionResultDTO(record entity.Recording) dto.ProductionResultDTO {
@@ -1778,7 +1712,7 @@ func (s *repportService) GetDebtSupplier(c *fiber.Ctx, params *validation.DebtSu
 		offset = 0
 	}
 
-	suppliers, totalSuppliers, err := s.DebtSupplierRepo.GetSuppliersWithPurchases(c.Context(), offset, params.Limit, params)
+	suppliers, totalSuppliers, err := s.DebtSupplierRepo.GetSuppliersWithDebts(c.Context(), offset, params.Limit, params)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -1803,11 +1737,21 @@ func (s *repportService) GetDebtSupplier(c *fiber.Ctx, params *validation.DebtSu
 		return nil, 0, err
 	}
 
+	expenses, err := s.DebtSupplierRepo.GetExpensesBySuppliers(c.Context(), supplierIDs, params)
+	if err != nil {
+		return nil, 0, err
+	}
+
 	purchasesBySupplier := make(map[uint][]entity.Purchase, len(supplierIDs))
 	for _, purchase := range purchases {
 		purchasesBySupplier[purchase.SupplierId] = append(purchasesBySupplier[purchase.SupplierId], purchase)
 	}
 
+	expensesBySupplier := make(map[uint][]entity.Expense, len(supplierIDs))
+	for _, exp := range expenses {
+		expensesBySupplier[uint(exp.SupplierId)] = append(expensesBySupplier[uint(exp.SupplierId)], exp)
+	}
+
 	paymentsBySupplier := make(map[uint][]entity.Payment, len(supplierIDs))
 	for _, payment := range payments {
 		paymentsBySupplier[payment.PartyId] = append(paymentsBySupplier[payment.PartyId], payment)
@@ -1823,6 +1767,11 @@ func (s *repportService) GetDebtSupplier(c *fiber.Ctx, params *validation.DebtSu
 		return nil, 0, err
 	}
 
+	initialExpenseTotals, err := s.DebtSupplierRepo.GetExpenseTotalsBeforeDate(c.Context(), supplierIDs, params)
+	if err != nil {
+		return nil, 0, err
+	}
+
 	initialBalanceTotals, err := s.DebtSupplierRepo.GetInitialBalanceTotals(c.Context(), supplierIDs)
 	if err != nil {
 		return nil, 0, err
@@ -1842,15 +1791,34 @@ func (s *repportService) GetDebtSupplier(c *fiber.Ctx, params *validation.DebtSu
 		DeltaBalance float64
 		CountTotals  bool
 	}
-	type debtSupplierAllocation struct {
+
-		RowIndex int
+	// Batch fetch payment allocation summaries (per purchase + per expense) untuk semua supplier.
-		SortTime time.Time
+	// FIFO matching dilakukan saat payment di-create/update; report tinggal baca dari DB.
-		Amount   float64
+	allPurchaseIDs := make([]uint, 0)
-		Purchase entity.Purchase
+	allExpenseIDs := make([]uint64, 0)
+	for _, sid := range supplierIDs {
+		for _, p := range purchasesBySupplier[sid] {
+			allPurchaseIDs = append(allPurchaseIDs, p.Id)
+		}
+		for _, e := range expensesBySupplier[sid] {
+			allExpenseIDs = append(allExpenseIDs, e.Id)
+		}
 	}
-	type paymentAllocation struct {
+	purchaseAllocSummary, err := s.fetchPurchaseAllocationSummary(c.Context(), allPurchaseIDs)
-		Date   time.Time
+	if err != nil {
-		Amount float64
+		return nil, 0, err
+	}
+	expenseAllocSummary, err := s.fetchExpenseAllocationSummary(c.Context(), allExpenseIDs)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	// rowRef tracks which combinedRows index belongs to which purchase/expense untuk update status di-akhir.
+	type rowRef struct {
+		Index    int
+		Kind     string // "PURCHASE" / "EXPENSE"
+		Purchase entity.Purchase
+		Expense  entity.Expense
 	}
 
 	for _, supplierID := range supplierIDs {
@@ -1859,13 +1827,13 @@ func (s *repportService) GetDebtSupplier(c *fiber.Ctx, params *validation.DebtSu
 			continue
 		}
 
-		initialBalance := initialBalanceTotals[supplierID] + (initialPaymentTotals[supplierID] - initialPurchaseTotals[supplierID])
+		initialBalance := initialBalanceTotals[supplierID] + (initialPaymentTotals[supplierID] - initialPurchaseTotals[supplierID] - initialExpenseTotals[supplierID])
 		items := purchasesBySupplier[supplierID]
 		paymentItems := paymentsBySupplier[supplierID]
 		total := dto.DebtSupplierTotalDTO{}
 
 		combinedRows := make([]debtSupplierRowItem, 0, len(items)+len(paymentItems))
-		purchaseAllocations := make([]debtSupplierAllocation, 0, len(items))
+		rowRefs := make([]rowRef, 0, len(items)+len(expensesBySupplier[supplierID]))
 		for _, purchase := range items {
 			row := buildDebtSupplierRow(purchase, now, location)
 			sortTime := resolveDebtSupplierSortTime(purchase, params.FilterBy, location)
@@ -1877,24 +1845,21 @@ func (s *repportService) GetDebtSupplier(c *fiber.Ctx, params *validation.DebtSu
 				DeltaBalance: -row.TotalPrice,
 				CountTotals:  true,
 			})
-			purchaseAllocations = append(purchaseAllocations, debtSupplierAllocation{
+			rowRefs = append(rowRefs, rowRef{Index: rowIndex, Kind: "PURCHASE", Purchase: purchase})
-				RowIndex: rowIndex,
-				SortTime: sortTime,
-				Amount:   row.TotalPrice,
-				Purchase: purchase,
-			})
 		}
 
-		paymentAllocations := make([]paymentAllocation, 0, len(paymentItems)+1)
+		for _, exp := range expensesBySupplier[supplierID] {
-		initialAllocation := initialBalanceTotals[supplierID] + initialPaymentTotals[supplierID] - initialPurchaseTotals[supplierID]
+			row := buildDebtSupplierExpenseRow(exp, now, location)
-		paymentCarry := 0.0
+			sortTime := exp.TransactionDate.In(location)
-		if initialAllocation > 0 && len(purchaseAllocations) > 0 {
+			rowIndex := len(combinedRows)
-			paymentAllocations = append(paymentAllocations, paymentAllocation{
+			combinedRows = append(combinedRows, debtSupplierRowItem{
-				Date:   purchaseAllocations[0].SortTime,
+				Row:          row,
-				Amount: initialAllocation,
+				SortTime:     sortTime,
+				Order:        0,
+				DeltaBalance: -row.TotalPrice,
+				CountTotals:  true,
 			})
-		} else if initialAllocation < 0 {
+			rowRefs = append(rowRefs, rowRef{Index: rowIndex, Kind: "EXPENSE", Expense: exp})
-			paymentCarry = -initialAllocation
 		}
 
 		for _, payment := range paymentItems {
@@ -1907,51 +1872,29 @@ func (s *repportService) GetDebtSupplier(c *fiber.Ctx, params *validation.DebtSu
 				DeltaBalance: payment.Nominal,
 				CountTotals:  false,
 			})
-			paymentAllocations = append(paymentAllocations, paymentAllocation{
-				Date:   sortTime,
-				Amount: payment.Nominal,
-			})
 		}
 
-		if len(purchaseAllocations) > 0 && len(paymentAllocations) > 0 {
+		// Determine Status & Aging dari payment_allocations DB.
-			sort.SliceStable(purchaseAllocations, func(i, j int) bool {
+		for _, ref := range rowRefs {
-				return purchaseAllocations[i].SortTime.Before(purchaseAllocations[j].SortTime)
+			rowTotal := combinedRows[ref.Index].Row.TotalPrice
-			})
+			if rowTotal <= fifoAllocationEpsilon {
-			sort.SliceStable(paymentAllocations, func(i, j int) bool {
+				continue
-				return paymentAllocations[i].Date.Before(paymentAllocations[j].Date)
-			})
-			remaining := make([]float64, len(purchaseAllocations))
-			for i := range purchaseAllocations {
-				remaining[i] = purchaseAllocations[i].Amount
 			}
-			purchaseIndex := 0
+			var summary paymentAllocationSummary
-			for _, pay := range paymentAllocations {
+			if ref.Kind == "PURCHASE" {
-				amount := pay.Amount
+				summary = purchaseAllocSummary[ref.Purchase.Id]
-				if amount <= 0 {
+			} else {
-					continue
+				summary = expenseAllocSummary[ref.Expense.Id]
-				}
+			}
-				if paymentCarry > 0 {
+			if summary.PaidAmount+fifoAllocationEpsilon < rowTotal {
-					used := math.Min(amount, paymentCarry)
+				continue
-					paymentCarry -= used
+			}
-					amount -= used
+			combinedRows[ref.Index].Row.Status = "Lunas"
-				}
+			if !summary.LastPaymentDate.IsZero() {
-				for amount > 0 && purchaseIndex < len(remaining) {
+				if ref.Kind == "PURCHASE" {
-					if remaining[purchaseIndex] <= 0 {
+					combinedRows[ref.Index].Row.Aging = calculateDebtSupplierAging(ref.Purchase, summary.LastPaymentDate.In(location), location)
-						purchaseIndex++
+				} else {
-						continue
+					combinedRows[ref.Index].Row.Aging = calculateExpenseAging(ref.Expense, summary.LastPaymentDate.In(location), location)
-					}
-					used := math.Min(amount, remaining[purchaseIndex])
-					remaining[purchaseIndex] -= used
-					amount -= used
-					if remaining[purchaseIndex] <= 0.000001 {
-						allocation := purchaseAllocations[purchaseIndex]
-						combinedRows[allocation.RowIndex].Row.Status = "Lunas"
-						combinedRows[allocation.RowIndex].Row.Aging = calculateDebtSupplierAging(allocation.Purchase, pay.Date, location)
-						purchaseIndex++
-					}
-				}
-				if purchaseIndex >= len(remaining) {
-					break
 				}
 			}
 		}
@@ -2128,6 +2071,115 @@ func buildDebtSupplierPaymentRow(payment entity.Payment, loc *time.Location) dto
 	}
 }
 
+// fifoAllocationEpsilon untuk float comparison saat membandingkan paid vs total.
+const fifoAllocationEpsilon = 0.001
+
+// paymentAllocationSummary aggregates per-document paid amount + latest payment date
+// from payment_allocations table, sebagai pengganti FIFO greedy in-memory.
+type paymentAllocationSummary struct {
+	PaidAmount      float64
+	LastPaymentDate time.Time
+}
+
+// fetchPurchaseAllocationSummary returns map[purchase_id]{paid_amount, last_payment_date}.
+// paid_amount = SUM(payment_allocations.amount) untuk semua items dalam purchase.
+// last_payment_date = MAX(payments.payment_date) untuk allocation tersebut.
+func (s *repportService) fetchPurchaseAllocationSummary(ctx context.Context, purchaseIDs []uint) (map[uint]paymentAllocationSummary, error) {
+	out := make(map[uint]paymentAllocationSummary)
+	if len(purchaseIDs) == 0 {
+		return out, nil
+	}
+	type row struct {
+		PurchaseID  uint
+		Total       float64
+		LastPayment *time.Time
+	}
+	var rows []row
+	if err := s.db.WithContext(ctx).
+		Table("payment_allocations pa").
+		Joins("JOIN purchase_items pi ON pi.id = pa.purchase_item_id").
+		Joins("JOIN payments p ON p.id = pa.payment_id").
+		Select("pi.purchase_id AS purchase_id, SUM(pa.amount) AS total, MAX(p.payment_date) AS last_payment").
+		Where("pi.purchase_id IN ?", purchaseIDs).
+		Group("pi.purchase_id").
+		Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+	for _, r := range rows {
+		summary := paymentAllocationSummary{PaidAmount: r.Total}
+		if r.LastPayment != nil {
+			summary.LastPaymentDate = *r.LastPayment
+		}
+		out[r.PurchaseID] = summary
+	}
+	return out, nil
+}
+
+// fetchExpenseAllocationSummary returns map[expense_id]{paid_amount, last_payment_date}.
+// Allocation di expense_realization_id → JOIN expense_nonstocks → expenses.id.
+func (s *repportService) fetchExpenseAllocationSummary(ctx context.Context, expenseIDs []uint64) (map[uint64]paymentAllocationSummary, error) {
+	out := make(map[uint64]paymentAllocationSummary)
+	if len(expenseIDs) == 0 {
+		return out, nil
+	}
+	type row struct {
+		ExpenseID   uint64
+		Total       float64
+		LastPayment *time.Time
+	}
+	var rows []row
+	if err := s.db.WithContext(ctx).
+		Table("payment_allocations pa").
+		Joins("JOIN expense_realizations er ON er.id = pa.expense_realization_id").
+		Joins("JOIN expense_nonstocks en ON en.id = er.expense_nonstock_id").
+		Joins("JOIN payments p ON p.id = pa.payment_id").
+		Select("en.expense_id AS expense_id, SUM(pa.amount) AS total, MAX(p.payment_date) AS last_payment").
+		Where("en.expense_id IN ?", expenseIDs).
+		Group("en.expense_id").
+		Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+	for _, r := range rows {
+		summary := paymentAllocationSummary{PaidAmount: r.Total}
+		if r.LastPayment != nil {
+			summary.LastPaymentDate = *r.LastPayment
+		}
+		out[r.ExpenseID] = summary
+	}
+	return out, nil
+}
+
+// fetchMdpAllocationSummary returns map[mdp_id]{paid_amount, last_payment_date}.
+func (s *repportService) fetchMdpAllocationSummary(ctx context.Context, mdpIDs []uint) (map[uint]paymentAllocationSummary, error) {
+	out := make(map[uint]paymentAllocationSummary)
+	if len(mdpIDs) == 0 {
+		return out, nil
+	}
+	type row struct {
+		MdpID       uint
+		Total       float64
+		LastPayment *time.Time
+	}
+	var rows []row
+	if err := s.db.WithContext(ctx).
+		Table("payment_allocations pa").
+		Joins("JOIN payments p ON p.id = pa.payment_id").
+		Select("pa.marketing_delivery_product_id AS mdp_id, SUM(pa.amount) AS total, MAX(p.payment_date) AS last_payment").
+		Where("pa.marketing_delivery_product_id IN ?", mdpIDs).
+		Group("pa.marketing_delivery_product_id").
+		Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+	for _, r := range rows {
+		summary := paymentAllocationSummary{PaidAmount: r.Total}
+		if r.LastPayment != nil {
+			summary.LastPaymentDate = *r.LastPayment
+		}
+		out[r.MdpID] = summary
+	}
+	return out, nil
+}
+
 func resolveDebtSupplierSortTime(purchase entity.Purchase, filterBy string, loc *time.Location) time.Time {
 	if strings.EqualFold(strings.TrimSpace(filterBy), "po_date") {
 		if purchase.PoDate != nil && !purchase.PoDate.IsZero() {
@@ -2220,6 +2272,62 @@ func resolveDebtSupplierReceivedDate(purchase entity.Purchase, loc *time.Locatio
 	return time.Date(earliest.Year(), earliest.Month(), earliest.Day(), 0, 0, 0, 0, loc)
 }
 
+func buildDebtSupplierExpenseRow(exp entity.Expense, now time.Time, loc *time.Location) dto.DebtSupplierRowDTO {
+	txDate := exp.TransactionDate.In(loc)
+	dateStr := txDate.Format("2006-01-02")
+
+	startDay := time.Date(txDate.Year(), txDate.Month(), txDate.Day(), 0, 0, 0, 0, loc)
+	endDay := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, loc)
+	aging := 0
+	if !startDay.IsZero() && !endDay.Before(startDay) {
+		aging = int(endDay.Sub(startDay).Hours() / 24)
+	}
+
+	// TotalPrice pakai expense.GrandTotal (= SUM realisasi) supaya konsisten dengan
+	// FIFO allocation yang juga pakai realisasi. Hindari pakai SUM nonstock pengajuan
+	// karena bisa beda nilai dari realisasi → mismatch dengan paid_amount → status salah.
+	totalPrice := exp.GrandTotal
+
+	var area *areaDTO.AreaRelationDTO
+	if exp.Location != nil && exp.Location.Area.Id != 0 {
+		mapped := areaDTO.ToAreaRelationDTO(exp.Location.Area)
+		area = &mapped
+	}
+
+	poNumber := ""
+	if strings.TrimSpace(exp.PoNumber) != "" {
+		poNumber = exp.PoNumber
+	}
+
+	return dto.DebtSupplierRowDTO{
+		PrNumber:     exp.ReferenceNumber,
+		PoNumber:     poNumber,
+		PoDate:       dateStr,
+		ReceivedDate: dateStr,
+		Aging:        aging,
+		Area:         area,
+		Warehouse:    nil,
+		DueDate:      "-",
+		DueStatus:    "-",
+		TotalPrice:   totalPrice,
+		PaymentPrice: 0,
+		DebtPrice:    0,
+		Status:       "Belum Lunas",
+		TravelNumber: "-",
+		Balance:      0,
+	}
+}
+
+func calculateExpenseAging(exp entity.Expense, endDate time.Time, loc *time.Location) int {
+	start := exp.TransactionDate.In(loc)
+	startDay := time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, loc)
+	stopDay := time.Date(endDate.Year(), endDate.Month(), endDate.Day(), 0, 0, 0, 0, loc)
+	if stopDay.Before(startDay) {
+		return 0
+	}
+	return int(stopDay.Sub(startDay).Hours() / 24)
+}
+
 func (s *repportService) GetHppV2Breakdown(ctx *fiber.Ctx, params *validation.HppV2BreakdownQuery) (*approvalService.HppV2Breakdown, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, fiber.NewError(fiber.StatusBadRequest, err.Error())
@@ -2893,3 +3001,163 @@ func parseOptionalFloat64(raw string) (*float64, error) {
 
 	return &value, nil
 }
+
+func (s *repportService) GetBalanceMonitoring(ctx *fiber.Ctx, params *validation.BalanceMonitoringQuery) ([]dto.BalanceMonitoringRowDTO, dto.BalanceMonitoringTotalsDTO, int64, error) {
+	if params.SortBy == "" {
+		params.SortBy = "customer"
+	}
+	if params.SortOrder == "" {
+		params.SortOrder = "asc"
+	}
+	if params.FilterBy == "" {
+		params.FilterBy = "sold_at"
+	}
+	if params.Page < 1 {
+		params.Page = 1
+	}
+	if params.Limit < 1 {
+		params.Limit = 10
+	}
+
+	if err := s.Validate.Struct(params); err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+
+	locationScope, err := m.ResolveLocationScope(ctx, s.DB())
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+	areaScope, err := m.ResolveAreaScope(ctx, s.DB())
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+	if locationScope.Restrict {
+		params.AllowedLocationIDs = toInt64Slice(locationScope.IDs)
+	}
+	if areaScope.Restrict {
+		params.AllowedAreaIDs = toInt64Slice(areaScope.IDs)
+	}
+
+	offset := (params.Page - 1) * params.Limit
+
+	customerIDs, total, err := s.BalanceMonitoringRepo.GetCustomerIDsForBalanceMonitoring(ctx.Context(), offset, params.Limit, params)
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+	if len(customerIDs) == 0 {
+		emptyTotals, gtErr := s.computeBalanceMonitoringTotals(ctx.Context(), params)
+		if gtErr != nil {
+			return nil, dto.BalanceMonitoringTotalsDTO{}, 0, gtErr
+		}
+		return []dto.BalanceMonitoringRowDTO{}, emptyTotals, total, nil
+	}
+
+	saldoAwalLifetimeMap, err := s.BalanceMonitoringRepo.GetSaldoAwalLifetime(ctx.Context(), customerIDs)
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+	salesBeforeMap, err := s.BalanceMonitoringRepo.GetSalesTotalsBeforeDate(ctx.Context(), customerIDs, params)
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+	paymentBeforeMap, err := s.BalanceMonitoringRepo.GetPaymentTotalsBeforeDate(ctx.Context(), customerIDs, params)
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+	categoryMap, err := s.BalanceMonitoringRepo.GetSalesByCategoryInPeriod(ctx.Context(), customerIDs, params)
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+	paymentInPeriodMap, err := s.BalanceMonitoringRepo.GetPaymentTotalsInPeriod(ctx.Context(), customerIDs, params)
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+	agingMap, err := s.BalanceMonitoringRepo.GetAgingPerCustomer(ctx.Context(), customerIDs, params)
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+
+	customers, err := s.CustomerRepo.GetByIDs(ctx.Context(), customerIDs, func(db *gorm.DB) *gorm.DB {
+		return db.Preload("Pic")
+	})
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+	customerMap := make(map[uint]entity.Customer, len(customers))
+	for _, c := range customers {
+		customerMap[c.Id] = c
+	}
+
+	result := make([]dto.BalanceMonitoringRowDTO, 0, len(customerIDs))
+	for _, customerID := range customerIDs {
+		customer, ok := customerMap[customerID]
+		if !ok {
+			continue
+		}
+
+		saldoAwal := saldoAwalLifetimeMap[customerID] + paymentBeforeMap[customerID] - salesBeforeMap[customerID]
+
+		category := categoryMap[customerID]
+		ayam := dto.BalanceMonitoringAyamDTO{
+			Ekor:    category.AyamQty,
+			Kg:      category.AyamKg,
+			Nominal: category.AyamNominal,
+		}
+		telur := dto.BalanceMonitoringTelurDTO{
+			Butir:   category.TelurQty,
+			Kg:      category.TelurKg,
+			Nominal: category.TelurNominal,
+		}
+		trading := dto.BalanceMonitoringTradingDTO{
+			Qty:     category.TradingQty,
+			Kg:      category.TradingKg,
+			Nominal: category.TradingNominal,
+		}
+
+		pembayaran := paymentInPeriodMap[customerID]
+		aging := agingMap[customerID]
+
+		row := dto.ToBalanceMonitoringRowDTO(customer, saldoAwal, ayam, telur, trading, pembayaran, aging.AgingMax, aging.AgingRataRata)
+		result = append(result, row)
+	}
+
+	totals, err := s.computeBalanceMonitoringTotals(ctx.Context(), params)
+	if err != nil {
+		return nil, dto.BalanceMonitoringTotalsDTO{}, 0, err
+	}
+
+	return result, totals, total, nil
+}
+
+func (s *repportService) computeBalanceMonitoringTotals(ctx context.Context, params *validation.BalanceMonitoringQuery) (dto.BalanceMonitoringTotalsDTO, error) {
+	grand, err := s.BalanceMonitoringRepo.GetGrandTotals(ctx, params)
+	if err != nil {
+		return dto.BalanceMonitoringTotalsDTO{}, err
+	}
+
+	saldoAwal := grand.SaldoAwalLifetime + grand.PaymentBeforeStart - grand.SalesBeforeStart
+	saldoAkhir := saldoAwal + grand.PaymentInPeriod - (grand.AyamNominal + grand.TelurNominal + grand.TradingNominal)
+
+	return dto.BalanceMonitoringTotalsDTO{
+		SaldoAwal: saldoAwal,
+		PenjualanAyam: dto.BalanceMonitoringAyamDTO{
+			Ekor:    grand.AyamQty,
+			Kg:      grand.AyamKg,
+			Nominal: grand.AyamNominal,
+		},
+		PenjualanTelur: dto.BalanceMonitoringTelurDTO{
+			Butir:   grand.TelurQty,
+			Kg:      grand.TelurKg,
+			Nominal: grand.TelurNominal,
+		},
+		PenjualanTrading: dto.BalanceMonitoringTradingDTO{
+			Qty:     grand.TradingQty,
+			Kg:      grand.TradingKg,
+			Nominal: grand.TradingNominal,
+		},
+		Pembayaran:    grand.PaymentInPeriod,
+		Aging:         grand.AgingMax,
+		AgingRataRata: grand.AgingRataRata,
+		SaldoAkhir:    saldoAkhir,
+	}, nil
+}

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

@@ -116,3 +116,17 @@ type CustomerPaymentQuery struct {
 	StartDate   string `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
 	EndDate     string `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
 }
+
+type BalanceMonitoringQuery struct {
+	Page               int     `query:"page" validate:"omitempty,min=1,gt=0"`
+	Limit              int     `query:"limit" validate:"omitempty,min=1,gt=0"`
+	CustomerIDs        []uint  `query:"-" validate:"omitempty,dive,gt=0"`
+	SalesIDs           []uint  `query:"-" validate:"omitempty,dive,gt=0"`
+	FilterBy           string  `query:"filter_by" validate:"omitempty,oneof=sold_at realized_at"`
+	SortBy             string  `query:"sort_by" validate:"omitempty,oneof=customer"`
+	SortOrder          string  `query:"sort_order" validate:"omitempty,oneof=asc desc"`
+	StartDate          string  `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
+	EndDate            string  `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
+	AllowedAreaIDs     []int64 `query:"-"`
+	AllowedLocationIDs []int64 `query:"-"`
+}