fix sales issues

2026-08-05 17:03:49 +05:30
parent 4324ba1a96
commit cbc72ef830
14 changed files with 392 additions and 114 deletions
@@ -23,6 +23,7 @@ public sealed class BundleSaleService : IBundleSaleService
    private readonly IRepository<Warehouse> _warehouses;
    private readonly IRepository<User> _users;
    private readonly ISalesDomainService _sales;
+    private readonly IUomConverter _uomConverter;
    private readonly ISalesPostingService _posting;
    private readonly ICurrentUser _currentUser;
    private readonly INumberSequenceService _numbers;
@@ -37,6 +38,7 @@ public sealed class BundleSaleService : IBundleSaleService
        IRepository<Warehouse> warehouses,
        IRepository<User> users,
        ISalesDomainService sales,
+        IUomConverter uomConverter,
        ISalesPostingService posting,
        ICurrentUser currentUser,
        INumberSequenceService numbers,
@@ -50,6 +52,7 @@ public sealed class BundleSaleService : IBundleSaleService
        _warehouses = warehouses;
        _users = users;
        _sales = sales;
+        _uomConverter = uomConverter;
        _posting = posting;
        _currentUser = currentUser;
        _numbers = numbers;
@@ -85,7 +88,7 @@ public sealed class BundleSaleService : IBundleSaleService
                x.BundleSaleTemplateLineId, x.ItemId, x.UomId, x.WarehouseId, x.Qty, x.UnitPrice, x.IncludeInBundle, x.SortOrder)).ToList());
    }

-    public async Task<PagedResponse<BundleSaleSummaryDto>> ListAsync(PageQuery query, int? customerId, int? warehouseId, CancellationToken ct = default)
+    public async Task<PagedResponse<BundleSaleSummaryDto>> ListAsync(PageQuery query, BundleSaleStatus? status, int? customerId, int? warehouseId, CancellationToken ct = default)
    {
        IQueryable<BundleSale> q = _bundles.Query().AsNoTracking().Include(x => x.Lines);
        if (!string.IsNullOrWhiteSpace(query.Q))
@@ -93,6 +96,7 @@ public sealed class BundleSaleService : IBundleSaleService
            var term = query.Q.Trim();
            q = q.Where(x => EF.Functions.ILike(x.BundleNo, $"%{term}%") || EF.Functions.ILike(x.BundleName, $"%{term}%") || EF.Functions.ILike(x.BundleCode, $"%{term}%"));
        }
+        if (status is not null) q = q.Where(x => x.Status == status);
        if (customerId is not null) q = q.Where(x => x.CustomerId == customerId);
        if (warehouseId is not null) q = q.Where(x => x.WarehouseId == warehouseId);
        var total = await q.CountAsync(ct);
@@ -204,21 +208,23 @@ public sealed class BundleSaleService : IBundleSaleService
        {
            if (r.Qty <= 0)
                throw new DomainException(ErrorCodes.Validation, "Bundle line quantity must be greater than zero.", 422);
-            if (r.WarehouseId != warehouseId)
-                throw new DomainException(ErrorCodes.Validation,
-                    $"Bundle line warehouse {r.WarehouseId} must match header warehouse {warehouseId}.", 422);
+
+            // Bundle sales use the header warehouse as the source of truth for stock and pricing.
+            // Keep any per-line warehouse input from drifting away from the header.
+            var lineWarehouseId = warehouseId;
+
            var item = await _items.Query().AsNoTracking().FirstAsync(x => x.ItemId == r.ItemId, ct);
-            await _sales.ValidateSalesLineAsync(warehouseId, r.ItemId, r.UomId, r.WarehouseId, r.Qty, 0m, null, ct);
-            var resolved = await _sales.ResolveLinePriceAsync(r.ItemId, r.WarehouseId, r.UnitPrice, true, ct);
-            var calc = _sales.ComputeLine(r.Qty, 0m, resolved.UnitPrice, SalesDiscountMode.Amount, 0m, 0m, 0m, 0m, false);
+            await _sales.ValidateSalesLineAsync(warehouseId, r.ItemId, r.UomId, lineWarehouseId, r.Qty, 0m, null, ct);
+            var (qtyBase, unitCostBase) = await _uomConverter.ToBaseAsync(item, r.UomId, r.Qty, r.UnitPrice, ct);
+            var calc = _sales.ComputeLine(qtyBase, 0m, unitCostBase, SalesDiscountMode.Amount, 0m, 0m, 0m, 0m, false);
            lines.Add(new BundleSaleLine
            {
                ItemId = r.ItemId,
                Description = item.Name,
-                Qty = r.Qty,
-                UomId = r.UomId,
-                WarehouseId = r.WarehouseId,
-                UnitPrice = resolved.UnitPrice,
+                Qty = qtyBase,
+                UomId = item.BaseUomId,
+                WarehouseId = lineWarehouseId,
+                UnitPrice = unitCostBase,
                LineTotal = calc.LineTotal,
                IncludeInBundle = r.IncludeInBundle,
                IsComponent = true,
@@ -20,6 +20,7 @@ public sealed class SalesPostingService : ISalesPostingService
    private readonly IRepository<Item> _items;
    private readonly IFifoCostingService _fifo;
    private readonly ISalesDomainService _sales;
+    private readonly IUomConverter _uomConverter;
    private readonly ICurrentUser _currentUser;
    private readonly IUnitOfWork _uow;

@@ -30,6 +31,7 @@ public sealed class SalesPostingService : ISalesPostingService
        IRepository<Item> items,
        IFifoCostingService fifo,
        ISalesDomainService sales,
+        IUomConverter uomConverter,
        ICurrentUser currentUser,
        IUnitOfWork uow)
    {
@@ -39,6 +41,7 @@ public sealed class SalesPostingService : ISalesPostingService
        _items = items;
        _fifo = fifo;
        _sales = sales;
+        _uomConverter = uomConverter;
        _currentUser = currentUser;
        _uow = uow;
    }
@@ -119,15 +122,14 @@ public sealed class SalesPostingService : ISalesPostingService
        {
            if (!await _sales.IsStockedItemAsync(line.ItemId, ct))
                continue;
+
+            var item = await _items.Query().AsNoTracking()
+                .FirstAsync(x => x.ItemId == line.ItemId, ct);
            var available = await _fifo.GetOnHandAsync(line.ItemId, line.WarehouseId, ct);
            if (available >= line.Qty) continue;

-            var item = await _items.Query().AsNoTracking()
-                .Where(x => x.ItemId == line.ItemId)
-                .Select(x => new { x.Sku, x.Name })
-                .FirstAsync(ct);
-
-            issues.Add(new BundleSalePostingIssueDto(line.BundleSaleLineId, line.ItemId, item.Sku, item.Name, line.WarehouseId, line.Qty, available, line.Qty - available));
+            issues.Add(new BundleSalePostingIssueDto(
+                line.BundleSaleLineId, line.ItemId, item.Sku, item.Name, line.WarehouseId, line.Qty, available, line.Qty - available));
        }

        return new BundleSalePostingCheckDto(bundle.BundleSaleId, bundle.BundleNo, bundle.Status, issues.Count == 0, issues);
@@ -139,10 +141,10 @@ public sealed class SalesPostingService : ISalesPostingService
            notFoundMessage: $"Sales invoice {salesInvoiceId} was not found.",
            statusSelector: x => x.Status,
            ensureDraftMessage: x => $"Sales invoice {x.SalesInvoiceId} is {x.Status} and cannot be posted.",
-            getLines: x => x.Lines.Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.Qty + l.FreeQty, l.Qty, l.FreeQty)),
+            getLines: x => x.Lines.Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.UomId, l.Qty + l.FreeQty, l.Qty, l.FreeQty)),
            setPosted: x => x.Status = SalesInvoiceStatus.Posted,
            setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
-            sourceDocType: nameof(SalesInvoice),
+            sourceDocType: DocumentTypes.SalesInvoice,
            getDocId: x => x.SalesInvoiceId,
            ct: ct);

@@ -152,10 +154,10 @@ public sealed class SalesPostingService : ISalesPostingService
            notFoundMessage: $"Sales slip {salesSlipId} was not found.",
            statusSelector: x => x.Status,
            ensureDraftMessage: x => $"Sales slip {x.SalesSlipId} is {x.Status} and cannot be posted.",
-            getLines: x => x.Lines.Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.Qty + l.FreeQty, l.Qty, l.FreeQty)),
+            getLines: x => x.Lines.Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.UomId, l.Qty + l.FreeQty, l.Qty, l.FreeQty)),
            setPosted: x => x.Status = SalesSlipStatus.Posted,
            setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
-            sourceDocType: nameof(SalesSlip),
+            sourceDocType: DocumentTypes.SalesSlip,
            getDocId: x => x.SalesSlipId,
            ct: ct);

@@ -165,10 +167,12 @@ public sealed class SalesPostingService : ISalesPostingService
            notFoundMessage: $"Bundle sale {bundleSaleId} was not found.",
            statusSelector: x => x.Status,
            ensureDraftMessage: x => $"Bundle sale {x.BundleSaleId} is {x.Status} and cannot be posted.",
-            getLines: x => x.Lines.Where(l => l.IncludeInBundle).Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.Qty, l.Qty, 0m)),
+            // Bundle lines are normalized to base UOM on save, so posting should consume the
+            // stored base quantity directly instead of converting again.
+            getLines: x => x.Lines.Where(l => l.IncludeInBundle).Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.UomId, l.Qty, l.Qty, 0m)),
            setPosted: x => x.Status = BundleSaleStatus.Posted,
            setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
-            sourceDocType: nameof(BundleSale),
+            sourceDocType: DocumentTypes.BundleSale,
            getDocId: x => x.BundleSaleId,
            ct: ct);

@@ -210,5 +214,5 @@ public sealed class SalesPostingService : ISalesPostingService
        }, ct);
    }

-    private sealed record PostingLine(int ItemId, int WarehouseId, decimal Qty, decimal PaidQty, decimal FreeQty);
+    private sealed record PostingLine(int ItemId, int WarehouseId, int UomId, decimal Qty, decimal PaidQty, decimal FreeQty);
 }
@@ -9,8 +9,6 @@ namespace ERPCore.Services;

 public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionService
 {
-    private const decimal FreeIssueThreshold = 10m;
-
    private readonly IRepository<SalesSlip> _slips;
    private readonly IRepository<Item> _items;

@@ -27,7 +25,14 @@ public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionS

        if (slip is null) return null;

-        var itemIds = slip.Lines.Select(x => x.ItemId).Distinct().ToList();
+        var freeIssueLines = slip.Lines
+            .Where(x => x.IsFreeIssue || x.FreeQty > 0m)
+            .ToList();
+
+        if (freeIssueLines.Count == 0)
+            return new SalesFreeIssueSuggestionDto(slip.SalesSlipId, slip.SlipNo, slip.SlipDate, Array.Empty<SalesFreeIssueSuggestionLineDto>());
+
+        var itemIds = freeIssueLines.Select(x => x.ItemId).Distinct().ToList();
        var candidateItems = await _items.Query().AsNoTracking()
            .Where(x => itemIds.Contains(x.ItemId) && x.Status == EntityStatus.Active)
            .ToListAsync(ct);
@@ -35,13 +40,10 @@ public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionS
        var byItemId = candidateItems.ToDictionary(x => x.ItemId);
        var suggestions = new List<SalesFreeIssueSuggestionLineDto>();

-        foreach (var line in slip.Lines.Where(x => x.Qty >= FreeIssueThreshold))
+        foreach (var line in freeIssueLines)
        {
            if (!byItemId.TryGetValue(line.ItemId, out var item)) continue;

-            var freeQty = Math.Floor(line.Qty / FreeIssueThreshold);
-            if (freeQty <= 0m) continue;
-
            var rewardOptions = new List<SalesFreeIssueRewardOptionDto>
            {
                new(item.ItemId, item.Sku, item.Name, item.SalePrice)
@@ -62,8 +64,8 @@ public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionS
                item.Sku,
                item.Name,
                line.Qty,
-                freeQty,
-                FreeIssueThreshold,
+                line.FreeQty,
+                line.Qty,
                rewardOptions));
        }

@@ -71,4 +73,4 @@ public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionS
            ? new SalesFreeIssueSuggestionDto(slip.SalesSlipId, slip.SlipNo, slip.SlipDate, Array.Empty<SalesFreeIssueSuggestionLineDto>())
            : new SalesFreeIssueSuggestionDto(slip.SalesSlipId, slip.SlipNo, slip.SlipDate, suggestions);
    }
-}
+}