瀏覽代碼

Added error flag to obsolete StockMovement.IsTransfer flag
Replaced StockMovementShell.BatchType with Type

Frank van den Bos 1 年之前
父節點
當前提交
1292a37e21

+ 1 - 1
prs.classes/Entities/Job/Materials/JobMaterials.cs

@@ -106,7 +106,7 @@ namespace Comal.Classes
     {
         public override Expression<Func<StockMovement, double>> Aggregate => x => x.Issued;
 
-        public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.IsTransfer).IsEqualTo(false);
+        public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.Type).IsEqualTo(StockMovementType.Issue);
 
         public override AggregateCalculation Calculation => AggregateCalculation.Sum;
 

+ 1 - 1
prs.classes/Entities/Stock/StockMovement.cs

@@ -171,7 +171,7 @@ namespace Comal.Classes
         public bool System { get; set; }
 
         [NullEditor]
-        [Obsolete("Replaced with Type")]
+        [Obsolete("Replaced with Type", true)]
         public bool IsTransfer { get; set; } = false;
 
         [NullEditor]

+ 1 - 1
prs.classes/Entities/Stock/StockSummary.cs

@@ -45,7 +45,7 @@ namespace Comal.Classes
     {
         public override Expression<Func<StockMovement, double>> Aggregate => x => x.Issued;
 
-        public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.IsTransfer).IsEqualTo(false)
+        public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.Type).IsEqualTo(StockMovementType.Issue)
             .And(x => x.Job.ID).IsNotEqualTo(Guid.Empty);
 
         public override AggregateCalculation Calculation => AggregateCalculation.Sum;

+ 6 - 14
prs.mobile.new/PRS.Mobile/Data Models/Lists/StockMovement/StockMovementShell.cs

@@ -33,7 +33,6 @@ namespace PRS.Mobile
                 .Map(nameof(Date), x => x.Date)
                 .Map(nameof(TransactionID), x => x.Transaction)
                 .Map(nameof(BatchID), x=>x.Batch.ID)
-                .Map(nameof(BatchType), x=>x.Batch.Type)
                 .Map(nameof(EmployeeID), x=>x.Employee.ID)
                 .Map(nameof(Type), x=>x.Type)
                 .Map(nameof(Notes), x=>x.Notes)
@@ -160,20 +159,13 @@ namespace PRS.Mobile
             get => Get<Guid>();
             set => Set(value);
         }
-
-        public StockMovementBatchType BatchType
-        {
-            get => Get<StockMovementBatchType>();
-            set => Set(value);
-        }
-
-        public ImageSource Image => BatchType switch
+        
+        public ImageSource Image => Type switch
         {
-            StockMovementBatchType.Stocktake => ImageSource.FromFile("stock_stocktake"), // tick
-            StockMovementBatchType.Issue => ImageSource.FromFile("stock_issue"), //minus
-            StockMovementBatchType.Receipt => ImageSource.FromFile("stock_receive"), //plus
-            StockMovementBatchType.Transfer => ImageSource.FromFile("stock_relocate"), // ?
-            _ => ImageSource.FromFile("question"), // ?
+            StockMovementType.StockTake => ImageSource.FromFile("stock_stocktake"), // tick
+            StockMovementType.Issue => ImageSource.FromFile("stock_issue"), //minus
+            StockMovementType.Receive => ImageSource.FromFile("stock_receive"), //plus
+            _ => ImageSource.FromFile("stock_relocate"), // transfer in/out
         };
         
         public Guid EmployeeID