|
@@ -117,6 +117,12 @@ public class StockForecastGrid : DynamicItemsListGrid<StockForecastItem>, IDataM
|
|
|
|
|
|
HiddenColumns.Add(x => x.Required);
|
|
|
HiddenColumns.Add(x => x.Optimised);
|
|
|
+ HiddenColumns.Add(x => x.MinStock);
|
|
|
+ HiddenColumns.Add(x => x.GenStock);
|
|
|
+ HiddenColumns.Add(x => x.GenPO);
|
|
|
+ HiddenColumns.Add(x => x.JobBOM);
|
|
|
+ HiddenColumns.Add(x => x.JobStock);
|
|
|
+ HiddenColumns.Add(x => x.JobPO);
|
|
|
|
|
|
ActionColumns.Add(new DynamicImageColumn(ProductInstance_Image, null)
|
|
|
{
|
|
@@ -333,7 +339,7 @@ public class StockForecastGrid : DynamicItemsListGrid<StockForecastItem>, IDataM
|
|
|
{
|
|
|
if (filters.Length == 1 && filters[0].Length == 0) return true;
|
|
|
|
|
|
- var value = GetColumnCalculatedData(tag, LoadItem(row));
|
|
|
+ var value = GetColumnCalculatedData(tag, row);
|
|
|
if(!value.HasValue)
|
|
|
{
|
|
|
return false;
|
|
@@ -570,17 +576,17 @@ public class StockForecastGrid : DynamicItemsListGrid<StockForecastItem>, IDataM
|
|
|
return total;
|
|
|
}
|
|
|
|
|
|
- private double? GetColumnCalculatedData(ColumnTag tag, StockForecastItem item)
|
|
|
+ private double? GetColumnCalculatedData(ColumnTag tag, CoreRow row)
|
|
|
{
|
|
|
return tag switch
|
|
|
{
|
|
|
- ColumnTag.MinimumStockRequired => item.MinStock,
|
|
|
- ColumnTag.GeneralStockHoldings => item.GenStock,
|
|
|
- ColumnTag.GeneralPurchaseOrders => item.GenPO,
|
|
|
- ColumnTag.JobStockRequired => item.JobBOM,
|
|
|
- ColumnTag.JobStockHoldings => item.JobStock,
|
|
|
- ColumnTag.JobPurchaseOrders => item.JobPO,
|
|
|
- ColumnTag.BalanceRequired => (Optimise ? item.Optimised : item.Required),
|
|
|
+ ColumnTag.MinimumStockRequired => row.Get<StockForecastItem, double>(x => x.MinStock),
|
|
|
+ ColumnTag.GeneralStockHoldings => row.Get<StockForecastItem, double>(x => x.GenStock),
|
|
|
+ ColumnTag.GeneralPurchaseOrders => row.Get<StockForecastItem, double>(x => x.GenPO),
|
|
|
+ ColumnTag.JobStockRequired => row.Get<StockForecastItem, double>(x => x.JobBOM),
|
|
|
+ ColumnTag.JobStockHoldings => row.Get<StockForecastItem, double>(x => x.JobStock),
|
|
|
+ ColumnTag.JobPurchaseOrders => row.Get<StockForecastItem, double>(x => x.JobPO),
|
|
|
+ ColumnTag.BalanceRequired => (Optimise ? row.Get<StockForecastItem, double>(x => x.Optimised) : row.Get<StockForecastItem, double>(x => x.Required)),
|
|
|
_ => null
|
|
|
};
|
|
|
}
|