Pārlūkot izejas kodu

ProductInstance.AverageCost is now based on StockHoldings, not StockMovements
Upgraded some packages to latest versions

frankvandenbos 1 mēnesi atpakaļ
vecāks
revīzija
3cef4e4c38

+ 16 - 16
prs.classes/Entities/Product/Instance/ProductInstance.cs

@@ -9,36 +9,36 @@ using InABox.Clients;
 namespace Comal.Classes
 {
 
-    public class ProductInstanceFreeStockAggregate : CoreAggregate<ProductInstance, StockMovement, double>
+    public class ProductInstanceFreeStockAggregate : CoreAggregate<ProductInstance, StockHolding, double>
     {
-        public override Expression<Func<StockMovement, double>> Aggregate => x => x.Units;
+        public override Expression<Func<StockHolding, double>> Aggregate => x => x.Units;
 
-        public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.Job).NotLinkValid();
+        public override Filter<StockHolding> Filter => new Filter<StockHolding>(x => x.Job).NotLinkValid();
 
-        public override Dictionary<Expression<Func<StockMovement, object?>>, Expression<Func<ProductInstance, object?>>>
+        public override Dictionary<Expression<Func<StockHolding, object?>>, Expression<Func<ProductInstance, object?>>>
             Links =>
-            new Dictionary<Expression<Func<StockMovement, object?>>, Expression<Func<ProductInstance, object?>>>()
+            new Dictionary<Expression<Func<StockHolding, object?>>, Expression<Func<ProductInstance, object?>>>()
             {
-                { StockMovement => StockMovement.Product.ID, Instance => Instance.Product.ID },
-                { StockMovement => StockMovement.Style.ID, Instance => Instance.Style.ID },
-            }.AddRange(Dimensions.GetLinks<StockMovement, ProductInstance>(x => x.Dimensions, x => x.Dimensions));
+                { StockHolding => StockHolding.Product.ID, Instance => Instance.Product.ID },
+                { StockHolding => StockHolding.Style.ID, Instance => Instance.Style.ID },
+            }.AddRange(Dimensions.GetLinks<StockHolding, ProductInstance>(x => x.Dimensions, x => x.Dimensions));
 
         public override AggregateCalculation Calculation => AggregateCalculation.Sum;
     }
     
-    public class ProductInstanceFreeStockValueAggregate : CoreAggregate<ProductInstance, StockMovement, double>
+    public class ProductInstanceFreeStockValueAggregate : CoreAggregate<ProductInstance, StockHolding, double>
     {
-        public override Expression<Func<StockMovement, double>> Aggregate => x => x.Value;
+        public override Expression<Func<StockHolding, double>> Aggregate => x => x.Value;
 
-        public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.Job).NotLinkValid();
+        public override Filter<StockHolding> Filter => new Filter<StockHolding>(x => x.Job).NotLinkValid();
 
-        public override Dictionary<Expression<Func<StockMovement, object?>>, Expression<Func<ProductInstance, object?>>>
+        public override Dictionary<Expression<Func<StockHolding, object?>>, Expression<Func<ProductInstance, object?>>>
             Links =>
-            new Dictionary<Expression<Func<StockMovement, object?>>, Expression<Func<ProductInstance, object?>>>()
+            new Dictionary<Expression<Func<StockHolding, object?>>, Expression<Func<ProductInstance, object?>>>()
             {
-                { StockMovement => StockMovement.Product.ID, Instance => Instance.Product.ID },
-                { StockMovement => StockMovement.Style.ID, Instance => Instance.Style.ID },
-            }.AddRange(Dimensions.GetLinks<StockMovement, ProductInstance>(x => x.Dimensions, x => x.Dimensions));
+                { StockHolding => StockHolding.Product.ID, Instance => Instance.Product.ID },
+                { StockHolding => StockHolding.Style.ID, Instance => Instance.Style.ID },
+            }.AddRange(Dimensions.GetLinks<StockHolding, ProductInstance>(x => x.Dimensions, x => x.Dimensions));
 
         public override AggregateCalculation Calculation => AggregateCalculation.Sum;
     }

+ 1 - 1
prs.desktop/PRSDesktop.csproj

@@ -938,7 +938,7 @@
       <PackageReference Include="Syncfusion.Themes.Office2019White.WPF" Version="25.2.6" />
       <PackageReference Include="Syncfusion.Themes.SystemTheme.WPF" Version="25.2.6" />
       <PackageReference Include="Syncfusion.Tools.WPF" Version="25.2.6" />
-      <PackageReference Include="System.Collections.Immutable" Version="9.0.0-preview.4.24266.19" />
+      <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
       <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
       <PackageReference Include="System.IO.Ports" Version="8.0.0" />
       <PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />

+ 2 - 2
prs.server/PRSServer.csproj

@@ -95,8 +95,8 @@
             <TreatAsUsed>true</TreatAsUsed>
         </PackageReference>
         <PackageReference Include="H.Pipes" Version="2.0.59" />
-        <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.13.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
         <PackageReference Include="Mindbox.Data.Linq" Version="10.7.2" />
         <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
         <PackageReference Include="RazorEngine.NetCore" Version="3.1.0" />

+ 1 - 1
prs.shared/PRS.Shared.csproj

@@ -55,7 +55,7 @@
 
   <ItemGroup>
     <PackageReference Include="RestSharp" Version="111.2.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="9.0.0-preview.4.24266.19" />
+    <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
   </ItemGroup>
   
 </Project>