Pārlūkot izejas kodu

Fixing strange syntax [] problems

Kenric Nugteren 1 gadu atpakaļ
vecāks
revīzija
c6c42fcc5f

+ 1 - 1
prs.desktop/Panels/Factory/FactoryPackGrid.cs

@@ -418,7 +418,7 @@ public class FactoryPackGrid : DynamicDataGrid<StockHolding>
             else if (ffi.Qty > requi.Qty)
                 errors.Add($"Qty must not exceed {requi.Qty}");
         };
-        if (!ffg.EditItems([ffi]))
+        if (!ffg.EditItems(new[] { ffi }))
             return;
 
         var batchid = CheckStockMovementBatch();

+ 2 - 2
prs.desktop/Panels/Factory/FactoryPanel.xaml.cs

@@ -42,8 +42,8 @@ namespace PRSDesktop
         private readonly BitmapImage starred = PRSDesktop.Resources.report.AsBitmapImage(48, 48);
         private readonly BitmapImage grouped = PRSDesktop.Resources.grouped.AsBitmapImage();
         
-        private SetoutDocument[] documents = [];
-        private readonly List<IMotorolaBarcodeScanner> _scanners = [];
+        private SetoutDocument[] documents = Array.Empty<SetoutDocument>();
+        private readonly List<IMotorolaBarcodeScanner> _scanners = new List<IMotorolaBarcodeScanner>();
 
         private readonly string NEARLYDUE_COLOR = "Orange";
         private readonly string NOTYETDUE_COLOR = "PaleGreen";

+ 0 - 2
prs.desktop/Panels/Requisitions/RequisitionGrid.cs

@@ -57,11 +57,9 @@ namespace PRSDesktop
             HiddenColumns.Add(x => x.Archived);
             HiddenColumns.Add(x => x.TakenBy.ID);
             HiddenColumns.Add(x => x.TakenBy.Name);
-            HiddenColumns.Add(x => x.TakenBy.Deleted);
             HiddenColumns.Add(x => x.Delivery.ID);
             HiddenColumns.Add(x => x.Delivery.Number);
             HiddenColumns.Add(x => x.Delivery.Completed);
-            HiddenColumns.Add(x => x.Delivery.Deleted);
             HiddenColumns.Add(x => x.StockUpdated);
 
 

+ 1 - 0
prs.desktop/Panels/Reservation Management/ReservationManagementItemGrid.cs

@@ -37,6 +37,7 @@ public class ReservationManagementItemGrid : DynamicDataGrid<JobRequisitionItem>
         FilterComponent.SetSettings(_userSettings.Filters, false);
 
         HiddenColumns.Add(x => x.ID);
+        HiddenColumns.Add(x => x.Qty);
         HiddenColumns.Add(x => x.InStock);
         HiddenColumns.Add(x => x.Product.ID);
         HiddenColumns.Add(x => x.Product.Code);

+ 18 - 21
prs.stores/RequisitionStore.cs

@@ -40,28 +40,26 @@ namespace Comal.Stores
             return true;
         }
 
-        private bool LoadRequisitionItems(Requisition entity, ref IEnumerable<RequisitionItem> requisitionitems)
+        private bool LoadRequisitionItems(Requisition entity, ref IList<RequisitionItem> requisitionitems)
         {
-            if (requisitionitems == null)
-                requisitionitems = Provider.Query(
+            requisitionitems ??= Provider.Query(
                     new Filter<RequisitionItem>(x => x.RequisitionLink.ID).IsEqualTo(entity.ID)
-                ).Rows.Select(x => x.ToObject<RequisitionItem>());
+                ).ToList<RequisitionItem>();
             return requisitionitems.Any();
         }
 
-        private bool LoadDeliveryItems(Requisition entity, ref IEnumerable<DeliveryItem> deliveryitems)
+        private bool LoadDeliveryItems(Requisition entity, ref IList<DeliveryItem> deliveryitems)
         {
-            if (deliveryitems == null)
-                deliveryitems = Provider.Query(
+            deliveryitems ??= Provider.Query(
                     new Filter<DeliveryItem>(x => x.RequisitionLink.ID).IsEqualTo(entity.ID),
                     new Columns<DeliveryItem>(x => x.ID, x => x.DeliveredDate)
-                ).Rows.Select(x => x.ToObject<DeliveryItem>());
+                ).ToList<DeliveryItem>();
             return deliveryitems.Any();
         }
 
         #region TakenBy
 
-        private void UpdateTakenBy(Requisition entity, ref IEnumerable<RequisitionItem> items, ref IEnumerable<DeliveryItem> deliveryitems)
+        private void UpdateTakenBy(Requisition entity, ref IList<RequisitionItem> items, ref IList<DeliveryItem> deliveryitems)
         {
             Log("UpdateTakenBy() - starting");
 
@@ -116,8 +114,8 @@ namespace Comal.Stores
         {
             base.AfterSave(entity);
 
-            IEnumerable<RequisitionItem> requisitionitems = null;
-            IEnumerable<DeliveryItem> deliveryitems = null;
+            IList<RequisitionItem> requisitionitems = null;
+            IList<DeliveryItem> deliveryitems = null;
             
             UpdateDeliveryItems(entity, ref requisitionitems, ref deliveryitems);
             UpdateTakenBy(entity, ref requisitionitems, ref deliveryitems);
@@ -153,8 +151,8 @@ namespace Comal.Stores
         
         #region Delivery Items
 
-        private void CreateDeliveryItems(Requisition entity, ref IEnumerable<RequisitionItem> requisitionitems,
-            ref IEnumerable<DeliveryItem> deliveryitems)
+        private void CreateDeliveryItems(Requisition entity, ref IList<RequisitionItem> requisitionitems,
+            ref IList<DeliveryItem> deliveryitems)
         {
             if (!LoadRequisitionItems(entity, ref requisitionitems))
             {
@@ -172,7 +170,7 @@ namespace Comal.Stores
             deliveryitems = updates;
         }
 
-        private void ClearDeliveryItems(Requisition entity, ref IEnumerable<DeliveryItem> deliveryitems)
+        private void ClearDeliveryItems(Requisition entity, ref IList<DeliveryItem> deliveryitems)
         {
             if (!LoadDeliveryItems(entity, ref deliveryitems))
             {
@@ -185,8 +183,8 @@ namespace Comal.Stores
             deliveryitems = new List<DeliveryItem>();
         }
 
-        private void UpdateDeliveryItems(Requisition entity, ref IEnumerable<RequisitionItem> requisitionitems,
-            ref IEnumerable<DeliveryItem> deliveryitems)
+        private void UpdateDeliveryItems(Requisition entity, ref IList<RequisitionItem> requisitionitems,
+            ref IList<DeliveryItem> deliveryitems)
         {
             Log("UpdateDeliveryItems() - starting");
 
@@ -241,10 +239,9 @@ namespace Comal.Stores
             return movement;
         }
 
-        private void CreateStockBatch(Requisition entity, ref IEnumerable<RequisitionItem> items)
+        private void CreateStockBatch(Requisition entity, ref IList<RequisitionItem> items)
         {
-            LoadRequisitionItems(entity, ref items);
-            if (!items.Any())
+            if(!LoadRequisitionItems(entity, ref items))
             {
                 Log("CreateStockBatch() - no items to update!");
                 return;
@@ -278,7 +275,7 @@ namespace Comal.Stores
                         new Filter<StockHolding>(x => x.Location.ID).IsEqualTo(locationid)
                             .And(x => x.Product.ID).IsEqualTo(productid)
                             .And(x => x.Style.ID).IsEqualTo(styleid)
-                            .And(x => x.Dimensions.UnitSize).IsEqualTo(unitsize)
+                            .And(x => x.Dimensions).DimensionEquals(item.Dimensions)
                             .And(x => x.Job.ID).IsEqualTo(jobid)
                             .And(x => x.Qty).IsGreaterThan(0.0),
                         new Columns<StockHolding>(x => x.Qty)
@@ -339,7 +336,7 @@ namespace Comal.Stores
                 FindSubStore<StockMovementBatch>().Delete(batches, "");
         }
 
-        private void UpdateStockBatches(Requisition entity, ref IEnumerable<RequisitionItem> items)
+        private void UpdateStockBatches(Requisition entity, ref IList<RequisitionItem> items)
         {
             Log("UpdateStockBatch() - starting");
             if (!NeedsUpdating(entity, x => x.StockUpdated))