Quellcode durchsuchen

Fix to bug with ViewStockHoldings; added summary to the Quantity column

Kenric Nugteren vor 11 Monaten
Ursprung
Commit
285e1b5634

+ 4 - 4
prs.classes/Entities/Stock/StockHolding/StockHolding.cs

@@ -178,10 +178,10 @@ namespace Comal.Classes
                 if (holding == null)
                 {
                     holding = new StockHolding();
-                    holding.Location.ID = first.Location.ID;
-                    holding.Product.ID = first.Product.ID;
-                    holding.Style.ID = first.Style.ID;
-                    holding.Job.ID = first.Job.ID;
+                    holding.Location.CopyFrom(first.Location);
+                    holding.Product.CopyFrom(first.Product);
+                    holding.Style.CopyFrom(first.Style);
+                    holding.Job.CopyFrom(first.Job);
                     holding.Dimensions.CopyFrom(first.Dimensions);
                     grouped.Add(holding);
                 }

+ 3 - 7
prs.desktop/Panels/Reservation Management/ReservationManagementItemGrid.cs

@@ -7,9 +7,6 @@ using InABox.Wpf;
 using InABox.WPF;
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.ComponentModel;
-using System.Drawing;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading;
@@ -17,11 +14,9 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using Fluent;
 using InABox.Core.Reports;
 using InABox.Wpf.Reports;
 using Microsoft.Xaml.Behaviors.Core;
-using NPOI.OpenXmlFormats.Spreadsheet;
 using PRSDimensionUtils;
 using Syncfusion.Data.Extensions;
 using Brush = System.Windows.Media.Brush;
@@ -879,6 +874,7 @@ public class ReservationManagementItemGrid : DynamicDataGrid<JobRequisitionItem>
             new Filter<StockMovement>(x => x.JobRequisitionItem.ID)
                 .IsEqualTo(row.Get<JobRequisitionItem, Guid>(x => x.ID)),
             Columns.None<StockMovement>()
+                .Add(x => x.ID)
                 .Add(x=>x.Location.ID)
                 .Add(x=>x.Location.Code)
                 .Add(x=>x.Location.Description)
@@ -904,8 +900,8 @@ public class ReservationManagementItemGrid : DynamicDataGrid<JobRequisitionItem>
             args.VisibleColumns.Add<StockHolding, string>(x => x.Style.Code, 150, "Style Code", "", Alignment.MiddleLeft);
             args.VisibleColumns.Add<StockHolding, string>(x => x.Style.Description, 0, "Style", "", Alignment.MiddleLeft);
             args.VisibleColumns.Add<StockHolding, string>(x => x.Dimensions.UnitSize, 150, "Unit Size", "", Alignment.MiddleLeft);
-            args.VisibleColumns.Add<StockHolding, double>(x => x.Units, 100, "Quantity", "", Alignment.MiddleCenter);
-            args.VisibleColumns.Add<StockHolding, double>(x => x.AverageValue, 100, "Cost $", "", Alignment.MiddleCenter);
+            args.VisibleColumns.Add<StockHolding, double>(x => x.Units);
+            args.VisibleColumns.Add<StockHolding, double>(x => x.AverageValue, caption: "Cost $");
         };
 
         var window = DynamicGridUtils.CreateGridWindow("Stock Holdings", grid);