Selaa lähdekoodia

Constrained orders to the selected jbos of stocksummarygrid

Kenric Nugteren 1 vuosi sitten
vanhempi
commit
a3667bd7a8
1 muutettua tiedostoa jossa 13 lisäystä ja 3 poistoa
  1. 13 3
      prs.desktop/Panels/StockSummary/StockSummaryGrid.cs

+ 13 - 3
prs.desktop/Panels/StockSummary/StockSummaryGrid.cs

@@ -302,7 +302,7 @@ public class StockSummaryGrid : DynamicDataGrid<StockSummary>, IDataModelSource
                 x=>x.Dimensions.UnitSize,
                 unitsize,
                 null,
-                null,
+                PurchaseOrderItemFilter(),
                 null
             );                  
         }
@@ -430,6 +430,15 @@ public class StockSummaryGrid : DynamicDataGrid<StockSummary>, IDataModelSource
         target.Set(aggregate, total);
         return total;
     }
+
+    private Filter<PurchaseOrderItem> PurchaseOrderItemFilter()
+    {
+        var poJobFilter =  new Filter<PurchaseOrderItem>(x => x.Job.ID).InList(JobIDs)
+            .Or(x => x.Job.ID).IsEqualTo(Guid.Empty);
+
+        return new Filter<PurchaseOrderItem>(x => x.ReceivedDate).IsEqualTo(DateTime.MinValue)
+            .And(poJobFilter);
+    }
     
     protected override void Reload(Filters<StockSummary> criteria, Columns<StockSummary> columns, ref SortOrder<StockSummary>? sort,
         Action<CoreTable?, Exception?> action)
@@ -457,9 +466,10 @@ public class StockSummaryGrid : DynamicDataGrid<StockSummary>, IDataModelSource
                     .Add(x => x.Dimensions.UnitSize)
                     .Add(x => x.Units)
             );
+
             query.Add<PurchaseOrderItem>(
-                new Filter<PurchaseOrderItem>(x => x.ReceivedDate).IsEqualTo(DateTime.MinValue)
-                    .And(x => x.Product.ID).InList(pids),
+                new Filter<PurchaseOrderItem>(x => x.Product.ID).InList(pids)
+                    .And(PurchaseOrderItemFilter()),
                 new Columns<PurchaseOrderItem>(x => x.Product.ID)
                     .Add(x => x.Style.ID)
                     .Add(x => x.Dimensions.UnitSize)