Merge branch 'development' of https://gitlab.com/mbugroup/lti-api into dev/teguh

ci/production.yml

@@ -49,40 +49,80 @@ build_production:
 
 
 # =========================
-# MIGRATE (PRODUCTION - MANUAL)
+# MIGRATE (PRODUCTION)
 # =========================
 migrate_production:
   stage: migrate
   rules:
     - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-      allow_failure: false
   needs:
     - job: build_production
       artifacts: false
   script: |
     set -e
-    cd /opt/deploy/lti
+    echo "✅ Running migrations (production) ..."
-    test -f .env || (echo "❌ .env not found" && exit 1)
 
+    cd "$DEPLOY_DIR"
+    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
+    test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
+
+    # ✅ load env dari server
     set -a
     . ./.env
     set +a
 
-    # Validasi env wajib
+    # ✅ validasi
-    : "${DB_HOST:?DB_HOST not set}"
+    test -n "$DB_HOST" || (echo "❌ DB_HOST empty" && exit 1)
-    : "${DB_PORT:?DB_PORT not set}"
+    test -n "$DB_PORT" || (echo "❌ DB_PORT empty" && exit 1)
-    : "${DB_USER:?DB_USER not set}"
+    test -n "$DB_USER" || (echo "❌ DB_USER empty" && exit 1)
-    : "${DB_PASSWORD:?DB_PASSWORD not set}"
+    test -n "$DB_PASSWORD" || (echo "❌ DB_PASSWORD empty" && exit 1)
-    : "${DB_NAME:?DB_NAME not set}"
+    test -n "$DB_NAME" || (echo "❌ DB_NAME empty" && exit 1)
 
-    DB_SSLMODE="${DB_SSLMODE:-require}"
+    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE:-disable}"
-    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE}"
+    echo "✅ DATABASE_URL=$DATABASE_URL"
 
-    echo "✅ Running migrations (production)..."
+    # ✅ Pastikan postgres & redis ON (sesuaikan nama service compose kamu!)
-    docker run --rm \
+    echo "✅ Ensuring postgres & redis running ..."
-      -v "/opt/deploy/lti/internal/database/migrations:/migrations:ro" \
+    docker compose -f "$COMPOSE_FILE" up -d stg-postgres-lti stg-redis-lti || true
+
+    # ✅ Ambil network key dari compose
+    COMPOSE_NETWORK_KEY="$(docker compose -f "$COMPOSE_FILE" config | awk '/networks:/ {getline; print $1}' | tr -d ':')"
+    echo "✅ Compose network key: $COMPOSE_NETWORK_KEY"
+
+    # ✅ Cari network name yang dipakai docker
+    NETWORK_NAME="$(docker network ls --format '{{.Name}}' | grep "_${COMPOSE_NETWORK_KEY}$" | head -n 1)"
+    test -n "$NETWORK_NAME" || (echo "❌ Cannot find docker network for compose ($COMPOSE_NETWORK_KEY)" && exit 1)
+
+    echo "✅ Docker network detected: $NETWORK_NAME"
+
+    # ✅ Migrations dari repo (CI workspace)
+    echo "✅ Checking migrations from repo..."
+    ls -lah "$CI_PROJECT_DIR/internal/database/migrations"
+
+    echo "✅ Running migrations via migrate/migrate container"
+    set +e
+    out=$(docker run --rm \
+      --network "$NETWORK_NAME" \
+      -v "$CI_PROJECT_DIR/internal/database/migrations:/migrations:ro" \
       migrate/migrate:v4.15.2 \
-      -path=/migrations -database "$DATABASE_URL" up
+      -path=/migrations -database "$DATABASE_URL" up 2>&1)
+    code=$?
+    set -e
+
+    echo "$out"
+
+    # ✅ Handle no change dengan benar (tidak false-success)
+    if echo "$out" | grep -qi "no change"; then
+      echo "✅ No change (already up to date)"
+      exit 0
+    fi
+
+    if [ $code -ne 0 ]; then
+      echo "❌ Migration failed with exit code $code"
+      exit $code
+    fi
+
+    echo "✅ Migration applied successfully"
 
 
 # =========================

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

@@ -0,0 +1,2 @@
+ALTER TABLE stock_logs
+DROP COLUMN stock;

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

@@ -0,0 +1,18 @@
+ALTER TABLE stock_logs
+ADD COLUMN stock NUMERIC(15, 3) NOT NULL DEFAULT 0;
+
+WITH calc AS (
+  SELECT
+    id,
+    SUM(COALESCE(increase, 0) - COALESCE(decrease, 0))
+      OVER (
+        PARTITION BY product_warehouse_id
+        ORDER BY id
+        ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
+      ) AS running_stock
+  FROM stock_logs
+)
+UPDATE stock_logs t
+SET stock = c.running_stock
+FROM calc c
+WHERE t.id = c.id;

internal/entities/stock_log.go

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

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

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

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

@@ -367,7 +367,7 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "type must be either incoming or outgoing")
 	}
 
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID)
+	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch warehouses for project flock %d: %+v", projectFlockID, err)
 		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouses for project flock")
@@ -451,7 +451,7 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
 	}
 
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID)
+	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch warehouses for project flock %d: %+v", projectFlockID, err)
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouses for project flock")
@@ -494,13 +494,16 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 	return items, nil
 }
 
-func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint) ([]uint, error) {
+func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint, kandangID *uint) ([]uint, error) {
 	var kandangIDs []uint
 	db := s.Repository.DB().WithContext(ctx)
 
-	if err := db.Model(&entity.ProjectFlockKandang{}).
+	query := db.Model(&entity.ProjectFlockKandang{}).
-		Where("project_flock_id = ?", projectFlockID).
+		Where("project_flock_id = ?", projectFlockID)
-		Pluck("kandang_id", &kandangIDs).Error; err != nil {
+	if kandangID != nil && *kandangID > 0 {
+		query = query.Where("id = ?", *kandangID)
+	}
+	if err := query.Pluck("kandang_id", &kandangIDs).Error; err != nil {
 		return nil, err
 	}
 
@@ -841,7 +844,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch FCR standard data")
 		}
 	}
-	age, err := s.calculateAverageSalesAge(c.Context(), projectFlockID)
+	age, err := s.calculateAverageSalesAge(c.Context(), projectFlockID, kandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to calculate sales age for project flock %d: %+v", projectFlockID, err)
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch sales age data")
@@ -1028,38 +1031,24 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 	return &result, nil
 }
 
-func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint) (float64, error) {
+func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) (float64, error) {
-	deliveryProducts, err := s.MarketingDeliveryProductRepo.GetDeliveryProductsByProjectFlockID(ctx, projectFlockID, func(db *gorm.DB) *gorm.DB {
+	penjualan, err := s.MarketingDeliveryProductRepo.GetClosingPenjualanForAgeChickDataProduction(ctx, projectFlockID, projectFlockKandangID)
-		return db.
-			Preload("MarketingProduct").
-			Preload("MarketingProduct.ProductWarehouse").
-			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
-			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins")
-	})
 	if err != nil {
 		return 0, err
 	}
-
+	acumulateAgeQty := 0.0
-	var (
+	totalQty := 0.0
-		totalQty      float64
+	for _, v := range penjualan {
-		totalAgeWeeks float64
+		sale := dto.ToSalesAgeDTO(v)
-	)
+		acumulateAgeQty += float64(sale.Age) * sale.Qty
-
+		totalQty += sale.Qty
-	for _, product := range deliveryProducts {
+	}
-		if product.UsageQty == 0 {
+	if totalQty > 0 {
-			continue
+		averageAge := acumulateAgeQty / totalQty
-		}
+		return averageAge, nil
-		projectFlockKandang := product.MarketingProduct.ProductWarehouse.ProjectFlockKandang
-		ageWeeks := dto.CalculateAgeFromChickinDataProduksi(projectFlockKandang, product.DeliveryDate)
-		totalAgeWeeks += float64(ageWeeks) * product.UsageQty
-		totalQty += product.UsageQty
 	}
 
-	if totalQty == 0 {
+	return 0, err
-		return 0, nil
-	}
-
-	return totalAgeWeeks / totalQty, nil
 }
 
 func (s closingService) determineProductionWeek(ctx context.Context, projectFlockKandangIDs []uint) (int, error) {

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

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

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

@@ -3,6 +3,7 @@ package service
 import (
 	"errors"
 	"math"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -259,8 +260,9 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 	}
 
 	if params.Search != "" {
-		like := "%" + params.Search + "%"
+		re := regexp.MustCompile("[^a-zA-Z0-9]")
-		db = db.Where("(k.name ILIKE ? OR dc.category::text ILIKE ?)", like, like)
+		like := re.ReplaceAll([]byte("%"+params.Search+"%"), []byte(""))
+		db = db.Where("(regexp_replace(k.name, '[^a-zA-Z0-9]', '', 'g') ILIKE ? OR regexp_replace(dc.category::text, '[^a-zA-Z0-9]', '', 'g') ILIKE ?)", string(like), string(like))
 	}
 
 	countDB := db.Session(&gorm.Session{})

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

@@ -169,15 +169,30 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			CreatedBy:          actorID,
 		}
 
+		stockLogs, err := s.StockLogsRepository.GetByProductWarehouse(ctx, productWarehouse.Id, 1)
+		if err != nil {
+			s.Log.Errorf("Failed to get stock logs: %+v", err)
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			newLog.Stock = latestStockLog.Stock
+		} else {
+			newLog.Stock = 0
+		}
+
 		if transactionType == string(utils.StockLogTransactionTypeIncrease) {
 			afterQuantity += req.Quantity
 			newLog.Increase = req.Quantity
+			newLog.Stock += newLog.Increase
 		} else {
 			if productWarehouse.Quantity < req.Quantity {
 				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk pengurangan. Stok saat ini: %.2f, Jumlah yang akan dikurangi: %.2f", productWarehouse.Quantity, req.Quantity))
 			}
 			afterQuantity -= req.Quantity
 			newLog.Decrease = req.Quantity
+			newLog.Stock -= newLog.Decrease
 		}
 
 		if err := s.StockLogsRepository.WithTx(tx).CreateOne(ctx, newLog, nil); err != nil {

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

@@ -476,6 +476,18 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				LoggableId:         uint(detail.Id),
 				Notes:              "",
 			}
+			stockLogs, err := s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.SourceProductWarehouseID), 1)
+			if err != nil {
+				s.Log.Errorf("Failed to get stock logs: %+v", err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				stockLogDecrease.Stock -= latestStockLog.Stock - stockLogDecrease.Decrease
+			} else {
+				stockLogDecrease.Stock -= stockLogDecrease.Decrease
+			}
+
 			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogDecrease, nil); err != nil {
 				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok keluar")
 			}
@@ -512,6 +524,17 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				LoggableId:         uint(detail.Id),
 				Notes:              "",
 			}
+			stockLogs, err = s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.DestProductWarehouseID), 1)
+			if err != nil {
+				s.Log.Errorf("Failed to get stock logs: %+v", err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				stockLogIncrease.Stock = latestStockLog.Stock + stockLogIncrease.Increase
+			} else {
+				stockLogIncrease.Stock += stockLogIncrease.Increase
+			}
 			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogIncrease, nil); err != nil {
 				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok masuk")
 			}

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

@@ -22,6 +22,7 @@ type MarketingDeliveryProductRepository interface {
 	UpdateFifoFields(ctx context.Context, id uint, usageQty, pendingQty float64) error
 	GetUsageQty(ctx context.Context, id uint) (float64, error)
 	ResetFifoFields(ctx context.Context, id uint) error
+	GetClosingPenjualanForAgeChickDataProduction(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error)
 }
 
 type MarketingDeliveryProductRepositoryImpl struct {
@@ -93,6 +94,46 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualan(ctx context
 	return deliveryProducts, nil
 }
 
+func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanForAgeChickDataProduction(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error) {
+	var deliveryProducts []entity.MarketingDeliveryProduct
+
+	db := r.DB().WithContext(ctx).
+		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
+		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
+		Where("flags.name IN (?)", []string{
+			string(utils.FlagAyamAfkir),
+			string(utils.FlagAyamCulling),
+			string(utils.FlagPullet),
+			string(utils.FlagLayer),
+		}).
+		Where("marketing_delivery_products.delivery_date IS NOT NULL").
+		Distinct("marketing_delivery_products.*")
+
+	if projectFlockKandangID != nil {
+		db = db.Where("product_warehouses.project_flock_kandang_id = ?", *projectFlockKandangID)
+	}
+
+	db = db.
+		Preload("MarketingProduct").
+		Preload("MarketingProduct.ProductWarehouse").
+		Preload("MarketingProduct.ProductWarehouse.Product").
+		Preload("MarketingProduct.ProductWarehouse.Product.ProductCategory").
+		Preload("MarketingProduct.ProductWarehouse.Product.Flags").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins").
+		Order("marketing_delivery_products.delivery_date DESC")
+
+	if err := db.Find(&deliveryProducts).Error; err != nil {
+		return nil, err
+	}
+
+	return deliveryProducts, nil
+}
+
 func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanByCategory(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, category string) ([]entity.MarketingDeliveryProduct, error) {
 	var deliveryProducts []entity.MarketingDeliveryProduct
 

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

@@ -410,6 +410,7 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 					return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery product")
 				}
 
+				oldRequestedQty := deliveryProduct.UsageQty + deliveryProduct.PendingQty
 				var itemDeliveryDate *time.Time
 				if requestedProduct.DeliveryDate != "" {
 					parsedDate, err := utils.ParseDateString(requestedProduct.DeliveryDate)
@@ -421,11 +422,8 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 					itemDeliveryDate = deliveryProduct.DeliveryDate
 				}
 
-				oldRequestedQty := deliveryProduct.UsageQty + deliveryProduct.PendingQty
-
-				// Cek apakah product punya flag PAKAN atau OVK
 				isPakanOrOVK := false
-				if foundMarketingProduct.ProductWarehouse.Product.Id != 0 && len(foundMarketingProduct.ProductWarehouse.Product.Flags) > 0 {
+				if foundMarketingProduct.ProductWarehouse.Id != 0 && foundMarketingProduct.ProductWarehouse.Product.Id != 0 && len(foundMarketingProduct.ProductWarehouse.Product.Flags) > 0 {
 					for _, flag := range foundMarketingProduct.ProductWarehouse.Product.Flags {
 						if flag.Name == string(utils.FlagPakan) || flag.Name == string(utils.FlagOVK) {
 							isPakanOrOVK = true
@@ -506,60 +504,82 @@ func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gor
 
 	deliveryProductRepo := marketingRepo.NewMarketingDeliveryProductRepository(tx)
 
-	if err == nil && result.UsageQuantity > 0 {
+	totalConsumed := 0.0
-		if actorID > 0 {
+	var fifoConsumed float64
-			decreaseLog := &entity.StockLog{
+	var directConsumed float64
-				Decrease:           result.UsageQuantity,
+
-				LoggableType:       string(utils.StockLogTypeMarketing),
+	if result != nil && result.UsageQuantity > 0 {
-				LoggableId:         deliveryProduct.Id,
+		fifoConsumed = result.UsageQuantity
-				ProductWarehouseId: marketingProduct.ProductWarehouseId,
+		totalConsumed = result.UsageQuantity
-				CreatedBy:          actorID,
-				Notes:              "",
-			}
-			s.StockLogRepo.WithTx(tx).CreateOne(ctx, decreaseLog, nil)
-		}
 	}
 
-	if err != nil {
+	if err != nil || (totalConsumed < requestedQty) {
+		remainder := requestedQty - totalConsumed
+
 		pwRepo := productWarehouseRepo.NewProductWarehouseRepository(tx)
 		pw, err2 := pwRepo.GetByID(ctx, marketingProduct.ProductWarehouseId, nil)
 		if err2 != nil {
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to check product warehouse stock")
 		}
 
-		if pw == nil || pw.Quantity < requestedQty {
+		if pw == nil || pw.Quantity < remainder {
-			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock. Available: %.2f, Requested: %.2f", func() float64 {
+			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock. FIFO: %.2f, Direct Available: %.2f, Total Needed: %.2f", func() float64 {
 				if pw != nil {
 					return pw.Quantity
 				} else {
 					return 0
 				}
-			}(), requestedQty))
+			}(), remainder, requestedQty))
 		}
 
-		if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, requestedQty, 0); err != nil {
+		if err := pwRepo.AdjustQuantities(ctx, map[uint]float64{
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
+			marketingProduct.ProductWarehouseId: -remainder,
+		}, func(db *gorm.DB) *gorm.DB {
+			return tx
+		}); err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to adjust product warehouse quantity")
 		}
 
-		if actorID > 0 {
+		directConsumed = remainder
-			decreaseLog := &entity.StockLog{
+		totalConsumed += remainder
-				Decrease:           requestedQty,
-				LoggableType:       string(utils.StockLogTypeMarketing),
-				LoggableId:         deliveryProduct.Id,
-				ProductWarehouseId: marketingProduct.ProductWarehouseId,
-				CreatedBy:          actorID,
-				Notes:              "",
-			}
-			s.StockLogRepo.WithTx(tx).CreateOne(ctx, decreaseLog, nil)
-		}
-
-		return nil
 	}
 
-	if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, result.UsageQuantity, result.PendingQuantity); err != nil {
+	if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, totalConsumed, 0); err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
 	}
 
+	if actorID > 0 && totalConsumed > 0 {
+		notes := ""
+		if fifoConsumed > 0 && directConsumed > 0 {
+			notes = fmt.Sprintf("Partial FIFO (%.2f) + Direct (%.2f)", fifoConsumed, directConsumed)
+		} else if fifoConsumed > 0 {
+			notes = fmt.Sprintf("FIFO stock only (%.2f)", fifoConsumed)
+		} else if directConsumed > 0 {
+			notes = fmt.Sprintf("Direct stock only (%.2f)", directConsumed)
+		}
+
+		decreaseLog := &entity.StockLog{
+			Decrease:           totalConsumed,
+			LoggableType:       string(utils.StockLogTypeMarketing),
+			LoggableId:         deliveryProduct.Id,
+			ProductWarehouseId: marketingProduct.ProductWarehouseId,
+			CreatedBy:          actorID,
+			Notes:              notes,
+		}
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			decreaseLog.Stock = latestStockLog.Stock
+			decreaseLog.Stock -= decreaseLog.Decrease
+		} else {
+			decreaseLog.Stock -= decreaseLog.Decrease
+		}
+		s.StockLogRepo.WithTx(tx).CreateOne(ctx, decreaseLog, nil)
+	}
+
 	return nil
 }
 
@@ -599,6 +619,18 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 			CreatedBy:          actorID,
 			Notes:              "",
 		}
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			increaseLog.Stock = latestStockLog.Stock
+			increaseLog.Stock += increaseLog.Increase
+		} else {
+			increaseLog.Stock += increaseLog.Increase
+		}
+
 		s.StockLogRepo.WithTx(tx).CreateOne(ctx, increaseLog, nil)
 	}
 

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

@@ -645,6 +645,18 @@ func (s *chickinService) ConsumeChickinStocks(ctx context.Context, tx *gorm.DB,
 			CreatedBy:          actorID,
 			Notes:              fmt.Sprintf("Chickin #%d", chickin.Id),
 		}
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, chickin.ProductWarehouseId, 1)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			decreaseLog.Stock = latestStockLog.Stock
+			decreaseLog.Stock -= decreaseLog.Decrease
+		} else {
+			decreaseLog.Stock -= decreaseLog.Decrease
+		}
+
 		s.StockLogRepo.CreateOne(ctx, decreaseLog, nil)
 	}
 
@@ -701,6 +713,18 @@ func (s *chickinService) ReleaseChickinStocks(ctx context.Context, tx *gorm.DB,
 			CreatedBy:          actorID,
 			Notes:              fmt.Sprintf("Chickin #%d - Stock released", chickin.Id),
 		}
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, chickin.ProductWarehouseId, 1)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			increaseLog.Stock = latestStockLog.Stock
+			increaseLog.Stock += increaseLog.Increase
+		} else {
+			increaseLog.Stock += increaseLog.Increase
+		}
+
 		s.StockLogRepo.CreateOne(ctx, increaseLog, nil)
 	}
 

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

@@ -4,6 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
+	"strings"
+	"time"
+
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -19,9 +23,6 @@ import (
 	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
 	recordingutil "gitlab.com/mbugroup/lti-api.git/internal/utils/recording"
-	"math"
-	"strings"
-	"time"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -535,6 +536,17 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 						if egg.ProductWarehouseId == 0 || egg.Qty <= 0 {
 							continue
 						}
+						stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, egg.ProductWarehouseId, 1)
+						if err != nil {
+							s.Log.Errorf("Failed to get stock logs: %+v", err)
+							return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+						}
+						latestStockLog := &entity.StockLog{}
+						if len(stockLogs) > 0 {
+							latestStockLog = stockLogs[0]
+						} else {
+							latestStockLog.Stock = 0
+						}
 						logs = append(logs, &entity.StockLog{
 							ProductWarehouseId: egg.ProductWarehouseId,
 							CreatedBy:          actorID,
@@ -542,6 +554,7 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 							LoggableType:       string(utils.StockLogTypeRecording),
 							LoggableId:         recordingEntity.Id,
 							Notes:              note,
+							Stock:              latestStockLog.Stock - float64(egg.Qty),
 						})
 					}
 					if len(logs) > 0 {
@@ -937,6 +950,18 @@ func (s *recordingService) consumeRecordingStocks(
 				LoggableId:         stock.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, stock.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock -= log.Decrease
+			} else {
+				log.Stock -= log.Decrease
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1004,6 +1029,18 @@ func (s *recordingService) consumeRecordingDepletions(
 				LoggableId:         depletion.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, sourceWarehouseID, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock -= log.Decrease
+			} else {
+				log.Stock -= log.Decrease
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1022,6 +1059,18 @@ func (s *recordingService) consumeRecordingDepletions(
 				LoggableId:         depletion.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, depletion.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock += log.Increase
+			} else {
+				log.Stock += log.Increase
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1082,6 +1131,18 @@ func (s *recordingService) releaseRecordingStocks(
 				LoggableId:         stock.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, stock.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock += log.Increase
+			} else {
+				log.Stock += log.Increase
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1144,6 +1205,18 @@ func (s *recordingService) releaseRecordingDepletions(
 				LoggableId:         depletion.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, sourceWarehouseID, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock += log.Increase
+			} else {
+				log.Stock += log.Increase
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1162,6 +1235,18 @@ func (s *recordingService) releaseRecordingDepletions(
 				LoggableId:         depletion.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, depletion.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock -= log.Decrease
+			} else {
+				log.Stock -= log.Decrease
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1309,6 +1394,18 @@ func (s *recordingService) replenishRecordingEggs(
 				LoggableId:         egg.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, egg.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock += log.Increase
+			} else {
+				log.Stock += log.Increase
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}

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

@@ -826,6 +826,18 @@ func (s transferLayingService) Approval(c *fiber.Ctx, req *validation.Approve) (
 						LoggableId:         approvableID,
 						Notes:              fmt.Sprintf("TL #%s", transfer.TransferNumber),
 					}
+					stockLogs, err := stockLogRepoTx.GetByProductWarehouse(c.Context(), *source.ProductWarehouseId, 1)
+					if err != nil {
+						s.Log.Errorf("Failed to get stock logs: %+v", err)
+						return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+					}
+					if len(stockLogs) > 0 {
+						latestStockLog := stockLogs[0]
+						stockLogDecrease.Stock = latestStockLog.Stock - stockLogDecrease.Decrease
+					} else {
+						stockLogDecrease.Stock -= stockLogDecrease.Decrease
+					}
+
 					if err := stockLogRepoTx.CreateOne(c.Context(), stockLogDecrease, nil); err != nil {
 						return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok keluar")
 					}
@@ -864,6 +876,18 @@ func (s transferLayingService) Approval(c *fiber.Ctx, req *validation.Approve) (
 						LoggableId:         approvableID,
 						Notes:              fmt.Sprintf("TL #%s", transfer.TransferNumber),
 					}
+					stockLogs, err := stockLogRepoTx.GetByProductWarehouse(c.Context(), *target.ProductWarehouseId, 1)
+					if err != nil {
+						s.Log.Errorf("Failed to get stock logs: %+v", err)
+						return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+					}
+					if len(stockLogs) > 0 {
+						latestStockLog := stockLogs[0]
+						stockLogIncrease.Stock = latestStockLog.Stock + stockLogIncrease.Increase
+					} else {
+						stockLogIncrease.Stock += stockLogIncrease.Increase
+					}
+
 					if err := stockLogRepoTx.CreateOne(c.Context(), stockLogIncrease, nil); err != nil {
 						return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok masuk")
 					}

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

@@ -1081,10 +1081,25 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 					LoggableId:         purchase.Id,
 					Notes:              receiveNote,
 				}
+				stockLogs, err := stockLogRepoTx.GetByProductWarehouse(ctx, entry.pwID, 1)
+				if err != nil {
+					s.Log.Errorf("Failed to get stock logs: %+v", err)
+					return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+				}
+
+				if len(stockLogs) > 0 {
+					latestStockLog := stockLogs[0]
+					log.Stock = latestStockLog.Stock
+				} else {
+					log.Stock = 0
+				}
+
 				if entry.delta > 0 {
 					log.Increase = entry.delta
+					log.Stock += log.Increase
 				} else {
 					log.Decrease = -entry.delta
+					log.Stock -= log.Decrease
 				}
 				logs = append(logs, log)
 			}