Преглед на файлове

Fixed aggregates on StockHolding to work more consistently with equivalent unit sizes.

Kenric Nugteren преди 1 година
родител
ревизия
a2fe2490da
променени са 1 файла, в които са добавени 24 реда и са изтрити 4 реда
  1. 24 4
      prs.classes/Entities/Stock/StockHolding.cs

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

@@ -18,7 +18,12 @@ namespace Comal.Classes
                 { StockMovement => StockMovement.Job.ID, StockHolding => StockHolding.Job.ID },
                 { StockMovement => StockMovement.Location.ID, StockHolding => StockHolding.Location.ID },
                 { StockMovement => StockMovement.Style.ID, StockHolding => StockHolding.Style.ID },
-                { StockMovement => StockMovement.Dimensions.UnitSize, StockHolding => StockHolding.Dimensions.UnitSize }
+                { StockMovement => StockMovement.Dimensions.Unit.ID, StockHolding => StockHolding.Dimensions.Unit.ID },
+                { StockMovement => StockMovement.Dimensions.Quantity, StockHolding => StockHolding.Dimensions.Quantity },
+                { StockMovement => StockMovement.Dimensions.Length, StockHolding => StockHolding.Dimensions.Length },
+                { StockMovement => StockMovement.Dimensions.Width, StockHolding => StockHolding.Dimensions.Width },
+                { StockMovement => StockMovement.Dimensions.Height, StockHolding => StockHolding.Dimensions.Height },
+                { StockMovement => StockMovement.Dimensions.Weight, StockHolding => StockHolding.Dimensions.Weight },
             };
 
         public override AggregateCalculation Calculation => AggregateCalculation.Sum;
@@ -35,7 +40,12 @@ namespace Comal.Classes
                 { StockMovement => StockMovement.Job.ID, StockHolding => StockHolding.Job.ID },
                 { StockMovement => StockMovement.Location.ID, StockHolding => StockHolding.Location.ID },
                 { StockMovement => StockMovement.Style.ID, StockHolding => StockHolding.Style.ID },
-                { StockMovement => StockMovement.Dimensions.UnitSize, StockHolding => StockHolding.Dimensions.UnitSize }
+                { StockMovement => StockMovement.Dimensions.Unit.ID, StockHolding => StockHolding.Dimensions.Unit.ID },
+                { StockMovement => StockMovement.Dimensions.Quantity, StockHolding => StockHolding.Dimensions.Quantity },
+                { StockMovement => StockMovement.Dimensions.Length, StockHolding => StockHolding.Dimensions.Length },
+                { StockMovement => StockMovement.Dimensions.Width, StockHolding => StockHolding.Dimensions.Width },
+                { StockMovement => StockMovement.Dimensions.Height, StockHolding => StockHolding.Dimensions.Height },
+                { StockMovement => StockMovement.Dimensions.Weight, StockHolding => StockHolding.Dimensions.Weight },
             };
 
         public override AggregateCalculation Calculation => AggregateCalculation.Sum;
@@ -63,7 +73,12 @@ namespace Comal.Classes
                 { StockMovement => StockMovement.Job.ID, StockHolding => StockHolding.Job.ID },
                 { StockMovement => StockMovement.Location.ID, StockHolding => StockHolding.Location.ID },
                 { StockMovement => StockMovement.Style.ID, StockHolding => StockHolding.Style.ID },
-                { StockMovement => StockMovement.Dimensions.UnitSize, StockHolding => StockHolding.Dimensions.UnitSize }
+                { StockMovement => StockMovement.Dimensions.Unit.ID, StockHolding => StockHolding.Dimensions.Unit.ID },
+                { StockMovement => StockMovement.Dimensions.Quantity, StockHolding => StockHolding.Dimensions.Quantity },
+                { StockMovement => StockMovement.Dimensions.Length, StockHolding => StockHolding.Dimensions.Length },
+                { StockMovement => StockMovement.Dimensions.Width, StockHolding => StockHolding.Dimensions.Width },
+                { StockMovement => StockMovement.Dimensions.Height, StockHolding => StockHolding.Dimensions.Height },
+                { StockMovement => StockMovement.Dimensions.Weight, StockHolding => StockHolding.Dimensions.Weight },
             };
 
         public override AggregateCalculation Calculation => AggregateCalculation.Sum;
@@ -80,7 +95,12 @@ namespace Comal.Classes
                 { StockMovement => StockMovement.Job.ID, StockHolding => StockHolding.Job.ID },
                 { StockMovement => StockMovement.Location.ID, StockHolding => StockHolding.Location.ID },
                 { StockMovement => StockMovement.Style.ID, StockHolding => StockHolding.Style.ID },
-                { StockMovement => StockMovement.Dimensions.UnitSize, StockHolding => StockHolding.Dimensions.UnitSize }
+                { StockMovement => StockMovement.Dimensions.Unit.ID, StockHolding => StockHolding.Dimensions.Unit.ID },
+                { StockMovement => StockMovement.Dimensions.Quantity, StockHolding => StockHolding.Dimensions.Quantity },
+                { StockMovement => StockMovement.Dimensions.Length, StockHolding => StockHolding.Dimensions.Length },
+                { StockMovement => StockMovement.Dimensions.Width, StockHolding => StockHolding.Dimensions.Width },
+                { StockMovement => StockMovement.Dimensions.Height, StockHolding => StockHolding.Dimensions.Height },
+                { StockMovement => StockMovement.Dimensions.Weight, StockHolding => StockHolding.Dimensions.Weight },
             };
 
         public override AggregateCalculation Calculation => AggregateCalculation.Sum;