diff --git a/CutList.Web/Components/Pages/Jobs/Edit.razor b/CutList.Web/Components/Pages/Jobs/Edit.razor index 806b99f..f0b6b73 100644 --- a/CutList.Web/Components/Pages/Jobs/Edit.razor +++ b/CutList.Web/Components/Pages/Jobs/Edit.razor @@ -118,14 +118,15 @@ else
-
@(editingPart == null ? "Add Part" : "Edit Part")
+
@(editingPart == null ? "Add Parts" : "Edit Part")
-
+
- @foreach (var shape in DistinctShapes) { @@ -135,7 +136,7 @@ else
- @foreach (var material in FilteredMaterials) { @@ -143,19 +144,63 @@ else }
-
- - -
-
- - -
-
- - -
+ + @if (editingPart != null) + { + @* Edit mode: single row *@ +
+
+ + +
+
+ + +
+
+ + +
+
+ } + else + { + @* Add mode: multi-row table *@ + + + + + + + + + + + @for (var i = 0; i < partRows.Count; i++) + { + var row = partRows[i]; + + + + + + + } + +
LengthQtyName (optional)
+ @if (partRows.Count > 1) + { + + } +
+ + } + @if (!string.IsNullOrEmpty(partErrorMessage)) {
@partErrorMessage
@@ -164,7 +209,14 @@ else
@@ -291,6 +343,8 @@ else private JobPart? editingPart; private string? partErrorMessage; private MaterialShape? selectedShape; + private int partSelectedMaterialId; + private List partRows = new(); // Stock form private bool showStockForm; @@ -541,15 +595,28 @@ else editingPart = null; newPart = new JobPart { JobId = Id!.Value, Quantity = 1 }; selectedShape = null; + partSelectedMaterialId = 0; + partRows = new List { new PartRow() }; showPartForm = true; partErrorMessage = null; } private void OnShapeChanged() { + partSelectedMaterialId = 0; newPart.MaterialId = 0; } + private void AddPartRow() + { + partRows.Add(new PartRow()); + } + + private void RemovePartRow(PartRow row) + { + partRows.Remove(row); + } + private void EditPart(JobPart part) { editingPart = part; @@ -564,6 +631,8 @@ else SortOrder = part.SortOrder }; selectedShape = part.Material?.Shape; + partSelectedMaterialId = part.MaterialId; + partRows.Clear(); showPartForm = true; partErrorMessage = null; } @@ -584,31 +653,59 @@ else return; } - if (newPart.MaterialId == 0) + if (partSelectedMaterialId == 0) { partErrorMessage = "Please select a size"; return; } - if (newPart.LengthInches <= 0) + if (editingPart != null) { - partErrorMessage = "Length must be greater than zero"; - return; - } + // Edit mode: single part + if (newPart.LengthInches <= 0) + { + partErrorMessage = "Length must be greater than zero"; + return; + } + if (newPart.Quantity < 1) + { + partErrorMessage = "Quantity must be at least 1"; + return; + } - if (newPart.Quantity < 1) - { - partErrorMessage = "Quantity must be at least 1"; - return; - } - - if (editingPart == null) - { - await JobService.AddPartAsync(newPart); + newPart.MaterialId = partSelectedMaterialId; + await JobService.UpdatePartAsync(newPart); } else { - await JobService.UpdatePartAsync(newPart); + // Add mode: multiple rows + for (int i = 0; i < partRows.Count; i++) + { + var row = partRows[i]; + if (row.LengthInches <= 0) + { + partErrorMessage = $"Row {i + 1}: Length must be greater than zero"; + return; + } + if (row.Quantity < 1) + { + partErrorMessage = $"Row {i + 1}: Quantity must be at least 1"; + return; + } + } + + foreach (var row in partRows) + { + var part = new JobPart + { + JobId = Id!.Value, + MaterialId = partSelectedMaterialId, + LengthInches = row.LengthInches, + Quantity = row.Quantity, + Name = row.Name ?? string.Empty + }; + await JobService.AddPartAsync(part); + } } job = (await JobService.GetByIdAsync(Id!.Value))!; @@ -931,113 +1028,158 @@ else
- -
-
-
-
-
In Stock
-
-
-

@summary.TotalInStockBins bars

-

Ready to cut from existing inventory

-
-
+ +
+
+
Purchase List
+ @if (summary.TotalToBePurchasedBins > 0) + { + @if (addedToOrderList) + { + Added to orders + } + else + { + + } + }
-
-
-
-
To Be Purchased
-
-
-

@summary.TotalToBePurchasedBins bars

- @if (summary.TotalToBePurchasedBins > 0) - { - @if (addedToOrderList) - { -
- Added to order list. View Orders -
- } - else - { -
- + @foreach (var materialResult in packResult.MaterialResults) { var materialSummary = summary.MaterialSummaries.First(s => s.Material.Id == materialResult.Material.Id); + var allBins = materialResult.InStockBins + .Select(b => new { Bin = b, Source = "Stock" }) + .Concat(materialResult.ToBePurchasedBins + .Select(b => new { Bin = b, Source = "Purchase" })) + .ToList(); -
-
-

@materialResult.Material.DisplayName

+
+
+
+
@materialResult.Material.DisplayName
+ + @(materialSummary.InStockBins + materialSummary.ToBePurchasedBins) bars + · @materialSummary.TotalPieces pieces + · @materialSummary.Efficiency.ToString("F1")% efficiency + +
- -
-
- @(materialSummary.InStockBins + materialSummary.ToBePurchasedBins) bars -
-
- @materialSummary.TotalPieces pieces -
-
- @materialSummary.Efficiency.ToString("F1")% efficiency -
-
- @materialSummary.InStockBins in stock -
-
- @materialSummary.ToBePurchasedBins to purchase -
-
- @if (materialResult.PackResult.ItemsNotUsed.Count > 0) {
- @materialResult.PackResult.ItemsNotUsed.Count items not placed - + @materialResult.PackResult.ItemsNotUsed.Count items not placed — No stock lengths available or parts too long.
} - @if (materialResult.InStockBins.Count > 0) - { -
In Stock (@materialResult.InStockBins.Count bars)
- @RenderBinList(materialResult.InStockBins) - } - - @if (materialResult.ToBePurchasedBins.Count > 0) - { -
To Be Purchased (@materialResult.ToBePurchasedBins.Count bars)
- @RenderBinList(materialResult.ToBePurchasedBins) - - -
- Order Summary: -
    - @foreach (var group in materialResult.ToBePurchasedBins.GroupBy(b => b.Length).OrderByDescending(g => g.Key)) +
    + + + + + + + + + + + + + + + @{ var binNum = 1; } + @foreach (var entry in allBins) { -
  • @group.Count() x @ArchUnits.FormatFromInches(group.Key)
    • + + + + + + + + binNum++; } - - - } + +
    + @materialResult.Material.DisplayName + + @(materialSummary.InStockBins + materialSummary.ToBePurchasedBins) bars + · @materialSummary.TotalPieces pieces + · @materialSummary.Efficiency.ToString("F1")% efficiency + +
    #SourceStock LengthCutsWaste
    @binNum + @if (entry.Source == "Stock") + { + Stock + } + else + { + Purchase + } + @ArchUnits.FormatFromInches(entry.Bin.Length) + @foreach (var item in entry.Bin.Items) + { + + @(string.IsNullOrWhiteSpace(item.Name) ? ArchUnits.FormatFromInches(item.Length) : $"{item.Name} ({ArchUnits.FormatFromInches(item.Length)})") + + } + @ArchUnits.FormatFromInches(entry.Bin.RemainingLength)
    +
} @@ -1052,41 +1194,6 @@ else } }; - private RenderFragment RenderBinList(List bins) => __builder => - { -
- - - - - - - - - - - @{ var binNumber = 1; } - @foreach (var bin in bins) - { - - - - - - - binNumber++; - } - -
#Stock LengthCutsWaste
@binNumber@ArchUnits.FormatFromInches(bin.Length) - @foreach (var item in bin.Items) - { - - @(string.IsNullOrWhiteSpace(item.Name) ? ArchUnits.FormatFromInches(item.Length) : $"{item.Name} ({ArchUnits.FormatFromInches(item.Length)})") - - } - @ArchUnits.FormatFromInches(bin.RemainingLength)
-
- }; private async Task RunOptimization() { @@ -1443,6 +1550,13 @@ else } } + private class PartRow + { + public decimal LengthInches { get; set; } + public int Quantity { get; set; } = 1; + public string? Name { get; set; } + } + private class ImportStockCandidate { public StockItem StockItem { get; set; } = null!; diff --git a/CutList.Web/wwwroot/css/report.css b/CutList.Web/wwwroot/css/report.css index 8668ee7..fb3182b 100644 --- a/CutList.Web/wwwroot/css/report.css +++ b/CutList.Web/wwwroot/css/report.css @@ -136,6 +136,11 @@ white-space: pre-wrap; } +/* Cut list material headers — hidden on screen, shown in print via repeating thead */ +.cutlist-material-print-header { + display: none; +} + /* Print styles - Compact layout to save paper */ @media print { body { @@ -299,18 +304,23 @@ margin: 0 !important; } - /* Hide redundant stock summary (shown per-material) */ - .print-stock-summary { - display: none !important; - } - - /* General card print styles */ - .card { - border: 1px solid #ccc !important; + /* Keep purchase list with cut lists to save paper */ + .print-purchase-list { break-inside: avoid; page-break-inside: avoid; } + /* General card print styles — allow large cards to break across pages */ + .card { + border: 1px solid #ccc !important; + } + + /* Keep card headers with the start of their content */ + .card-header { + break-after: avoid; + page-break-after: avoid; + } + .card-header { background-color: #f0f0f0 !important; } @@ -319,6 +329,42 @@ border: 1px solid #999; } + /* Cut list tables: hide screen header, show repeating print header in thead */ + .cutlist-material-screen-header { + display: none !important; + } + + .cutlist-material-print-header { + display: table-row !important; + } + + .cutlist-material-print-header th { + background: #f0f0f0 !important; + padding: 0.4rem 0.5rem !important; + border-bottom: 1px solid #ccc !important; + } + + .cutlist-material-name { + font-size: 12pt; + font-weight: 700; + } + + .cutlist-material-stats { + float: right; + font-size: 9pt; + font-weight: 400; + color: #666; + } + + /* Remove card border/padding for cut list cards in print — table handles it */ + .cutlist-material-card { + border: none !important; + } + + .cutlist-material-card > .card-body { + padding: 0 !important; + } + /* Reduce spacing */ .mb-4 { margin-bottom: 0.5rem !important;