diff --git a/src/PowderCoating.Application/DTOs/Job/JobDtos.cs b/src/PowderCoating.Application/DTOs/Job/JobDtos.cs
index 6291f24..dc46d4c 100644
--- a/src/PowderCoating.Application/DTOs/Job/JobDtos.cs
+++ b/src/PowderCoating.Application/DTOs/Job/JobDtos.cs
@@ -137,6 +137,13 @@ public class CreateJobDto
     [Display(Name = "Oven")]
     public int? OvenCostId { get; set; }
 
+    [Display(Name = "Batches")]
+    [Range(1, 999)]
+    public int OvenBatches { get; set; } = 1;
+
+    [Display(Name = "Cycle Time (min)")]
+    public int? OvenCycleMinutes { get; set; }
+
     [Required(ErrorMessage = "Description is required")]
     [StringLength(2000, ErrorMessage = "Description cannot exceed 2000 characters")]
     [Display(Name = "Description")]
@@ -208,6 +215,16 @@ public class UpdateJobDto
     [Display(Name = "Assigned Worker")]
     public string? AssignedUserId { get; set; }
 
+    [Display(Name = "Oven")]
+    public int? OvenCostId { get; set; }
+
+    [Display(Name = "Batches")]
+    [Range(1, 999)]
+    public int OvenBatches { get; set; } = 1;
+
+    [Display(Name = "Cycle Time (min)")]
+    public int? OvenCycleMinutes { get; set; }
+
     [Required(ErrorMessage = "Description is required")]
     [StringLength(2000, ErrorMessage = "Description cannot exceed 2000 characters")]
     [Display(Name = "Description")]
diff --git a/src/PowderCoating.Web/Controllers/JobsController.cs b/src/PowderCoating.Web/Controllers/JobsController.cs
index c160ee5..c2fe1ea 100644
--- a/src/PowderCoating.Web/Controllers/JobsController.cs
+++ b/src/PowderCoating.Web/Controllers/JobsController.cs
@@ -1078,6 +1078,8 @@ public class JobsController : Controller
                 QuoteId = dto.QuoteId,
                 AssignedUserId = dto.AssignedUserId,
                 OvenCostId = dto.OvenCostId,
+                OvenBatches = dto.OvenBatches > 0 ? dto.OvenBatches : 1,
+                OvenCycleMinutes = dto.OvenCycleMinutes,
                 Description = dto.Description,
                 JobPriorityId = dto.JobPriorityId,
                 JobStatusId = pendingStatus?.Id ?? 1,
@@ -1149,7 +1151,7 @@ public class JobsController : Controller
                 var totals = await _pricingService.CalculateQuoteTotalsAsync(
                     dto.JobItems, companyId, dto.CustomerId,
                     await GetEffectiveTaxPercentAsync(dto.CustomerId, createCosts?.TaxPercent ?? 0m),
-                    dto.DiscountType, dto.DiscountValue, dto.IsRushJob, createOvenRate, job.OvenBatches, job.OvenCycleMinutes);
+                    dto.DiscountType, dto.DiscountValue, dto.IsRushJob, createOvenRate, dto.OvenBatches > 0 ? dto.OvenBatches : 1, dto.OvenCycleMinutes);
 
                 job.FinalPrice             = totals.Total;
                 job.OvenBatchCost          = totals.OvenBatchCost;
@@ -1217,6 +1219,9 @@ public class JobsController : Controller
                 CustomerId = job.CustomerId,
                 QuoteId = job.QuoteId,
                 AssignedUserId = job.AssignedUserId,
+                OvenCostId = job.OvenCostId,
+                OvenBatches = job.OvenBatches > 0 ? job.OvenBatches : 1,
+                OvenCycleMinutes = job.OvenCycleMinutes,
                 Description = job.Description,
                 JobStatusId = job.JobStatusId,
                 JobPriorityId = job.JobPriorityId,
@@ -1261,6 +1266,7 @@ public class JobsController : Controller
                         TransferEfficiency = c.TransferEfficiency,
                         PowderCostPerLb    = c.PowderCostPerLb,
                         PowderToOrder      = c.PowderToOrder,
+                        NoExtraLayerCharge = c.NoExtraLayerCharge,
                         Notes              = c.Notes
                     }).ToList(),
                     PrepServices = ji.PrepServices.Select(ps => new CreateQuoteItemPrepServiceDto
@@ -1391,6 +1397,9 @@ public class JobsController : Controller
             job.CustomerId = dto.CustomerId;
             job.QuoteId = dto.QuoteId;
             job.Description = dto.Description;
+            job.OvenCostId = dto.OvenCostId;
+            job.OvenBatches = dto.OvenBatches > 0 ? dto.OvenBatches : 1;
+            job.OvenCycleMinutes = dto.OvenCycleMinutes;
             await RecordStatusChangeAsync(job, dto.JobStatusId);
             job.JobStatusId = dto.JobStatusId;
             job.JobPriorityId = dto.JobPriorityId;
@@ -1617,7 +1626,7 @@ public class JobsController : Controller
                 var totals = await _pricingService.CalculateQuoteTotalsAsync(
                     dto.JobItems, companyId, dto.CustomerId,
                     await GetEffectiveTaxPercentAsync(dto.CustomerId, editCosts?.TaxPercent ?? 0m),
-                    dto.DiscountType, dto.DiscountValue, dto.IsRushJob, editOvenRate, job.OvenBatches, job.OvenCycleMinutes);
+                    dto.DiscountType, dto.DiscountValue, dto.IsRushJob, editOvenRate, dto.OvenBatches > 0 ? dto.OvenBatches : 1, dto.OvenCycleMinutes);
                 job.FinalPrice             = totals.Total;
                 job.OvenBatchCost          = totals.OvenBatchCost;
                 job.ShopSuppliesAmount     = totals.ShopSuppliesAmount;
@@ -1818,6 +1827,7 @@ public class JobsController : Controller
         ViewBag.ComplexityModeratePercent = costs?.ComplexityModeratePercent ?? 5m;
         ViewBag.ComplexityComplexPercent  = costs?.ComplexityComplexPercent  ?? 15m;
         ViewBag.ComplexityExtremePercent  = costs?.ComplexityExtremePercent  ?? 25m;
+        ViewBag.DefaultOvenCycleMinutes   = costs?.DefaultOvenCycleMinutes  ?? 45;
         var useMetric = await _tenantContext.UseMetricSystemAsync();
         ViewBag.UseMetric = useMetric;
         ViewBag.AreaUnit = _measurementService.GetAreaUnitLabel(useMetric);
diff --git a/src/PowderCoating.Web/Views/Jobs/Create.cshtml b/src/PowderCoating.Web/Views/Jobs/Create.cshtml
index 1b93496..ff2c988 100644
--- a/src/PowderCoating.Web/Views/Jobs/Create.cshtml
+++ b/src/PowderCoating.Web/Views/Jobs/Create.cshtml
@@ -221,6 +221,49 @@
             </div>
         </div>
 
+        <!-- Oven & Batch Settings -->
+        <div class="card mb-4">
+            <div class="card-header">
+                <div class="d-flex align-items-center gap-2">
+                    <h5 class="mb-0"><i class="bi bi-thermometer-half me-2"></i>Oven &amp; Batch Settings</h5>
+                    <a tabindex="0" class="help-icon" role="button"
+                       data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
+                       data-bs-title="Oven &amp; Batch Pricing"
+                       data-bs-content="The oven cost is charged once per batch at the job level, not per item. Estimate how many oven loads the full job will fill &amp;mdash; for example, if you have 20 small parts and your oven fits 10, that&amp;#39;s 2 batches. Cycle time is how long each batch runs. The cost is calculated from your oven&amp;#39;s hourly rate in Settings.">
+                        <i class="bi bi-question-circle"></i>
+                    </a>
+                </div>
+            </div>
+            <div class="card-body">
+                <p class="text-muted small mb-3">Estimate how many oven loads the complete job will require. The oven cycle cost is added once at the job level, not per item.</p>
+                <div class="row g-3 align-items-end">
+                    @if (ViewBag.OvenCosts != null && ((List<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.OvenCosts).Count > 1)
+                    {
+                        <div class="col-md-4">
+                            <label asp-for="OvenCostId" class="form-label fw-semibold"><i class="bi bi-thermometer-half me-1"></i>Oven</label>
+                            <select asp-for="OvenCostId" asp-items="@((List<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.OvenCosts)"
+                                    class="form-select" onchange="scheduleAutoPricing()"></select>
+                        </div>
+                    }
+                    <div class="col-sm-3 col-md-2">
+                        <label asp-for="OvenBatches" class="form-label fw-semibold">Batches</label>
+                        <input asp-for="OvenBatches" class="form-control" type="number" min="1"
+                               value="@(Model.OvenBatches > 0 ? Model.OvenBatches : 1)"
+                               id="OvenBatches" onchange="scheduleAutoPricing()" />
+                    </div>
+                    <div class="col-sm-4 col-md-3">
+                        <label asp-for="OvenCycleMinutes" class="form-label fw-semibold">
+                            Cycle Time per Batch (min)
+                            <small class="text-muted fw-normal">default: @(ViewBag.DefaultOvenCycleMinutes ?? 45)</small>
+                        </label>
+                        <input asp-for="OvenCycleMinutes" class="form-control" type="number" min="1"
+                               id="OvenCycleMinutes" placeholder="@(ViewBag.DefaultOvenCycleMinutes ?? 45)"
+                               onchange="scheduleAutoPricing()" />
+                    </div>
+                </div>
+            </div>
+        </div>
+
         <!-- Pricing Options (Rush / Discount) -->
         <div class="card mb-4">
             <div class="card-header">
@@ -388,7 +431,7 @@
     "discountType": @Json.Serialize(Model.DiscountType),
     "discountValue": @Model.DiscountValue,
     "isRushJob": @Json.Serialize(Model.IsRushJob),
-    "ovenCostId": null,
+    "ovenCostId": @Json.Serialize(Model.OvenCostId),
     "areaUnit": @Json.Serialize((string?)ViewBag.AreaUnit),
     "useMetric": @Json.Serialize((bool)(ViewBag.UseMetric ?? false)),
     "pricingUrl": "@Url.Action("CalculatePricing", "Jobs")",
diff --git a/src/PowderCoating.Web/Views/Jobs/Edit.cshtml b/src/PowderCoating.Web/Views/Jobs/Edit.cshtml
index 0a975bc..bb81cb2 100644
--- a/src/PowderCoating.Web/Views/Jobs/Edit.cshtml
+++ b/src/PowderCoating.Web/Views/Jobs/Edit.cshtml
@@ -190,6 +190,49 @@
             </div>
         </div>
 
+        <!-- Oven & Batch Settings -->
+        <div class="card mb-4">
+            <div class="card-header">
+                <div class="d-flex align-items-center gap-2">
+                    <h5 class="mb-0"><i class="bi bi-thermometer-half me-2"></i>Oven &amp; Batch Settings</h5>
+                    <a tabindex="0" class="help-icon" role="button"
+                       data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
+                       data-bs-title="Oven &amp; Batch Pricing"
+                       data-bs-content="The oven cost is charged once per batch at the job level, not per item. Estimate how many oven loads the full job will fill &amp;mdash; for example, if you have 20 small parts and your oven fits 10, that&amp;#39;s 2 batches. Cycle time is how long each batch runs. The cost is calculated from your oven&amp;#39;s hourly rate in Settings.">
+                        <i class="bi bi-question-circle"></i>
+                    </a>
+                </div>
+            </div>
+            <div class="card-body">
+                <p class="text-muted small mb-3">Estimate how many oven loads the complete job will require. The oven cycle cost is added once at the job level, not per item.</p>
+                <div class="row g-3 align-items-end">
+                    @if (ViewBag.OvenCosts != null && ((List<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.OvenCosts).Count > 1)
+                    {
+                        <div class="col-md-4">
+                            <label asp-for="OvenCostId" class="form-label fw-semibold"><i class="bi bi-thermometer-half me-1"></i>Oven</label>
+                            <select asp-for="OvenCostId" asp-items="@((List<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.OvenCosts)"
+                                    class="form-select" onchange="scheduleAutoPricing()"></select>
+                        </div>
+                    }
+                    <div class="col-sm-3 col-md-2">
+                        <label asp-for="OvenBatches" class="form-label fw-semibold">Batches</label>
+                        <input asp-for="OvenBatches" class="form-control" type="number" min="1"
+                               value="@(Model.OvenBatches > 0 ? Model.OvenBatches : 1)"
+                               id="OvenBatches" onchange="scheduleAutoPricing()" />
+                    </div>
+                    <div class="col-sm-4 col-md-3">
+                        <label asp-for="OvenCycleMinutes" class="form-label fw-semibold">
+                            Cycle Time per Batch (min)
+                            <small class="text-muted fw-normal">default: @(ViewBag.DefaultOvenCycleMinutes ?? 45)</small>
+                        </label>
+                        <input asp-for="OvenCycleMinutes" class="form-control" type="number" min="1"
+                               id="OvenCycleMinutes" placeholder="@(ViewBag.DefaultOvenCycleMinutes ?? 45)"
+                               onchange="scheduleAutoPricing()" />
+                    </div>
+                </div>
+            </div>
+        </div>
+
         <!-- Pricing Options (Rush / Discount) -->
         <div class="card mb-4">
             <div class="card-header">
@@ -375,7 +418,7 @@
     "discountType": @Json.Serialize(Model.DiscountType),
     "discountValue": @Model.DiscountValue,
     "isRushJob": @Json.Serialize(Model.IsRushJob),
-    "ovenCostId": null,
+    "ovenCostId": @Json.Serialize(Model.OvenCostId),
     "areaUnit": @Json.Serialize((string?)ViewBag.AreaUnit),
     "useMetric": @Json.Serialize((bool)(ViewBag.UseMetric ?? false)),
     "pricingUrl": "@Url.Action("CalculatePricing", "Jobs")",