fix: update toast messages and improve UI elements in purchase orders and stock pages

.gitignore

@@ -36,4 +36,12 @@ Testing/e2e/test-results/
 Testing/e2e/.auth/
 Testing/e2e/blob-report/
 
-
+# ── Migrations ─────────────────────────────────────────────────────────
+# Reverted 2026-07-31: excluding new EF Core migrations while
+# ErpDbContextModelSnapshot.cs stayed tracked meant every `dotnet ef
+# migrations add` after the initial 4 silently produced a migration git would
+# never see, while the (tracked) snapshot's changes committed normally —
+# so the snapshot kept claiming tables existed that no migration in git
+# history ever created them. Confirmed live: 25 HRM tables + 11 Manufacturing
+# tables were missing from the actual database for exactly this reason.
+# Migrations now stay tracked like any other source file — commit them.

Backend/ERPCore/Controllers/BundleSalesController.cs

@@ -33,11 +33,10 @@ public sealed class BundleSalesController : ApiControllerBase
     [ProducesResponseType(typeof(PagedResponse<BundleSaleSummaryDto>), StatusCodes.Status200OK)]
     public async Task<ActionResult<PagedResponse<BundleSaleSummaryDto>>> List(
         [FromQuery] PageQuery query,
-        [FromQuery] BundleSaleStatus? status,
         [FromQuery] int? customerId,
         [FromQuery] int? warehouseId,
         CancellationToken ct)
-        => Ok(await _bundles.ListAsync(query, status, customerId, warehouseId, ct));
+        => Ok(await _bundles.ListAsync(query, customerId, warehouseId, ct));
 
     [HttpGet("{bundleSaleId:int}")]
     [ProducesResponseType(typeof(BundleSaleDto), StatusCodes.Status200OK)]

Backend/ERPCore/Controllers/ItemsController.cs

@@ -81,4 +81,11 @@ public sealed class ItemsController : ApiControllerBase
     [ProducesResponseType(StatusCodes.Status404NotFound)]
     public async Task<ActionResult<ItemReorderSettingsDto>> UpdateReorder(int itemId, [FromBody] UpdateReorderRequest request, CancellationToken ct)
         => Ok(await _items.UpdateReorderAsync(itemId, request, ct));
+
+    /// <summary>Replace the item's UOM conversions (FR-MD-02).</summary>
+    [HttpPut("{itemId:int}/uom-conversions")]
+    [ProducesResponseType(typeof(ItemUomConversionsDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<ItemUomConversionsDto>> UpdateUomConversions(int itemId, [FromBody] UpdateUomConversionsRequest request, CancellationToken ct)
+        => Ok(await _items.UpdateUomConversionsAsync(itemId, request, ct));
 }

Backend/ERPCore/Controllers/SalesReturnsController.cs

@@ -1,49 +0,0 @@
-using ERPCore.Dtos.Common;
-using ERPCore.Dtos.Sales;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-/// <summary>Sales-return endpoints — customer returns of previously sold goods.</summary>
-[Route("api/v1/sales-returns")]
-public sealed class SalesReturnsController : ApiControllerBase
-{
-    private readonly ISalesReturnService _returns;
-
-    public SalesReturnsController(ISalesReturnService returns) => _returns = returns;
-
-    /// <summary>List posted returns, newest first.</summary>
-    [HttpGet]
-    [ProducesResponseType(typeof(PagedResponse<SalesReturnSummaryDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedResponse<SalesReturnSummaryDto>>> List(
-        [FromQuery] PageQuery query, [FromQuery] int? customerId, [FromQuery] int? warehouseId, CancellationToken ct)
-        => Ok(await _returns.ListAsync(query, customerId, warehouseId, ct));
-
-    /// <summary>Remaining returnable qty per line of one sales invoice (invoiced qty minus already-returned).</summary>
-    [HttpGet("remaining")]
-    [ProducesResponseType(typeof(IReadOnlyList<SalesInvoiceLineRemainingDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<IReadOnlyList<SalesInvoiceLineRemainingDto>>> GetRemaining([FromQuery] int salesInvoiceId, CancellationToken ct)
-        => Ok(await _returns.GetRemainingByInvoiceAsync(salesInvoiceId, ct));
-
-    /// <summary>Get one return with its lines and the ledger entries it posted.</summary>
-    [HttpGet("{returnId:int}")]
-    [ProducesResponseType(typeof(SalesReturnDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<SalesReturnDto>> GetById(int returnId, CancellationToken ct)
-    {
-        var dto = await _returns.GetAsync(returnId, ct);
-        return dto is null ? NotFound() : Ok(dto);
-    }
-
-    /// <summary>Create + auto-post a return (inbound movement).</summary>
-    [HttpPost]
-    [ProducesResponseType(typeof(SalesReturnDto), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    public async Task<ActionResult<SalesReturnDto>> Create([FromBody] CreateSalesReturnRequest request, CancellationToken ct)
-    {
-        var dto = await _returns.CreateAsync(request, ct);
-        return Created($"/api/v1/sales-returns/{dto.ReturnId}", dto);
-    }
-}

Backend/ERPCore/Domain/DocumentTypes.cs

@@ -20,5 +20,4 @@ public static class DocumentTypes
     public const string SalesInvoice = "SI";
     public const string SalesSlip = "SSL";
     public const string BundleSale = "BND";
-    public const string SalesReturn = "SRET";
 }

Backend/ERPCore/Domain/Entities/BundleSaleLine.cs

@@ -12,6 +12,8 @@ public class BundleSaleLine
     public Item? Item { get; set; }
     public string Description { get; set; } = string.Empty;
     public decimal Qty { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
     public int WarehouseId { get; set; }
     public Warehouse? Warehouse { get; set; }
     public decimal UnitPrice { get; set; }

Backend/ERPCore/Domain/Entities/BundleSaleTemplateLine.cs

@@ -8,6 +8,8 @@ public class BundleSaleTemplateLine
 
     public int ItemId { get; set; }
     public Item? Item { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
     public int WarehouseId { get; set; }
     public Warehouse? Warehouse { get; set; }
 

Backend/ERPCore/Domain/Entities/GrnLine.cs

@@ -25,6 +25,9 @@ public class GrnLine
     public int ItemId { get; set; }
     public Item? Item { get; set; }
 
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
+
     public int? BinId { get; set; }
     public Bin? Bin { get; set; }
 
@@ -58,11 +61,4 @@ public class GrnLine
     public decimal LineTotal { get; set; }
 
     public HoldStatus HoldStatus { get; set; } = HoldStatus.Available;
-
-    /// <summary>
-    /// One row per received unit when <see cref="Item.Warranty"/> is
-    /// <see cref="Enums.Warranty.Warranty"/> — count must equal <see cref="Qty"/>.
-    /// Empty for a non-warranty item.
-    /// </summary>
-    public ICollection<GrnLineWarrantyNumber> WarrantyNumbers { get; set; } = new List<GrnLineWarrantyNumber>();
 }

Backend/ERPCore/Domain/Entities/GrnLineWarrantyNumber.cs

@@ -1,20 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// One warranty number captured against a single received unit of a warranty-tracked
-/// item (<see cref="Item.Warranty"/> = <see cref="Enums.Warranty.Warranty"/>). A GRN line
-/// for such an item must carry exactly <see cref="GrnLine.Qty"/> of these — one per unit —
-/// mirroring how a Serial-tracked item requires one serial per unit (docs/10 Part C.3).
-/// </summary>
-public class GrnLineWarrantyNumber
-{
-    public int GrnLineWarrantyNumberId { get; set; }
-
-    public int GrnLineId { get; set; }
-    public GrnLine? GrnLine { get; set; }
-
-    public string WarrantyNo { get; set; } = string.Empty;
-
-    /// <summary>Warranty coverage length in months, selected at receipt (e.g. 3/6/12/18).</summary>
-    public int WarrantyPeriodMonths { get; set; }
-}

Backend/ERPCore/Domain/Entities/Item.cs

@@ -24,12 +24,6 @@ public class Item
     public int? BrandId { get; set; }
     public Brand? Brand { get; set; }
 
-    /// <summary>
-    /// The stocking unit — the pack the item is counted in (BOTTLE, PACKET, BOX, PCS).
-    /// <b>Every</b> quantity in the system is a count of these: stock layers, the ledger,
-    /// and every document line. Nothing converts, so this is the sole meaning of a
-    /// quantity and cannot be changed once the item has stock history.
-    /// </summary>
     public int BaseUomId { get; set; }
     public Uom? BaseUom { get; set; }
 
@@ -38,9 +32,6 @@ public class Item
 
     public StockNature StockNature { get; set; }
     public TrackingMode TrackingMode { get; set; }
-    public Warranty Warranty { get; set; } = Warranty.NonWarranty;
-    /// <summary>Coverage length in months (see <see cref="Enums.WarrantyPeriods.AllowedMonths"/>) when <see cref="Warranty"/> is Warranty; null otherwise.</summary>
-    public int? WarrantyPeriodMonths { get; set; }
     public string? TaxClass { get; set; }
 
     /// <summary>
@@ -50,34 +41,6 @@ public class Item
     /// </summary>
     public decimal? SalePrice { get; set; }
 
-    /// <summary>
-    /// How much one pack holds, as the user entered it — <c>500</c> with
-    /// <see cref="ContentUnit"/> <c>Ml</c> for a 500 ml bottle, <c>1.5</c> with <c>L</c>
-    /// for a 1.5 L one. Null (together with the other three) when the item has no
-    /// measurable content: a screw, a label, a service.
-    /// <para>
-    /// Content never affects stock — that is always a pack count. It exists so production
-    /// can express a formula in millilitres or grams and resolve it to packs
-    /// (see <c>IItemMeasure</c>).
-    /// </para>
-    /// <para>
-    /// A loose bulk item bought by weight is modelled the same way:
-    /// <c>BaseUom = KG, ContentQty = 1, ContentUnit = Kg</c> ⇒ 1000 g per stocked unit.
-    /// </para>
-    /// </summary>
-    public decimal? ContentQty { get; set; }
-    public MeasureUnit? ContentUnit { get; set; }
-
-    /// <summary>
-    /// <see cref="ContentQty"/>/<see cref="ContentUnit"/> normalised to a base unit
-    /// (L→Ml, Kg→G, both ×1000) at write time by <c>ItemContent.Normalize</c>. Server-derived
-    /// and never accepted from a client. <see cref="ContentBaseUnit"/> is therefore only ever
-    /// <see cref="MeasureUnit.Ml"/> or <see cref="MeasureUnit.G"/>.
-    /// <para>Stored rather than recomputed so every consumer reads one settled number.</para>
-    /// </summary>
-    public decimal? ContentBaseQty { get; set; }
-    public MeasureUnit? ContentBaseUnit { get; set; }
-
     public EntityStatus Status { get; set; } = EntityStatus.Active;
 
     public DateTime CreatedAt { get; set; }
@@ -87,4 +50,5 @@ public class Item
     public uint RowVersion { get; set; }
 
     public ICollection<ItemReorder> ReorderSettings { get; set; } = new List<ItemReorder>();
+    public ICollection<UomConversion> UomConversions { get; set; } = new List<UomConversion>();
 }

Backend/ERPCore/Domain/Entities/ItemType.cs

@@ -7,15 +7,12 @@ namespace ERPCore.Domain.Entities;
 /// Material.
 /// <para>
 /// <b>Deliberately unlinked.</b> Nothing references this entity and it references
-/// nothing: there is no value table and no join to <see cref="Item"/>. The chosen
+/// nothing: there is no value table and no join to <see cref="Item"/>. Its only job is
+/// to feed the frontend's item-builder dropdown via <c>GET /item-types</c>. The chosen
 /// values (Red, S, M) are encoded by the client into the generated SKU
 /// (e.g. <c>BL-100-0003</c>) and are never stored or parsed server-side — the item list
 /// is the record of what was built. See the accepted trade-off in docs/10 Part C.9.
 /// </para>
-/// <para>
-/// It does, however, carry one piece of meaning the client acts on:
-/// <see cref="IsMeasurable"/>. So this is no longer purely a dropdown source.
-/// </para>
 /// Not to be confused with <see cref="Enums.StockNature"/> (Stocked/NonStocked/Service),
 /// which is what the old <c>ItemType</c> enum became.
 /// Model: docs/10-BACKEND-PHASE1.md Part C.1.
@@ -24,24 +21,6 @@ public class ItemType
 {
     public int ItemTypeId { get; set; }
     public string Name { get; set; } = string.Empty;
-
-    /// <summary>
-    /// When true, this dimension's values are content <b>measurements</b> (500 ml, 1 L) rather
-    /// than plain labels (Red, S). The item builder then captures a number + unit per value and
-    /// stamps that pair onto each generated item's <see cref="Item.ContentQty"/> /
-    /// <see cref="Item.ContentUnit"/>, instead of copying one form-level pair into every variant
-    /// — which is what makes "Coca-Cola in 500 ml / 1 L / 250 ml" three correctly sized items.
-    /// <para>
-    /// This is what lets an apparel <c>Size</c> (S/M/L) stay plain text while a
-    /// <c>Pack Size</c>/<c>Volume</c> dimension carries ml/g/L/kg.
-    /// </para>
-    /// <para>
-    /// A client hint only: the server never reads it when writing an item. Each item's pair is
-    /// still validated and normalised on its own by <c>ItemContent</c>.
-    /// </para>
-    /// </summary>
-    public bool IsMeasurable { get; set; }
-
     public EntityStatus Status { get; set; } = EntityStatus.Active;
 
     public DateTime CreatedAt { get; set; }

Backend/ERPCore/Domain/Entities/PoLine.cs

@@ -15,6 +15,9 @@ public class PoLine
     public int ItemId { get; set; }
     public Item? Item { get; set; }
 
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
+
     public int WarehouseId { get; set; }
     public Warehouse? Warehouse { get; set; }
 

Backend/ERPCore/Domain/Entities/RunStageInput.cs

@@ -31,14 +31,10 @@ public class RunStageInput
     public int? FromRunOutputId { get; set; }
     public RunStageOutput? FromRunOutput { get; set; }
 
-    /// <summary>Copied from the template input: what <see cref="PlannedQty"/> is expressed in.</summary>
-    public StageQtyUnit QtyUnit { get; set; } = StageQtyUnit.Pack;
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
 
-    /// <summary>
-    /// Scaled at creation; per-run editable until the stage starts (FR-MFG-08,
-    /// <c>409 STAGE_NOT_EDITABLE</c>). Expressed in <see cref="QtyUnit"/> — so unlike the
-    /// consumption figures below it is <b>not</b> necessarily a pack count.
-    /// </summary>
+    /// <summary>Scaled at creation; per-run editable until the stage starts (FR-MFG-08, <c>409 STAGE_NOT_EDITABLE</c>).</summary>
     public decimal PlannedQty { get; set; }
 
     /// <summary>

Backend/ERPCore/Domain/Entities/RunStageOutput.cs

@@ -23,17 +23,10 @@ public class RunStageOutput
 
     public string Name { get; set; } = string.Empty;
 
-    /// <summary>
-    /// Display label for intermediate WIP; null on the terminal output, whose unit is the
-    /// finished item's base UOM. Never converted — see <see cref="StageOutput.UomId"/>.
-    /// </summary>
-    public int? UomId { get; set; }
+    public int UomId { get; set; }
     public Uom? Uom { get; set; }
 
-    /// <summary>
-    /// Scaled at creation; per-run editable until the stage starts. Every quantity on an
-    /// output is a pack count, so scrap is recorded in whole broken bottles rather than ml.
-    /// </summary>
+    /// <summary>Scaled at creation; per-run editable until the stage starts.</summary>
     public decimal PlannedQty { get; set; }
 
     /// <summary>Recorded at complete. A re-complete after a rework <b>overwrites</b> this, never adds to it.</summary>

Backend/ERPCore/Domain/Entities/SalesInvoiceLine.cs

@@ -16,6 +16,8 @@ public class SalesInvoiceLine
 
     public decimal Qty { get; set; }
     public decimal FreeQty { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
     public int WarehouseId { get; set; }
     public Warehouse? Warehouse { get; set; }
 

Backend/ERPCore/Domain/Entities/SalesReturn.cs

@@ -1,32 +0,0 @@
-using ERPCore.Domain.Enums;
-
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// Sales return header — a customer returns previously sold goods, generating an
-/// inbound stock movement. Auto-posts with a mandatory reason code, mirroring
-/// <see cref="PurchaseReturn"/> with the direction reversed.
-/// </summary>
-public class SalesReturn
-{
-    public int ReturnId { get; set; }
-    public string DocNo { get; set; } = string.Empty;
-
-    public int CustomerId { get; set; }
-    public Customer? Customer { get; set; }
-
-    public int WarehouseId { get; set; }
-    public Warehouse? Warehouse { get; set; }
-
-    public int ReasonCodeId { get; set; }
-    public ReasonCode? ReasonCode { get; set; }
-
-    public ReturnStatus Status { get; set; } = ReturnStatus.Posted;
-
-    public int CreatedBy { get; set; }
-    public User? Creator { get; set; }
-
-    public DateTime CreatedAt { get; set; }
-
-    public ICollection<SalesReturnLine> Lines { get; set; } = new List<SalesReturnLine>();
-}

Backend/ERPCore/Domain/Entities/SalesReturnLine.cs

@@ -1,21 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// Sales-return line referencing the original sales invoice line for traceability.
-/// <see cref="Qty"/> is in base UOM.
-/// </summary>
-public class SalesReturnLine
-{
-    public int ReturnLineId { get; set; }
-
-    public int ReturnId { get; set; }
-    public SalesReturn? Return { get; set; }
-
-    public int? SalesInvoiceLineId { get; set; }
-    public SalesInvoiceLine? SalesInvoiceLine { get; set; }
-
-    public int ItemId { get; set; }
-    public Item? Item { get; set; }
-
-    public decimal Qty { get; set; }
-}

Backend/ERPCore/Domain/Entities/SalesSlipLine.cs

@@ -16,6 +16,8 @@ public class SalesSlipLine
 
     public decimal Qty { get; set; }
     public decimal FreeQty { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
     public int WarehouseId { get; set; }
     public Warehouse? Warehouse { get; set; }
 

Backend/ERPCore/Domain/Entities/StageInput.cs

@@ -32,13 +32,8 @@ public class StageInput
     public int? FromOutputId { get; set; }
     public StageOutput? FromOutput { get; set; }
 
-    /// <summary>
-    /// What <see cref="QtyPerBatch"/> is expressed in. Stock inputs may use
-    /// <see cref="StageQtyUnit.Content"/> (ml/g) when the item has a content size; Upstream
-    /// inputs are always <see cref="StageQtyUnit.Pack"/> — WIP is counted in the unit its
-    /// source output declares.
-    /// </summary>
-    public StageQtyUnit QtyUnit { get; set; } = StageQtyUnit.Pack;
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
 
     public decimal QtyPerBatch { get; set; }
 }

Backend/ERPCore/Domain/Entities/StageOutput.cs

@@ -20,14 +20,8 @@ public class StageOutput
 
     public string Name { get; set; } = string.Empty;
 
-    /// <summary>
-    /// Display label for intermediate work-in-progress. Required when <see cref="ItemId"/>
-    /// is null and must be null when it is set — a real item's unit is its own base UOM.
-    /// WIP never touches stock or the ledger, so this is never converted, only shown.
-    /// </summary>
-    public int? UomId { get; set; }
+    public int UomId { get; set; }
     public Uom? Uom { get; set; }
 
-    /// <summary>Always a pack count: of the WIP unit above, or of the item's base UOM.</summary>
     public decimal QtyPerBatch { get; set; }
 }

Backend/ERPCore/Domain/Entities/Uom.cs

@@ -1,10 +1,8 @@
 namespace ERPCore.Domain.Entities;
 
 /// <summary>
-/// Unit of Measure (FR-MD-02). A flat lookup, used as an item's base UOM — the pack every
-/// quantity in the system counts — and as the display label on an intermediate production
-/// output. There are no conversions between UOMs: an item is stocked in exactly one, and a
-/// differently sized pack is a different item. Model: docs/10-BACKEND-PHASE1.md Part C.1.
+/// Unit of Measure (FR-MD-02). Referenced as an item's base UOM and as the
+/// endpoints of a <see cref="UomConversion"/>. Model: docs/10-BACKEND-PHASE1.md Part C.1.
 /// </summary>
 public class Uom
 {

Backend/ERPCore/Domain/Entities/UomConversion.cs

@@ -0,0 +1,22 @@
+namespace ERPCore.Domain.Entities;
+
+/// <summary>
+/// Per-item conversion factor between two UOMs (FR-MD-02/03): quantity in
+/// <see cref="FromUomId"/> × <see cref="Factor"/> = quantity in <see cref="ToUomId"/>.
+/// Model: docs/10-BACKEND-PHASE1.md Part C.1.
+/// </summary>
+public class UomConversion
+{
+    public int ConversionId { get; set; }
+
+    public int ItemId { get; set; }
+    public Item? Item { get; set; }
+
+    public int FromUomId { get; set; }
+    public Uom? FromUom { get; set; }
+
+    public int ToUomId { get; set; }
+    public Uom? ToUom { get; set; }
+
+    public decimal Factor { get; set; }
+}

Backend/ERPCore/Domain/Enums/MeasureUnit.cs

@@ -1,23 +0,0 @@
-namespace ERPCore.Domain.Enums;
-
-/// <summary>
-/// Unit of an item's <b>content size</b> — how much a single stocked pack holds
-/// (a 500 ml bottle, a 50 kg sack). Stored as a string in the database.
-/// <para>
-/// This is <b>not</b> a stocking unit. Stock is always counted in packs
-/// (<c>Item.BaseUomId</c>); content is a separate, optional attribute used by
-/// production to turn "2000 ml of syrup" into a pack count.
-/// </para>
-/// <para>
-/// Only <see cref="Ml"/> and <see cref="G"/> are ever stored as a <i>base</i> content
-/// unit. <see cref="L"/> and <see cref="Kg"/> are entry conveniences normalised ×1000
-/// on write by <c>ItemContent.Normalize</c>, so nothing downstream has to convert.
-/// </para>
-/// </summary>
-public enum MeasureUnit
-{
-    Ml,
-    L,
-    G,
-    Kg
-}

Backend/ERPCore/Domain/Enums/StageQtyUnit.cs

@@ -1,22 +0,0 @@
-namespace ERPCore.Domain.Enums;
-
-/// <summary>
-/// What a stage input's quantity is expressed in (FR-MFG-04). Stored as a string.
-/// <para>
-/// Deliberately explicit rather than inferred from whether the item happens to have a
-/// content size: templates outlive item edits, so an inferred unit would let adding a
-/// content size to an existing item silently reinterpret every saved formula — "300"
-/// meaning 300 packs would become 300 ml.
-/// </para>
-/// </summary>
-public enum StageQtyUnit
-{
-    /// <summary>A count of the item's base UOM — bottles, packets, pieces.</summary>
-    Pack,
-
-    /// <summary>
-    /// An amount of the item's content in its base content unit (ml or g), resolved to
-    /// packs by <c>IItemMeasure</c> at stage start. Requires the item to have a content size.
-    /// </summary>
-    Content
-}

Backend/ERPCore/Domain/Enums/Warranty.cs

@@ -1,17 +0,0 @@
-namespace ERPCore.Domain.Enums;
-
-/// <summary>
-/// Whether an item is sold under warranty (FR-MD-01). Stored as a string, same
-/// convention as <see cref="StockNature"/> and <see cref="TrackingMode"/>.
-/// </summary>
-public enum Warranty
-{
-    NonWarranty,
-    Warranty
-}
-
-/// <summary>Allowed warranty coverage lengths, in months — set once on the item (FR-MD-01).</summary>
-public static class WarrantyPeriods
-{
-    public static readonly int[] AllowedMonths = { 3, 6, 12, 18 };
-}

Backend/ERPCore/Dtos/Grn/GrnDtos.cs

@@ -5,14 +5,12 @@ namespace ERPCore.Dtos.Grn;
 
 // Responses (docs/11 §4) --------------------------------------------------------
 
-public sealed record GrnLineWarrantyNumberDto(string WarrantyNo, int WarrantyPeriodMonths);
-
 public sealed record GrnLineDto(
-    int GrnLineId, int? PoLineId, int ItemId, int? BinId,
+    int GrnLineId, int? PoLineId, int ItemId, int UomId, int? BinId,
     decimal Qty, decimal UnitCost, decimal? PoUnitPrice,
     decimal DiscountPct, decimal NetUnitCost, decimal VatPct, decimal VatAmount,
     decimal ReceivedValue, decimal LineTotal, decimal PriceVariance,
-    HoldStatus HoldStatus, int? BatchId, IReadOnlyList<GrnLineWarrantyNumberDto> WarrantyNumbers);
+    HoldStatus HoldStatus, int? BatchId);
 
 public sealed record GrnDto(
     int GrnId, string DocNo, int? PoId, int VendorId, int WarehouseId, GrnStatus Status,
@@ -46,6 +44,7 @@ public sealed class CreateGrnLineInput
     /// <summary>Set for a PO-based receipt; cost is then derived from the PO line (02-SECURITY C.3).</summary>
     public int? PoLineId { get; set; }
     [Required] public int ItemId { get; set; }
+    [Required] public int UomId { get; set; }
     public int? BinId { get; set; }
     [Range(0.0001, double.MaxValue)] public decimal Qty { get; set; }
     /// <summary>
@@ -60,11 +59,6 @@ public sealed class CreateGrnLineInput
     [Range(0, 100)] public decimal VatPct { get; set; }
     [EnumDataType(typeof(HoldStatus))] public HoldStatus HoldStatus { get; set; } = HoldStatus.Available;
     public BatchInput? Batch { get; set; }
-    /// <summary>
-    /// Required, one per unit (count must equal <see cref="Qty"/>), when the item is
-    /// warranty-tracked (<c>Item.Warranty == Warranty.Warranty</c>). Ignored otherwise.
-    /// </summary>
-    public List<string>? WarrantyNumbers { get; set; }
 }
 
 public sealed class CreateGrnRequest

Backend/ERPCore/Dtos/ItemTypes/ItemTypeDtos.cs

@@ -5,16 +5,12 @@ namespace ERPCore.Dtos.ItemTypes;
 
 /// <summary>
 /// Item type resource (docs/11-BACKEND-PHASE1.md §2.7) — a dimension name such as Color
-/// or Size. Carries no values and no item linkage: the chosen values are encoded into the
+/// or Size. Carries no values and no item linkage: <c>GET /item-types</c> exists to
+/// populate the frontend builder's dropdown, and the chosen values are encoded into the
 /// client-generated SKU rather than stored (docs/10 Part C.9).
-/// <para>
-/// <c>IsMeasurable</c> marks a dimension whose values are content measurements (500 ml, 1 L)
-/// rather than plain labels; the builder captures a number + unit per value and writes it to
-/// each generated item's content size.
-/// </para>
 /// </summary>
 public sealed record ItemTypeDto(
-    int ItemTypeId, string Name, bool IsMeasurable, EntityStatus Status, DateTime CreatedAt, DateTime? UpdatedAt);
+    int ItemTypeId, string Name, EntityStatus Status, DateTime CreatedAt, DateTime? UpdatedAt);
 
 // Request DTOs — narrow: server-controlled fields (status, ids, timestamps)
 // are intentionally excluded to prevent over-posting (02-SECURITY B.6 / C.1). ----
@@ -22,21 +18,11 @@ public sealed record ItemTypeDto(
 public sealed class CreateItemTypeRequest
 {
     [Required, StringLength(200)] public string Name { get; set; } = string.Empty;
-
-    /// <summary>Omitted ⇒ false, i.e. plain-text values. See <see cref="ItemTypeDto"/>.</summary>
-    public bool IsMeasurable { get; set; }
 }
 
 public sealed class UpdateItemTypeRequest
 {
     [Required, StringLength(200)] public string Name { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Nullable on purpose: a plain <c>bool</c> binds an absent property as <c>false</c>, so any
-    /// client that PUT only a name — as the item-types screen used to — would silently clear the
-    /// flag on every rename. Omitting this field <b>preserves</b> the stored value.
-    /// </summary>
-    public bool? IsMeasurable { get; set; }
 }
 
 public sealed class UpdateItemTypeStatusRequest

Backend/ERPCore/Dtos/Items/ItemDtos.cs

@@ -9,11 +9,7 @@ namespace ERPCore.Dtos.Items;
 public sealed record ItemListItemDto(
     int ItemId, string Sku, string Name, int CategoryId, int? SubCategoryId, int? BrandId,
     int BaseUomId, int? DefaultVendorId, StockNature StockNature, TrackingMode TrackingMode,
-    Warranty Warranty, int? WarrantyPeriodMonths,
-    string? TaxClass, decimal? SalePrice,
-    decimal? ContentQty, MeasureUnit? ContentUnit,
-    decimal? ContentBaseQty, MeasureUnit? ContentBaseUnit,
-    EntityStatus Status);
+    string? TaxClass, decimal? SalePrice, EntityStatus Status);
 
 /// <summary>A single per-warehouse reorder policy row.</summary>
 public sealed record ItemReorderDto(int WarehouseId, decimal ReorderPoint, decimal ReorderQty);
@@ -21,22 +17,26 @@ public sealed record ItemReorderDto(int WarehouseId, decimal ReorderPoint, decim
 /// <summary>
 /// Full item resource for <c>GET /items/{id}</c> and create/update responses.
 /// <para>
-/// <c>ContentBaseQty</c>/<c>ContentBaseUnit</c> are echoed back so a detail screen can show
-/// what the entered size normalised to (1.5 L ⇒ 1500 ml) — they are server-derived and are
-/// not accepted on write.
+/// <see cref="Conversions"/> is embedded because they are otherwise unreadable: they can
+/// only be written via <c>PUT /items/{id}/uom-conversions</c>, which returns them, but no
+/// endpoint reads them back — so a detail screen could never show current state before
+/// editing. Mirrors how <see cref="Reorder"/> is already inlined.
 /// </para>
 /// </summary>
 public sealed record ItemDetailDto(
     int ItemId, string Sku, string Name, string? Description, int CategoryId,
     int? SubCategoryId, int? BrandId, int BaseUomId, int? DefaultVendorId,
     StockNature StockNature, TrackingMode TrackingMode,
-    Warranty Warranty, int? WarrantyPeriodMonths,
-    string? TaxClass, decimal? SalePrice,
-    decimal? ContentQty, MeasureUnit? ContentUnit,
-    decimal? ContentBaseQty, MeasureUnit? ContentBaseUnit,
-    EntityStatus Status, IReadOnlyList<ItemReorderDto> Reorder,
+    string? TaxClass, decimal? SalePrice, EntityStatus Status, IReadOnlyList<ItemReorderDto> Reorder,
+    IReadOnlyList<UomConversionDto> Conversions,
     DateTime CreatedAt, DateTime? UpdatedAt);
 
+/// <summary>UOM conversion row (docs/11 §2.2).</summary>
+public sealed record UomConversionDto(int ConversionId, int FromUom, int ToUom, decimal Factor);
+
+/// <summary>Response body for <c>PUT /items/{id}/uom-conversions</c>.</summary>
+public sealed record ItemUomConversionsDto(int ItemId, int BaseUomId, IReadOnlyList<UomConversionDto> Conversions);
+
 /// <summary>Response body for <c>PUT /items/{id}/reorder</c>.</summary>
 public sealed record ItemReorderSettingsDto(IReadOnlyList<ItemReorderDto> Settings);
 
@@ -61,20 +61,9 @@ public sealed class CreateItemRequest
     public int? DefaultVendorId { get; set; }
     [Required, EnumDataType(typeof(StockNature))] public StockNature StockNature { get; set; }
     [EnumDataType(typeof(TrackingMode))] public TrackingMode TrackingMode { get; set; } = TrackingMode.None;
-    [EnumDataType(typeof(Warranty))] public Warranty Warranty { get; set; } = Warranty.NonWarranty;
-    /// <summary>Required (one of <see cref="Enums.WarrantyPeriods.AllowedMonths"/>) when <see cref="Warranty"/> is Warranty; ignored otherwise.</summary>
-    public int? WarrantyPeriodMonths { get; set; }
     [StringLength(20)] public string? TaxClass { get; set; }
     /// <summary>Optional fixed sale price (Sales only). Null ⇒ sell at stock/FIFO value.</summary>
     [Range(0, double.MaxValue)] public decimal? SalePrice { get; set; }
-
-    /// <summary>
-    /// How much one pack holds. Supply with <see cref="ContentUnit"/> or leave both null
-    /// for items with no measurable content. The normalised base pair is derived by the
-    /// server and is deliberately not accepted here.
-    /// </summary>
-    [Range(0.0001, double.MaxValue)] public decimal? ContentQty { get; set; }
-    [EnumDataType(typeof(MeasureUnit))] public MeasureUnit? ContentUnit { get; set; }
 }
 
 public sealed class UpdateItemRequest
@@ -91,20 +80,9 @@ public sealed class UpdateItemRequest
     public int? DefaultVendorId { get; set; }
     [Required, EnumDataType(typeof(StockNature))] public StockNature StockNature { get; set; }
     [EnumDataType(typeof(TrackingMode))] public TrackingMode TrackingMode { get; set; } = TrackingMode.None;
-    [EnumDataType(typeof(Warranty))] public Warranty Warranty { get; set; } = Warranty.NonWarranty;
-    /// <summary>Required (one of <see cref="Enums.WarrantyPeriods.AllowedMonths"/>) when <see cref="Warranty"/> is Warranty; ignored otherwise.</summary>
-    public int? WarrantyPeriodMonths { get; set; }
     [StringLength(20)] public string? TaxClass { get; set; }
     /// <summary>Optional fixed sale price (Sales only). Null ⇒ sell at stock/FIFO value.</summary>
     [Range(0, double.MaxValue)] public decimal? SalePrice { get; set; }
-
-    /// <summary>
-    /// How much one pack holds. Supply with <see cref="ContentUnit"/> or leave both null
-    /// for items with no measurable content. The normalised base pair is derived by the
-    /// server and is deliberately not accepted here.
-    /// </summary>
-    [Range(0.0001, double.MaxValue)] public decimal? ContentQty { get; set; }
-    [EnumDataType(typeof(MeasureUnit))] public MeasureUnit? ContentUnit { get; set; }
 }
 
 public sealed class UpdateItemStatusRequest
@@ -123,3 +101,15 @@ public sealed class UpdateReorderRequest
 {
     [Required, MinLength(1)] public List<ReorderSettingInput> Settings { get; set; } = new();
 }
+
+public sealed class UomConversionInput
+{
+    [Required] public int FromUom { get; set; }
+    [Required] public int ToUom { get; set; }
+    [Range(0.000001, double.MaxValue)] public decimal Factor { get; set; }
+}
+
+public sealed class UpdateUomConversionsRequest
+{
+    [Required, MinLength(1)] public List<UomConversionInput> Conversions { get; set; } = new();
+}

Backend/ERPCore/Dtos/Procurement/PurchaseOrderDtos.cs

@@ -6,7 +6,7 @@ namespace ERPCore.Dtos.Procurement;
 // Responses (docs/11 §3.3) ------------------------------------------------------
 
 public sealed record PoLineDto(
-    int PoLineId, int ItemId, int WarehouseId,
+    int PoLineId, int ItemId, int UomId, int WarehouseId,
     decimal Qty, decimal UnitPrice, decimal Tax, decimal QtyReceived);
 
 public sealed record PoTotalsDto(decimal SubTotal, decimal Tax, decimal GrandTotal, string Currency);
@@ -25,6 +25,7 @@ public sealed record PurchaseOrderSummaryDto(
 public sealed class CreatePoLineInput
 {
     [Required] public int ItemId { get; set; }
+    [Required] public int UomId { get; set; }
     [Required] public int WarehouseId { get; set; }
     [Range(0.0001, double.MaxValue)] public decimal Qty { get; set; }
     [Range(0, double.MaxValue)] public decimal UnitPrice { get; set; }

Backend/ERPCore/Dtos/Production/RunDtos.cs

@@ -29,23 +29,17 @@ public sealed record RunSummaryDto(
 /// </summary>
 public sealed record CostPoolDto(decimal Consumed, decimal Returned, decimal Net);
 
-/// <summary>
-/// One input of a run stage. <c>PlannedQty</c> is expressed in <c>QtyUnit</c> — content
-/// (ml/g) or packs — while every consumption figure is always a pack count, so the two are
-/// not directly comparable for a Content input.
-/// </summary>
 public sealed record RunStageInputDto(
-    int RunInputId, StageInputSource Source, int? ItemId, int? FromRunOutputId, StageQtyUnit QtyUnit,
+    int RunInputId, StageInputSource Source, int? ItemId, int? FromRunOutputId, int UomId,
     decimal PlannedQty, decimal ConsumedQty, decimal ConsumedValue,
     decimal DeliveredQty, decimal ReturnedQty, decimal ReturnedValue);
 
 /// <summary>
 /// One output of a run stage. <c>AvailableToTransfer</c> is derived — produced − scrapped −
-/// transferred (FR-MFG-12) — and never stored. <c>UomId</c> is the WIP label and is null on
-/// the terminal output, whose unit is the finished item's base UOM.
+/// transferred (FR-MFG-12) — and never stored.
 /// </summary>
 public sealed record RunStageOutputDto(
-    int RunOutputId, int? ItemId, string Name, int? UomId,
+    int RunOutputId, int? ItemId, string Name, int UomId,
     decimal PlannedQty, decimal ProducedQty, decimal ScrappedQty, int? ScrapReasonCodeId,
     decimal TransferredQty, decimal AvailableToTransfer);
 

Backend/ERPCore/Dtos/Production/TemplateDtos.cs

@@ -35,11 +35,10 @@ public sealed record FieldDefDto(
 
 public sealed record StageInputDto(
     int InputId, StageInputSource Source, int? ItemId,
-    int? FromOutputId, string? FromOutputKey, StageQtyUnit QtyUnit, decimal QtyPerBatch);
+    int? FromOutputId, string? FromOutputKey, int UomId, decimal QtyPerBatch);
 
-/// <summary><c>UomId</c> is the WIP label and is null exactly when <c>ItemId</c> is set.</summary>
 public sealed record StageOutputDto(
-    int OutputId, string Key, int? ItemId, string Name, int? UomId, decimal QtyPerBatch);
+    int OutputId, string Key, int? ItemId, string Name, int UomId, decimal QtyPerBatch);
 
 public sealed record TemplateStageDto(
     int StageId, string Key, string Name, string? RoleLabel, int EstimatedMinutes,
@@ -135,12 +134,8 @@ public sealed class SaveInputRequest
     [StringLength(60)]
     public string? FromOutputKey { get; set; }
 
-    /// <summary>
-    /// What <see cref="QtyPerBatch"/> means. <c>Content</c> (ml/g) is allowed only on a Stock
-    /// input whose item has a content size; Upstream inputs must be <c>Pack</c>.
-    /// </summary>
-    [EnumDataType(typeof(StageQtyUnit))]
-    public StageQtyUnit QtyUnit { get; set; } = StageQtyUnit.Pack;
+    [Range(1, int.MaxValue)]
+    public int UomId { get; set; }
 
     [Range(0.0001, double.MaxValue)]
     public decimal QtyPerBatch { get; set; }
@@ -158,12 +153,8 @@ public sealed class SaveOutputRequest
     [Required, StringLength(150, MinimumLength = 1)]
     public string Name { get; set; } = string.Empty;
 
-    /// <summary>
-    /// The WIP display unit. Required when <see cref="ItemId"/> is null; must be null when it
-    /// is set, because a real item's unit is its own base UOM.
-    /// </summary>
     [Range(1, int.MaxValue)]
-    public int? UomId { get; set; }
+    public int UomId { get; set; }
 
     [Range(0.0001, double.MaxValue)]
     public decimal QtyPerBatch { get; set; }

Backend/ERPCore/Dtos/Sales/BundleSaleDtos.cs

@@ -4,7 +4,7 @@ using ERPCore.Domain.Enums;
 namespace ERPCore.Dtos.Sales;
 
 public sealed record BundleSaleLineDto(
-    int BundleSaleLineId, int ItemId, string Description, decimal Qty, int WarehouseId,
+    int BundleSaleLineId, int ItemId, string Description, decimal Qty, int UomId, int WarehouseId,
     decimal UnitPrice, decimal LineTotal, bool IncludeInBundle, bool IsComponent, int? ParentLineId);
 
 public sealed record BundleSaleDto(
@@ -20,7 +20,7 @@ public sealed record BundleSaleSummaryDto(
     decimal ComponentSubtotal, decimal BundlePrice, decimal GrandTotal, DateTime CreatedAt);
 
 public sealed record BundleSaleTemplateLineDto(
-    int BundleSaleTemplateLineId, int ItemId, int WarehouseId, decimal Qty,
+    int BundleSaleTemplateLineId, int ItemId, int UomId, int WarehouseId, decimal Qty,
     decimal UnitPrice, bool IncludeInBundle, int SortOrder);
 
 public sealed record BundleSaleTemplateDto(
@@ -42,6 +42,7 @@ public sealed record BundleSalePostingCheckDto(
 public sealed class CreateBundleSaleTemplateLineRequest
 {
     [Required] public int ItemId { get; set; }
+    [Required] public int UomId { get; set; }
     [Required] public int WarehouseId { get; set; }
     [Range(0.0001, double.MaxValue)] public decimal Qty { get; set; }
     [Range(0, double.MaxValue)] public decimal UnitPrice { get; set; }

Backend/ERPCore/Dtos/Sales/SalesInvoiceDtos.cs

@@ -4,7 +4,7 @@ using ERPCore.Domain.Enums;
 namespace ERPCore.Dtos.Sales;
 
 public sealed record SalesInvoiceLineDto(
-    int SalesInvoiceLineId, int ItemId, string Description, decimal Qty, decimal FreeQty,
+    int SalesInvoiceLineId, int ItemId, string Description, decimal Qty, decimal FreeQty, int UomId,
     int WarehouseId, decimal UnitPrice, decimal BaseCost, string PriceSource, decimal DiscountPct,
     decimal DiscountAmount, SalesDiscountMode DiscountMode, decimal NetUnitPrice, decimal LineTotal,
     decimal TaxPct, decimal TaxAmount, bool IsFreeIssue, int? ParentLineId);
@@ -35,6 +35,7 @@ public sealed record SalesInvoicePostingCheckDto(
 public sealed class CreateSalesInvoiceLineRequest
 {
     [Required] public int ItemId { get; set; }
+    [Required] public int UomId { get; set; }
     [Required] public int WarehouseId { get; set; }
     [Range(0.0001, double.MaxValue)] public decimal Qty { get; set; }
     [Range(0, double.MaxValue)] public decimal FreeQty { get; set; }

Backend/ERPCore/Dtos/Sales/SalesReturnDtos.cs

@@ -1,43 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using ERPCore.Domain.Enums;
-
-namespace ERPCore.Dtos.Sales;
-
-// Responses -----------------------------------------------------------------
-
-public sealed record SalesReturnLineDto(int ReturnLineId, int? SalesInvoiceLineId, int ItemId, decimal Qty);
-
-public sealed record SalesReturnDto(
-    int ReturnId, string DocNo, int CustomerId, int WarehouseId, int ReasonCodeId, ReturnStatus Status,
-    int CreatedBy, DateTime CreatedAt, IReadOnlyList<SalesReturnLineDto> Lines, IReadOnlyList<int> LedgerRefs);
-
-/// <summary>Row shape for <c>GET /sales-returns</c> — no lines/ledgerRefs (those need a per-row query).</summary>
-public sealed record SalesReturnSummaryDto(
-    int ReturnId, string DocNo, int CustomerId, int WarehouseId, int ReasonCodeId, ReturnStatus Status,
-    int CreatedBy, DateTime CreatedAt, int LineCount, decimal TotalQty);
-
-/// <summary>
-/// Remaining returnable qty for one sales invoice line — the invoiced qty minus
-/// whatever has already been returned against it. The invoice line's own <c>Qty</c>
-/// is never mutated by a return, so this is computed on read from return history.
-/// </summary>
-public sealed record SalesInvoiceLineRemainingDto(int SalesInvoiceLineId, decimal RemainingQty);
-
-// Requests --------------------------------------------------------------------
-
-public sealed class CreateSalesReturnLineInput
-{
-    /// <summary>Original sales invoice line, for traceability against the sale.</summary>
-    public int? SalesInvoiceLineId { get; set; }
-    [Required] public int ItemId { get; set; }
-    [Range(0.0001, double.MaxValue)] public decimal Qty { get; set; }
-}
-
-public sealed class CreateSalesReturnRequest
-{
-    [Required] public int CustomerId { get; set; }
-    [Required] public int WarehouseId { get; set; }
-    /// <summary>Nullable so an omitted value is a distinct <c>REASON_CODE_REQUIRED</c> error.</summary>
-    public int? ReasonCodeId { get; set; }
-    [Required, MinLength(1)] public List<CreateSalesReturnLineInput> Lines { get; set; } = new();
-}

Backend/ERPCore/Dtos/Sales/SalesSlipDtos.cs

@@ -4,7 +4,7 @@ using ERPCore.Domain.Enums;
 namespace ERPCore.Dtos.Sales;
 
 public sealed record SalesSlipLineDto(
-    int SalesSlipLineId, int ItemId, string Description, decimal Qty, decimal FreeQty,
+    int SalesSlipLineId, int ItemId, string Description, decimal Qty, decimal FreeQty, int UomId,
     int WarehouseId, decimal UnitPrice, decimal BaseCost, string PriceSource, decimal DiscountPct,
     decimal DiscountAmount, SalesDiscountMode DiscountMode, decimal NetUnitPrice, decimal LineTotal,
     decimal TaxPct, decimal TaxAmount, bool IsFreeIssue, int? ParentLineId);
@@ -34,7 +34,7 @@ public sealed record SalesSlipPostingCheckDto(
 public sealed record FreeIssueSummaryDto(
     int SalesSlipId, string SlipNo, SalesSlipStatus Status, DateTime CreatedAt,
     int WarehouseId, string WarehouseName, int ItemId, string ItemSku, string ItemName,
-    string UomName, decimal Qty, decimal FreeQty, string SchemeLabel);
+    int UomId, string UomName, decimal Qty, decimal FreeQty, string SchemeLabel);
 
 public sealed record FreeIssueDto(
     int SalesSlipId, string SlipNo, DateTime SlipDate, SalesSlipStatus Status,
@@ -45,6 +45,7 @@ public sealed record FreeIssueDto(
 public sealed class CreateSalesSlipLineRequest
 {
     [Required] public int ItemId { get; set; }
+    [Required] public int UomId { get; set; }
     [Required] public int WarehouseId { get; set; }
     [Range(0.0001, double.MaxValue)] public decimal Qty { get; set; }
     [Range(0, double.MaxValue)] public decimal FreeQty { get; set; }

Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleLineConfiguration.cs

@@ -18,6 +18,7 @@ public sealed class BundleSaleLineConfiguration : IEntityTypeConfiguration<Bundl
         builder.Property(x => x.IsComponent).HasDefaultValue(true);
 
         builder.HasOne(x => x.Item).WithMany().HasForeignKey(x => x.ItemId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.Uom).WithMany().HasForeignKey(x => x.UomId).OnDelete(DeleteBehavior.Restrict);
         builder.HasOne(x => x.Warehouse).WithMany().HasForeignKey(x => x.WarehouseId).OnDelete(DeleteBehavior.Restrict);
     }
 }

Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleTemplateLineConfiguration.cs

@@ -15,6 +15,7 @@ public sealed class BundleSaleTemplateLineConfiguration : IEntityTypeConfigurati
         builder.Property(x => x.SortOrder).HasDefaultValue(0);
 
         builder.HasOne(x => x.Item).WithMany().HasForeignKey(x => x.ItemId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.Uom).WithMany().HasForeignKey(x => x.UomId).OnDelete(DeleteBehavior.Restrict);
         builder.HasOne(x => x.Warehouse).WithMany().HasForeignKey(x => x.WarehouseId).OnDelete(DeleteBehavior.Restrict);
     }
 }

Backend/ERPCore/Infra/Persistence/Configurations/GrnConfiguration.cs

@@ -49,25 +49,8 @@ public sealed class GrnLineConfiguration : IEntityTypeConfiguration<GrnLine>
         builder.HasOne(l => l.Grn).WithMany(g => g.Lines).HasForeignKey(l => l.GrnId).OnDelete(DeleteBehavior.Cascade);
         builder.HasOne(l => l.PoLine).WithMany().HasForeignKey(l => l.PoLineId).OnDelete(DeleteBehavior.Restrict);
         builder.HasOne(l => l.Item).WithMany().HasForeignKey(l => l.ItemId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(l => l.Uom).WithMany().HasForeignKey(l => l.UomId).OnDelete(DeleteBehavior.Restrict);
         builder.HasOne(l => l.Bin).WithMany().HasForeignKey(l => l.BinId).OnDelete(DeleteBehavior.Restrict);
         builder.HasOne(l => l.Batch).WithMany().HasForeignKey(l => l.BatchId).OnDelete(DeleteBehavior.Restrict);
     }
 }
-
-public sealed class GrnLineWarrantyNumberConfiguration : IEntityTypeConfiguration<GrnLineWarrantyNumber>
-{
-    public void Configure(EntityTypeBuilder<GrnLineWarrantyNumber> builder)
-    {
-        builder.ToTable("grn_line_warranty_numbers");
-        builder.HasKey(w => w.GrnLineWarrantyNumberId);
-
-        builder.Property(w => w.WarrantyNo).IsRequired().HasMaxLength(100);
-
-        builder.HasOne(w => w.GrnLine).WithMany(l => l.WarrantyNumbers)
-            .HasForeignKey(w => w.GrnLineId).OnDelete(DeleteBehavior.Cascade);
-
-        // A warranty number entered twice on the same line is almost certainly a typo —
-        // catch it at the DB, not just client-side.
-        builder.HasIndex(w => new { w.GrnLineId, w.WarrantyNo }).IsUnique();
-    }
-}

Backend/ERPCore/Infra/Persistence/Configurations/ItemConfiguration.cs

@@ -22,23 +22,10 @@ public sealed class ItemConfiguration : IEntityTypeConfiguration<Item>
         // Sales-only fixed selling price; nullable (null ⇒ sell at stock/FIFO value).
         builder.Property(i => i.SalePrice).HasPrecision(18, 4);
 
-        // Optional content size (how much one stocked pack holds). All four are nullable
-        // together: null ⇒ the item has no measurable content. The base pair is derived
-        // server-side by ItemContent.Normalize and is only ever Ml or G.
-        builder.Property(i => i.ContentQty).HasPrecision(18, 4);
-        builder.Property(i => i.ContentBaseQty).HasPrecision(18, 4);
-        builder.Property(i => i.ContentUnit)
-            .HasConversion<string>().HasMaxLength(20);
-        builder.Property(i => i.ContentBaseUnit)
-            .HasConversion<string>().HasMaxLength(20);
-
         builder.Property(i => i.StockNature)
             .HasConversion<string>().HasMaxLength(20).IsRequired();
         builder.Property(i => i.TrackingMode)
             .HasConversion<string>().HasMaxLength(20).IsRequired();
-        builder.Property(i => i.Warranty)
-            .HasConversion<string>().HasMaxLength(20).IsRequired()
-            .HasDefaultValue(Warranty.NonWarranty);
         builder.Property(i => i.Status)
             .HasConversion<string>().HasMaxLength(20).IsRequired()
             .HasDefaultValue(EntityStatus.Active);

Backend/ERPCore/Infra/Persistence/Configurations/ItemTypeConfiguration.cs

@@ -19,11 +19,6 @@ public sealed class ItemTypeConfiguration : IEntityTypeConfiguration<ItemType>
         builder.Property(t => t.Name).IsRequired().HasMaxLength(200);
         builder.HasIndex(t => t.Name).IsUnique();
 
-        // false is the only safe default here: EF uses the CLR default as its "unset" sentinel,
-        // so if the store default were true, inserting an explicit false would be mistaken for
-        // "not set" and silently written as true. Sentinel and store default must agree.
-        builder.Property(t => t.IsMeasurable).IsRequired().HasDefaultValue(false);
-
         builder.Property(t => t.Status)
             .HasConversion<string>().HasMaxLength(20).IsRequired()
             .HasDefaultValue(EntityStatus.Active);

Backend/ERPCore/Infra/Persistence/Configurations/ProductionConfiguration.cs

@@ -91,13 +91,13 @@ public sealed class StageInputConfiguration : IEntityTypeConfiguration<StageInpu
         builder.HasKey(i => i.InputId);
 
         builder.Property(i => i.Source).HasConversion<string>().HasMaxLength(20).IsRequired();
-        builder.Property(i => i.QtyUnit).HasConversion<string>().HasMaxLength(20).IsRequired();
         builder.Property(i => i.QtyPerBatch).HasPrecision(18, 4);
 
         builder.HasOne(i => i.Stage).WithMany(s => s.Inputs)
             .HasForeignKey(i => i.StageId).OnDelete(DeleteBehavior.Cascade);
 
         builder.HasOne(i => i.Item).WithMany().HasForeignKey(i => i.ItemId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(i => i.Uom).WithMany().HasForeignKey(i => i.UomId).OnDelete(DeleteBehavior.Restrict);
         builder.HasOne(i => i.FromOutput).WithMany()
             .HasForeignKey(i => i.FromOutputId).OnDelete(DeleteBehavior.Restrict);
     }
@@ -206,7 +206,6 @@ public sealed class RunStageInputConfiguration : IEntityTypeConfiguration<RunSta
         builder.HasKey(i => i.RunInputId);
 
         builder.Property(i => i.Source).HasConversion<string>().HasMaxLength(20).IsRequired();
-        builder.Property(i => i.QtyUnit).HasConversion<string>().HasMaxLength(20).IsRequired();
         builder.Property(i => i.PlannedQty).HasPrecision(18, 4);
         builder.Property(i => i.ConsumedQty).HasPrecision(18, 4);
         builder.Property(i => i.ConsumedValue).HasPrecision(18, 4);
@@ -218,6 +217,7 @@ public sealed class RunStageInputConfiguration : IEntityTypeConfiguration<RunSta
             .HasForeignKey(i => i.RunStageId).OnDelete(DeleteBehavior.Cascade);
 
         builder.HasOne(i => i.Item).WithMany().HasForeignKey(i => i.ItemId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(i => i.Uom).WithMany().HasForeignKey(i => i.UomId).OnDelete(DeleteBehavior.Restrict);
         builder.HasOne(i => i.FromRunOutput).WithMany()
             .HasForeignKey(i => i.FromRunOutputId).OnDelete(DeleteBehavior.Restrict);
 

Backend/ERPCore/Infra/Persistence/Configurations/PurchaseOrderConfiguration.cs

@@ -63,6 +63,11 @@ public sealed class PoLineConfiguration : IEntityTypeConfiguration<PoLine>
             .HasForeignKey(l => l.ItemId)
             .OnDelete(DeleteBehavior.Restrict);
 
+        builder.HasOne(l => l.Uom)
+            .WithMany()
+            .HasForeignKey(l => l.UomId)
+            .OnDelete(DeleteBehavior.Restrict);
+
         builder.HasOne(l => l.Warehouse)
             .WithMany()
             .HasForeignKey(l => l.WarehouseId)

Backend/ERPCore/Infra/Persistence/Configurations/SalesInvoiceConfiguration.cs

@@ -79,6 +79,11 @@ public sealed class SalesInvoiceLineConfiguration : IEntityTypeConfiguration<Sal
         builder.Property(x => x.TaxPct).HasPrecision(9, 4);
         builder.Property(x => x.TaxAmount).HasPrecision(18, 4);
 
+        builder.HasOne(x => x.Uom)
+            .WithMany()
+            .HasForeignKey(x => x.UomId)
+            .OnDelete(DeleteBehavior.Restrict);
+
         builder.HasOne(x => x.Warehouse)
             .WithMany()
             .HasForeignKey(x => x.WarehouseId)

Backend/ERPCore/Infra/Persistence/Configurations/SalesReturnConfiguration.cs

@@ -1,40 +0,0 @@
-using ERPCore.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace ERPCore.Infra.Persistence.Configurations;
-
-public sealed class SalesReturnConfiguration : IEntityTypeConfiguration<SalesReturn>
-{
-    public void Configure(EntityTypeBuilder<SalesReturn> builder)
-    {
-        builder.ToTable("sales_returns");
-        builder.HasKey(r => r.ReturnId);
-
-        builder.Property(r => r.DocNo).IsRequired().HasMaxLength(30);
-        builder.HasIndex(r => r.DocNo).IsUnique();
-
-        builder.Property(r => r.Status).HasConversion<string>().HasMaxLength(20).IsRequired();
-        builder.Property(r => r.CreatedAt).IsRequired();
-
-        builder.HasOne(r => r.Customer).WithMany().HasForeignKey(r => r.CustomerId).OnDelete(DeleteBehavior.Restrict);
-        builder.HasOne(r => r.Warehouse).WithMany().HasForeignKey(r => r.WarehouseId).OnDelete(DeleteBehavior.Restrict);
-        builder.HasOne(r => r.ReasonCode).WithMany().HasForeignKey(r => r.ReasonCodeId).OnDelete(DeleteBehavior.Restrict);
-        builder.HasOne(r => r.Creator).WithMany().HasForeignKey(r => r.CreatedBy).OnDelete(DeleteBehavior.Restrict);
-    }
-}
-
-public sealed class SalesReturnLineConfiguration : IEntityTypeConfiguration<SalesReturnLine>
-{
-    public void Configure(EntityTypeBuilder<SalesReturnLine> builder)
-    {
-        builder.ToTable("sales_return_lines");
-        builder.HasKey(l => l.ReturnLineId);
-
-        builder.Property(l => l.Qty).HasPrecision(18, 4);
-
-        builder.HasOne(l => l.Return).WithMany(r => r.Lines).HasForeignKey(l => l.ReturnId).OnDelete(DeleteBehavior.Cascade);
-        builder.HasOne(l => l.SalesInvoiceLine).WithMany().HasForeignKey(l => l.SalesInvoiceLineId).OnDelete(DeleteBehavior.Restrict);
-        builder.HasOne(l => l.Item).WithMany().HasForeignKey(l => l.ItemId).OnDelete(DeleteBehavior.Restrict);
-    }
-}

Backend/ERPCore/Infra/Persistence/Configurations/SalesSlipConfiguration.cs

@@ -79,6 +79,11 @@ public sealed class SalesSlipLineConfiguration : IEntityTypeConfiguration<SalesS
         builder.Property(x => x.TaxPct).HasPrecision(9, 4);
         builder.Property(x => x.TaxAmount).HasPrecision(18, 4);
 
+        builder.HasOne(x => x.Uom)
+            .WithMany()
+            .HasForeignKey(x => x.UomId)
+            .OnDelete(DeleteBehavior.Restrict);
+
         builder.HasOne(x => x.Warehouse)
             .WithMany()
             .HasForeignKey(x => x.WarehouseId)

Backend/ERPCore/Infra/Persistence/Configurations/UomConversionConfiguration.cs

@@ -0,0 +1,34 @@
+using ERPCore.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class UomConversionConfiguration : IEntityTypeConfiguration<UomConversion>
+{
+    public void Configure(EntityTypeBuilder<UomConversion> builder)
+    {
+        builder.ToTable("uom_conversions");
+        builder.HasKey(c => c.ConversionId);
+
+        builder.Property(c => c.Factor).HasPrecision(18, 6);
+
+        builder.HasOne(c => c.Item)
+            .WithMany(i => i.UomConversions)
+            .HasForeignKey(c => c.ItemId)
+            .OnDelete(DeleteBehavior.Cascade);
+
+        builder.HasOne(c => c.FromUom)
+            .WithMany()
+            .HasForeignKey(c => c.FromUomId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.HasOne(c => c.ToUom)
+            .WithMany()
+            .HasForeignKey(c => c.ToUomId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        // One conversion per (item, from, to) triple.
+        builder.HasIndex(c => new { c.ItemId, c.FromUomId, c.ToUomId }).IsUnique();
+    }
+}

Backend/ERPCore/Infra/Persistence/DataSeeder.cs

@@ -285,18 +285,13 @@ public static class DataSeeder
             new Item
             {
                 Sku = "SKU-DEMO-002",
-                Name = "Demo Item 2 (500 ml)",
-                Description = "Secondary seeded sample item; carries a content size so the "
-                    + "production content-unit path has a fixture",
+                Name = "Demo Item 2",
+                Description = "Secondary seeded sample item for sales documents",
                 CategoryId = category.CategoryId,
                 BaseUomId = uom.UomId,
                 StockNature = StockNature.Stocked,
                 TrackingMode = TrackingMode.None,
                 SalePrice = 50m,
-                ContentQty = 500m,
-                ContentUnit = MeasureUnit.Ml,
-                ContentBaseQty = 500m,
-                ContentBaseUnit = MeasureUnit.Ml,
                 Status = EntityStatus.Active,
                 CreatedAt = now
             }
@@ -443,6 +438,7 @@ public static class DataSeeder
                 new BundleSaleTemplateLine
                 {
                     ItemId = items[0].ItemId,
+                    UomId = uom.UomId,
                     WarehouseId = warehouse.WarehouseId,
                     Qty = 1m,
                     UnitPrice = items[0].SalePrice.GetValueOrDefault(),
@@ -452,6 +448,7 @@ public static class DataSeeder
                 new BundleSaleTemplateLine
                 {
                     ItemId = items[1].ItemId,
+                    UomId = uom.UomId,
                     WarehouseId = warehouse.WarehouseId,
                     Qty = 1m,
                     UnitPrice = items[1].SalePrice.GetValueOrDefault(),
@@ -492,6 +489,7 @@ public static class DataSeeder
                         ItemId = items[0].ItemId,
                         Description = items[0].Name,
                         Qty = 1m,
+                        UomId = uom.UomId,
                         WarehouseId = warehouse.WarehouseId,
                         UnitPrice = items[0].SalePrice.GetValueOrDefault(),
                         LineTotal = items[0].SalePrice.GetValueOrDefault(),
@@ -503,6 +501,7 @@ public static class DataSeeder
                         ItemId = items[1].ItemId,
                         Description = items[1].Name,
                         Qty = 1m,
+                        UomId = uom.UomId,
                         WarehouseId = warehouse.WarehouseId,
                         UnitPrice = items[1].SalePrice.GetValueOrDefault(),
                         LineTotal = items[1].SalePrice.GetValueOrDefault(),
@@ -538,6 +537,7 @@ public static class DataSeeder
                         ItemId = items[0].ItemId,
                         Description = items[0].Name,
                         Qty = 1m,
+                        UomId = uom.UomId,
                         WarehouseId = warehouse.WarehouseId,
                         UnitPrice = items[0].SalePrice.GetValueOrDefault(),
                         LineTotal = items[0].SalePrice.GetValueOrDefault(),
@@ -549,6 +549,7 @@ public static class DataSeeder
                         ItemId = items[1].ItemId,
                         Description = items[1].Name,
                         Qty = 1m,
+                        UomId = uom.UomId,
                         WarehouseId = warehouse.WarehouseId,
                         UnitPrice = items[1].SalePrice.GetValueOrDefault(),
                         LineTotal = items[1].SalePrice.GetValueOrDefault(),
@@ -584,6 +585,7 @@ public static class DataSeeder
                         ItemId = items[0].ItemId,
                         Description = items[0].Name,
                         Qty = 1m,
+                        UomId = uom.UomId,
                         WarehouseId = secondaryWarehouse.WarehouseId,
                         UnitPrice = items[0].SalePrice.GetValueOrDefault(),
                         LineTotal = items[0].SalePrice.GetValueOrDefault(),
@@ -660,6 +662,7 @@ public static class DataSeeder
                         Description = postableItem.Name,
                         Qty = 2m,
                         FreeQty = 0m,
+                        UomId = uom.UomId,
                         WarehouseId = warehouse.WarehouseId,
                         UnitPrice = 100m,
                         BaseCost = 0m,
@@ -703,6 +706,7 @@ public static class DataSeeder
                         Description = shortageItem.Name,
                         Qty = 6m,
                         FreeQty = 0m,
+                        UomId = uom.UomId,
                         WarehouseId = secondaryWarehouse.WarehouseId,
                         UnitPrice = 50m,
                         BaseCost = 0m,
@@ -747,6 +751,7 @@ public static class DataSeeder
                         Description = postableItem.Name,
                         Qty = 1m,
                         FreeQty = 0m,
+                        UomId = uom.UomId,
                         WarehouseId = warehouse.WarehouseId,
                         UnitPrice = 100m,
                         BaseCost = 0m,
@@ -789,6 +794,7 @@ public static class DataSeeder
                         Description = postableItem.Name,
                         Qty = 1m,
                         FreeQty = 0m,
+                        UomId = uom.UomId,
                         WarehouseId = warehouse.WarehouseId,
                         UnitPrice = 50m,
                         BaseCost = 0m,
@@ -828,6 +834,7 @@ public static class DataSeeder
                         Description = shortageItem.Name,
                         Qty = 3m,
                         FreeQty = 0m,
+                        UomId = uom.UomId,
                         WarehouseId = secondaryWarehouse.WarehouseId,
                         UnitPrice = 50m,
                         BaseCost = 0m,

Backend/ERPCore/Infra/Persistence/ErpDbContext.cs

@@ -30,6 +30,7 @@ public class ErpDbContext : DbContext
     /// <summary>Color/Size/Material dimension names. Unlinked to Item by design (docs/10 C.9).</summary>
     public DbSet<ItemType> ItemTypes => Set<ItemType>();
     public DbSet<Uom> Uoms => Set<Uom>();
+    public DbSet<UomConversion> UomConversions => Set<UomConversion>();
     public DbSet<Item> Items => Set<Item>();
     public DbSet<ItemReorder> ItemReorders => Set<ItemReorder>();
     public DbSet<Vendor> Vendors => Set<Vendor>();
@@ -93,8 +94,6 @@ public class ErpDbContext : DbContext
     public DbSet<BundleSaleTemplateLine> BundleSaleTemplateLines => Set<BundleSaleTemplateLine>();
     public DbSet<BundleSale> BundleSales => Set<BundleSale>();
     public DbSet<BundleSaleLine> BundleSaleLines => Set<BundleSaleLine>();
-    public DbSet<SalesReturn> SalesReturns => Set<SalesReturn>();
-    public DbSet<SalesReturnLine> SalesReturnLines => Set<SalesReturnLine>();
 
     // --- Reference data (docs/10 Part C.7) ---
     public DbSet<ReasonCode> ReasonCodes => Set<ReasonCode>();

Backend/ERPCore/Migrations/20260804111315_a.Designer.cs

@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace ERPCore.Migrations
 {
     [DbContext(typeof(ErpDbContext))]
-    [Migration("20260811095944_AddItemTypeIsMeasurable")]
-    partial class AddItemTypeIsMeasurable
+    [Migration("20260804111315_a")]
+    partial class a
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -514,6 +514,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -523,6 +526,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("ItemId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("bundle_sale_lines", (string)null);
@@ -607,6 +612,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -616,6 +624,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("ItemId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("bundle_sale_template_lines", (string)null);
@@ -1517,6 +1527,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 6)
                         .HasColumnType("numeric(18,6)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<decimal>("VatAmount")
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
@@ -1537,6 +1550,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("PoLineId");
 
+                    b.HasIndex("UomId");
+
                     b.ToTable("grn_lines", (string)null);
                 });
 
@@ -1615,22 +1630,6 @@ namespace ERPCore.Migrations
                     b.Property<int>("CategoryId")
                         .HasColumnType("integer");
 
-                    b.Property<decimal?>("ContentBaseQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("ContentBaseUnit")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<decimal?>("ContentQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("ContentUnit")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("timestamp with time zone");
 
@@ -1751,11 +1750,6 @@ namespace ERPCore.Migrations
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<bool>("IsMeasurable")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(false);
-
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200)
@@ -2810,6 +2804,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -2819,6 +2816,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("PoId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("po_lines", (string)null);
@@ -3534,11 +3533,6 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
-                    b.Property<string>("QtyUnit")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
                     b.Property<decimal>("ReturnedQty")
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
@@ -3555,6 +3549,9 @@ namespace ERPCore.Migrations
                         .HasMaxLength(20)
                         .HasColumnType("character varying(20)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.HasKey("RunInputId");
 
                     b.HasIndex("FromRunOutputId");
@@ -3563,6 +3560,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("RunStageId");
 
+                    b.HasIndex("UomId");
+
                     b.ToTable("run_stage_inputs", (string)null);
                 });
 
@@ -3604,7 +3603,7 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
-                    b.Property<int?>("UomId")
+                    b.Property<int>("UomId")
                         .HasColumnType("integer");
 
                     b.HasKey("RunOutputId");
@@ -3870,6 +3869,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -3879,6 +3881,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("SalesInvoiceId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("sales_invoice_lines", (string)null);
@@ -4054,6 +4058,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -4063,6 +4070,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("SalesSlipId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("sales_slip_lines", (string)null);
@@ -4144,11 +4153,6 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
-                    b.Property<string>("QtyUnit")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
                     b.Property<string>("Source")
                         .IsRequired()
                         .HasMaxLength(20)
@@ -4157,6 +4161,9 @@ namespace ERPCore.Migrations
                     b.Property<int>("StageId")
                         .HasColumnType("integer");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.HasKey("InputId");
 
                     b.HasIndex("FromOutputId");
@@ -4165,6 +4172,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("StageId");
 
+                    b.HasIndex("UomId");
+
                     b.ToTable("stage_inputs", (string)null);
                 });
 
@@ -4191,7 +4200,7 @@ namespace ERPCore.Migrations
                     b.Property<int>("StageId")
                         .HasColumnType("integer");
 
-                    b.Property<int?>("UomId")
+                    b.Property<int>("UomId")
                         .HasColumnType("integer");
 
                     b.HasKey("OutputId");
@@ -5059,6 +5068,39 @@ namespace ERPCore.Migrations
                     b.ToTable("uoms", (string)null);
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
+                {
+                    b.Property<int>("ConversionId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ConversionId"));
+
+                    b.Property<decimal>("Factor")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("numeric(18,6)");
+
+                    b.Property<int>("FromUomId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ItemId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ToUomId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("ConversionId");
+
+                    b.HasIndex("FromUomId");
+
+                    b.HasIndex("ToUomId");
+
+                    b.HasIndex("ItemId", "FromUomId", "ToUomId")
+                        .IsUnique();
+
+                    b.ToTable("uom_conversions", (string)null);
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
                 {
                     b.Property<int>("UserId")
@@ -5441,6 +5483,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -5451,6 +5499,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("Item");
 
+                    b.Navigation("Uom");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -5468,6 +5518,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -5478,6 +5534,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("Item");
 
+                    b.Navigation("Uom");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -5705,6 +5763,12 @@ namespace ERPCore.Migrations
                         .HasForeignKey("PoLineId")
                         .OnDelete(DeleteBehavior.Restrict);
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.Navigation("Batch");
 
                     b.Navigation("Bin");
@@ -5714,6 +5778,8 @@ namespace ERPCore.Migrations
                     b.Navigation("Item");
 
                     b.Navigation("PoLine");
+
+                    b.Navigation("Uom");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
@@ -5920,6 +5986,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -5930,6 +6002,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("PurchaseOrder");
 
+                    b.Navigation("Uom");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -6250,11 +6324,19 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.Navigation("FromRunOutput");
 
                     b.Navigation("Item");
 
                     b.Navigation("RunStage");
+
+                    b.Navigation("Uom");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.RunStageOutput", b =>
@@ -6278,7 +6360,8 @@ namespace ERPCore.Migrations
                     b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
                         .WithMany()
                         .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict);
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
 
                     b.Navigation("Item");
 
@@ -6328,6 +6411,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -6338,6 +6427,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("SalesInvoice");
 
+                    b.Navigation("Uom");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -6382,6 +6473,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -6392,6 +6489,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("SalesSlip");
 
+                    b.Navigation("Uom");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -6451,11 +6550,19 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.Navigation("FromOutput");
 
                     b.Navigation("Item");
 
                     b.Navigation("Stage");
+
+                    b.Navigation("Uom");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.StageOutput", b =>
@@ -6474,7 +6581,8 @@ namespace ERPCore.Migrations
                     b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
                         .WithMany()
                         .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict);
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
 
                     b.Navigation("Item");
 
@@ -6762,6 +6870,33 @@ namespace ERPCore.Migrations
                     b.Navigation("Template");
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
+                {
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "FromUom")
+                        .WithMany()
+                        .HasForeignKey("FromUomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
+                        .WithMany("UomConversions")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "ToUom")
+                        .WithMany()
+                        .HasForeignKey("ToUomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("FromUom");
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ToUom");
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
                 {
                     b.HasOne("ERPCore.Domain.Entities.Role", "Role")
@@ -6843,6 +6978,8 @@ namespace ERPCore.Migrations
             modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
                 {
                     b.Navigation("ReorderSettings");
+
+                    b.Navigation("UomConversions");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.NavItem", b =>

Backend/ERPCore/Migrations/20260804111315_a.cs

@@ -9,7 +9,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace ERPCore.Migrations
 {
     /// <inheritdoc />
-    public partial class initial : Migration
+    public partial class a : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -611,10 +611,6 @@ namespace ERPCore.Migrations
                     TrackingMode = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
                     TaxClass = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: true),
                     SalePrice = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: true),
-                    ContentQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: true),
-                    ContentUnit = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: true),
-                    ContentBaseQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: true),
-                    ContentBaseUnit = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: true),
                     Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, defaultValue: "Active"),
                     CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
                     UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
@@ -1106,6 +1102,7 @@ namespace ERPCore.Migrations
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
                     BundleSaleTemplateId = table.Column<int>(type: "integer", nullable: false),
                     ItemId = table.Column<int>(type: "integer", nullable: false),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     WarehouseId = table.Column<int>(type: "integer", nullable: false),
                     Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     UnitPrice = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
@@ -1127,6 +1124,12 @@ namespace ERPCore.Migrations
                         principalTable: "items",
                         principalColumn: "ItemId",
                         onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_bundle_sale_template_lines_uoms_UomId",
+                        column: x => x.UomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
                         name: "FK_bundle_sale_template_lines_warehouses_WarehouseId",
                         column: x => x.WarehouseId,
@@ -1184,6 +1187,40 @@ namespace ERPCore.Migrations
                         onDelete: ReferentialAction.Restrict);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "uom_conversions",
+                columns: table => new
+                {
+                    ConversionId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ItemId = table.Column<int>(type: "integer", nullable: false),
+                    FromUomId = table.Column<int>(type: "integer", nullable: false),
+                    ToUomId = table.Column<int>(type: "integer", nullable: false),
+                    Factor = table.Column<decimal>(type: "numeric(18,6)", precision: 18, scale: 6, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_uom_conversions", x => x.ConversionId);
+                    table.ForeignKey(
+                        name: "FK_uom_conversions_items_ItemId",
+                        column: x => x.ItemId,
+                        principalTable: "items",
+                        principalColumn: "ItemId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_uom_conversions_uoms_FromUomId",
+                        column: x => x.FromUomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_uom_conversions_uoms_ToUomId",
+                        column: x => x.ToUomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
             migrationBuilder.CreateTable(
                 name: "role_permissions",
                 columns: table => new
@@ -1423,6 +1460,7 @@ namespace ERPCore.Migrations
                     ItemId = table.Column<int>(type: "integer", nullable: false),
                     Description = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
                     Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     WarehouseId = table.Column<int>(type: "integer", nullable: false),
                     UnitPrice = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     LineTotal = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
@@ -1445,6 +1483,12 @@ namespace ERPCore.Migrations
                         principalTable: "items",
                         principalColumn: "ItemId",
                         onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_bundle_sale_lines_uoms_UomId",
+                        column: x => x.UomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
                         name: "FK_bundle_sale_lines_warehouses_WarehouseId",
                         column: x => x.WarehouseId,
@@ -1464,6 +1508,7 @@ namespace ERPCore.Migrations
                     Description = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
                     Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     FreeQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     WarehouseId = table.Column<int>(type: "integer", nullable: false),
                     UnitPrice = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     BaseCost = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
@@ -1494,6 +1539,12 @@ namespace ERPCore.Migrations
                         principalTable: "sales_invoices",
                         principalColumn: "SalesInvoiceId",
                         onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_sales_invoice_lines_uoms_UomId",
+                        column: x => x.UomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
                         name: "FK_sales_invoice_lines_warehouses_WarehouseId",
                         column: x => x.WarehouseId,
@@ -1513,6 +1564,7 @@ namespace ERPCore.Migrations
                     Description = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
                     Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     FreeQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     WarehouseId = table.Column<int>(type: "integer", nullable: false),
                     UnitPrice = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     BaseCost = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
@@ -1543,6 +1595,12 @@ namespace ERPCore.Migrations
                         principalTable: "sales_slips",
                         principalColumn: "SalesSlipId",
                         onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_sales_slip_lines_uoms_UomId",
+                        column: x => x.UomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
                         name: "FK_sales_slip_lines_warehouses_WarehouseId",
                         column: x => x.WarehouseId,
@@ -1797,7 +1855,7 @@ namespace ERPCore.Migrations
                     StageId = table.Column<int>(type: "integer", nullable: false),
                     ItemId = table.Column<int>(type: "integer", nullable: true),
                     Name = table.Column<string>(type: "character varying(150)", maxLength: 150, nullable: false),
-                    UomId = table.Column<int>(type: "integer", nullable: true),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     QtyPerBatch = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
                 },
                 constraints: table =>
@@ -1876,6 +1934,7 @@ namespace ERPCore.Migrations
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
                     PoId = table.Column<int>(type: "integer", nullable: false),
                     ItemId = table.Column<int>(type: "integer", nullable: false),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     WarehouseId = table.Column<int>(type: "integer", nullable: false),
                     Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     UnitPrice = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
@@ -1897,6 +1956,12 @@ namespace ERPCore.Migrations
                         principalTable: "purchase_orders",
                         principalColumn: "PoId",
                         onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_po_lines_uoms_UomId",
+                        column: x => x.UomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
                         name: "FK_po_lines_warehouses_WarehouseId",
                         column: x => x.WarehouseId,
@@ -2038,7 +2103,7 @@ namespace ERPCore.Migrations
                     RunStageId = table.Column<int>(type: "integer", nullable: false),
                     ItemId = table.Column<int>(type: "integer", nullable: true),
                     Name = table.Column<string>(type: "character varying(150)", maxLength: 150, nullable: false),
-                    UomId = table.Column<int>(type: "integer", nullable: true),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     PlannedQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     ProducedQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     ScrappedQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
@@ -2084,7 +2149,7 @@ namespace ERPCore.Migrations
                     Source = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
                     ItemId = table.Column<int>(type: "integer", nullable: true),
                     FromOutputId = table.Column<int>(type: "integer", nullable: true),
-                    QtyUnit = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     QtyPerBatch = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
                 },
                 constraints: table =>
@@ -2108,6 +2173,12 @@ namespace ERPCore.Migrations
                         principalTable: "template_stages",
                         principalColumn: "StageId",
                         onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_stage_inputs_uoms_UomId",
+                        column: x => x.UomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
                 });
 
             migrationBuilder.CreateTable(
@@ -2119,6 +2190,7 @@ namespace ERPCore.Migrations
                     GrnId = table.Column<int>(type: "integer", nullable: false),
                     PoLineId = table.Column<int>(type: "integer", nullable: true),
                     ItemId = table.Column<int>(type: "integer", nullable: false),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     BinId = table.Column<int>(type: "integer", nullable: true),
                     BatchId = table.Column<int>(type: "integer", nullable: true),
                     Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
@@ -2165,6 +2237,12 @@ namespace ERPCore.Migrations
                         principalTable: "po_lines",
                         principalColumn: "PoLineId",
                         onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_grn_lines_uoms_UomId",
+                        column: x => x.UomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
                 });
 
             migrationBuilder.CreateTable(
@@ -2205,7 +2283,7 @@ namespace ERPCore.Migrations
                     Source = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
                     ItemId = table.Column<int>(type: "integer", nullable: true),
                     FromRunOutputId = table.Column<int>(type: "integer", nullable: true),
-                    QtyUnit = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
+                    UomId = table.Column<int>(type: "integer", nullable: false),
                     PlannedQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     ConsumedQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
                     ConsumedValue = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
@@ -2234,6 +2312,12 @@ namespace ERPCore.Migrations
                         principalTable: "run_stages",
                         principalColumn: "RunStageId",
                         onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_run_stage_inputs_uoms_UomId",
+                        column: x => x.UomId,
+                        principalTable: "uoms",
+                        principalColumn: "UomId",
+                        onDelete: ReferentialAction.Restrict);
                 });
 
             migrationBuilder.CreateTable(
@@ -2998,6 +3082,11 @@ namespace ERPCore.Migrations
                 table: "bundle_sale_lines",
                 column: "ItemId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_bundle_sale_lines_UomId",
+                table: "bundle_sale_lines",
+                column: "UomId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_bundle_sale_lines_WarehouseId",
                 table: "bundle_sale_lines",
@@ -3013,6 +3102,11 @@ namespace ERPCore.Migrations
                 table: "bundle_sale_template_lines",
                 column: "ItemId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_bundle_sale_template_lines_UomId",
+                table: "bundle_sale_template_lines",
+                column: "UomId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_bundle_sale_template_lines_WarehouseId",
                 table: "bundle_sale_template_lines",
@@ -3107,6 +3201,11 @@ namespace ERPCore.Migrations
                 table: "grn_lines",
                 column: "PoLineId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_grn_lines_UomId",
+                table: "grn_lines",
+                column: "UomId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_grns_CreatedBy",
                 table: "grns",
@@ -3586,6 +3685,11 @@ namespace ERPCore.Migrations
                 table: "po_lines",
                 column: "PoId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_po_lines_UomId",
+                table: "po_lines",
+                column: "UomId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_po_lines_WarehouseId",
                 table: "po_lines",
@@ -3831,6 +3935,11 @@ namespace ERPCore.Migrations
                 table: "run_stage_inputs",
                 column: "RunStageId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_run_stage_inputs_UomId",
+                table: "run_stage_inputs",
+                column: "UomId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_run_stage_outputs_ItemId",
                 table: "run_stage_outputs",
@@ -3871,6 +3980,11 @@ namespace ERPCore.Migrations
                 table: "sales_invoice_lines",
                 column: "SalesInvoiceId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_sales_invoice_lines_UomId",
+                table: "sales_invoice_lines",
+                column: "UomId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_sales_invoice_lines_WarehouseId",
                 table: "sales_invoice_lines",
@@ -3917,6 +4031,11 @@ namespace ERPCore.Migrations
                 table: "sales_slip_lines",
                 column: "SalesSlipId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_sales_slip_lines_UomId",
+                table: "sales_slip_lines",
+                column: "UomId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_sales_slip_lines_WarehouseId",
                 table: "sales_slip_lines",
@@ -3990,6 +4109,11 @@ namespace ERPCore.Migrations
                 table: "stage_inputs",
                 column: "StageId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_stage_inputs_UomId",
+                table: "stage_inputs",
+                column: "UomId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_stage_outputs_ItemId",
                 table: "stage_outputs",
@@ -4235,6 +4359,22 @@ namespace ERPCore.Migrations
                 table: "template_stages",
                 column: "TemplateId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_uom_conversions_FromUomId",
+                table: "uom_conversions",
+                column: "FromUomId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_uom_conversions_ItemId_FromUomId_ToUomId",
+                table: "uom_conversions",
+                columns: new[] { "ItemId", "FromUomId", "ToUomId" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_uom_conversions_ToUomId",
+                table: "uom_conversions",
+                column: "ToUomId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_uoms_Name",
                 table: "uoms",
@@ -4435,6 +4575,9 @@ namespace ERPCore.Migrations
             migrationBuilder.DropTable(
                 name: "stock_transfer_lines");
 
+            migrationBuilder.DropTable(
+                name: "uom_conversions");
+
             migrationBuilder.DropTable(
                 name: "vendor_quotation_lines");
 

Backend/ERPCore/Migrations/20260811095944_AddItemTypeIsMeasurable.cs

@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ERPCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddItemTypeIsMeasurable : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsMeasurable",
-                table: "item_types",
-                type: "boolean",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsMeasurable",
-                table: "item_types");
-        }
-    }
-}

Backend/ERPCore/Migrations/20260813091828_warrenty.cs

@@ -1,196 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace ERPCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class warrenty : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Warranty",
-                table: "items",
-                type: "character varying(20)",
-                maxLength: 20,
-                nullable: false,
-                defaultValue: "NonWarranty");
-
-            migrationBuilder.AddColumn<int>(
-                name: "WarrantyPeriodMonths",
-                table: "items",
-                type: "integer",
-                nullable: true);
-
-            migrationBuilder.CreateTable(
-                name: "grn_line_warranty_numbers",
-                columns: table => new
-                {
-                    GrnLineWarrantyNumberId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    GrnLineId = table.Column<int>(type: "integer", nullable: false),
-                    WarrantyNo = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
-                    WarrantyPeriodMonths = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_grn_line_warranty_numbers", x => x.GrnLineWarrantyNumberId);
-                    table.ForeignKey(
-                        name: "FK_grn_line_warranty_numbers_grn_lines_GrnLineId",
-                        column: x => x.GrnLineId,
-                        principalTable: "grn_lines",
-                        principalColumn: "GrnLineId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "sales_returns",
-                columns: table => new
-                {
-                    ReturnId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
-                    CustomerId = table.Column<int>(type: "integer", nullable: false),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    ReasonCodeId = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    CreatedBy = table.Column<int>(type: "integer", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_sales_returns", x => x.ReturnId);
-                    table.ForeignKey(
-                        name: "FK_sales_returns_customers_CustomerId",
-                        column: x => x.CustomerId,
-                        principalTable: "customers",
-                        principalColumn: "CustomerId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_sales_returns_reason_codes_ReasonCodeId",
-                        column: x => x.ReasonCodeId,
-                        principalTable: "reason_codes",
-                        principalColumn: "ReasonCodeId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_sales_returns_users_CreatedBy",
-                        column: x => x.CreatedBy,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_sales_returns_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "sales_return_lines",
-                columns: table => new
-                {
-                    ReturnLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ReturnId = table.Column<int>(type: "integer", nullable: false),
-                    SalesInvoiceLineId = table.Column<int>(type: "integer", nullable: true),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_sales_return_lines", x => x.ReturnLineId);
-                    table.ForeignKey(
-                        name: "FK_sales_return_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_sales_return_lines_sales_invoice_lines_SalesInvoiceLineId",
-                        column: x => x.SalesInvoiceLineId,
-                        principalTable: "sales_invoice_lines",
-                        principalColumn: "SalesInvoiceLineId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_sales_return_lines_sales_returns_ReturnId",
-                        column: x => x.ReturnId,
-                        principalTable: "sales_returns",
-                        principalColumn: "ReturnId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grn_line_warranty_numbers_GrnLineId_WarrantyNo",
-                table: "grn_line_warranty_numbers",
-                columns: new[] { "GrnLineId", "WarrantyNo" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sales_return_lines_ItemId",
-                table: "sales_return_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sales_return_lines_ReturnId",
-                table: "sales_return_lines",
-                column: "ReturnId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sales_return_lines_SalesInvoiceLineId",
-                table: "sales_return_lines",
-                column: "SalesInvoiceLineId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sales_returns_CreatedBy",
-                table: "sales_returns",
-                column: "CreatedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sales_returns_CustomerId",
-                table: "sales_returns",
-                column: "CustomerId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sales_returns_DocNo",
-                table: "sales_returns",
-                column: "DocNo",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sales_returns_ReasonCodeId",
-                table: "sales_returns",
-                column: "ReasonCodeId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sales_returns_WarehouseId",
-                table: "sales_returns",
-                column: "WarehouseId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "grn_line_warranty_numbers");
-
-            migrationBuilder.DropTable(
-                name: "sales_return_lines");
-
-            migrationBuilder.DropTable(
-                name: "sales_returns");
-
-            migrationBuilder.DropColumn(
-                name: "Warranty",
-                table: "items");
-
-            migrationBuilder.DropColumn(
-                name: "WarrantyPeriodMonths",
-                table: "items");
-        }
-    }
-}

Backend/ERPCore/Migrations/ErpDbContextModelSnapshot.cs

@@ -511,6 +511,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -520,6 +523,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("ItemId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("bundle_sale_lines", (string)null);
@@ -604,6 +609,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -613,6 +621,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("ItemId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("bundle_sale_template_lines", (string)null);
@@ -1514,6 +1524,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 6)
                         .HasColumnType("numeric(18,6)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<decimal>("VatAmount")
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
@@ -1534,36 +1547,11 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("PoLineId");
 
+                    b.HasIndex("UomId");
+
                     b.ToTable("grn_lines", (string)null);
                 });
 
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLineWarrantyNumber", b =>
-                {
-                    b.Property<int>("GrnLineWarrantyNumberId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnLineWarrantyNumberId"));
-
-                    b.Property<int>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("WarrantyNo")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<int>("WarrantyPeriodMonths")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnLineWarrantyNumberId");
-
-                    b.HasIndex("GrnLineId", "WarrantyNo")
-                        .IsUnique();
-
-                    b.ToTable("grn_line_warranty_numbers", (string)null);
-                });
-
             modelBuilder.Entity("ERPCore.Domain.Entities.HrDocumentType", b =>
                 {
                     b.Property<int>("HrDocumentTypeId")
@@ -1639,22 +1627,6 @@ namespace ERPCore.Migrations
                     b.Property<int>("CategoryId")
                         .HasColumnType("integer");
 
-                    b.Property<decimal?>("ContentBaseQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("ContentBaseUnit")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<decimal?>("ContentQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("ContentUnit")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("timestamp with time zone");
 
@@ -1712,16 +1684,6 @@ namespace ERPCore.Migrations
                     b.Property<DateTime?>("UpdatedAt")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<string>("Warranty")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("NonWarranty");
-
-                    b.Property<int?>("WarrantyPeriodMonths")
-                        .HasColumnType("integer");
-
                     b.HasKey("ItemId");
 
                     b.HasIndex("BaseUomId");
@@ -1785,11 +1747,6 @@ namespace ERPCore.Migrations
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<bool>("IsMeasurable")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(false);
-
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200)
@@ -2844,6 +2801,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -2853,6 +2813,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("PoId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("po_lines", (string)null);
@@ -3568,11 +3530,6 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
-                    b.Property<string>("QtyUnit")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
                     b.Property<decimal>("ReturnedQty")
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
@@ -3589,6 +3546,9 @@ namespace ERPCore.Migrations
                         .HasMaxLength(20)
                         .HasColumnType("character varying(20)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.HasKey("RunInputId");
 
                     b.HasIndex("FromRunOutputId");
@@ -3597,6 +3557,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("RunStageId");
 
+                    b.HasIndex("UomId");
+
                     b.ToTable("run_stage_inputs", (string)null);
                 });
 
@@ -3638,7 +3600,7 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
-                    b.Property<int?>("UomId")
+                    b.Property<int>("UomId")
                         .HasColumnType("integer");
 
                     b.HasKey("RunOutputId");
@@ -3904,6 +3866,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -3913,92 +3878,13 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("SalesInvoiceId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("sales_invoice_lines", (string)null);
                 });
 
-            modelBuilder.Entity("ERPCore.Domain.Entities.SalesReturn", b =>
-                {
-                    b.Property<int>("ReturnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CustomerId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("CustomerId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("sales_returns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SalesReturnLine", b =>
-                {
-                    b.Property<int>("ReturnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ReturnId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("SalesInvoiceLineId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("ReturnId");
-
-                    b.HasIndex("SalesInvoiceLineId");
-
-                    b.ToTable("sales_return_lines", (string)null);
-                });
-
             modelBuilder.Entity("ERPCore.Domain.Entities.SalesSlip", b =>
                 {
                     b.Property<int>("SalesSlipId")
@@ -4169,6 +4055,9 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("WarehouseId")
                         .HasColumnType("integer");
 
@@ -4178,6 +4067,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("SalesSlipId");
 
+                    b.HasIndex("UomId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("sales_slip_lines", (string)null);
@@ -4259,11 +4150,6 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
-                    b.Property<string>("QtyUnit")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
                     b.Property<string>("Source")
                         .IsRequired()
                         .HasMaxLength(20)
@@ -4272,6 +4158,9 @@ namespace ERPCore.Migrations
                     b.Property<int>("StageId")
                         .HasColumnType("integer");
 
+                    b.Property<int>("UomId")
+                        .HasColumnType("integer");
+
                     b.HasKey("InputId");
 
                     b.HasIndex("FromOutputId");
@@ -4280,6 +4169,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("StageId");
 
+                    b.HasIndex("UomId");
+
                     b.ToTable("stage_inputs", (string)null);
                 });
 
@@ -4306,7 +4197,7 @@ namespace ERPCore.Migrations
                     b.Property<int>("StageId")
                         .HasColumnType("integer");
 
-                    b.Property<int?>("UomId")
+                    b.Property<int>("UomId")
                         .HasColumnType("integer");
 
                     b.HasKey("OutputId");
@@ -5174,6 +5065,39 @@ namespace ERPCore.Migrations
                     b.ToTable("uoms", (string)null);
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
+                {
+                    b.Property<int>("ConversionId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ConversionId"));
+
+                    b.Property<decimal>("Factor")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("numeric(18,6)");
+
+                    b.Property<int>("FromUomId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ItemId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ToUomId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("ConversionId");
+
+                    b.HasIndex("FromUomId");
+
+                    b.HasIndex("ToUomId");
+
+                    b.HasIndex("ItemId", "FromUomId", "ToUomId")
+                        .IsUnique();
+
+                    b.ToTable("uom_conversions", (string)null);
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
                 {
                     b.Property<int>("UserId")
@@ -5556,6 +5480,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -5566,6 +5496,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("Item");
 
+                    b.Navigation("Uom");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -5583,6 +5515,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -5593,6 +5531,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("Item");
 
+                    b.Navigation("Uom");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -5820,6 +5760,12 @@ namespace ERPCore.Migrations
                         .HasForeignKey("PoLineId")
                         .OnDelete(DeleteBehavior.Restrict);
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.Navigation("Batch");
 
                     b.Navigation("Bin");
@@ -5829,17 +5775,8 @@ namespace ERPCore.Migrations
                     b.Navigation("Item");
 
                     b.Navigation("PoLine");
-                });
 
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLineWarrantyNumber", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany("WarrantyNumbers")
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("GrnLine");
+                    b.Navigation("Uom");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
@@ -6046,6 +5983,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -6056,6 +5999,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("PurchaseOrder");
 
+                    b.Navigation("Uom");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -6376,11 +6321,19 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.Navigation("FromRunOutput");
 
                     b.Navigation("Item");
 
                     b.Navigation("RunStage");
+
+                    b.Navigation("Uom");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.RunStageOutput", b =>
@@ -6404,7 +6357,8 @@ namespace ERPCore.Migrations
                     b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
                         .WithMany()
                         .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict);
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
 
                     b.Navigation("Item");
 
@@ -6454,6 +6408,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -6464,70 +6424,11 @@ namespace ERPCore.Migrations
 
                     b.Navigation("SalesInvoice");
 
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SalesReturn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Customer", "Customer")
-                        .WithMany()
-                        .HasForeignKey("CustomerId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Customer");
-
-                    b.Navigation("ReasonCode");
+                    b.Navigation("Uom");
 
                     b.Navigation("Warehouse");
                 });
 
-            modelBuilder.Entity("ERPCore.Domain.Entities.SalesReturnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.SalesReturn", "Return")
-                        .WithMany("Lines")
-                        .HasForeignKey("ReturnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.SalesInvoiceLine", "SalesInvoiceLine")
-                        .WithMany()
-                        .HasForeignKey("SalesInvoiceLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Return");
-
-                    b.Navigation("SalesInvoiceLine");
-                });
-
             modelBuilder.Entity("ERPCore.Domain.Entities.SalesSlip", b =>
                 {
                     b.HasOne("ERPCore.Domain.Entities.User", "CashierUser")
@@ -6569,6 +6470,12 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -6579,6 +6486,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("SalesSlip");
 
+                    b.Navigation("Uom");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -6638,11 +6547,19 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
+                        .WithMany()
+                        .HasForeignKey("UomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.Navigation("FromOutput");
 
                     b.Navigation("Item");
 
                     b.Navigation("Stage");
+
+                    b.Navigation("Uom");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.StageOutput", b =>
@@ -6661,7 +6578,8 @@ namespace ERPCore.Migrations
                     b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
                         .WithMany()
                         .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict);
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
 
                     b.Navigation("Item");
 
@@ -6949,6 +6867,33 @@ namespace ERPCore.Migrations
                     b.Navigation("Template");
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
+                {
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "FromUom")
+                        .WithMany()
+                        .HasForeignKey("FromUomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
+                        .WithMany("UomConversions")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ERPCore.Domain.Entities.Uom", "ToUom")
+                        .WithMany()
+                        .HasForeignKey("ToUomId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("FromUom");
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ToUom");
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
                 {
                     b.HasOne("ERPCore.Domain.Entities.Role", "Role")
@@ -7027,14 +6972,11 @@ namespace ERPCore.Migrations
                     b.Navigation("Lines");
                 });
 
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.Navigation("WarrantyNumbers");
-                });
-
             modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
                 {
                     b.Navigation("ReorderSettings");
+
+                    b.Navigation("UomConversions");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.NavItem", b =>
@@ -7106,11 +7048,6 @@ namespace ERPCore.Migrations
                     b.Navigation("Lines");
                 });
 
-            modelBuilder.Entity("ERPCore.Domain.Entities.SalesReturn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
             modelBuilder.Entity("ERPCore.Domain.Entities.SalesSlip", b =>
                 {
                     b.Navigation("Lines");

Backend/ERPCore/Program.cs

@@ -99,7 +99,7 @@ builder.Services.AddScoped<IRfqService, RfqService>();
 builder.Services.AddScoped<IPurchaseOrderService, PurchaseOrderService>();
 
 // Stock core + goods receipt (docs/11 §4–5)
-builder.Services.AddScoped<IItemMeasure, ItemMeasure>();
+builder.Services.AddScoped<IUomConverter, UomConverter>();
 builder.Services.AddScoped<IFifoCostingService, FifoCostingService>();
 builder.Services.AddScoped<IStockService, StockService>();
 builder.Services.AddScoped<IGrnService, GrnService>();
@@ -115,7 +115,6 @@ builder.Services.AddScoped<ISalesSlipService, SalesSlipService>();
 builder.Services.AddScoped<IBundleSaleService, BundleSaleService>();
 builder.Services.AddScoped<ISalesPromotionSuggestionService, SalesPromotionSuggestionService>();
 builder.Services.AddScoped<ISalesReportService, SalesReportService>();
-builder.Services.AddScoped<ISalesReturnService, SalesReturnService>();
 
 // Stock transactions + reference data (docs/11 §5–6)
 builder.Services.AddScoped<IStockMutator, StockMutator>();

Backend/ERPCore/Services/BundleSaleService.cs

@@ -19,6 +19,7 @@ public sealed class BundleSaleService : IBundleSaleService
     private readonly IRepository<BundleSale> _bundles;
     private readonly IRepository<Customer> _customers;
     private readonly IRepository<Item> _items;
+    private readonly IRepository<Uom> _uoms;
     private readonly IRepository<Warehouse> _warehouses;
     private readonly IRepository<User> _users;
     private readonly ISalesDomainService _sales;
@@ -32,6 +33,7 @@ public sealed class BundleSaleService : IBundleSaleService
         IRepository<BundleSaleTemplate> templates,
         IRepository<Customer> customers,
         IRepository<Item> items,
+        IRepository<Uom> uoms,
         IRepository<Warehouse> warehouses,
         IRepository<User> users,
         ISalesDomainService sales,
@@ -44,6 +46,7 @@ public sealed class BundleSaleService : IBundleSaleService
         _bundles = bundles;
         _customers = customers;
         _items = items;
+        _uoms = uoms;
         _warehouses = warehouses;
         _users = users;
         _sales = sales;
@@ -79,10 +82,10 @@ public sealed class BundleSaleService : IBundleSaleService
             template.CreatedAt,
             template.UpdatedAt,
             template.Lines.OrderBy(x => x.SortOrder).Select(x => new BundleSaleTemplateLineDto(
-                x.BundleSaleTemplateLineId, x.ItemId, x.WarehouseId, x.Qty, x.UnitPrice, x.IncludeInBundle, x.SortOrder)).ToList());
+                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, BundleSaleStatus? status, int? customerId, int? warehouseId, CancellationToken ct = default)
+    public async Task<PagedResponse<BundleSaleSummaryDto>> ListAsync(PageQuery query, int? customerId, int? warehouseId, CancellationToken ct = default)
     {
         IQueryable<BundleSale> q = _bundles.Query().AsNoTracking().Include(x => x.Lines);
         if (!string.IsNullOrWhiteSpace(query.Q))
@@ -90,7 +93,6 @@ 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);
@@ -190,6 +192,7 @@ public sealed class BundleSaleService : IBundleSaleService
             : template.Lines.OrderBy(x => x.SortOrder).Select(x => new CreateBundleSaleTemplateLineRequest
             {
                 ItemId = x.ItemId,
+                UomId = x.UomId,
                 WarehouseId = x.WarehouseId,
                 Qty = x.Qty,
                 UnitPrice = x.UnitPrice,
@@ -201,21 +204,21 @@ public sealed class BundleSaleService : IBundleSaleService
         {
             if (r.Qty <= 0)
                 throw new DomainException(ErrorCodes.Validation, "Bundle line quantity must be greater than zero.", 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;
-
+            if (r.WarehouseId != warehouseId)
+                throw new DomainException(ErrorCodes.Validation,
+                    $"Bundle line warehouse {r.WarehouseId} must match header warehouse {warehouseId}.", 422);
             var item = await _items.Query().AsNoTracking().FirstAsync(x => x.ItemId == r.ItemId, ct);
-            await _sales.ValidateSalesLineAsync(warehouseId, r.ItemId, lineWarehouseId, r.Qty, 0m, null, ct);
-            var calc = _sales.ComputeLine(r.Qty, 0m, r.UnitPrice, SalesDiscountMode.Amount, 0m, 0m, 0m, 0m, false);
+            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);
             lines.Add(new BundleSaleLine
             {
                 ItemId = r.ItemId,
                 Description = item.Name,
                 Qty = r.Qty,
-                WarehouseId = lineWarehouseId,
-                UnitPrice = r.UnitPrice,
+                UomId = r.UomId,
+                WarehouseId = r.WarehouseId,
+                UnitPrice = resolved.UnitPrice,
                 LineTotal = calc.LineTotal,
                 IncludeInBundle = r.IncludeInBundle,
                 IsComponent = true,
@@ -242,6 +245,6 @@ public sealed class BundleSaleService : IBundleSaleService
         x.BundleSaleId, x.BundleNo, x.BundleDate, x.CustomerId, x.CustomerSnapshotName, x.WarehouseId, x.CashierUserId, x.BundleSaleTemplateId,
         x.BundleName, x.BundleCode, x.Status, x.ComponentSubtotal, x.BundlePrice, x.MarginAmount, x.DiscountTotal, x.TaxTotal, x.GrandTotal,
         x.CreatedAt, x.UpdatedAt,
-        x.Lines.Select(l => new BundleSaleLineDto(l.BundleSaleLineId, l.ItemId, l.Description, l.Qty, l.WarehouseId, l.UnitPrice, l.LineTotal, l.IncludeInBundle, l.IsComponent, l.ParentLineId)).ToList());
+        x.Lines.Select(l => new BundleSaleLineDto(l.BundleSaleLineId, l.ItemId, l.Description, l.Qty, l.UomId, l.WarehouseId, l.UnitPrice, l.LineTotal, l.IncludeInBundle, l.IsComponent, l.ParentLineId)).ToList());
 
 }

Backend/ERPCore/Services/GrnService.cs

@@ -28,12 +28,14 @@ public sealed class GrnService : IGrnService
     private readonly IRepository<PurchaseOrder> _pos;
     private readonly IRepository<PoLine> _poLines;
     private readonly IRepository<Item> _items;
+    private readonly IRepository<Uom> _uoms;
     private readonly IRepository<Warehouse> _warehouses;
     private readonly IRepository<Bin> _bins;
     private readonly IRepository<Vendor> _vendors;
     private readonly IRepository<Batch> _batches;
     private readonly IRepository<StockLayer> _layers;
     private readonly IRepository<StockLedger> _ledger;
+    private readonly IUomConverter _uomConverter;
     private readonly IFifoCostingService _fifo;
     private readonly INumberSequenceService _numbers;
     private readonly ICurrentUser _currentUser;
@@ -41,21 +43,23 @@ public sealed class GrnService : IGrnService
 
     public GrnService(
         IRepository<Grn> grns, IRepository<PurchaseOrder> pos, IRepository<PoLine> poLines,
-        IRepository<Item> items, IRepository<Warehouse> warehouses,
+        IRepository<Item> items, IRepository<Uom> uoms, IRepository<Warehouse> warehouses,
         IRepository<Bin> bins, IRepository<Vendor> vendors, IRepository<Batch> batches,
-        IRepository<StockLayer> layers, IRepository<StockLedger> ledger,
+        IRepository<StockLayer> layers, IRepository<StockLedger> ledger, IUomConverter uomConverter,
         IFifoCostingService fifo, INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow)
     {
         _grns = grns;
         _pos = pos;
         _poLines = poLines;
         _items = items;
+        _uoms = uoms;
         _warehouses = warehouses;
         _bins = bins;
         _vendors = vendors;
         _batches = batches;
         _layers = layers;
         _ledger = ledger;
+        _uomConverter = uomConverter;
         _fifo = fifo;
         _numbers = numbers;
         _currentUser = currentUser;
@@ -91,7 +95,7 @@ public sealed class GrnService : IGrnService
     public async Task<GrnDto?> GetAsync(int grnId, CancellationToken ct = default)
     {
         var grn = await _grns.Query().AsNoTracking()
-            .Include(g => g.Lines).ThenInclude(l => l.WarrantyNumbers)
+            .Include(g => g.Lines)
             .FirstOrDefaultAsync(g => g.GrnId == grnId, ct);
         return grn is null ? null : Map(grn);
     }
@@ -129,6 +133,8 @@ public sealed class GrnService : IGrnService
         {
             var item = await _items.Query().AsNoTracking().FirstOrDefaultAsync(i => i.ItemId == input.ItemId, ct)
                 ?? throw new DomainException(ErrorCodes.Validation, $"Item {input.ItemId} does not exist.", 422);
+            if (!await _uoms.Query().AnyAsync(u => u.UomId == input.UomId, ct))
+                throw new DomainException(ErrorCodes.Validation, $"UOM {input.UomId} does not exist.", 422);
             if (input.BinId is not null && !await _bins.Query().AnyAsync(b => b.BinId == input.BinId && b.WarehouseId == request.WarehouseId, ct))
                 throw new DomainException(ErrorCodes.Validation, $"Bin {input.BinId} is not in warehouse {request.WarehouseId}.", 422);
 
@@ -144,8 +150,6 @@ public sealed class GrnService : IGrnService
                 if (poLine.ItemId != input.ItemId)
                     throw new DomainException(ErrorCodes.Validation, $"PO line {input.PoLineId} is for a different item.", 422);
 
-                // Both sides are counts of the item's base UOM — the GRN line no longer carries
-                // a unit of its own — so this comparison and the accrual below are like-for-like.
                 var openQty = poLine.Qty - poLine.QtyReceived;
                 if (input.Qty > openQty * (1 + OverReceiptTolerance))
                     throw new DomainException(ErrorCodes.OverReceiptTolerance,
@@ -165,12 +169,12 @@ public sealed class GrnService : IGrnService
             var vatAmount = Math.Round(receivedValue * input.VatPct / 100m, 4, MidpointRounding.AwayFromZero);
 
             var batch = await ResolveBatchAsync(item, input.Batch, batchCache, ct);
-            var warrantyNumbers = ResolveWarrantyNumbers(item, input.WarrantyNumbers, input.Qty);
 
             lines.Add(new GrnLine
             {
                 PoLineId = input.PoLineId,
                 ItemId = input.ItemId,
+                UomId = input.UomId,
                 BinId = input.BinId,
                 Batch = batch, // navigation so EF fixes up BatchId once the batch is inserted
                 Qty = input.Qty,
@@ -182,8 +186,7 @@ public sealed class GrnService : IGrnService
                 VatAmount = vatAmount,
                 ReceivedValue = receivedValue,
                 LineTotal = receivedValue + vatAmount,
-                HoldStatus = input.HoldStatus,
-                WarrantyNumbers = warrantyNumbers
+                HoldStatus = input.HoldStatus
             });
         }
 
@@ -231,11 +234,10 @@ public sealed class GrnService : IGrnService
         {
             foreach (var line in grn.Lines.OrderBy(l => l.GrnLineId))
             {
+                var item = await _items.Query().AsNoTracking().FirstAsync(i => i.ItemId == line.ItemId, token);
                 // FIFO layer costs at the after-discount net price; VAT is recoverable and never
-                // enters stock value (docs/10 FR-GRN-06, revised). The line quantity is already
-                // a count of the item's base UOM, so it layers exactly as entered.
-                var qtyBase = line.Qty;
-                var unitCostBase = line.NetUnitCost;
+                // enters stock value (docs/10 FR-GRN-06, revised).
+                var (qtyBase, unitCostBase) = await ToBaseAsync(item, line.UomId, line.Qty, line.NetUnitCost, token);
 
                 var layer = await _fifo.CreateInboundLayerAsync(
                     line.ItemId, grn.WarehouseId, line.BatchId, null, line.GrnLineId,
@@ -344,28 +346,13 @@ public sealed class GrnService : IGrnService
     }
 
     /// <summary>
-    /// A warranty-tracked item requires exactly one warranty number per received unit —
-    /// same shape of rule as <see cref="ResolveBatchAsync"/> for batch tracking. The coverage
-    /// period is not entered at receipt; it is snapshotted from <see cref="Item.WarrantyPeriodMonths"/>,
-    /// which the item must have been given at creation (<see cref="ItemService"/> enforces that).
+    /// Delegates to the shared <see cref="IUomConverter"/>. This was a private method here
+    /// until manufacturing needed the same conversion for stage stock inputs; behaviour is
+    /// identical, so receive costing is unchanged.
     /// </summary>
-    private static List<GrnLineWarrantyNumber> ResolveWarrantyNumbers(Item item, List<string>? numbers, decimal qty)
-    {
-        if (item.Warranty != Warranty.Warranty) return new List<GrnLineWarrantyNumber>();
-        if (item.WarrantyPeriodMonths is null)
-            throw new DomainException(
-                ErrorCodes.Validation, $"Item {item.Sku} is under warranty but has no warranty period configured.", 422);
-
-        var trimmed = (numbers ?? new List<string>()).Select(n => n.Trim()).Where(n => n.Length > 0).ToList();
-        if (trimmed.Count != qty)
-            throw new DomainException(
-                ErrorCodes.Validation,
-                $"Item {item.Sku} is under warranty; provide exactly {qty} warranty number(s), got {trimmed.Count}.", 422);
-        if (trimmed.Distinct(StringComparer.OrdinalIgnoreCase).Count() != trimmed.Count)
-            throw new DomainException(ErrorCodes.Validation, $"Warranty numbers for item {item.Sku} must be unique.", 422);
-
-        return trimmed.Select(n => new GrnLineWarrantyNumber { WarrantyNo = n, WarrantyPeriodMonths = item.WarrantyPeriodMonths.Value }).ToList();
-    }
+    private Task<(decimal QtyBase, decimal UnitCostBase)> ToBaseAsync(
+        Item item, int uomId, decimal qty, decimal unitCostPerUom, CancellationToken ct)
+        => _uomConverter.ToBaseAsync(item, uomId, qty, unitCostPerUom, ct);
 
     private async Task UpdatePoStatusAsync(int? poId, CancellationToken ct)
     {
@@ -405,9 +392,8 @@ public sealed class GrnService : IGrnService
     private static GrnDto Map(Grn g) => new(
         g.GrnId, g.DocNo, g.PoId, g.VendorId, g.WarehouseId, g.Status, g.CreatedBy, g.CreatedAt, g.PostedAt,
         g.Lines.OrderBy(l => l.GrnLineId).Select(l => new GrnLineDto(
-            l.GrnLineId, l.PoLineId, l.ItemId, l.BinId, l.Qty, l.UnitCost, l.PoUnitPrice,
+            l.GrnLineId, l.PoLineId, l.ItemId, l.UomId, l.BinId, l.Qty, l.UnitCost, l.PoUnitPrice,
             l.DiscountPct, l.NetUnitCost, l.VatPct, l.VatAmount, l.ReceivedValue, l.LineTotal,
             l.PoUnitPrice is null ? 0m : Math.Round((l.UnitCost - l.PoUnitPrice.Value) * l.Qty, 4, MidpointRounding.AwayFromZero),
-            l.HoldStatus, l.BatchId,
-            l.WarrantyNumbers.Select(w => new GrnLineWarrantyNumberDto(w.WarrantyNo, w.WarrantyPeriodMonths)).ToList())).ToList());
+            l.HoldStatus, l.BatchId)).ToList());
 }

Backend/ERPCore/Services/Interfaces/IBundleSaleService.cs

@@ -1,5 +1,4 @@
 using ERPCore.Common.Http;
-using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Sales;
 
@@ -9,7 +8,7 @@ public interface IBundleSaleService
 {
     Task<PagedResponse<BundleSaleTemplateSummaryDto>> ListTemplatesAsync(PageQuery query, CancellationToken ct = default);
     Task<BundleSaleTemplateDto?> GetTemplateAsync(int bundleSaleTemplateId, CancellationToken ct = default);
-    Task<PagedResponse<BundleSaleSummaryDto>> ListAsync(PageQuery query, BundleSaleStatus? status, int? customerId, int? warehouseId, CancellationToken ct = default);
+    Task<PagedResponse<BundleSaleSummaryDto>> ListAsync(PageQuery query, int? customerId, int? warehouseId, CancellationToken ct = default);
     Task<BundleSaleDto?> GetAsync(int bundleSaleId, CancellationToken ct = default);
     Task<BundleSalePostingCheckDto> CheckPostingAsync(int bundleSaleId, CancellationToken ct = default);
     Task<BundleSaleDto> CreateAsync(CreateBundleSaleRequest request, CancellationToken ct = default);

Backend/ERPCore/Services/Interfaces/IItemMeasure.cs

@@ -1,25 +0,0 @@
-using ERPCore.Domain.Entities;
-using ERPCore.Domain.Enums;
-
-namespace ERPCore.Services.Interfaces;
-
-/// <summary>
-/// Resolves a production formula quantity to the only unit stock speaks: a count of the
-/// item's base UOM. Replaces the old per-item UOM conversion table — everything needed is
-/// on the item row, so this does no I/O.
-/// </summary>
-public interface IItemMeasure
-{
-    /// <summary>
-    /// Formula quantity → packs. <see cref="StageQtyUnit.Pack"/> passes straight through;
-    /// <see cref="StageQtyUnit.Content"/> divides by the item's content size, so 2000 ml of
-    /// a 500 ml bottle is 4 bottles and 300 ml is 0.6 of one.
-    /// </summary>
-    decimal ToPacks(Item item, decimal formulaQty, StageQtyUnit unit);
-
-    /// <summary>Packs → formula quantity. The exact inverse of <see cref="ToPacks"/>, for display.</summary>
-    decimal FromPacks(Item item, decimal packs, StageQtyUnit unit);
-
-    /// <summary>Whether the item carries a usable content size.</summary>
-    bool HasContent(Item item);
-}

Backend/ERPCore/Services/Interfaces/IItemService.cs

@@ -24,4 +24,6 @@ public interface IItemService
     Task SetStatusAsync(int itemId, EntityStatus status, CancellationToken ct = default);
 
     Task<ItemReorderSettingsDto> UpdateReorderAsync(int itemId, UpdateReorderRequest request, CancellationToken ct = default);
+
+    Task<ItemUomConversionsDto> UpdateUomConversionsAsync(int itemId, UpdateUomConversionsRequest request, CancellationToken ct = default);
 }

Backend/ERPCore/Services/Interfaces/ISalesDomainService.cs

@@ -15,6 +15,7 @@ public interface ISalesDomainService
     Task ValidateSalesLineAsync(
         int headerWarehouseId,
         int lineItemId,
+        int lineUomId,
         int lineWarehouseId,
         decimal qty,
         decimal freeQty,

Backend/ERPCore/Services/Interfaces/ISalesReturnService.cs

@@ -1,18 +0,0 @@
-using ERPCore.Dtos.Common;
-using ERPCore.Dtos.Sales;
-
-namespace ERPCore.Services.Interfaces;
-
-/// <summary>Sales-return business logic — customer returns, mirroring purchase-return logic reversed.</summary>
-public interface ISalesReturnService
-{
-    Task<PagedResponse<SalesReturnSummaryDto>> ListAsync(
-        PageQuery query, int? customerId, int? warehouseId, CancellationToken ct = default);
-
-    Task<SalesReturnDto?> GetAsync(int returnId, CancellationToken ct = default);
-
-    Task<SalesReturnDto> CreateAsync(CreateSalesReturnRequest request, CancellationToken ct = default);
-
-    /// <summary>Remaining returnable qty per line of one sales invoice (invoiced qty minus already-returned).</summary>
-    Task<IReadOnlyList<SalesInvoiceLineRemainingDto>> GetRemainingByInvoiceAsync(int salesInvoiceId, CancellationToken ct = default);
-}

Backend/ERPCore/Services/Interfaces/IUomConverter.cs

@@ -0,0 +1,35 @@
+using ERPCore.Domain.Entities;
+
+namespace ERPCore.Services.Interfaces;
+
+/// <summary>
+/// Converts a quantity and its per-UOM cost into the item's <b>base</b> UOM.
+/// </summary>
+/// <remarks>
+/// <para>Everything in the FIFO engine — <c>StockLayer</c>, <c>StockLedger</c>,
+/// <c>IFifoCostingService.ConsumeAsync</c> — works exclusively in base UOM, while
+/// documents let a user enter a line in any UOM the item has a conversion for. This is the
+/// one place that bridges the two.</para>
+/// <para>Extracted from <c>GrnService</c>'s private <c>ToBaseAsync</c> when manufacturing
+/// needed the same conversion for stage stock inputs (docs/30 never mentions UOM
+/// conversion, but <c>STAGE_INPUT.uom_id</c> is a free FK — without this, an input
+/// specified in "Box of 12" would consume 1 base unit instead of 12 and silently
+/// mis-cost the run).</para>
+/// </remarks>
+public interface IUomConverter
+{
+    /// <summary>
+    /// Returns the quantity and unit cost restated in <paramref name="item"/>'s base UOM.
+    /// A no-op when <paramref name="uomId"/> already is the base UOM. Throws 422 when no
+    /// conversion is defined for the item from that UOM to its base.
+    /// </summary>
+    Task<(decimal QtyBase, decimal UnitCostBase)> ToBaseAsync(
+        Item item, int uomId, decimal qty, decimal unitCostPerUom, CancellationToken ct = default);
+
+    /// <summary>
+    /// Quantity-only conversion, for callers that have no per-UOM cost to restate (a
+    /// production stage input declares a quantity; its cost comes from the FIFO layers it
+    /// consumes, not from the document).
+    /// </summary>
+    Task<decimal> ToBaseQtyAsync(Item item, int uomId, decimal qty, CancellationToken ct = default);
+}

Backend/ERPCore/Services/ItemContent.cs

@@ -1,61 +0,0 @@
-using ERPCore.Domain.Enums;
-using ERPCore.System.Errors;
-
-namespace ERPCore.Services;
-
-/// <summary>
-/// Item content-size rules: validate the (qty, unit) pair and normalise it to a base
-/// unit. Pure — no DI, no database — because everything it needs is on the item row.
-/// <para>
-/// Litres and kilograms exist only at the point of entry. Everything stored and every
-/// downstream calculation works in millilitres or grams, so no consumer ever has to ask
-/// which unit it is holding.
-/// </para>
-/// </summary>
-public static class ItemContent
-{
-    /// <summary>
-    /// Rejects a half-filled pair. Both null is valid and means "this item has no
-    /// measurable content" — a screw, a label, a service.
-    /// </summary>
-    public static void ValidatePair(decimal? contentQty, MeasureUnit? contentUnit)
-    {
-        if (contentQty is null && contentUnit is null) return;
-
-        if (contentQty is null || contentUnit is null)
-            throw new DomainException(
-                ErrorCodes.Validation,
-                "contentQty and contentUnit must be supplied together, or both left null.", 422);
-
-        if (contentQty <= 0)
-            throw new DomainException(
-                ErrorCodes.Validation, "contentQty must be greater than zero.", 422);
-    }
-
-    /// <summary>
-    /// Converts an entered content size to its base unit: L → Ml and Kg → G, both ×1000;
-    /// Ml and G pass through. Both-null in, both-null out.
-    /// <para>
-    /// Rounded to 4dp AwayFromZero to match the quantity columns' <c>(18,4)</c> scale and
-    /// <c>ProductionRunService.Scale</c>, so a content size can never carry precision the
-    /// database would silently drop.
-    /// </para>
-    /// </summary>
-    public static (decimal? BaseQty, MeasureUnit? BaseUnit) Normalize(
-        decimal? contentQty, MeasureUnit? contentUnit)
-    {
-        if (contentQty is null || contentUnit is null) return (null, null);
-
-        var (factor, baseUnit) = contentUnit.Value switch
-        {
-            MeasureUnit.Ml => (1m, MeasureUnit.Ml),
-            MeasureUnit.L => (1000m, MeasureUnit.Ml),
-            MeasureUnit.G => (1m, MeasureUnit.G),
-            MeasureUnit.Kg => (1000m, MeasureUnit.G),
-            _ => throw new DomainException(
-                ErrorCodes.Validation, $"Unsupported content unit '{contentUnit}'.", 422)
-        };
-
-        return (Math.Round(contentQty.Value * factor, 4, MidpointRounding.AwayFromZero), baseUnit);
-    }
-}

Backend/ERPCore/Services/ItemService.cs

@@ -31,8 +31,6 @@ public sealed class ItemService : IItemService
     private readonly IRepository<Uom> _uoms;
     private readonly IRepository<Vendor> _vendors;
     private readonly IRepository<Warehouse> _warehouses;
-    private readonly IRepository<StockLayer> _stockLayers;
-    private readonly IRepository<StockLedger> _stockLedger;
     private readonly IProductConfigService _config;
     private readonly IUnitOfWork _uow;
 
@@ -44,8 +42,6 @@ public sealed class ItemService : IItemService
         IRepository<Uom> uoms,
         IRepository<Vendor> vendors,
         IRepository<Warehouse> warehouses,
-        IRepository<StockLayer> stockLayers,
-        IRepository<StockLedger> stockLedger,
         IProductConfigService config,
         IUnitOfWork uow)
     {
@@ -56,8 +52,6 @@ public sealed class ItemService : IItemService
         _uoms = uoms;
         _vendors = vendors;
         _warehouses = warehouses;
-        _stockLayers = stockLayers;
-        _stockLedger = stockLedger;
         _config = config;
         _uow = uow;
     }
@@ -85,9 +79,7 @@ public sealed class ItemService : IItemService
             .Select(i => new ItemListItemDto(
                 i.ItemId, i.Sku, i.Name, i.CategoryId, i.SubCategoryId, i.BrandId,
                 i.BaseUomId, i.DefaultVendorId,
-                i.StockNature, i.TrackingMode, i.Warranty, i.WarrantyPeriodMonths, i.TaxClass, i.SalePrice,
-                i.ContentQty, i.ContentUnit, i.ContentBaseQty, i.ContentBaseUnit,
-                i.Status))
+                i.StockNature, i.TrackingMode, i.TaxClass, i.SalePrice, i.Status))
             .ToListAsync(ct);
 
         return PagedResponse<ItemListItemDto>.Create(rows, query.Page, query.PageSize, total);
@@ -97,6 +89,7 @@ public sealed class ItemService : IItemService
     {
         var item = await _items.Query().AsNoTracking()
             .Include(i => i.ReorderSettings)
+            .Include(i => i.UomConversions)
             .FirstOrDefaultAsync(i => i.ItemId == itemId, ct);
 
         return item is null ? null : new ETagged<ItemDetailDto>(ToDetail(item), item.RowVersion);
@@ -111,10 +104,6 @@ public sealed class ItemService : IItemService
             request.CategoryId, request.SubCategoryId, request.BrandId,
             request.BaseUomId, request.DefaultVendorId, ct);
 
-        ItemContent.ValidatePair(request.ContentQty, request.ContentUnit);
-        var (contentBaseQty, contentBaseUnit) = ItemContent.Normalize(request.ContentQty, request.ContentUnit);
-        var warrantyPeriodMonths = ValidateWarrantyPeriod(request.Warranty, request.WarrantyPeriodMonths);
-
         var item = new Item
         {
             Sku = request.Sku.Trim(),
@@ -127,14 +116,8 @@ public sealed class ItemService : IItemService
             DefaultVendorId = request.DefaultVendorId,
             StockNature = request.StockNature,
             TrackingMode = request.TrackingMode,
-            Warranty = request.Warranty,
-            WarrantyPeriodMonths = warrantyPeriodMonths,
             TaxClass = request.TaxClass,
             SalePrice = request.SalePrice,
-            ContentQty = request.ContentQty,
-            ContentUnit = request.ContentUnit,
-            ContentBaseQty = contentBaseQty,
-            ContentBaseUnit = contentBaseUnit,
             Status = EntityStatus.Active,
             CreatedAt = DateTime.UtcNow
         };
@@ -150,6 +133,7 @@ public sealed class ItemService : IItemService
     {
         var item = await _items.Query()
             .Include(i => i.ReorderSettings)
+            .Include(i => i.UomConversions)
             .FirstOrDefaultAsync(i => i.ItemId == itemId, ct)
             ?? throw new NotFoundException($"Item {itemId} was not found.");
 
@@ -164,19 +148,6 @@ public sealed class ItemService : IItemService
             request.CategoryId, request.SubCategoryId, request.BrandId,
             request.BaseUomId, request.DefaultVendorId, ct);
 
-        // The base UOM is the sole meaning of every quantity recorded against this item —
-        // stock layers, ledger rows and document lines are all plain counts of it. Once any
-        // of that history exists, changing it would silently reinterpret every one of those
-        // numbers (240 bottles becoming 240 cases), so it is frozen instead.
-        if (item.BaseUomId != request.BaseUomId && await HasStockHistoryAsync(itemId, ct))
-            throw new DomainException(
-                ErrorCodes.MasterInUse,
-                $"Item {itemId} has stock history; its base UOM can no longer be changed.", 409);
-
-        ItemContent.ValidatePair(request.ContentQty, request.ContentUnit);
-        var (contentBaseQty, contentBaseUnit) = ItemContent.Normalize(request.ContentQty, request.ContentUnit);
-        var warrantyPeriodMonths = ValidateWarrantyPeriod(request.Warranty, request.WarrantyPeriodMonths);
-
         item.Sku = request.Sku.Trim();
         item.Name = request.Name.Trim();
         item.Description = request.Description;
@@ -187,14 +158,8 @@ public sealed class ItemService : IItemService
         item.DefaultVendorId = request.DefaultVendorId;
         item.StockNature = request.StockNature;
         item.TrackingMode = request.TrackingMode;
-        item.Warranty = request.Warranty;
-        item.WarrantyPeriodMonths = warrantyPeriodMonths;
         item.TaxClass = request.TaxClass;
         item.SalePrice = request.SalePrice;
-        item.ContentQty = request.ContentQty;
-        item.ContentUnit = request.ContentUnit;
-        item.ContentBaseQty = contentBaseQty;
-        item.ContentBaseUnit = contentBaseUnit;
         item.UpdatedAt = DateTime.UtcNow;
 
         await SaveGuardingConcurrencyAsync(ct);
@@ -259,14 +224,52 @@ public sealed class ItemService : IItemService
         return new ItemReorderSettingsDto(settings);
     }
 
-    /// <summary>
-    /// Whether anything has ever been recorded against this item's stock. Checks the ledger
-    /// as well as live layers, because a fully consumed item has no layer left but its
-    /// history still reads in the old unit.
-    /// </summary>
-    private async Task<bool> HasStockHistoryAsync(int itemId, CancellationToken ct)
-        => await _stockLayers.Query().AnyAsync(l => l.ItemId == itemId, ct)
-           || await _stockLedger.Query().AnyAsync(l => l.ItemId == itemId, ct);
+    public async Task<ItemUomConversionsDto> UpdateUomConversionsAsync(
+        int itemId, UpdateUomConversionsRequest request, CancellationToken ct = default)
+    {
+        var pairs = request.Conversions.Select(c => (c.FromUom, c.ToUom)).ToList();
+        if (pairs.Distinct().Count() != pairs.Count)
+            throw new DomainException(ErrorCodes.Validation, "Duplicate (fromUom, toUom) in conversions.", 400);
+
+        var item = await _items.Query()
+            .Include(i => i.UomConversions)
+            .FirstOrDefaultAsync(i => i.ItemId == itemId, ct)
+            ?? throw new NotFoundException($"Item {itemId} was not found.");
+
+        foreach (var uomId in request.Conversions.SelectMany(c => new[] { c.FromUom, c.ToUom }).Distinct())
+            if (!await _uoms.Query().AnyAsync(u => u.UomId == uomId, ct))
+                throw new DomainException(ErrorCodes.Validation, $"UOM {uomId} does not exist.", 422);
+
+        foreach (var stale in item.UomConversions.Where(c => request.Conversions.All(r => r.FromUom != c.FromUomId || r.ToUom != c.ToUomId)).ToList())
+            item.UomConversions.Remove(stale);
+        foreach (var input in request.Conversions)
+        {
+            var existing = item.UomConversions.FirstOrDefault(c => c.FromUomId == input.FromUom && c.ToUomId == input.ToUom);
+            if (existing is null)
+            {
+                item.UomConversions.Add(new UomConversion
+                {
+                    ItemId = itemId,
+                    FromUomId = input.FromUom,
+                    ToUomId = input.ToUom,
+                    Factor = input.Factor
+                });
+            }
+            else
+            {
+                existing.Factor = input.Factor;
+            }
+        }
+
+        item.UpdatedAt = DateTime.UtcNow;
+        await _uow.SaveChangesAsync(ct);
+
+        var conversions = item.UomConversions
+            .OrderBy(c => c.ConversionId)
+            .Select(c => new UomConversionDto(c.ConversionId, c.FromUomId, c.ToUomId, c.Factor))
+            .ToList();
+        return new ItemUomConversionsDto(item.ItemId, item.BaseUomId, conversions);
+    }
 
     /// <summary>
     /// Validates every FK on an item write, and gates the optional ones on the product
@@ -332,23 +335,6 @@ public sealed class ItemService : IItemService
         }
     }
 
-    /// <summary>
-    /// A warranty-tracked item must declare a coverage period (one of
-    /// <see cref="WarrantyPeriods.AllowedMonths"/>); a non-warranty item carries none —
-    /// any value sent for one is silently dropped rather than trusted from the client.
-    /// </summary>
-    private static int? ValidateWarrantyPeriod(Warranty warranty, int? warrantyPeriodMonths)
-    {
-        if (warranty != Warranty.Warranty) return null;
-
-        if (warrantyPeriodMonths is null || !WarrantyPeriods.AllowedMonths.Contains(warrantyPeriodMonths.Value))
-            throw new DomainException(
-                ErrorCodes.Validation,
-                $"Warranty period must be one of {string.Join(", ", WarrantyPeriods.AllowedMonths)} months.", 422);
-
-        return warrantyPeriodMonths;
-    }
-
     private async Task SaveGuardingConcurrencyAsync(CancellationToken ct)
     {
         try
@@ -364,12 +350,14 @@ public sealed class ItemService : IItemService
     private static ItemDetailDto ToDetail(Item i) => new(
         i.ItemId, i.Sku, i.Name, i.Description, i.CategoryId, i.SubCategoryId, i.BrandId,
         i.BaseUomId, i.DefaultVendorId,
-        i.StockNature, i.TrackingMode, i.Warranty, i.WarrantyPeriodMonths, i.TaxClass, i.SalePrice,
-        i.ContentQty, i.ContentUnit, i.ContentBaseQty, i.ContentBaseUnit,
-        i.Status,
+        i.StockNature, i.TrackingMode, i.TaxClass, i.SalePrice, i.Status,
         i.ReorderSettings
             .OrderBy(r => r.WarehouseId)
             .Select(r => new ItemReorderDto(r.WarehouseId, r.ReorderPoint, r.ReorderQty))
             .ToList(),
+        i.UomConversions
+            .OrderBy(c => c.ConversionId)
+            .Select(c => new UomConversionDto(c.ConversionId, c.FromUomId, c.ToUomId, c.Factor))
+            .ToList(),
         i.CreatedAt, i.UpdatedAt);
 }

Backend/ERPCore/Services/ItemTypeService.cs

@@ -41,7 +41,7 @@ public sealed class ItemTypeService : IItemTypeService
         var total = await q.CountAsync(ct);
         var rows = await q.OrderBy(t => t.Name)
             .Skip(query.Skip).Take(query.PageSize)
-            .Select(t => new ItemTypeDto(t.ItemTypeId, t.Name, t.IsMeasurable, t.Status, t.CreatedAt, t.UpdatedAt))
+            .Select(t => new ItemTypeDto(t.ItemTypeId, t.Name, t.Status, t.CreatedAt, t.UpdatedAt))
             .ToListAsync(ct);
 
         return PagedResponse<ItemTypeDto>.Create(rows, query.Page, query.PageSize, total);
@@ -63,7 +63,6 @@ public sealed class ItemTypeService : IItemTypeService
         var itemType = new ItemType
         {
             Name = name,
-            IsMeasurable = request.IsMeasurable,
             Status = EntityStatus.Active,
             CreatedAt = DateTime.UtcNow
         };
@@ -91,9 +90,6 @@ public sealed class ItemTypeService : IItemTypeService
         // Renaming does not touch existing items: their SKUs already encode the values that
         // were chosen, and nothing joins back to this row (docs/10 Part C.9).
         itemType.Name = name;
-        // Omitted ⇒ keep what is stored. A plain bool would bind an absent property as false and
-        // so let a name-only PUT silently clear the flag on every rename.
-        itemType.IsMeasurable = request.IsMeasurable ?? itemType.IsMeasurable;
         itemType.UpdatedAt = DateTime.UtcNow;
 
         try
@@ -118,5 +114,5 @@ public sealed class ItemTypeService : IItemTypeService
         await _uow.SaveChangesAsync(ct);
     }
 
-    private static ItemTypeDto Map(ItemType t) => new(t.ItemTypeId, t.Name, t.IsMeasurable, t.Status, t.CreatedAt, t.UpdatedAt);
+    private static ItemTypeDto Map(ItemType t) => new(t.ItemTypeId, t.Name, t.Status, t.CreatedAt, t.UpdatedAt);
 }

Backend/ERPCore/Services/Production/ProductionGraphValidator.cs

@@ -21,10 +21,9 @@ namespace ERPCore.Services.Production;
 /// </remarks>
 public static class ProductionGraphValidator
 {
-    public sealed record InputDraft(
-        int Index, StageInputSource Source, int? ItemId, string? FromOutputKey, StageQtyUnit QtyUnit);
+    public sealed record InputDraft(int Index, StageInputSource Source, int? ItemId, string? FromOutputKey);
 
-    public sealed record OutputDraft(string Key, string Name, int? ItemId, int? UomId);
+    public sealed record OutputDraft(string Key, string Name, int? ItemId);
 
     public sealed record StageDraft(
         string Key, string Name, IReadOnlyList<InputDraft> Inputs, IReadOnlyList<OutputDraft> Outputs);
@@ -172,12 +171,6 @@ public static class ProductionGraphValidator
                         throw new DomainException(ErrorCodes.GraphInputSourceInvalid,
                             $"Input {input.Index + 1} of stage '{s.Name}' is a Stock input and cannot reference an upstream output.", 422);
                 }
-
-                // WIP has no content size — it is counted in whatever unit its source output
-                // declares — so only a Stock input may be expressed in ml/g.
-                if (input.Source == StageInputSource.Upstream && input.QtyUnit != StageQtyUnit.Pack)
-                    throw new DomainException(ErrorCodes.GraphInputSourceInvalid,
-                        $"Input {input.Index + 1} of stage '{s.Name}' is Upstream, so its quantity must be in whole units of its source output, not content units.", 422);
             }
         }
 
@@ -196,20 +189,6 @@ public static class ProductionGraphValidator
             foreach (var o in s.Outputs.Where(o => o.ItemId is not null))
                 throw Invalid(
                     $"Output '{o.Name}' of stage '{s.Name}' is intermediate work-in-progress and cannot reference an item — only the final stage produces a stocked item.");
-
-        // 7 — output units. An item-bearing output already has a unit (the item's base UOM),
-        // so carrying a second one could only contradict it. WIP has no item to ask, so it
-        // must name its own — the label the run board and any downstream input display.
-        foreach (var s in stages)
-            foreach (var o in s.Outputs)
-            {
-                if (o.ItemId is null && o.UomId is null)
-                    throw new DomainException(ErrorCodes.WipUnitRequired,
-                        $"Output '{o.Name}' of stage '{s.Name}' is work-in-progress and must declare a unit.", 422);
-                if (o.ItemId is not null && o.UomId is not null)
-                    throw Invalid(
-                        $"Output '{o.Name}' of stage '{s.Name}' references an item, so its unit comes from that item and must not be set.");
-            }
     }
 
     /// <summary>Set of keys reachable from <paramref name="roots"/> following <paramref name="next"/>.</summary>

Backend/ERPCore/Services/Production/ProductionRunService.cs

@@ -26,7 +26,7 @@ public sealed class ProductionRunService : IProductionRunService
     private readonly IRepository<Item> _items;
     private readonly IRepository<ReasonCode> _reasonCodes;
     private readonly IFifoCostingService _fifo;
-    private readonly IItemMeasure _measure;
+    private readonly IUomConverter _uomConverter;
     private readonly INumberSequenceService _numbers;
     private readonly IUnitOfWork _uow;
     private readonly ICurrentUser _currentUser;
@@ -35,7 +35,7 @@ public sealed class ProductionRunService : IProductionRunService
         IRepository<ProductionRun> runs, IRepository<ProductionTemplate> templates,
         IRepository<Warehouse> warehouses, IRepository<Bin> bins,
         IRepository<Item> items, IRepository<ReasonCode> reasonCodes,
-        IFifoCostingService fifo, IItemMeasure measure,
+        IFifoCostingService fifo, IUomConverter uomConverter,
         INumberSequenceService numbers, IUnitOfWork uow, ICurrentUser currentUser)
     {
         _runs = runs;
@@ -45,7 +45,7 @@ public sealed class ProductionRunService : IProductionRunService
         _items = items;
         _reasonCodes = reasonCodes;
         _fifo = fifo;
-        _measure = measure;
+        _uomConverter = uomConverter;
         _numbers = numbers;
         _uow = uow;
         _currentUser = currentUser;
@@ -245,7 +245,7 @@ public sealed class ProductionRunService : IProductionRunService
                     Source = i.Source,
                     ItemId = i.ItemId,
                     FromRunOutput = i.FromOutputId is null ? null : outputByTemplateOutputId[i.FromOutputId.Value],
-                    QtyUnit = i.QtyUnit,
+                    UomId = i.UomId,
                     PlannedQty = Scale(i.QtyPerBatch, ratio)
                 });
             }
@@ -367,11 +367,9 @@ public sealed class ProductionRunService : IProductionRunService
                     ?? throw new DomainException(ErrorCodes.Validation,
                         $"Item {input.ItemId} on stage '{stage.Name}' no longer exists.", 422);
 
-                // PlannedQty is in the input's declared unit — content (ml/g) for an item with
-                // a content size, otherwise packs. ConsumedQty is always packs, the only unit
-                // FIFO and the ledger speak, so resolve before comparing. 2000 ml of a 500 ml
-                // bottle is 4 bottles; 300 ml is 0.6 of one, which (18,4) stores exactly.
-                var plannedBase = _measure.ToPacks(item, input.PlannedQty, input.QtyUnit);
+                // PlannedQty is in the input's declared UOM; ConsumedQty is in the item's
+                // base UOM (the only unit FIFO and the ledger speak). Compare in base.
+                var plannedBase = await _uomConverter.ToBaseQtyAsync(item, input.UomId, input.PlannedQty, token);
                 var delta = plannedBase - input.ConsumedQty;
                 if (delta <= 0) continue; // rework restart with no increase — nothing to draw
 
@@ -1059,9 +1057,7 @@ public sealed class ProductionRunService : IProductionRunService
                 $"Item {item.Sku} is {item.TrackingMode}-tracked; batch/serial-tracked finished goods "
                 + "are not supported in this phase.", 422);
 
-        // Output quantities are always a count of the finished item's base UOM — produced and
-        // scrapped are recorded in whole bottles, not millilitres — so nothing to resolve.
-        var qtyBase = good;
+        var qtyBase = await _uomConverter.ToBaseQtyAsync(item, output.UomId, good, ct);
 
         var consumedValue = run.Stages.SelectMany(s => s.Inputs).Sum(i => i.ConsumedValue);
         var returnedValue = run.Stages.SelectMany(s => s.Inputs).Sum(i => i.ReturnedValue);
@@ -1227,7 +1223,7 @@ public sealed class ProductionRunService : IProductionRunService
                 ProductionJson.Deserialize<List<FieldDefDto>>(s.FieldDefs, []),
                 ParseJson(s.FieldValues),
                 s.Inputs.OrderBy(i => i.RunInputId).Select(i => new RunStageInputDto(
-                    i.RunInputId, i.Source, i.ItemId, i.FromRunOutputId, i.QtyUnit,
+                    i.RunInputId, i.Source, i.ItemId, i.FromRunOutputId, i.UomId,
                     i.PlannedQty, i.ConsumedQty, i.ConsumedValue,
                     i.DeliveredQty, i.ReturnedQty, i.ReturnedValue)).ToList(),
                 s.Outputs.OrderBy(o => o.RunOutputId).Select(o => new RunStageOutputDto(

Backend/ERPCore/Services/Production/ProductionTemplateService.cs

@@ -253,20 +253,19 @@ public sealed class ProductionTemplateService : IProductionTemplateService
         ProductionGraphValidator.Validate(
             request.Stages.Select(s => new ProductionGraphValidator.StageDraft(
                 s.Key, s.Name,
-                s.Inputs.Select((i, idx) => new ProductionGraphValidator.InputDraft(idx, i.Source, i.ItemId, i.FromOutputKey, i.QtyUnit)).ToList(),
-                s.Outputs.Select(o => new ProductionGraphValidator.OutputDraft(o.Key, o.Name, o.ItemId, o.UomId)).ToList())).ToList(),
+                s.Inputs.Select((i, idx) => new ProductionGraphValidator.InputDraft(idx, i.Source, i.ItemId, i.FromOutputKey)).ToList(),
+                s.Outputs.Select(o => new ProductionGraphValidator.OutputDraft(o.Key, o.Name, o.ItemId)).ToList())).ToList(),
             request.Edges.Select(e => new ProductionGraphValidator.EdgeDraft(e.ParentKey, e.ChildKey)).ToList());
 
         var itemIds = request.Stages
             .SelectMany(s => s.Inputs.Select(i => i.ItemId).Concat(s.Outputs.Select(o => o.ItemId)))
             .OfType<int>().Distinct().ToList();
 
-        var contentByItem = new Dictionary<int, decimal?>();
         if (itemIds.Count > 0)
         {
             var found = await _items.Query().AsNoTracking()
                 .Where(i => itemIds.Contains(i.ItemId))
-                .Select(i => new { i.ItemId, i.Status, i.ContentBaseQty })
+                .Select(i => new { i.ItemId, i.Status })
                 .ToListAsync(ct);
 
             var missing = itemIds.Except(found.Select(f => f.ItemId)).ToList();
@@ -278,42 +277,19 @@ public sealed class ProductionTemplateService : IProductionTemplateService
             if (inactive.Count > 0)
                 throw new DomainException(ErrorCodes.Validation,
                     $"Item(s) {string.Join(", ", inactive)} are inactive and cannot be used in a template.", 422);
-
-            contentByItem = found.ToDictionary(f => f.ItemId, f => f.ContentBaseQty);
         }
 
-        // A Content quantity is only meaningful against an item that declares a content size,
-        // and it must still land on a storable pack count: quantities persist at (18,4), so
-        // anything under 0.0001 packs would round to zero and consume nothing at stage start.
-        foreach (var s in request.Stages)
-            foreach (var i in s.Inputs.Where(i => i.QtyUnit == StageQtyUnit.Content))
-            {
-                var contentBaseQty = contentByItem.GetValueOrDefault(i.ItemId ?? 0);
-                if (contentBaseQty is not > 0m)
-                    throw new DomainException(ErrorCodes.Validation,
-                        $"Stage '{s.Name}' has an input in content units, but item {i.ItemId} has no content size.", 422);
-
-                if (i.QtyPerBatch / contentBaseQty.Value < 0.0001m)
-                    throw new DomainException(ErrorCodes.Validation,
-                        $"Stage '{s.Name}': {i.QtyPerBatch} is less than 0.0001 of item {i.ItemId}'s content size ({contentBaseQty}), which would round to no stock at all.", 422);
-            }
-
-        // Only WIP outputs carry a UOM now; the validator has already rejected one on an
-        // item-bearing output, so every non-null id here belongs to real work-in-progress.
         var uomIds = request.Stages
-            .SelectMany(s => s.Outputs.Select(o => o.UomId))
-            .OfType<int>().Distinct().ToList();
+            .SelectMany(s => s.Inputs.Select(i => i.UomId).Concat(s.Outputs.Select(o => o.UomId)))
+            .Distinct().ToList();
 
-        if (uomIds.Count > 0)
-        {
-            var knownUoms = await _uoms.Query().AsNoTracking()
-                .Where(u => uomIds.Contains(u.UomId)).Select(u => u.UomId).ToListAsync(ct);
+        var knownUoms = await _uoms.Query().AsNoTracking()
+            .Where(u => uomIds.Contains(u.UomId)).Select(u => u.UomId).ToListAsync(ct);
 
-            var missingUoms = uomIds.Except(knownUoms).ToList();
-            if (missingUoms.Count > 0)
-                throw new DomainException(ErrorCodes.Validation,
-                    $"UOM(s) {string.Join(", ", missingUoms)} do not exist.", 422);
-        }
+        var missingUoms = uomIds.Except(knownUoms).ToList();
+        if (missingUoms.Count > 0)
+            throw new DomainException(ErrorCodes.Validation,
+                $"UOM(s) {string.Join(", ", missingUoms)} do not exist.", 422);
 
         // Annotations go into jsonb unvalidated by anything else, so pin the one field the
         // client renders off. Unknown kinds would round-trip fine but draw nothing.
@@ -452,7 +428,7 @@ public sealed class ProductionTemplateService : IProductionTemplateService
                     Source = i.Source,
                     ItemId = i.Source == StageInputSource.Stock ? i.ItemId : null,
                     FromOutput = i.Source == StageInputSource.Upstream ? outputsByKey[i.FromOutputKey!] : null,
-                    QtyUnit = i.QtyUnit,
+                    UomId = i.UomId,
                     QtyPerBatch = i.QtyPerBatch
                 });
             }
@@ -500,7 +476,7 @@ public sealed class ProductionTemplateService : IProductionTemplateService
                 s.Inputs.OrderBy(i => i.InputId).Select(i => new StageInputDto(
                     i.InputId, i.Source, i.ItemId, i.FromOutputId,
                     i.FromOutputId is null ? null : outputKeyById.GetValueOrDefault(i.FromOutputId.Value),
-                    i.QtyUnit, i.QtyPerBatch)).ToList(),
+                    i.UomId, i.QtyPerBatch)).ToList(),
                 s.Outputs.OrderBy(o => o.OutputId).Select(o => new StageOutputDto(
                     o.OutputId, o.OutputId.ToString(), o.ItemId, o.Name, o.UomId, o.QtyPerBatch)).ToList()))
             .ToList();

Backend/ERPCore/Services/PurchaseOrderService.cs

@@ -222,6 +222,7 @@ public sealed class PurchaseOrderService : IPurchaseOrderService
     private static PoLine ToLine(CreatePoLineInput l) => new()
     {
         ItemId = l.ItemId,
+        UomId = l.UomId,
         WarehouseId = l.WarehouseId,
         Qty = l.Qty,
         UnitPrice = l.UnitPrice,
@@ -257,6 +258,7 @@ public sealed class PurchaseOrderService : IPurchaseOrderService
             throw new DomainException(ErrorCodes.Validation, $"Requisition {requisitionId} does not exist.", 422);
 
         await EnsureAllExistAsync(_items.Query().Select(i => i.ItemId), lines.Select(l => l.ItemId), "Item", ct);
+        await EnsureAllExistAsync(_uoms.Query().Select(u => u.UomId), lines.Select(l => l.UomId), "UOM", ct);
         await EnsureAllExistAsync(_warehouses.Query().Select(w => w.WarehouseId), lines.Select(l => l.WarehouseId), "Warehouse", ct);
     }
 
@@ -274,5 +276,5 @@ public sealed class PurchaseOrderService : IPurchaseOrderService
         p.PoId, p.DocNo, p.VendorId, p.RequisitionId, p.Status, p.ApprovalRequired,
         p.CreatedBy, p.CreatedAt, p.UpdatedAt, ComputeTotals(p.Lines),
         p.Lines.OrderBy(l => l.PoLineId).Select(l => new PoLineDto(
-            l.PoLineId, l.ItemId, l.WarehouseId, l.Qty, l.UnitPrice, l.Tax, l.QtyReceived)).ToList());
+            l.PoLineId, l.ItemId, l.UomId, l.WarehouseId, l.Qty, l.UnitPrice, l.Tax, l.QtyReceived)).ToList());
 }

Backend/ERPCore/Services/SalesDomainService.cs

@@ -13,6 +13,7 @@ public sealed class SalesDomainService : ISalesDomainService
     private readonly IRepository<Warehouse> _warehouses;
     private readonly IRepository<User> _users;
     private readonly IRepository<Item> _items;
+    private readonly IRepository<Uom> _uoms;
     private readonly ISalesPricingService _pricing;
 
     public SalesDomainService(
@@ -20,12 +21,14 @@ public sealed class SalesDomainService : ISalesDomainService
         IRepository<Warehouse> warehouses,
         IRepository<User> users,
         IRepository<Item> items,
+        IRepository<Uom> uoms,
         ISalesPricingService pricing)
     {
         _customers = customers;
         _warehouses = warehouses;
         _users = users;
         _items = items;
+        _uoms = uoms;
         _pricing = pricing;
     }
 
@@ -45,7 +48,7 @@ public sealed class SalesDomainService : ISalesDomainService
     }
 
     public async Task ValidateSalesLineAsync(
-        int headerWarehouseId, int lineItemId, int lineWarehouseId, decimal qty, decimal freeQty, int? parentLineId, CancellationToken ct = default)
+        int headerWarehouseId, int lineItemId, int lineUomId, int lineWarehouseId, decimal qty, decimal freeQty, int? parentLineId, CancellationToken ct = default)
     {
         if (qty <= 0)
             throw new DomainException(ErrorCodes.Validation, "Sales line quantity must be greater than zero.", 422);
@@ -57,6 +60,8 @@ public sealed class SalesDomainService : ISalesDomainService
             throw new DomainException(ErrorCodes.Validation, $"Sales line warehouse {lineWarehouseId} must match header warehouse {headerWarehouseId}.", 422);
         if (!await _items.Query().AnyAsync(x => x.ItemId == lineItemId, ct))
             throw new NotFoundException($"Item {lineItemId} was not found.");
+        if (!await _uoms.Query().AnyAsync(x => x.UomId == lineUomId, ct))
+            throw new NotFoundException($"UOM {lineUomId} was not found.");
         if (!await _warehouses.Query().AnyAsync(x => x.WarehouseId == lineWarehouseId, ct))
             throw new NotFoundException($"Warehouse {lineWarehouseId} was not found.");
     }

Backend/ERPCore/Services/SalesInvoiceService.cs

@@ -145,7 +145,7 @@ public sealed class SalesInvoiceService : ISalesInvoiceService
         foreach (var r in requests)
         {
             var item = await _items.Query().AsNoTracking().FirstAsync(x => x.ItemId == r.ItemId, ct);
-            await _sales.ValidateSalesLineAsync(headerWarehouseId, r.ItemId, r.WarehouseId, r.Qty, r.FreeQty, r.ParentLineId, ct);
+            await _sales.ValidateSalesLineAsync(headerWarehouseId, r.ItemId, r.UomId, r.WarehouseId, r.Qty, r.FreeQty, r.ParentLineId, ct);
             var resolved = await _sales.ResolveLinePriceAsync(r.ItemId, r.WarehouseId, r.UnitPrice, r.AllowManualPriceOverride, ct);
             var unitPrice = resolved.UnitPrice;
             var priceSource = resolved.PriceSource;
@@ -158,6 +158,7 @@ public sealed class SalesInvoiceService : ISalesInvoiceService
                 Description = item.Name,
                 Qty = r.Qty,
                 FreeQty = r.FreeQty,
+                UomId = r.UomId,
                 WarehouseId = r.WarehouseId,
                 UnitPrice = unitPrice,
                 BaseCost = unitPrice,

Backend/ERPCore/Services/SalesMappingService.cs

@@ -35,7 +35,7 @@ public sealed class SalesMappingService : ISalesMappingService
             invoice.InvoiceType, invoice.Status, invoice.CreatedBy, invoice.CreatedAt, invoice.UpdatedAt,
             MapInvoiceTotals(invoice),
             invoice.Lines.Select(l => new SalesInvoiceLineDto(
-                l.SalesInvoiceLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.WarehouseId,
+                l.SalesInvoiceLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.UomId, l.WarehouseId,
                 l.UnitPrice, l.BaseCost, l.PriceSource, l.DiscountPct, l.DiscountAmount, l.DiscountMode,
                 l.NetUnitPrice, l.LineTotal, l.TaxPct, l.TaxAmount, l.IsFreeIssue, l.ParentLineId)).ToList());
 
@@ -45,7 +45,7 @@ public sealed class SalesMappingService : ISalesMappingService
             slip.WarehouseId, slip.CashierUserId, slip.Status, slip.CreatedAt, slip.UpdatedAt,
             MapSlipTotals(slip),
             slip.Lines.Select(l => new SalesSlipLineDto(
-                l.SalesSlipLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.WarehouseId,
+                l.SalesSlipLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.UomId, l.WarehouseId,
                 l.UnitPrice, l.BaseCost, l.PriceSource, l.DiscountPct, l.DiscountAmount, l.DiscountMode,
                 l.NetUnitPrice, l.LineTotal, l.TaxPct, l.TaxAmount, l.IsFreeIssue, l.ParentLineId)).ToList());
 }

Backend/ERPCore/Services/SalesPostingService.cs

@@ -119,14 +119,15 @@ 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;
 
-            issues.Add(new BundleSalePostingIssueDto(
-                line.BundleSaleLineId, line.ItemId, item.Sku, item.Name, line.WarehouseId, line.Qty, available, line.Qty - available));
+            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));
         }
 
         return new BundleSalePostingCheckDto(bundle.BundleSaleId, bundle.BundleNo, bundle.Status, issues.Count == 0, issues);
@@ -141,7 +142,7 @@ public sealed class SalesPostingService : ISalesPostingService
             getLines: x => x.Lines.Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.Qty + l.FreeQty, l.Qty, l.FreeQty)),
             setPosted: x => x.Status = SalesInvoiceStatus.Posted,
             setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
-            sourceDocType: DocumentTypes.SalesInvoice,
+            sourceDocType: nameof(SalesInvoice),
             getDocId: x => x.SalesInvoiceId,
             ct: ct);
 
@@ -154,7 +155,7 @@ public sealed class SalesPostingService : ISalesPostingService
             getLines: x => x.Lines.Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.Qty + l.FreeQty, l.Qty, l.FreeQty)),
             setPosted: x => x.Status = SalesSlipStatus.Posted,
             setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
-            sourceDocType: DocumentTypes.SalesSlip,
+            sourceDocType: nameof(SalesSlip),
             getDocId: x => x.SalesSlipId,
             ct: ct);
 
@@ -167,7 +168,7 @@ public sealed class SalesPostingService : ISalesPostingService
             getLines: x => x.Lines.Where(l => l.IncludeInBundle).Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.Qty, l.Qty, 0m)),
             setPosted: x => x.Status = BundleSaleStatus.Posted,
             setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
-            sourceDocType: DocumentTypes.BundleSale,
+            sourceDocType: nameof(BundleSale),
             getDocId: x => x.BundleSaleId,
             ct: ct);
 
@@ -198,8 +199,6 @@ public sealed class SalesPostingService : ISalesPostingService
                 if (!await _sales.IsStockedItemAsync(line.ItemId, token))
                     continue;
 
-                // Line quantities are already a count of the item's base UOM — sales documents
-                // carry no unit of their own — so this is the quantity FIFO consumes verbatim.
                 var consumed = await _fifo.ConsumeAsync(line.ItemId, line.WarehouseId, null, line.Qty, token);
                 var cost = consumed.Count == 0 ? 0m : consumed.Sum(x => x.Qty * x.UnitCost) / consumed.Sum(x => x.Qty);
                 await _fifo.PostLedgerAsync(line.ItemId, line.WarehouseId, null, null, null, _currentUser.AuditUserId,

Backend/ERPCore/Services/SalesPromotionSuggestionService.cs

@@ -9,6 +9,8 @@ namespace ERPCore.Services;
 
 public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionService
 {
+    private const decimal FreeIssueThreshold = 10m;
+
     private readonly IRepository<SalesSlip> _slips;
     private readonly IRepository<Item> _items;
 
@@ -25,14 +27,7 @@ public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionS
 
         if (slip is null) return null;
 
-        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 itemIds = slip.Lines.Select(x => x.ItemId).Distinct().ToList();
         var candidateItems = await _items.Query().AsNoTracking()
             .Where(x => itemIds.Contains(x.ItemId) && x.Status == EntityStatus.Active)
             .ToListAsync(ct);
@@ -40,10 +35,13 @@ public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionS
         var byItemId = candidateItems.ToDictionary(x => x.ItemId);
         var suggestions = new List<SalesFreeIssueSuggestionLineDto>();
 
-        foreach (var line in freeIssueLines)
+        foreach (var line in slip.Lines.Where(x => x.Qty >= FreeIssueThreshold))
         {
             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)
@@ -64,8 +62,8 @@ public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionS
                 item.Sku,
                 item.Name,
                 line.Qty,
-                line.FreeQty,
-                line.Qty,
+                freeQty,
+                FreeIssueThreshold,
                 rewardOptions));
         }
 
@@ -73,4 +71,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);
     }
-}
+}

Backend/ERPCore/Services/SalesReturnService.cs

@@ -1,200 +0,0 @@
-using ERPCore.Domain;
-using ERPCore.Domain.Entities;
-using ERPCore.Domain.Enums;
-using ERPCore.Dtos.Common;
-using ERPCore.Dtos.Sales;
-using ERPCore.Infra.Auth;
-using ERPCore.Infra.UoW;
-using ERPCore.Repositories.Interfaces;
-using ERPCore.Services.Interfaces;
-using ERPCore.System.Errors;
-using Microsoft.EntityFrameworkCore;
-
-namespace ERPCore.Services;
-
-/// <summary>
-/// Sales-return service. Auto-posts with a mandatory Return reason code and
-/// generates an inbound stock movement via the shared <see cref="IStockMutator"/>
-/// (positive delta — creates an inbound FIFO layer at last cost). Single UoW
-/// transaction, mirroring <see cref="PurchaseReturnService"/> with the direction
-/// reversed.
-/// </summary>
-public sealed class SalesReturnService : ISalesReturnService
-{
-    private readonly IRepository<SalesReturn> _returns;
-    private readonly IRepository<Customer> _customers;
-    private readonly IRepository<Warehouse> _warehouses;
-    private readonly IRepository<Item> _items;
-    private readonly IRepository<ReasonCode> _reasonCodes;
-    private readonly IRepository<SalesInvoiceLine> _salesInvoiceLines;
-    private readonly IRepository<SalesReturnLine> _returnLines;
-    private readonly IRepository<StockLedger> _ledger;
-    private readonly IStockMutator _mutator;
-    private readonly INumberSequenceService _numbers;
-    private readonly ICurrentUser _currentUser;
-    private readonly IUnitOfWork _uow;
-
-    public SalesReturnService(
-        IRepository<SalesReturn> returns, IRepository<Customer> customers, IRepository<Warehouse> warehouses,
-        IRepository<Item> items, IRepository<ReasonCode> reasonCodes, IRepository<SalesInvoiceLine> salesInvoiceLines,
-        IRepository<SalesReturnLine> returnLines, IRepository<StockLedger> ledger, IStockMutator mutator,
-        INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow)
-    {
-        _returns = returns;
-        _customers = customers;
-        _warehouses = warehouses;
-        _items = items;
-        _reasonCodes = reasonCodes;
-        _salesInvoiceLines = salesInvoiceLines;
-        _returnLines = returnLines;
-        _ledger = ledger;
-        _mutator = mutator;
-        _numbers = numbers;
-        _currentUser = currentUser;
-        _uow = uow;
-    }
-
-    public async Task<PagedResponse<SalesReturnSummaryDto>> ListAsync(
-        PageQuery query, int? customerId, int? warehouseId, CancellationToken ct = default)
-    {
-        var q = _returns.Query().AsNoTracking();
-
-        if (!string.IsNullOrWhiteSpace(query.Q))
-        {
-            var term = query.Q.Trim();
-            q = q.Where(r => EF.Functions.ILike(r.DocNo, $"%{term}%"));
-        }
-        if (customerId is not null) q = q.Where(r => r.CustomerId == customerId);
-        if (warehouseId is not null) q = q.Where(r => r.WarehouseId == warehouseId);
-
-        var total = await q.CountAsync(ct);
-        var rows = await q.OrderByDescending(r => r.ReturnId)
-            .Skip(query.Skip).Take(query.PageSize)
-            .Select(r => new SalesReturnSummaryDto(
-                r.ReturnId, r.DocNo, r.CustomerId, r.WarehouseId, r.ReasonCodeId, r.Status,
-                r.CreatedBy, r.CreatedAt, r.Lines.Count, r.Lines.Sum(l => l.Qty)))
-            .ToListAsync(ct);
-
-        return PagedResponse<SalesReturnSummaryDto>.Create(rows, query.Page, query.PageSize, total);
-    }
-
-    public async Task<SalesReturnDto?> GetAsync(int returnId, CancellationToken ct = default)
-    {
-        var ret = await _returns.Query().AsNoTracking()
-            .Include(r => r.Lines)
-            .FirstOrDefaultAsync(r => r.ReturnId == returnId, ct);
-        if (ret is null) return null;
-
-        // Polymorphic ledger reference — recovered by source-doc lookup.
-        var ledgerRefs = await _ledger.Query().AsNoTracking()
-            .Where(l => l.SourceDocType == DocumentTypes.SalesReturn && l.SourceDocId == returnId)
-            .OrderBy(l => l.LedgerId)
-            .Select(l => l.LedgerId)
-            .ToListAsync(ct);
-
-        return ToDto(ret, ledgerRefs);
-    }
-
-    public async Task<SalesReturnDto> CreateAsync(CreateSalesReturnRequest request, CancellationToken ct = default)
-    {
-        if (request.ReasonCodeId is null)
-            throw new DomainException(ErrorCodes.ReasonCodeRequired, "A reason code is required for a sales return.", 400);
-
-        if (!await _customers.Query().AnyAsync(c => c.CustomerId == request.CustomerId, ct))
-            throw new DomainException(ErrorCodes.Validation, $"Customer {request.CustomerId} does not exist.", 422);
-        if (!await _warehouses.Query().AnyAsync(w => w.WarehouseId == request.WarehouseId, ct))
-            throw new DomainException(ErrorCodes.Validation, $"Warehouse {request.WarehouseId} does not exist.", 422);
-
-        var reason = await _reasonCodes.Query().AsNoTracking().FirstOrDefaultAsync(r => r.ReasonCodeId == request.ReasonCodeId, ct)
-            ?? throw new DomainException(ErrorCodes.Validation, $"Reason code {request.ReasonCodeId} does not exist.", 422);
-        if (reason.Context != ReasonContext.Return)
-            throw new DomainException(ErrorCodes.Validation, $"Reason code {request.ReasonCodeId} is not a Return reason.", 422);
-
-        // Original sold qty is never mutated — "remaining returnable" is computed from
-        // return history instead, so the invoice keeps recording what was actually sold.
-        var pendingByInvoiceLine = new Dictionary<int, decimal>();
-
-        foreach (var line in request.Lines)
-        {
-            if (!await _items.Query().AnyAsync(i => i.ItemId == line.ItemId, ct))
-                throw new DomainException(ErrorCodes.Validation, $"Item {line.ItemId} does not exist.", 422);
-            if (line.SalesInvoiceLineId is not null)
-            {
-                var invoiceLineId = line.SalesInvoiceLineId.Value;
-                var invoiceLine = await _salesInvoiceLines.Query().AsNoTracking().FirstOrDefaultAsync(l => l.SalesInvoiceLineId == invoiceLineId, ct)
-                    ?? throw new DomainException(ErrorCodes.Validation, $"Sales invoice line {invoiceLineId} does not exist.", 422);
-                if (invoiceLine.ItemId != line.ItemId)
-                    throw new DomainException(ErrorCodes.Validation, $"Sales invoice line {invoiceLineId} is for a different item.", 422);
-
-                var alreadyReturned = await _returnLines.Query().AsNoTracking()
-                    .Where(l => l.SalesInvoiceLineId == invoiceLineId)
-                    .SumAsync(l => (decimal?)l.Qty, ct) ?? 0m;
-                pendingByInvoiceLine.TryGetValue(invoiceLineId, out var pending);
-                var remaining = invoiceLine.Qty - alreadyReturned - pending;
-
-                if (line.Qty > remaining)
-                    throw new DomainException(ErrorCodes.Validation, $"Insufficient quantity — only {remaining} remain returnable on sales invoice line {invoiceLineId} (requested {line.Qty}).", 422);
-                pendingByInvoiceLine[invoiceLineId] = pending + line.Qty;
-            }
-        }
-
-        var now = DateTime.UtcNow;
-        var deltas = request.Lines.Select(l => new StockDelta(l.ItemId, null, null, l.Qty)).ToList();
-
-        var (entity, ledgerEntries) = await _uow.ExecuteInTransactionAsync(async token =>
-        {
-            var docNo = await _numbers.NextAsync(DocumentTypes.SalesReturn, token);
-            var ret = new SalesReturn
-            {
-                DocNo = docNo,
-                CustomerId = request.CustomerId,
-                WarehouseId = request.WarehouseId,
-                ReasonCodeId = request.ReasonCodeId.Value,
-                Status = ReturnStatus.Posted,
-                CreatedBy = _currentUser.AuditUserId,
-                CreatedAt = now,
-                Lines = request.Lines.Select(l => new SalesReturnLine
-                {
-                    SalesInvoiceLineId = l.SalesInvoiceLineId,
-                    ItemId = l.ItemId,
-                    Qty = l.Qty
-                }).ToList()
-            };
-            await _returns.AddAsync(ret, token);
-            await _uow.SaveChangesAsync(token); // flush for a valid ledger sourceDocId
-
-            var refs = await _mutator.ApplyAsync(request.WarehouseId, DocumentTypes.SalesReturn, ret.ReturnId, now, deltas, token);
-            return (ret, refs);
-        }, ct);
-
-        // Map ledger ids after commit so they are populated.
-        return ToDto(entity, ledgerEntries.Select(r => r.LedgerId).ToList());
-    }
-
-    public async Task<IReadOnlyList<SalesInvoiceLineRemainingDto>> GetRemainingByInvoiceAsync(int salesInvoiceId, CancellationToken ct = default)
-    {
-        var lines = await _salesInvoiceLines.Query().AsNoTracking()
-            .Where(l => l.SalesInvoiceId == salesInvoiceId)
-            .Select(l => new { l.SalesInvoiceLineId, l.Qty })
-            .ToListAsync(ct);
-
-        var lineIds = lines.Select(l => l.SalesInvoiceLineId).ToList();
-        var returnedByLine = await _returnLines.Query().AsNoTracking()
-            .Where(l => l.SalesInvoiceLineId != null && lineIds.Contains(l.SalesInvoiceLineId.Value))
-            .GroupBy(l => l.SalesInvoiceLineId!.Value)
-            .Select(g => new { SalesInvoiceLineId = g.Key, Returned = g.Sum(x => x.Qty) })
-            .ToDictionaryAsync(x => x.SalesInvoiceLineId, x => x.Returned, ct);
-
-        return lines
-            .Select(l => new SalesInvoiceLineRemainingDto(
-                l.SalesInvoiceLineId,
-                l.Qty - (returnedByLine.TryGetValue(l.SalesInvoiceLineId, out var returned) ? returned : 0m)))
-            .ToList();
-    }
-
-    private static SalesReturnDto ToDto(SalesReturn r, IReadOnlyList<int> ledgerRefs) => new(
-        r.ReturnId, r.DocNo, r.CustomerId, r.WarehouseId, r.ReasonCodeId, r.Status, r.CreatedBy, r.CreatedAt,
-        r.Lines.OrderBy(l => l.ReturnLineId)
-            .Select(l => new SalesReturnLineDto(l.ReturnLineId, l.SalesInvoiceLineId, l.ItemId, l.Qty)).ToList(),
-        ledgerRefs);
-}

Backend/ERPCore/Services/SalesSlipService.cs

@@ -169,7 +169,7 @@ public sealed class SalesSlipService : ISalesSlipService
         foreach (var r in requests)
         {
             var item = await _items.Query().AsNoTracking().FirstAsync(x => x.ItemId == r.ItemId, ct);
-            await _sales.ValidateSalesLineAsync(headerWarehouseId, r.ItemId, r.WarehouseId, r.Qty, r.FreeQty, r.ParentLineId, ct);
+            await _sales.ValidateSalesLineAsync(headerWarehouseId, r.ItemId, r.UomId, r.WarehouseId, r.Qty, r.FreeQty, r.ParentLineId, ct);
             var resolved = await _sales.ResolveLinePriceAsync(r.ItemId, r.WarehouseId, r.UnitPrice, r.AllowManualPriceOverride, ct);
             var unitPrice = resolved.UnitPrice;
             var priceSource = resolved.PriceSource;
@@ -182,6 +182,7 @@ public sealed class SalesSlipService : ISalesSlipService
                 Description = item.Name,
                 Qty = r.Qty,
                 FreeQty = r.FreeQty,
+                UomId = r.UomId,
                 WarehouseId = r.WarehouseId,
                 UnitPrice = unitPrice,
                 BaseCost = unitPrice,
@@ -221,10 +222,8 @@ public sealed class SalesSlipService : ISalesSlipService
             .Where(i => i.ItemId == line.ItemId)
             .Select(i => new { i.ItemId, i.Sku, i.Name, i.BaseUomId })
             .FirstOrDefault();
-        // The line carries no unit of its own — its quantity is a count of the item's base
-        // UOM — so the display name comes from there.
-        var uom = item is null ? null : _uoms.Query().AsNoTracking()
-            .Where(u => u.UomId == item.BaseUomId)
+        var uom = line is null ? null : _uoms.Query().AsNoTracking()
+            .Where(u => u.UomId == line.UomId)
             .Select(u => new { u.UomId, u.Name })
             .FirstOrDefault();
         var warehouse = _warehouses.Query().AsNoTracking()
@@ -241,7 +240,8 @@ public sealed class SalesSlipService : ISalesSlipService
             line?.ItemId ?? 0,
             item?.Sku ?? $"SKU-{line?.ItemId ?? 0}",
             item?.Name ?? line?.Description ?? "—",
-            uom?.Name ?? $"UOM {item?.BaseUomId ?? 0}",
+            line?.UomId ?? 0,
+            uom?.Name ?? $"UOM {line?.UomId ?? 0}",
             line?.Qty ?? 0m,
             line?.FreeQty ?? 0m,
             line is null ? "No line" : $"Buy {line.Qty} Get {line.FreeQty}");
@@ -263,7 +263,7 @@ public sealed class SalesSlipService : ISalesSlipService
             x.CreatedAt,
             x.UpdatedAt,
             summary,
-            x.Lines.Select(l => new SalesSlipLineDto(l.SalesSlipLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.WarehouseId, l.UnitPrice, l.BaseCost, l.PriceSource, l.DiscountPct, l.DiscountAmount, l.DiscountMode, l.NetUnitPrice, l.LineTotal, l.TaxPct, l.TaxAmount, l.IsFreeIssue, l.ParentLineId)).ToList());
+            x.Lines.Select(l => new SalesSlipLineDto(l.SalesSlipLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.UomId, l.WarehouseId, l.UnitPrice, l.BaseCost, l.PriceSource, l.DiscountPct, l.DiscountAmount, l.DiscountMode, l.NetUnitPrice, l.LineTotal, l.TaxPct, l.TaxAmount, l.IsFreeIssue, l.ParentLineId)).ToList());
     }
 
     private SalesSlipDto Map(SalesSlip x) => _mapping.MapSlip(x);

Backend/ERPCore/Services/Stock/ItemMeasure.cs

@@ -1,39 +0,0 @@
-using ERPCore.Domain.Entities;
-using ERPCore.Domain.Enums;
-using ERPCore.Services.Interfaces;
-using ERPCore.System.Errors;
-
-namespace ERPCore.Services.Stock;
-
-/// <summary>
-/// Content ↔ pack arithmetic (see <see cref="IItemMeasure"/>). Stateless and I/O-free:
-/// the content size is already on the <see cref="Item"/> every caller has loaded.
-/// </summary>
-public sealed class ItemMeasure : IItemMeasure
-{
-    public bool HasContent(Item item) => item.ContentBaseQty is > 0m;
-
-    public decimal ToPacks(Item item, decimal formulaQty, StageQtyUnit unit)
-    {
-        if (unit == StageQtyUnit.Pack) return formulaQty;
-
-        // Rounded to the quantity columns' (18,4) scale with the same mode as
-        // ProductionRunService.Scale, so what FIFO consumes and what the cost pool divides
-        // by are the same number to the last stored digit.
-        return Math.Round(formulaQty / RequireContent(item), 4, MidpointRounding.AwayFromZero);
-    }
-
-    public decimal FromPacks(Item item, decimal packs, StageQtyUnit unit)
-    {
-        if (unit == StageQtyUnit.Pack) return packs;
-
-        return Math.Round(packs * RequireContent(item), 4, MidpointRounding.AwayFromZero);
-    }
-
-    private static decimal RequireContent(Item item)
-        => item.ContentBaseQty is > 0m
-            ? item.ContentBaseQty.Value
-            : throw new DomainException(
-                ErrorCodes.Validation,
-                $"Item {item.ItemId} has no content size, so its quantity cannot be expressed in content units.", 422);
-}

Backend/ERPCore/Services/Stock/UomConverter.cs

@@ -0,0 +1,38 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services.Stock;
+
+/// <summary>
+/// Shared UOM → base-UOM conversion (see <see cref="IUomConverter"/>). Behaviour is
+/// unchanged from the <c>GrnService.ToBaseAsync</c> it was extracted from, so the GRN
+/// receive path keeps costing exactly as before.
+/// </summary>
+public sealed class UomConverter : IUomConverter
+{
+    private readonly IRepository<UomConversion> _conversions;
+
+    public UomConverter(IRepository<UomConversion> conversions) => _conversions = conversions;
+
+    public async Task<(decimal QtyBase, decimal UnitCostBase)> ToBaseAsync(
+        Item item, int uomId, decimal qty, decimal unitCostPerUom, CancellationToken ct = default)
+    {
+        if (uomId == item.BaseUomId)
+            return (qty, unitCostPerUom);
+
+        var conv = await _conversions.Query().AsNoTracking()
+            .FirstOrDefaultAsync(c => c.ItemId == item.ItemId && c.FromUomId == uomId && c.ToUomId == item.BaseUomId, ct)
+            ?? throw new DomainException(ErrorCodes.Validation,
+                $"No UOM conversion from {uomId} to base UOM {item.BaseUomId} for item {item.ItemId}.", 422);
+
+        // Quantity scales up by the factor, so the per-unit cost scales down by it —
+        // total value is preserved.
+        return (qty * conv.Factor, unitCostPerUom / conv.Factor);
+    }
+
+    public async Task<decimal> ToBaseQtyAsync(Item item, int uomId, decimal qty, CancellationToken ct = default)
+        => (await ToBaseAsync(item, uomId, qty, 0m, ct)).QtyBase;
+}

Backend/ERPCore/System/Errors/ErrorCodes.cs

@@ -56,7 +56,6 @@ public static class ErrorCodes
     public const string GraphDisconnected = "GRAPH_DISCONNECTED";
     public const string GraphInputSourceInvalid = "GRAPH_INPUT_SOURCE_INVALID";
     public const string TerminalOutputItemRequired = "TERMINAL_OUTPUT_ITEM_REQUIRED";
-    public const string WipUnitRequired = "WIP_UNIT_REQUIRED";
     public const string StageNotReady = "STAGE_NOT_READY";
     public const string StageNotInProgress = "STAGE_NOT_IN_PROGRESS";
     public const string StageNotDone = "STAGE_NOT_DONE";

Backend/ERPCore/appsettings.Development.json

@@ -6,7 +6,7 @@
     }
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Host=127.0.0.1;Port=5433;Database=ERPCoreTest;Username=postgres;Password=post@hexdive"
+    "DefaultConnection": "Host=localhost;Port=5432;Database=ERPCoreTest;Username=postgres;Password=root"
   },
   "AuthHex": {
     "BaseUrl": "http://localhost:5011"

Backend/PROGRESS.md

@@ -4,73 +4,6 @@ Legend: `[ ]` not started · `[~]` in progress · `[x]` done
 Spec: `docs/10-BACKEND-PHASE1.md` (model + rules) · `docs/11-BACKEND-PHASE1.md` (API)
 Convention: `docs/01-DOC-GUIDE.md §6`. Update this file in the **same commit** as the code. When ticking `[x]`, append a short note + any deviation.
 
-## Per-variant content size (2026-08-11) — follow-up to the UOM re-model below
-
-The UOM re-model put `ContentQty`/`ContentUnit` on `Item` correctly, but the item **create page
-is a variant builder** and collected **one** form-level pair, copying it into every generated
-variant. Building "Coca-Cola in 500 ml / 1 L / 250 ml" produced three items all recorded as the
-same size — the exact case the builder exists for. The item contract already accepted a
-per-item pair, so the whole fix is in how values are captured.
-
-- **`ItemType.IsMeasurable`** (bool, default `false`) — set on Products → Item Types. A flagged
-  dimension's values are entered as a number + unit; the chip label, the SKU segment, the item
-  name and the stored content size all derive from that one pair. Unflagged dimensions are
-  unchanged free text, which is what an apparel `Size` (S/M/L) needs.
-- **`UpdateItemTypeRequest.IsMeasurable` is `bool?` and preserved when omitted.** A plain `bool`
-  binds an absent property as `false`, so the admin screen's name-only PUT would have cleared the
-  flag on every rename — the same bug class already recorded for `product-config` further down.
-- **The `BUILDER_ITEM_TYPES = ["color","size"]` hardcode is gone.** It had one consumer and had
-  become a live bug: a user-created "Pack Size" would be flagged measurable and then never
-  appear. Removal is behaviour-preserving on any current database (the seeder seeds exactly those
-  two names, and the fetch was already `status: Active`) and restores the documented contract
-  that users add their own types. Every Active item type is now offered; deactivation is the
-  intended remedy and the admin page already says so.
-- **SKU collision fixed before it could bite.** `skuSegment` strips the decimal point and
-  truncates to 3, so derived labels collided — `1.5L`/`15L` → `15L`, `500ml`/`500g` → `500`,
-  `2.5ml`/`25ml` → `25M`. Since the create loop is sequential and non-transactional, that would
-  have failed partway with `SKU_DUPLICATE` after creating some rows. Measurement segments now use
-  `measureKey`, which mirrors `ItemContent.Normalize` (L/Kg ×1000) and renders the point as `P`.
-- **Values dedupe on the normalised size, not the label** — `500 ml` and `0.5 L` read differently
-  but store identically, and `ItemContent.Normalize` is the server's notion of equality.
-- **At most one measurable dimension** per product: unchecked measurable types are disabled once
-  one is checked, re-checked at submit.
-- **The form-level pair survives as a fallback** — correct when the varying dimension isn't size —
-  and is hidden *and cleared* whenever a measurable dimension is active, so the two can never
-  disagree. Its validation is skipped in that mode, since its error message would otherwise be
-  invisible inside the hidden block.
-- The item **edit** page is untouched: one item, one size.
-
-## UOM re-model (2026-08-11) — supersedes every "UOM conversion" note below
-
-Per-item UOM conversion is **gone**. Entries further down this file that describe
-`IUomConverter`, `PUT /items/{id}/uom-conversions`, `uom_conversions`, or a line-level
-`uomId` are historical and no longer describe the code.
-
-What replaced it:
-
-- **One unit per item.** `Item.BaseUomId` is the pack an item is stocked and counted in, and
-  every quantity in the system — stock layers, ledger rows, GRN/PO/sales/bundle/transfer lines
-  — is a plain count of it. A differently sized pack is a different item. `UomId` was dropped
-  from all six document-line entities; `Uom` itself survives as the lookup.
-- **Optional content size on `Item`**: `ContentQty` + `ContentUnit` as entered (`Ml|L|G|Kg`),
-  normalised on write into `ContentBaseQty` + `ContentBaseUnit` (only ever `Ml` or `G`, L/Kg
-  ×1000). All four null ⇒ nothing measurable to hold. `ItemContent` is the pure normaliser.
-- **Production is the only content consumer.** `StageInput.QtyUnit` (`Pack|Content`) says what
-  `QtyPerBatch` means; `IItemMeasure` divides a `Content` quantity by the item's content size
-  to get packs. **Fractional packs are legal** — 300 ml of a 500 ml bottle consumes 0.6000.
-  Outputs are always pack counts, so scrap stays in whole broken bottles.
-- **WIP keeps a label.** `StageOutput.UomId`/`RunStageOutput.UomId` are now nullable and
-  required *only* when `ItemId` is null (`422 WIP_UNIT_REQUIRED`), since an item-bearing output
-  takes its unit from the item. WIP never touches stock, so the label is never converted.
-- **Two live defects fixed as a consequence.** `SalesPostingService` injected `IUomConverter`
-  and never called it, so a sales line in a non-base UOM consumed the wrong quantity outright;
-  `GrnService` accrued `poLine.QtyReceived += line.Qty` and range-checked over-receipt across
-  the same unit boundary. Both are now like-for-like by construction.
-- **`BaseUomId` is frozen once an item has stock history** (`409 MASTER_IN_USE`) — it is the
-  sole meaning of every recorded quantity, so changing it would silently reinterpret all of it.
-- Smoke: `m4b_uom_conversion.py` deleted; `m4c_content_units.py` added (whole packs, fractional
-  packs, and the contentless-item guard).
-
 ## 8. Sales
 - [x] Sales bootstrap data seeded locally for development: warehouses, UOMs, categories, items, customers, current-year `SI`/`SSL` sequences, plus sample invoice/slip headers and lines. Existing data is preserved.
 - [x] Sales report API consolidated into `GET /api/v1/reports/sales` (catalog), `GET /api/v1/reports/sales/{reportId}` (report metadata), and `POST /api/v1/reports/sales/query` (filtered data). Legacy per-report GET routes removed; invalid report/filter combinations now fail validation.
@@ -96,7 +29,7 @@ What replaced it:
 - [x] Warehouse + Bin (`/warehouses`, nested `/warehouses/{id}/bins`, bin code unique per warehouse)
 - [x] Item reorder settings (`PUT /items/{id}/reorder` full-replace upsert, warehouse-exists validation)
 - [x] Brand master (FR-MD-09) — CRUD + status + ETag; `Item.brandId` nullable FK
-- [x] Item Type master (FR-MD-10) — CRUD + status + ETag; **unreferenced by design**. Feeds the builder's dimension list, and since 2026-08-11 carries `isMeasurable`, which decides whether its values are captured as free text or as a number + unit that becomes each item's content size (see the entry at the top of this file)
+- [x] Item Type master (FR-MD-10) — CRUD + status + ETag; **unreferenced by design**, feeds the builder dropdown only
 - [x] SubCategory (FR-MD-04) — nested list/create under a category, `PUT`/`PATCH status` by id; `Item.subCategoryId` nullable FK, validated to belong to `categoryId`
 - [x] Product Configuration (FR-MD-11) — singleton `GET`/`PUT /product-config`; `CONFIG_DISABLED` gating on item writes
 - [x] Item **sale price** (FR-MD-01, 2026-07-22) — nullable `Item.SalePrice` (`numeric(18,4)`); on all Item DTOs (list/detail/create/update), validated `>= 0`. **Sales-only** — never enters GRN/FIFO/ledger. `null` ⇒ sell at stock value. Migration `AddItemSalePrice`. See the 2026-07-22 Done entry.

Backend/smoke/m2_templates.py

@@ -44,26 +44,25 @@ def diamond(raw_item, finished_item, uom):
                 "estimatedMinutes": 60, "posX": 80, "posY": 120,
                 "fieldDefs": [{"key": "moisture_ok", "label": "Moisture check",
                                "type": "Checkbox", "required": True}],
-                "inputs": [{"source": "Stock", "itemId": raw_item, "qtyPerBatch": 8}],
+                "inputs": [{"source": "Stock", "itemId": raw_item, "uomId": uom, "qtyPerBatch": 8}],
                 "outputs": [{"key": "tmp-frame", "name": "Frame set", "uomId": uom, "qtyPerBatch": 1}],
             },
             {
                 "key": "tmp-prep", "name": "Prep cushions", "roleLabel": "Upholstery",
                 "estimatedMinutes": 30, "posX": 80, "posY": 320, "fieldDefs": [],
-                "inputs": [{"source": "Stock", "itemId": raw_item, "qtyPerBatch": 2}],
+                "inputs": [{"source": "Stock", "itemId": raw_item, "uomId": uom, "qtyPerBatch": 2}],
                 "outputs": [{"key": "tmp-cushion", "name": "Cushion set", "uomId": uom, "qtyPerBatch": 1}],
             },
             {
                 "key": "tmp-asm", "name": "Assemble & QA", "roleLabel": "QA",
                 "estimatedMinutes": 45, "posX": 560, "posY": 200, "fieldDefs": [],
                 "inputs": [
-                    {"source": "Upstream", "fromOutputKey": "tmp-frame", "qtyPerBatch": 1},
-                    {"source": "Upstream", "fromOutputKey": "tmp-cushion", "qtyPerBatch": 1},
+                    {"source": "Upstream", "fromOutputKey": "tmp-frame", "uomId": uom, "qtyPerBatch": 1},
+                    {"source": "Upstream", "fromOutputKey": "tmp-cushion", "uomId": uom, "qtyPerBatch": 1},
                 ],
-                # Terminal output must name the finished item (FR-MFG-05), and takes its unit
-                # from that item — sending a uomId as well is rejected.
+                # Terminal output must name the finished item (FR-MFG-05).
                 "outputs": [{"key": "tmp-chair", "name": "Chair", "itemId": finished_item,
-                             "qtyPerBatch": 1}],
+                             "uomId": uom, "qtyPerBatch": 1}],
             },
         ],
         "edges": [
@@ -244,7 +243,7 @@ def main():
     grandparent["stages"].append({
         "key": "tmp-mid", "name": "Middle", "estimatedMinutes": 5, "posX": 320, "posY": 120,
         "fieldDefs": [],
-        "inputs": [{"source": "Upstream", "fromOutputKey": cut_output_key, "qtyPerBatch": 1}],
+        "inputs": [{"source": "Upstream", "fromOutputKey": cut_output_key, "uomId": uom, "qtyPerBatch": 1}],
         "outputs": [{"key": "tmp-mid-out", "name": "Mid part", "uomId": uom, "qtyPerBatch": 1}],
     })
     grandparent["edges"] = [e for e in grandparent["edges"] if e["parentKey"] != cut_key]
@@ -321,11 +320,9 @@ def rebuild_from_get(g: dict) -> dict:
                 "inputs": [
                     {"source": i["source"], "itemId": i.get("itemId"),
                      "fromOutputKey": i.get("fromOutputKey"),
-                     "qtyUnit": i["qtyUnit"], "qtyPerBatch": i["qtyPerBatch"]}
+                     "uomId": i["uomId"], "qtyPerBatch": i["qtyPerBatch"]}
                     for i in s["inputs"]
                 ],
-                # uomId round-trips as null on an item-bearing output and as the WIP label
-                # otherwise, so echoing it back verbatim is correct either way.
                 "outputs": [
                     {"key": o["key"], "itemId": o.get("itemId"), "name": o["name"],
                      "uomId": o["uomId"], "qtyPerBatch": o["qtyPerBatch"]}

Backend/smoke/m3_runs.py

@@ -147,7 +147,7 @@ def main():
              "estimatedMinutes": s["estimatedMinutes"], "posX": s["posX"], "posY": s["posY"],
              "fieldDefs": s["fieldDefs"],
              "inputs": [{"source": i["source"], "itemId": i.get("itemId"),
-                         "fromOutputKey": i.get("fromOutputKey"), "qtyUnit": i["qtyUnit"],
+                         "fromOutputKey": i.get("fromOutputKey"), "uomId": i["uomId"],
                          "qtyPerBatch": i["qtyPerBatch"]} for i in s["inputs"]],
              "outputs": [{"key": o["key"], "itemId": o.get("itemId"), "name": o["name"],
                           "uomId": o["uomId"], "qtyPerBatch": o["qtyPerBatch"]} for o in s["outputs"]]}

Backend/smoke/m4_stage_actions.py

@@ -65,16 +65,16 @@ def ledger_rows(c, run_id, source):
     return rows
 
 
-def seed_stock(c, wh, raw, pack):
+def seed_stock(c, wh, raw, pack, uom):
     """
     Seed on-hand at explicit unit costs. Two raw layers at different costs mean the FIFO
     consumption at start has to weight them, so `consumedValue` is a real number the
     assertions can check rather than the 0.00 a positive adjustment would produce.
     """
     seed_costed_stock(c, wh, [
-        (raw, SEED_RAW * 0.4, RAW_COST_1),
-        (raw, SEED_RAW * 0.6, RAW_COST_2),
-        (pack, SEED_PACK, PACK_COST),
+        (raw, uom, SEED_RAW * 0.4, RAW_COST_1),
+        (raw, uom, SEED_RAW * 0.6, RAW_COST_2),
+        (pack, uom, SEED_PACK, PACK_COST),
     ])
 
 
@@ -90,7 +90,7 @@ def build_template(c, raw, pack, finished, uom):
                 "estimatedMinutes": 60, "posX": 80, "posY": 100,
                 "fieldDefs": [{"key": "moisture_ok", "label": "Moisture check",
                                "type": "Checkbox", "required": True}],
-                "inputs": [{"source": "Stock", "itemId": raw, "qtyPerBatch": 8}],
+                "inputs": [{"source": "Stock", "itemId": raw, "uomId": uom, "qtyPerBatch": 8}],
                 "outputs": [{"key": "tmp-frame", "name": "Frame", "uomId": uom, "qtyPerBatch": 1}],
             },
             {
@@ -99,11 +99,11 @@ def build_template(c, raw, pack, finished, uom):
                 "key": "tmp-asm", "name": "Assemble", "roleLabel": "QA",
                 "estimatedMinutes": 45, "posX": 520, "posY": 100, "fieldDefs": [],
                 "inputs": [
-                    {"source": "Upstream", "fromOutputKey": "tmp-frame", "qtyPerBatch": 1},
-                    {"source": "Stock", "itemId": pack, "qtyPerBatch": 2},
+                    {"source": "Upstream", "fromOutputKey": "tmp-frame", "uomId": uom, "qtyPerBatch": 1},
+                    {"source": "Stock", "itemId": pack, "uomId": uom, "qtyPerBatch": 2},
                 ],
                 "outputs": [{"key": "tmp-chair", "name": "Chair", "itemId": finished,
-                             "qtyPerBatch": 1}],
+                             "uomId": uom, "qtyPerBatch": 1}],
             },
         ],
         "edges": [{"parentKey": "tmp-cut", "childKey": "tmp-asm"}],
@@ -141,7 +141,7 @@ def main():
     drained = drain_stock(c, wh)
     if drained:
         print(f"drained {len(drained)} leftover item(s) from a previous execution")
-    seed_stock(c, wh, raw, pack)
+    seed_stock(c, wh, raw, pack, uom)
     raw_before = on_hand(c, raw, wh)
     pack_before = on_hand(c, pack, wh)
     print(f"warehouse={wh} raw={raw}(on-hand {raw_before}) pack={pack}(on-hand {pack_before}) finished={finished}")

Backend/smoke/m4_state.json

@@ -1 +1 @@
-{"runId": 20, "templateId": 6, "warehouseId": 4, "assembleStageId": 30, "finishedItemId": 1, "rawItemId": 4, "packItemId": 3}
+{"runId": 64, "templateId": 2, "warehouseId": 4, "assembleStageId": 118, "finishedItemId": 13, "rawItemId": 18, "packItemId": 14}

Backend/smoke/m4b_uom_conversion.py

@@ -0,0 +1,170 @@
+"""M4b smoke test — UOM conversion on production stock inputs.
+
+This covers the single highest-risk correctness gap in the manufacturing phase.
+`IFifoCostingService.ConsumeAsync` works exclusively in an item's BASE UOM, while
+`STAGE_INPUT.uom_id` is a free FK — docs/30 never mentions conversion at all. Without the
+shared `IUomConverter` (extracted from `GrnService.ToBaseAsync`), a stage input declared in
+"box of 12" would consume 1 base unit instead of 12 and silently mis-cost the whole run.
+
+The dev database has no `uom_conversions` rows at all, so the non-base path was previously
+unexercised by any data. This script creates a real conversion and proves:
+
+  * a stage input in a non-base UOM consumes qtyPerBatch x scaleFactor x factor base units
+  * the ledger records the BASE quantity, not the declared one
+  * an input in a UOM with no conversion defined is refused with 422 rather than mis-consumed
+
+    python Backend/smoke/m4b_uom_conversion.py
+"""
+
+from __future__ import annotations
+
+import sys
+
+from smoke_common import bootstrap
+
+WAREHOUSE_CODE = "SMOKE-PRD"
+TEMPLATE_CODE = "SMOKE-PT-M4B"
+FACTOR = 12          # 1 case = 12 base units
+QTY_PER_BATCH = 3    # cases per batch
+TARGET_QTY = 10      # -> scale 10 -> 30 cases -> 360 base units
+SEED = 5000
+
+
+def main():
+    c, chk, args = bootstrap(__doc__)
+    print(f"API {args.api}")
+
+    # --- fixtures ---------------------------------------------------------
+    wh = next((w["warehouseId"] for w in c.get(f"/warehouses?q={WAREHOUSE_CODE}&pageSize=50").body["items"]
+               if w["code"] == WAREHOUSE_CODE), None)
+    if wh is None:
+        sys.exit("FATAL: run m4_stage_actions.py first (it creates the SMOKE-PRD warehouse).")
+
+    items = c.get("/items?pageSize=5&status=Active").body["items"]
+    raw, finished = items[0], items[1]
+    base_uom = raw["baseUomId"]
+
+    uoms = c.get("/uoms?pageSize=50").body["items"]
+    case_uom = next((u["uomId"] for u in uoms if u["uomId"] != base_uom), None)
+    if case_uom is None:
+        sys.exit("FATAL: need at least 2 UOMs to test conversion.")
+    print(f"item={raw['itemId']} baseUom={base_uom} caseUom={case_uom} factor={FACTOR}")
+
+    # --- define the conversion -------------------------------------------
+    chk.section("1. Define a non-base UOM conversion for the item")
+    conv = c.put(f"/items/{raw['itemId']}/uom-conversions",
+                 {"conversions": [{"fromUom": case_uom, "toUom": base_uom, "factor": FACTOR}]})
+    chk.status("PUT /items/{id}/uom-conversions", conv, 200)
+    if conv.status != 200:
+        return chk.finish("M4b")
+    chk.check("conversion stored", any(float(x["factor"]) == FACTOR for x in conv.body["conversions"]), True)
+
+    reason = c.get("/reason-codes?context=Adjustment&pageSize=5").body["items"][0]["reasonCodeId"]
+    c.post("/stock-adjustments", {"warehouseId": wh, "reasonCodeId": reason,
+                                  "lines": [{"itemId": raw["itemId"], "qtyDelta": SEED}]})
+    before = float(c.get(f"/stock/on-hand?itemId={raw['itemId']}&warehouseId={wh}").body["onHand"])
+    print(f"on-hand before: {before}")
+
+    # --- template whose stock input is declared in CASES ------------------
+    chk.section("2. A stage input declared in the non-base UOM")
+    payload = {
+        "code": TEMPLATE_CODE, "name": "Smoke M4b conversion line",
+        "stages": [{
+            "key": "tmp-only", "name": "Pack", "estimatedMinutes": 10,
+            "posX": 0, "posY": 0, "fieldDefs": [],
+            # Declared in cases, not base units.
+            "inputs": [{"source": "Stock", "itemId": raw["itemId"],
+                        "uomId": case_uom, "qtyPerBatch": QTY_PER_BATCH}],
+            "outputs": [{"key": "tmp-out", "name": "Packed", "itemId": finished["itemId"],
+                         "uomId": base_uom, "qtyPerBatch": 1}],
+        }],
+        "edges": [],
+    }
+
+    existing = next((t for t in c.get(f"/production-templates?q={TEMPLATE_CODE}").body["items"]
+                     if t["code"] == TEMPLATE_CODE), None)
+    if existing:
+        head = c.get(f"/production-templates/{existing['templateId']}")
+        res = c.put(f"/production-templates/{existing['templateId']}", payload, if_match=head.etag)
+        tid = existing["templateId"] if res.status in (200, 409) else None
+        chk.check("template ready", tid is not None, True)
+    else:
+        res = c.post("/production-templates", payload)
+        chk.status("create single-stage template", res, 201)
+        tid = res.body["templateId"] if res.status == 201 else None
+
+    if tid is None:
+        return chk.finish("M4b")
+
+    # A lone stage is both the entry and the terminal — worth asserting explicitly.
+    run = c.post("/production-runs", {"templateId": tid, "targetQty": TARGET_QTY, "warehouseId": wh})
+    chk.status("create the run", run, 201)
+    if run.status != 201:
+        return chk.finish("M4b")
+
+    stage = run.body["stages"][0]
+    chk.check("single stage is both entry and terminal",
+              (stage["isEntry"], stage["isTerminal"]), (True, True))
+    chk.check("single stage starts Ready", stage["status"], "Ready")
+    chk.check("plannedQty stays in the DECLARED uom (3 x 10 cases)",
+              float(stage["inputs"][0]["plannedQty"]), float(QTY_PER_BATCH * TARGET_QTY))
+
+    # --- the actual conversion assertion ---------------------------------
+    chk.section("3. Consumption converts cases to base units")
+    expected_base = QTY_PER_BATCH * TARGET_QTY * FACTOR   # 3 x 10 x 12 = 360
+    started = c.post(f"/production-runs/{run.body['runId']}/stages/{stage['runStageId']}/start")
+    chk.status("start the stage", started, 200)
+    if started.status != 200:
+        return chk.finish("M4b")
+
+    con = started.body["consumed"][0]
+    chk.check(f"consumed {expected_base} BASE units, not {QTY_PER_BATCH * TARGET_QTY}",
+              float(con["qty"]), float(expected_base))
+    chk.check("on-hand fell by the base quantity",
+              float(c.get(f"/stock/on-hand?itemId={raw['itemId']}&warehouseId={wh}").body["onHand"]),
+              before - expected_base)
+
+    rows = c.get(f"/stock/ledger?sourceDocType=PRDI&sourceDocId={run.body['runId']}&pageSize=50").body["items"]
+    chk.check("one PRDI row", len(rows), 1)
+    if rows:
+        chk.check("ledger qtyBase is the converted quantity", float(rows[0]["qtyBase"]), float(expected_base))
+
+    detail = c.get(f"/production-runs/{run.body['runId']}").body
+    chk.check("consumedQty stored in base units",
+              float(detail["stages"][0]["inputs"][0]["consumedQty"]), float(expected_base))
+
+    # --- missing conversion is refused, not silently mis-consumed --------
+    chk.section("4. An undefined conversion is refused (422), never assumed 1:1")
+    third_uom = next((u["uomId"] for u in c.get("/uoms?pageSize=50").body["items"]
+                      if u["uomId"] not in (base_uom, case_uom)), None)
+    if third_uom is None:
+        chk.check("skipped: need a third UOM", True, True)
+    else:
+        bad = dict(payload)
+        bad["code"] = TEMPLATE_CODE + "-BAD"
+        bad["stages"] = [dict(payload["stages"][0])]
+        bad["stages"][0] = {**payload["stages"][0],
+                            "inputs": [{"source": "Stock", "itemId": raw["itemId"],
+                                        "uomId": third_uom, "qtyPerBatch": 1}]}
+        made = c.post("/production-templates", bad)
+        if made.status != 201:
+            head = c.get(f"/production-templates?q={TEMPLATE_CODE}-BAD")
+            tid2 = next((t["templateId"] for t in head.body["items"]
+                         if t["code"] == TEMPLATE_CODE + "-BAD"), None)
+        else:
+            tid2 = made.body["templateId"]
+
+        if tid2:
+            run2 = c.post("/production-runs", {"templateId": tid2, "targetQty": 1, "warehouseId": wh})
+            if run2.status == 201:
+                s2 = run2.body["stages"][0]["runStageId"]
+                chk.status("start a stage whose input UOM has no conversion",
+                           c.post(f"/production-runs/{run2.body['runId']}/stages/{s2}/start"), 422)
+            else:
+                chk.check("could create the second run", run2.status, 201)
+
+    return chk.finish("M4b")
+
+
+if __name__ == "__main__":
+    sys.exit(main())

Backend/smoke/m4c_content_units.py

@@ -1,226 +0,0 @@
-"""M4c smoke test — production stage inputs expressed in content units (FR-MFG-04).
-
-Replaces m4b_uom_conversion.py, which tested the per-item UOM conversion table that no longer
-exists. Stock is now always a count of the item's base UOM (a bottle, a packet), and the only
-place another unit appears is a production formula: a stage input may be written as an amount
-of the item's *content* (ml or g), which the server divides by the item's content size to get
-the pack count FIFO actually consumes.
-
-What this pins down, none of which any other script covers:
-
-  * 2000 ml against a 500 ml bottle consumes exactly 4.0000 bottles, and the ledger agrees;
-  * 300 ml against the same item consumes 0.6000 — **fractional packs are legal**, which is
-    the whole reason the quantity columns are (18,4);
-  * a Content input on an item with no content size is refused at template save (422), not
-    silently treated as packs at stage start.
-
-Self-contained: creates its own item, warehouse, template and runs.
-
-    python Backend/smoke/m4c_content_units.py
-"""
-
-from __future__ import annotations
-
-import sys
-
-from smoke_common import bootstrap, drain_stock, seed_costed_stock
-
-WAREHOUSE_CODE = "SMOKE-CONTENT"
-TEMPLATE_CODE = "SMOKE-PT-M4C"
-SKU = "SMOKE-BOTTLE-500ML"
-PLAIN_SKU = "SMOKE-NO-CONTENT"
-
-CONTENT_QTY = 500          # ml held by one bottle
-SEED_BOTTLES = 100
-UNIT_COST = 3.0
-
-
-def production_reason(c, code):
-    for r in c.get("/reason-codes?context=Production&pageSize=50").body["items"]:
-        if r["code"] == code:
-            return r["reasonCodeId"]
-    sys.exit(f"FATAL: Production reason {code} not seeded.")
-
-
-def ensure_warehouse(c):
-    for w in c.get(f"/warehouses?q={WAREHOUSE_CODE}&pageSize=50").body["items"]:
-        if w["code"] == WAREHOUSE_CODE:
-            return w["warehouseId"]
-    created = c.post("/warehouses", {"code": WAREHOUSE_CODE, "name": "Content-unit smoke warehouse"})
-    if created.status != 201:
-        sys.exit(f"FATAL: could not create the smoke warehouse: {created.status} {created.body}")
-    return created.body["warehouseId"]
-
-
-def ensure_item(c, sku, name, content_qty, content_unit):
-    """Find-or-create; content fields are only sent when the item is meant to have them."""
-    for i in c.get(f"/items?q={sku}&pageSize=50").body["items"]:
-        if i["sku"] == sku:
-            return i
-
-    category = c.get("/categories?pageSize=1").body["items"]
-    uoms = c.get("/uoms?pageSize=1").body["items"]
-    if not category or not uoms:
-        sys.exit("FATAL: need at least one category and one UOM seeded.")
-
-    body = {
-        "sku": sku, "name": name,
-        "categoryId": category[0]["categoryId"],
-        "baseUomId": uoms[0]["uomId"],
-        "stockNature": "Stocked", "trackingMode": "None",
-    }
-    if content_qty is not None:
-        body["contentQty"] = content_qty
-        body["contentUnit"] = content_unit
-
-    created = c.post("/items", body)
-    if created.status != 201:
-        sys.exit(f"FATAL: could not create item {sku}: {created.status} {created.body}")
-    return created.body
-
-
-def save_template(c, raw_item, finished_item, qty_per_batch, qty_unit, suffix):
-    """
-    One template per section, never a shared one.
-
-    Each section starts a run and leaves it InProgress, and a template with a live run is
-    edit-locked (FR-MFG-06, 409 TEMPLATE_IN_USE) — so re-saving a single shared code would
-    fail from the second section onward for reasons that have nothing to do with content units.
-    """
-    code = f"{TEMPLATE_CODE}-{suffix}"
-    payload = {
-        "code": code, "name": f"Content-unit smoke line ({suffix})",
-        "stages": [{
-            "key": "tmp-mix", "name": "Mix", "estimatedMinutes": 5, "posX": 0, "posY": 0,
-            "fieldDefs": [],
-            "inputs": [{"source": "Stock", "itemId": raw_item,
-                        "qtyUnit": qty_unit, "qtyPerBatch": qty_per_batch}],
-            "outputs": [{"key": "tmp-out", "name": "Mixed", "itemId": finished_item,
-                         "qtyPerBatch": 1}],
-        }],
-        "edges": [],
-    }
-    existing = next((t for t in c.get(f"/production-templates?q={code}").body["items"]
-                     if t["code"] == code), None)
-    if existing:
-        head = c.get(f"/production-templates/{existing['templateId']}")
-        return c.put(f"/production-templates/{existing['templateId']}", payload, if_match=head.etag)
-    return c.post("/production-templates", payload)
-
-
-def saved_ok(chk, label, response):
-    """Template save is find-or-create, so a POST gives 201 and a PUT gives 200."""
-    ok = chk.check(f"{label} -> 200/201", response.status in (200, 201), True)
-    if not ok:
-        print(f"          server said: {response.body}")
-    return ok
-
-
-def consume_once(c, chk, tid, wh, target_qty, label, expected_packs):
-    """
-    Create a run, start its only stage, and assert what FIFO actually took.
-
-    `expected_packs` is compared against the RAW formula quantity resolved to packs, which is
-    only valid while the run scale factor is 1. Run creation computes
-    `ratio = targetQty / terminalOutput.qtyPerBatch` and pre-scales every planned quantity, so
-    this holds because `save_template` pins the terminal output to `qtyPerBatch: 1` and every
-    caller here passes `target_qty=1`. Change either and these numbers move by that ratio.
-    """
-    created = c.post("/production-runs", {"templateId": tid, "targetQty": target_qty, "warehouseId": wh})
-    if not chk.status(f"{label}: create the run", created, 201):
-        return
-    run = created.body
-    stage_id = run["stages"][0]["runStageId"]
-
-    started = c.post(f"/production-runs/{run['runId']}/stages/{stage_id}/start",
-                     idempotency_key=f"m4c-{run['runId']}")
-    if not chk.status(f"{label}: POST .../start", started, 200):
-        return
-
-    consumed = started.body["consumed"]
-    if not chk.check(f"{label}: exactly one input consumed", len(consumed), 1):
-        return
-    chk.check(f"{label}: consumed {expected_packs} base units",
-              round(float(consumed[0]["qty"]), 4), expected_packs)
-
-    rows = c.get(f"/stock/ledger?sourceDocType=PRDI&sourceDocId={run['runId']}&pageSize=50").body["items"]
-    chk.check(f"{label}: one PRDI ledger row", len(rows), 1)
-    if rows:
-        chk.check(f"{label}: ledger qtyBase matches the consumption",
-                  round(abs(float(rows[0]["qtyBase"])), 4), expected_packs)
-
-    # Cancel so the script is re-runnable. A run left InProgress edit-locks its template
-    # (FR-MFG-06), so the next execution could not re-save it and would fail with a 409 that
-    # says nothing about content units. Cancelling also returns the consumed stock (FR-MFG-17),
-    # which keeps the seeded on-hand stable across runs.
-    c.post(f"/production-runs/{run['runId']}/cancel",
-           {"reasonCodeId": production_reason(c, "PRD-CANCEL"), "note": "m4c cleanup"})
-
-
-def cancel_stale_runs(c):
-    """
-    Cancel any InProgress run this script left behind previously.
-
-    Self-healing rather than merely tidy: a live run edit-locks its template, so without this
-    a re-run (or an earlier interrupted run) fails at template save with 409 TEMPLATE_IN_USE —
-    a failure that looks like a content-unit bug and is not one.
-    """
-    ours = {t["templateId"] for t in c.get(f"/production-templates?q={TEMPLATE_CODE}&pageSize=50").body["items"]
-            if t["code"].startswith(TEMPLATE_CODE)}
-    if not ours:
-        return
-    stale = [r for r in c.get("/production-runs?status=InProgress&pageSize=200").body["items"]
-             if r["templateId"] in ours]
-    for r in stale:
-        c.post(f"/production-runs/{r['runId']}/cancel",
-               {"reasonCodeId": production_reason(c, "PRD-CANCEL"), "note": "m4c stale cleanup"})
-    if stale:
-        print(f"cancelled {len(stale)} stale run(s) from a previous execution")
-
-
-def main():
-    c, chk, args = bootstrap(__doc__)
-    print(f"API {args.api}")
-    cancel_stale_runs(c)
-
-    bottle = ensure_item(c, SKU, "Smoke syrup 500ml bottle", CONTENT_QTY, "Ml")
-    plain = ensure_item(c, PLAIN_SKU, "Smoke item with no content", None, None)
-    finished = c.get("/items?pageSize=5&status=Active").body["items"][0]
-    print(f"bottle={bottle['itemId']} contentBaseQty={bottle.get('contentBaseQty')} "
-          f"plain={plain['itemId']} finished={finished['itemId']}")
-
-    chk.section("0. Content size normalises to a base unit on the item")
-    chk.check("contentBaseQty is the entered ml", float(bottle["contentBaseQty"]), float(CONTENT_QTY))
-    chk.check("contentBaseUnit is Ml", bottle["contentBaseUnit"], "Ml")
-
-    wh = ensure_warehouse(c)
-    drain_stock(c, wh)
-    seed_costed_stock(c, wh, [(bottle["itemId"], SEED_BOTTLES, UNIT_COST)])
-
-    # ------------------------------------------------- whole packs out of content units
-    chk.section("1. A content quantity resolves to whole packs (2000 ml / 500 ml = 4)")
-    saved = save_template(c, bottle["itemId"], finished["itemId"], 2000, "Content", "whole")
-    if saved_ok(chk, "save the Content template", saved):
-        consume_once(c, chk, saved.body["templateId"], wh, 1, "2000 ml", 4.0)
-
-    # --------------------------------------------------------------- fractional packs
-    chk.section("2. A content quantity below one pack consumes a FRACTION of one (300 ml = 0.6)")
-    saved = save_template(c, bottle["itemId"], finished["itemId"], 300, "Content", "frac")
-    if saved_ok(chk, "save the fractional Content template", saved):
-        consume_once(c, chk, saved.body["templateId"], wh, 1, "300 ml", 0.6)
-
-    # ------------------------------------------------------------------ the guard rail
-    chk.section("3. Content units are refused on an item that has no content size")
-    refused = save_template(c, plain["itemId"], finished["itemId"], 100, "Content", "nocontent")
-    chk.status("Content input on a contentless item", refused, 422)
-
-    chk.section("4. The same item still works when the formula is written in packs")
-    saved = save_template(c, bottle["itemId"], finished["itemId"], 3, "Pack", "pack")
-    if saved_ok(chk, "save the Pack template", saved):
-        consume_once(c, chk, saved.body["templateId"], wh, 1, "3 bottles", 3.0)
-
-    return chk.finish("M4c")
-
-
-if __name__ == "__main__":
-    sys.exit(main())

Backend/smoke/m5_receipt.py

@@ -157,18 +157,18 @@ def main():
                    if i["itemId"] == raw)
     finished_b = state["finishedItemId"]
 
-    # A fresh single-stage template: a pack-counted input, so no content division muddies
-    # the arithmetic; qtyPerBatch 3.5 so consumed is NOT a multiple of the target (which is what
+    # A fresh single-stage template: base-UOM input so no conversion muddies the arithmetic,
+    # qtyPerBatch 3.5 so the consumed quantity is NOT a multiple of the target (which is what
     # forces pool / goodQty to repeat).
     payload_b = {
         "code": BIG_TEMPLATE_CODE, "name": "Smoke M5 rounding line",
         "stages": [{
             "key": "tmp-b", "name": "Mix", "estimatedMinutes": 5, "posX": 0, "posY": 0,
             "fieldDefs": [],
-            "inputs": [{"source": "Stock", "itemId": raw,
+            "inputs": [{"source": "Stock", "itemId": raw, "uomId": raw_uom,
                         "qtyPerBatch": BIG_QTY_PER_BATCH}],
             "outputs": [{"key": "tmp-bo", "name": "Mixed", "itemId": finished_b,
-                         "qtyPerBatch": 1}],
+                         "uomId": raw_uom, "qtyPerBatch": 1}],
         }],
         "edges": [],
     }
@@ -190,7 +190,7 @@ def main():
         # and the pool would not match the figures this section reasons about — the assertions
         # would still "pass" while testing something else entirely.
         drain_stock(c, wh)
-        seed_costed_stock(c, wh, [(raw, 5000, BIG_UNIT_COST)])
+        seed_costed_stock(c, wh, [(raw, raw_uom, 5000, BIG_UNIT_COST)])
 
         big = c.post("/production-runs", {"templateId": tid, "targetQty": BIG_TARGET, "warehouseId": wh})
         if big.status != 201:
@@ -243,7 +243,7 @@ def main():
                 "key": "tmp-one", "name": "Make", "estimatedMinutes": 1, "posX": 0, "posY": 0,
                 "fieldDefs": [], "inputs": [],
                 "outputs": [{"key": "tmp-o", "name": "Tracked", "itemId": tracked["itemId"],
-                             "qtyPerBatch": 1}],
+                             "uomId": tracked["baseUomId"], "qtyPerBatch": 1}],
             }],
             "edges": [],
         }

Backend/smoke/m6_m7_leftover_rework_cancel.py

@@ -54,13 +54,13 @@ def ensure_template(c, raw, finished, uom):
         "stages": [
             {"key": "tmp-cut", "name": "Cut", "estimatedMinutes": 10, "posX": 0, "posY": 0,
              "fieldDefs": [],
-             "inputs": [{"source": "Stock", "itemId": raw, "qtyPerBatch": RAW_QPB}],
+             "inputs": [{"source": "Stock", "itemId": raw, "uomId": uom, "qtyPerBatch": RAW_QPB}],
              "outputs": [{"key": "tmp-f", "name": "Frame", "uomId": uom, "qtyPerBatch": 1}]},
             {"key": "tmp-asm", "name": "Assemble", "estimatedMinutes": 10, "posX": 400, "posY": 0,
              "fieldDefs": [],
-             "inputs": [{"source": "Upstream", "fromOutputKey": "tmp-f", "qtyPerBatch": 1}],
+             "inputs": [{"source": "Upstream", "fromOutputKey": "tmp-f", "uomId": uom, "qtyPerBatch": 1}],
              "outputs": [{"key": "tmp-c", "name": "Chair", "itemId": finished,
-                          "qtyPerBatch": 1}]},
+                          "uomId": uom, "qtyPerBatch": 1}]},
         ],
         "edges": [{"parentKey": "tmp-cut", "childKey": "tmp-asm"}],
     }
@@ -101,7 +101,7 @@ def main():
     uom = items[0]["baseUomId"]
 
     drain_stock(c, wh)
-    seed_costed_stock(c, wh, [(raw, SEED, UNIT_COST)])
+    seed_costed_stock(c, wh, [(raw, uom, SEED, UNIT_COST)])
     tid = ensure_template(c, raw, finished, uom)
     consumed_units = RAW_QPB * TARGET      # 50
     consumed_value = consumed_units * UNIT_COST   # 150.00

Backend/smoke/run_all.py

@@ -22,7 +22,7 @@ SCRIPTS = [
     ("M2  templates + graph validation", "m2_templates.py"),
     ("M3  run creation / board / quantities", "m3_runs.py"),
     ("M4  stage start / complete / approve / transfer", "m4_stage_actions.py"),
-    ("M4c content-unit stage inputs + fractional packs", "m4c_content_units.py"),
+    ("M4b UOM conversion on stock inputs", "m4b_uom_conversion.py"),
     ("M5  terminal receipt + cost pool", "m5_receipt.py"),
     ("M6+M7 leftover / rework / cancel", "m6_m7_leftover_rework_cancel.py"),
 ]

Backend/smoke/smoke_common.py

@@ -240,16 +240,15 @@ def seed_costed_stock(c, warehouse_id: int, lines, vendor_id: int | None = None)
     """
     Create on-hand at explicit unit costs via a direct GRN + confirm.
 
-    `lines` is an iterable of (item_id, qty, unit_cost). Quantities are counts of the item's
-    base UOM — document lines carry no unit of their own.
+    `lines` is an iterable of (item_id, uom_id, qty, unit_cost).
     """
     vendor_id = vendor_id or ensure_vendor(c)
     grn = c.post("/grns", {
         "vendorId": vendor_id,
         "warehouseId": warehouse_id,
         "lines": [
-            {"itemId": i, "qty": q, "unitCost": cost, "discountPct": 0, "vatPct": 0}
-            for (i, q, cost) in lines
+            {"itemId": i, "uomId": u, "qty": q, "unitCost": cost, "discountPct": 0, "vatPct": 0}
+            for (i, u, q, cost) in lines
         ],
     })
     if grn.status != 201:

Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx

@@ -8,7 +8,6 @@ import { isPoEditable, purchaseOrdersApi } from "@/lib/api/purchase-orders"
 import { warehousesApi } from "@/lib/api/warehouses"
 import { itemsApi } from "@/lib/api/items"
 import { uomsApi } from "@/lib/api/uoms"
-import { baseUomLabel } from "@/lib/uom-label"
 import { vendorsApi } from "@/lib/api/vendors"
 import { errorMessage } from "@/lib/error-map"
 import { validatePoLine } from "@/lib/validations/procurement"
@@ -29,6 +28,7 @@ interface DraftLine {
   key: string
   poLineId: number | null
   itemId: number | null
+  uomId: number | null
   warehouseId: number | null
   qty: string
   unitPrice: string
@@ -72,6 +72,7 @@ export default function PurchaseOrderDetailPage() {
       key: newKey(),
       poLineId: l.poLineId,
       itemId: l.itemId,
+      uomId: l.uomId,
       warehouseId: l.warehouseId,
       qty: String(l.qty),
       unitPrice: String(l.unitPrice),
@@ -110,6 +111,9 @@ export default function PurchaseOrderDetailPage() {
   function itemFor(itemId: number | null) {
     return items.find((i) => i.itemId === itemId) ?? null
   }
+  function uomName(uomId: number) {
+    return uoms.find((u) => u.uomId === uomId)?.name ?? `#${uomId}`
+  }
   function warehouseCode(warehouseId: number) {
     return warehouses.find((w) => w.warehouseId === warehouseId)?.code ?? `#${warehouseId}`
   }
@@ -137,6 +141,7 @@ export default function PurchaseOrderDetailPage() {
     for (const line of lines) {
       const errors = validatePoLine({
         itemId: line.itemId,
+        uomId: line.uomId,
         warehouseId: line.warehouseId,
         qty: line.qty,
         unitPrice: line.unitPrice,
@@ -152,6 +157,7 @@ export default function PurchaseOrderDetailPage() {
 
     const payloadLines: CreatePoLineInput[] = lines.map((l) => ({
       itemId: l.itemId as number,
+      uomId: l.uomId as number,
       warehouseId: l.warehouseId as number,
       qty: Number(l.qty),
       unitPrice: Number(l.unitPrice),
@@ -278,7 +284,7 @@ export default function PurchaseOrderDetailPage() {
             <>
               <Button variant="success" size="lg" onClick={handleSubmitPo} disabled={submitting || deleting}>
                 <Check className="size-5" />
-                {submitting ? "Approving�" : "Approve"}
+                {submitting ? "Approving…" : "Approve"}
               </Button>
               <Button variant="destructive" size="lg" onClick={handleDelete} disabled={deleting || submitting}>
                 <Trash2 className="size-5" />
@@ -341,7 +347,7 @@ export default function PurchaseOrderDetailPage() {
         <div className="flex items-center justify-between">
           <h2 className="text-base font-semibold text-foreground">Lines</h2>
           {editable && (
-            <Button type="button" variant="outline" onClick={() => setLines((prev) => [...prev, { key: newKey(), poLineId: null, itemId: null, warehouseId: null, qty: "", unitPrice: "", tax: "0.18", qtyReceived: 0 }])}>
+            <Button type="button" variant="outline" onClick={() => setLines((prev) => [...prev, { key: newKey(), poLineId: null, itemId: null, uomId: null, warehouseId: null, qty: "", unitPrice: "", tax: "0.18", qtyReceived: 0 }])}>
               <Plus className="size-5" />
               Add line
             </Button>
@@ -370,7 +376,7 @@ export default function PurchaseOrderDetailPage() {
                   return (
                     <TableRow key={line.key}>
                       <TableCell className="px-3 py-3.5">{item ? `${item.sku} — ${item.name}` : `Item #${line.itemId}`}</TableCell>
-                      <TableCell className="px-3 py-3.5">{baseUomLabel(items, uoms, line.itemId)}</TableCell>
+                      <TableCell className="px-3 py-3.5">{line.uomId ? uomName(line.uomId) : "—"}</TableCell>
                       <TableCell className="px-3 py-3.5">{line.warehouseId ? warehouseCode(line.warehouseId) : "—"}</TableCell>
                       <TableCell className="px-3 py-3.5">{line.qty}</TableCell>
                       <TableCell className="px-3 py-3.5">{line.qtyReceived}</TableCell>
@@ -397,9 +403,19 @@ export default function PurchaseOrderDetailPage() {
                       <FieldError errors={[errors.itemId ? { message: errors.itemId } : undefined]} />
                     </TableCell>
                     <TableCell className="px-3 py-3 align-top">
-                      <div className="flex h-11 items-center text-base text-muted-foreground">
-                        {baseUomLabel(items, uoms, line.itemId)}
-                      </div>
+                      <Select<number | null> value={line.uomId} onValueChange={(v) => updateLine(line.key, { uomId: v })}>
+                        <SelectTrigger className="h-11! w-full text-base" aria-invalid={!!errors.uomId}>
+                          <SelectValue placeholder="UOM" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {uoms.map((u) => (
+                            <SelectItem key={u.uomId} value={u.uomId} className="text-base">
+                              {u.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                      <FieldError errors={[errors.uomId ? { message: errors.uomId } : undefined]} />
                     </TableCell>
                     <TableCell className="px-3 py-3 align-top">
                       <Select<number | null> value={line.warehouseId} onValueChange={(v) => updateLine(line.key, { warehouseId: v })}>

Frontend/erp-system/app/dashboard/procurement/purchase-orders/new/page.tsx

@@ -12,7 +12,6 @@ import { vendorsApi } from "@/lib/api/vendors"
 import { warehousesApi } from "@/lib/api/warehouses"
 import { itemsApi } from "@/lib/api/items"
 import { uomsApi } from "@/lib/api/uoms"
-import { baseUomLabel } from "@/lib/uom-label"
 import { errorMessage } from "@/lib/error-map"
 import { validatePoLine } from "@/lib/validations/procurement"
 import { cn } from "@/lib/utils"
@@ -40,6 +39,7 @@ import { toast } from "@/components/ui/toast"
 interface DraftLine {
   key: string
   itemId: number | null
+  uomId: number | null
   warehouseId: number | null
   qty: string
   unitPrice: string
@@ -57,7 +57,7 @@ function newKey() {
 // DTO still requires it. Unit price *is* entered here; a PO prefilled from an RFQ starts
 // from its negotiated price (below) but stays editable.
 function emptyLine(): DraftLine {
-  return { key: newKey(), itemId: null, warehouseId: null, qty: "", unitPrice: "0", tax: "0" }
+  return { key: newKey(), itemId: null, uomId: null, warehouseId: null, qty: "", unitPrice: "0", tax: "0" }
 }
 
 function NewPurchaseOrderContent() {
@@ -169,6 +169,7 @@ function NewPurchaseOrderContent() {
               (l): DraftLine => ({
                 key: newKey(),
                 itemId: l.itemId,
+                uomId: null,
                 warehouseId: null,
                 qty: String(l.qty),
                 unitPrice: "0",
@@ -194,6 +195,7 @@ function NewPurchaseOrderContent() {
               return {
                 key: newKey(),
                 itemId: l.itemId,
+                uomId: null,
                 warehouseId: null,
                 qty: String(l.qty),
                 unitPrice: cell ? String(cell.unitPrice) : "0",
@@ -240,6 +242,7 @@ function NewPurchaseOrderContent() {
     for (const line of lines) {
       const errors = validatePoLine({
         itemId: line.itemId,
+        uomId: line.uomId,
         warehouseId: line.warehouseId,
         qty: line.qty,
         unitPrice: line.unitPrice,
@@ -255,6 +258,7 @@ function NewPurchaseOrderContent() {
 
     const payloadLines: CreatePoLineInput[] = lines.map((l) => ({
       itemId: l.itemId as number,
+      uomId: l.uomId as number,
       warehouseId: l.warehouseId as number,
       qty: Number(l.qty),
       unitPrice: Number(l.unitPrice),
@@ -445,9 +449,19 @@ function NewPurchaseOrderContent() {
                             )}
                           </TableCell>
                           <TableCell className="px-3 py-3 align-top">
-                            <div className="flex h-11 items-center text-base text-muted-foreground">
-                              {baseUomLabel(items ?? [], uoms ?? [], line.itemId)}
-                            </div>
+                            <Select<number | null> value={line.uomId} onValueChange={(v) => updateLine(line.key, { uomId: v })}>
+                              <SelectTrigger className="h-11! w-full text-base" aria-invalid={!!errors.uomId}>
+                                <SelectValue placeholder="UOM" />
+                              </SelectTrigger>
+                              <SelectContent>
+                                {(uoms ?? []).map((u) => (
+                                  <SelectItem key={u.uomId} value={u.uomId} className="text-base">
+                                    {u.name}
+                                  </SelectItem>
+                                ))}
+                              </SelectContent>
+                            </Select>
+                            <FieldError errors={[errors.uomId ? { message: errors.uomId } : undefined]} />
                           </TableCell>
                           <TableCell className="px-3 py-3 align-top">
                             <Select<number | null> value={line.warehouseId} onValueChange={(v) => updateLine(line.key, { warehouseId: v })}>

Frontend/erp-system/app/dashboard/production/runs/[id]/StageDrawer.tsx

@@ -18,7 +18,6 @@ import {
   TransferLine,
 } from "@/types/production"
 import { ItemListItem, Uom } from "@/types/master-data"
-import { baseUomLabel, contentUnitLabel, uomLabel } from "@/lib/uom-label"
 import { ReasonCode } from "@/types/stock"
 
 import { AlertDialog, AlertDialogContent } from "@/components/ui/alert-dialog"
@@ -155,24 +154,10 @@ export function StageDrawer({
     return (id: number | null) => (id === null ? "—" : byId.get(id) ?? `Item #${id}`)
   }, [items])
 
-  // Nothing on a run line carries a unit of its own any more. An output that references a
-  // real item shows that item's base UOM; only intermediate WIP falls back to its own label.
-  const outputUnit = useMemo(
-    () => (output: RunStageOutput) =>
-      output.itemId !== null ? baseUomLabel(items, uoms, output.itemId) : uomLabel(uoms, output.uomId),
-    [items, uoms],
-  )
-
-  // An input's unit follows how its quantity was expressed: ml/g for a content formula,
-  // otherwise a count of the item's packs. Upstream inputs are WIP from a parent stage.
-  const inputUnit = useMemo(
-    () => (input: RunStageInput) => {
-      if (input.source === "Upstream") return "WIP"
-      if (input.qtyUnit === "Content") return contentUnitLabel(items, input.itemId) ?? "—"
-      return baseUomLabel(items, uoms, input.itemId)
-    },
-    [items, uoms],
-  )
+  const uomName = useMemo(() => {
+    const byId = new Map(uoms.map((u) => [u.uomId, u.name]))
+    return (id: number) => byId.get(id) ?? `#${id}`
+  }, [uoms])
 
   const stageName = useMemo(() => {
     const byId = new Map(run.stages.map((s) => [s.runStageId, s.name]))
@@ -338,7 +323,7 @@ export function StageDrawer({
                   value={plannedInputs[input.runInputId] ?? String(input.plannedQty)}
                   onValueChange={(v) => setPlannedInputs((prev) => ({ ...prev, [input.runInputId]: v }))}
                   itemName={itemName}
-                  unitLabel={inputUnit}
+                  uomName={uomName}
                 />
               ))}
             </section>
@@ -352,7 +337,7 @@ export function StageDrawer({
                 <div key={output.runOutputId} className="rounded-lg border border-border p-3">
                   <div className="flex items-baseline justify-between gap-2">
                     <p className="min-w-0 truncate text-sm font-medium text-foreground">{output.name}</p>
-                    <span className="shrink-0 text-xs text-muted-foreground">{outputUnit(output)}</span>
+                    <span className="shrink-0 text-xs text-muted-foreground">{uomName(output.uomId)}</span>
                   </div>
                   {output.itemId !== null && (
                     <p className="text-xs text-muted-foreground">Finished good: {itemName(output.itemId)}</p>
@@ -537,7 +522,7 @@ export function StageDrawer({
               <section className="flex flex-col gap-3">
                 <h3 className="text-sm font-bold text-foreground">Finish the run</h3>
                 <div className="flex flex-col gap-1 rounded-lg border border-info/30 bg-info/5 p-3">
-                  <Row label="Good quantity">{fmt(goodQty)} {outputUnit(terminalOutput)}</Row>
+                  <Row label="Good quantity">{fmt(goodQty)} {uomName(terminalOutput.uomId)}</Row>
                   <Row label="Materials consumed">{money(run.costPool.consumed)}</Row>
                   <Row label="Leftovers returned">−{money(run.costPool.returned)}</Row>
                   <Separator className="my-1" />
@@ -668,14 +653,14 @@ function InputCard({
   value,
   onValueChange,
   itemName,
-  unitLabel,
+  uomName,
 }: {
   input: RunStageInput
   editable: boolean
   value: string
   onValueChange: (value: string) => void
   itemName: (id: number | null) => string
-  unitLabel: (input: RunStageInput) => string
+  uomName: (id: number) => string
 }) {
   const isUpstream = input.source === "Upstream"
   const short = isUpstream && input.deliveredQty < input.plannedQty
@@ -686,7 +671,7 @@ function InputCard({
         <p className="min-w-0 truncate text-sm font-medium text-foreground">
           {isUpstream ? "Upstream work in progress" : itemName(input.itemId)}
         </p>
-        <span className="shrink-0 text-xs text-muted-foreground">{unitLabel(input)}</span>
+        <span className="shrink-0 text-xs text-muted-foreground">{uomName(input.uomId)}</span>
       </div>
 
       <div className="mt-2 flex flex-col gap-1">
@@ -713,10 +698,9 @@ function InputCard({
         )}
 
         {/*
-          Consumed/returned figures are always a count of the item's packs, while `plannedQty`
-          above is in the input's declared unit — a formula written as 2000 ml against a 500 ml
-          bottle shows planned 2000 and consumed 4. Labelled explicitly so the two are never
-          read as the same unit.
+          Consumed/returned figures are in the item's BASE uom, while `plannedQty` above is in the
+          input's declared uom — an input declared in "box of 12" shows planned 3 and consumed 36.
+          Labelled explicitly so the two are never read as the same unit.
         */}
         {input.consumedQty > 0 && (
           <>

Frontend/erp-system/app/dashboard/production/templates/[id]/StageEditorPanel.tsx

@@ -1,11 +1,9 @@
 "use client"
 
-import type { ReactNode } from "react"
 import { Plus, Trash2 } from "lucide-react"
 
 import { cn } from "@/lib/utils"
-import { baseUomLabel, contentUnitLabel } from "@/lib/uom-label"
-import { CustomFieldType, StageInputSource, StageQtyUnit } from "@/types/production"
+import { CustomFieldType, StageInputSource } from "@/types/production"
 import { ItemListItem, Uom } from "@/types/master-data"
 import {
   BuilderFieldDef,
@@ -37,24 +35,21 @@ export interface UpstreamOutputOption {
   outputName: string
 }
 
-/**
- * One quantity row: the number, plus whatever names its unit.
- *
- * The unit is no longer a free choice. An input's is decided by its item (and, when that item
- * has a content size, by the Pack/Content toggle); an output's comes from its item, or from a
- * WIP label when it has none. So each caller supplies its own `unit` control and this row only
- * owns the number.
- */
+/** One row per input/output quantity — UOM select plus qty, used three times below. */
 function QtyRow({
   qty,
+  uomId,
+  uoms,
   readOnly,
   onQtyChange,
-  unit,
+  onUomChange,
 }: {
   qty: number
+  uomId: number | null
+  uoms: Uom[]
   readOnly: boolean
   onQtyChange: (qty: number) => void
-  unit: ReactNode
+  onUomChange: (uomId: number) => void
 }) {
   return (
     <div className="flex items-center gap-2">
@@ -69,59 +64,22 @@ function QtyRow({
         placeholder="Qty per batch"
         aria-label="Quantity per batch"
       />
-      {unit}
+      <Select<number> value={uomId} onValueChange={(v) => v && onUomChange(v)}>
+        <SelectTrigger className="h-8! w-24 shrink-0 text-sm" disabled={readOnly} aria-label="UOM">
+          <SelectValue placeholder="UOM" />
+        </SelectTrigger>
+        <SelectContent>
+          {uoms.map((u) => (
+            <SelectItem key={u.uomId} value={u.uomId} className="text-sm">
+              {u.name}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
     </div>
   )
 }
 
-/** Static unit name, for the rows whose unit is derived and therefore not editable. */
-function UnitLabel({ children }: { children: ReactNode }) {
-  return (
-    <span className="flex h-8 w-24 shrink-0 items-center text-sm text-muted-foreground">{children}</span>
-  )
-}
-
-/**
- * Names the unit of a stage input's quantity.
- *
- * Only one case is a choice: a Stock input whose item declares a content size can be written
- * either as an amount of that content (2000 ml) or as a pack count (4 bottles). Everything
- * else has exactly one possible unit, so it renders as a label rather than a control.
- */
-function InputUnitControl({
-  input,
-  items,
-  uoms,
-  readOnly,
-  onChange,
-}: {
-  input: BuilderInput
-  items: ItemListItem[]
-  uoms: Uom[]
-  readOnly: boolean
-  onChange: (unit: StageQtyUnit) => void
-}) {
-  if (input.source === "Upstream") return <UnitLabel>WIP</UnitLabel>
-
-  const item = items.find((candidate) => candidate.itemId === input.itemId)
-  const packName = baseUomLabel(items, uoms, input.itemId)
-  const contentName = contentUnitLabel(items, input.itemId)
-
-  if (!item?.contentBaseQty || !contentName) return <UnitLabel>{packName}</UnitLabel>
-
-  return (
-    <Select<string> value={input.qtyUnit} onValueChange={(v) => v && onChange(v as StageQtyUnit)}>
-      <SelectTrigger className="h-8! w-24 shrink-0 text-sm" disabled={readOnly} aria-label="Quantity unit">
-        <SelectValue />
-      </SelectTrigger>
-      <SelectContent>
-        <SelectItem value="Content" className="text-sm">{contentName}</SelectItem>
-        <SelectItem value="Pack" className="text-sm">{packName}</SelectItem>
-      </SelectContent>
-    </Select>
-  )
-}
-
 export function StageEditorPanel({
   data,
   isTerminal,
@@ -150,7 +108,7 @@ export function StageEditorPanel({
     onChange({
       inputs: [
         ...data.inputs,
-        { localId: newLocalId(), source: "Stock", itemId: null, fromOutputKey: null, qtyUnit: "Pack", qtyPerBatch: 1 },
+        { localId: newLocalId(), source: "Stock", itemId: null, fromOutputKey: null, uomId: null, qtyPerBatch: 1 },
       ],
     })
   }
@@ -164,20 +122,13 @@ export function StageEditorPanel({
    * the validator rejects an input that carries both.
    */
   function changeInputSource(localId: string, source: StageInputSource) {
-    updateInput(
-      localId,
-      // WIP has no content size, so an Upstream input can only ever be counted in whole units.
-      source === "Stock" ? { source, fromOutputKey: null } : { source, itemId: null, qtyUnit: "Pack" },
-    )
+    updateInput(localId, source === "Stock" ? { source, fromOutputKey: null } : { source, itemId: null })
   }
 
-  /**
-   * Default to content units when the item has a content size — a recipe is far more often
-   * written as "2000 ml of syrup" than "4 bottles" — and to packs otherwise. Still switchable.
-   */
+  /** Default the UOM to the item's base unit — right most of the time, still overridable. */
   function pickInputItem(input: BuilderInput, itemId: number) {
     const item = items.find((i) => i.itemId === itemId)
-    updateInput(input.localId, { itemId, qtyUnit: item?.contentBaseQty ? "Content" : "Pack" })
+    updateInput(input.localId, { itemId, uomId: input.uomId ?? item?.baseUomId ?? null })
   }
 
   function updateOutput(key: string, patch: Partial<BuilderOutput>) {
@@ -336,15 +287,11 @@ export function StageEditorPanel({
 
                     <QtyRow
                       qty={input.qtyPerBatch}
+                      uomId={input.uomId}
+                      uoms={uoms}
                       readOnly={readOnly}
                       onQtyChange={(qtyPerBatch) => updateInput(input.localId, { qtyPerBatch })}
-                      unit={<InputUnitControl
-                        input={input}
-                        items={items}
-                        uoms={uoms}
-                        readOnly={readOnly}
-                        onChange={(qtyUnit) => updateInput(input.localId, { qtyUnit })}
-                      />}
+                      onUomChange={(uomId) => updateInput(input.localId, { uomId })}
                     />
                   </div>
                 </div>
@@ -400,27 +347,11 @@ export function StageEditorPanel({
                   </div>
                   <QtyRow
                     qty={output.qtyPerBatch}
+                    uomId={output.uomId}
+                    uoms={uoms}
                     readOnly={readOnly}
                     onQtyChange={(qtyPerBatch) => updateOutput(output.key, { qtyPerBatch })}
-                    unit={
-                      // A finished good is counted in its item's own unit; only WIP names one.
-                      output.itemId !== null ? (
-                        <UnitLabel>{baseUomLabel(items, uoms, output.itemId)}</UnitLabel>
-                      ) : (
-                        <Select<number> value={output.uomId} onValueChange={(v) => v && updateOutput(output.key, { uomId: v })}>
-                          <SelectTrigger className="h-8! w-24 shrink-0 text-sm" disabled={readOnly} aria-label="WIP unit">
-                            <SelectValue placeholder="Unit" />
-                          </SelectTrigger>
-                          <SelectContent>
-                            {uoms.map((u) => (
-                              <SelectItem key={u.uomId} value={u.uomId} className="text-sm">
-                                {u.name}
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        </Select>
-                      )
-                    }
+                    onUomChange={(uomId) => updateOutput(output.key, { uomId })}
                   />
                 </div>
               ))}

Frontend/erp-system/app/dashboard/production/templates/[id]/page.tsx

@@ -77,7 +77,7 @@ function graphToFlow(graph: ProductionTemplateGraph): { nodes: Node[]; edges: Ed
         source: i.source,
         itemId: i.itemId,
         fromOutputKey: i.fromOutputKey,
-        qtyUnit: i.qtyUnit,
+        uomId: i.uomId,
         qtyPerBatch: i.qtyPerBatch,
       })),
       outputs: s.outputs.map((o) => ({
@@ -414,21 +414,14 @@ function TemplateBuilderContent() {
         const where = `Input ${i + 1} of "${label}"`
         if (input.source === "Stock" && input.itemId === null) list.push(`${where} needs an item.`)
         if (input.source === "Upstream" && !input.fromOutputKey) list.push(`${where} needs an upstream output.`)
-        // Content quantities divide by the item's content size, so the item must declare one.
-        if (input.qtyUnit === "Content") {
-          const item = items.find((candidate) => candidate.itemId === input.itemId)
-          if (item && !item.contentBaseQty) {
-            list.push(`${where} is in content units, but ${item.sku} has no content size.`)
-          }
-        }
+        if (input.uomId === null) list.push(`${where} needs a UOM.`)
         if (input.qtyPerBatch <= 0) list.push(`${where} needs a quantity greater than zero.`)
       })
 
       data.outputs.forEach((output, i) => {
         const where = `Output ${i + 1} of "${label}"`
         if (!isTerminal && !output.name.trim()) list.push(`${where} needs a name.`)
-        // Only work-in-progress declares its own unit; a finished good takes its item's.
-        if (!isTerminal && output.uomId === null) list.push(`${where} needs a UOM.`)
+        if (output.uomId === null) list.push(`${where} needs a UOM.`)
         if (output.qtyPerBatch <= 0) list.push(`${where} needs a quantity greater than zero.`)
       })
 
@@ -509,7 +502,7 @@ function TemplateBuilderContent() {
           source: i.source,
           itemId: i.source === "Stock" ? i.itemId : null,
           fromOutputKey: i.source === "Upstream" ? i.fromOutputKey : null,
-          qtyUnit: i.source === "Upstream" ? "Pack" : i.qtyUnit,
+          uomId: i.uomId!,
           qtyPerBatch: i.qtyPerBatch,
         })),
         // Only the terminal stage's output may name an item (FR-MFG-05). A stage that *was*
@@ -520,8 +513,7 @@ function TemplateBuilderContent() {
           key: o.key,
           itemId: isTerminal ? o.itemId : null,
           name: o.name.trim(),
-          // An item-bearing output takes its unit from the item, so it must send none.
-          uomId: isTerminal ? null : o.uomId,
+          uomId: o.uomId!,
           qtyPerBatch: o.qtyPerBatch,
         })),
       }