diff --git a/internal/common/repository/common.hppv2.repository.go b/internal/common/repository/common.hppv2.repository.go index 0968ad0e..beedd7ce 100644 --- a/internal/common/repository/common.hppv2.repository.go +++ b/internal/common/repository/common.hppv2.repository.go @@ -869,7 +869,7 @@ func (r *HppV2RepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKanda } err := r.db.WithContext(ctx). Table("recordings AS r"). - Select("COALESCE(SUM(re.qty), 0) AS total_pieces, COALESCE(SUM(re.weight), 0)AS total_weight_kg"). + Select("COALESCE(SUM(re.qty), 0) AS total_pieces, COALESCE(SUM(re.weight), 0) AS total_weight_kg"). Joins("JOIN recording_eggs AS re ON re.recording_id = r.id"). Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs). Where("r.record_datetime <= ?", *date). @@ -878,37 +878,6 @@ func (r *HppV2RepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKanda return 0, 0, err } - var adjustmentTotals struct { - TotalQty float64 - TotalWeight float64 - } - adjustmentSubQuery := r.db.WithContext(ctx). - Table("recordings AS r"). - Select("DISTINCT ast.id AS adjustment_id, ast.total_qty AS total_qty, ast.price AS price"). - Joins("JOIN recording_eggs AS re ON re.recording_id = r.id"). - Joins("JOIN stock_transfer_details AS std ON std.dest_product_warehouse_id = re.product_warehouse_id"). - Joins( - "JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = std.id AND sa.stockable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?", - fifo.UsableKeyStockTransferOut.String(), - fifo.StockableKeyAdjustmentIn.String(), - entity.StockAllocationStatusActive, - entity.StockAllocationPurposeConsume, - ). - Joins("JOIN adjustment_stocks AS ast ON ast.id = sa.stockable_id AND ast.product_warehouse_id = std.source_product_warehouse_id"). - Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs). - Where("r.record_datetime <= ?", *date) - - err = r.db.WithContext(ctx). - Table("(?) AS adjustment_sources", adjustmentSubQuery). - Select("COALESCE(SUM(adjustment_sources.total_qty), 0) AS total_qty, COALESCE(SUM(adjustment_sources.price), 0) AS total_weight"). - Scan(&adjustmentTotals).Error - if err != nil { - return 0, 0, err - } - - totals.TotalPieces += adjustmentTotals.TotalQty - totals.TotalWeightKg += adjustmentTotals.TotalWeight - return totals.TotalPieces, totals.TotalWeightKg, nil }