From 1348483b1c904e8ed732c6de0f628ff0ebef7f58 Mon Sep 17 00:00:00 2001 From: MacBook Air M1 Date: Fri, 2 Jan 2026 13:19:11 +0700 Subject: [PATCH] adjust api closing tap sapronak --- .../closings/repositories/closing.repository.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/modules/closings/repositories/closing.repository.go b/internal/modules/closings/repositories/closing.repository.go index 912f2f25..4948ae5e 100644 --- a/internal/modules/closings/repositories/closing.repository.go +++ b/internal/modules/closings/repositories/closing.repository.go @@ -407,7 +407,7 @@ SELECT COALESCE(fw.name, '') AS source_warehouse, COALESCE(tw.name, '') AS destination_warehouse, '' AS destination, - std.quantity AS quantity, + std.usage_qty AS quantity, u.name AS unit, 'Stock Refill' AS notes FROM stock_transfer_details std @@ -456,7 +456,7 @@ SELECT COALESCE(fw.name, '') AS source_warehouse, '' AS destination_warehouse, COALESCE(tw.name, '') AS destination, - std.quantity AS quantity, + std.usage_qty AS quantity, u.name AS unit, 'Transfer to other unit' AS notes FROM stock_transfer_details std @@ -927,34 +927,34 @@ func (r *ClosingRepositoryImpl) GetActualUsageCostByProjectFlockID(ctx context.C COALESCE(SUM( CASE WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0) - WHEN sa.stockable_type = ? THEN COALESCE(std.quantity, 0) + WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0) ELSE 0 END ), 0) AS total_qty, COALESCE(SUM( CASE WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0) * COALESCE(pi.price, 0) - WHEN sa.stockable_type = ? THEN COALESCE(std.quantity, 0) * COALESCE(tpi.price, 0) + WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0) * COALESCE(tpi.price, 0) ELSE 0 END ), 0) AS total_price, COALESCE(SUM( CASE WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0) - WHEN sa.stockable_type = ? THEN COALESCE(std.quantity, 0) + WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0) ELSE 0 END ), 0) AS qty_divisor, COALESCE(SUM( CASE WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0) * COALESCE(pi.price, 0) - WHEN sa.stockable_type = ? THEN COALESCE(std.quantity, 0) * COALESCE(tpi.price, 0) + WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0) * COALESCE(tpi.price, 0) ELSE 0 END ), 0) / NULLIF(COALESCE(SUM( CASE WHEN sa.stockable_type = ? THEN COALESCE(sa.qty, 0) - WHEN sa.stockable_type = ? THEN COALESCE(std.quantity, 0) + WHEN sa.stockable_type = ? THEN COALESCE(std.usage_qty, 0) ELSE 0 END ), 0), 0) AS average_price`,