|
@@ -58,7 +58,20 @@ public class ProductInstanceControl : DynamicDataGrid<ProductInstance>, IProduct
|
|
|
{
|
|
|
var item = base.CreateItem();
|
|
|
item.Product.ID = Product.ID;
|
|
|
- item.Dimensions.Unit.ID = Product.UnitOfMeasure.ID;
|
|
|
+
|
|
|
+ if(Product.UnitOfMeasure.ID != Guid.Empty)
|
|
|
+ {
|
|
|
+ item.Dimensions.Unit.ID = Product.UnitOfMeasure.ID;
|
|
|
+
|
|
|
+ var unitOfMeasure = Client.Query<ProductDimensionUnit>(
|
|
|
+ new Filter<ProductDimensionUnit>(x => x.ID).IsEqualTo(Product.UnitOfMeasure.ID),
|
|
|
+ null)
|
|
|
+ .ToObjects<ProductDimensionUnit>().FirstOrDefault();
|
|
|
+ if(unitOfMeasure is not null)
|
|
|
+ {
|
|
|
+ item.Dimensions.Unit.Synchronise(unitOfMeasure);
|
|
|
+ }
|
|
|
+ }
|
|
|
return item;
|
|
|
}
|
|
|
|