diff --git a/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml b/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml index a4b8914..164a351 100644 --- a/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml +++ b/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml @@ -56,7 +56,7 @@ - + diff --git a/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml.cs b/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml.cs index 9950c5f..a4c19b3 100644 --- a/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml.cs +++ b/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml.cs @@ -234,11 +234,11 @@ namespace B3DealerClient.Windows.CarcassInStoreWindow_ record.Goods_Name = context.Detail.Goods_Name; record.Weight = context.Weight; record.Pics = context.Pics.Value; - record.Discont = (context.HookWeight ?? 0) * Math.Ceiling(record.Pics); if (weightUnit.IsChecked == true) - record.NetWeight = Math.Ceiling(record.Pics / 2) * (context.HookWeight ?? 0); + record.Discont = Math.Ceiling(record.Pics / 2) * (context.HookWeight ?? 0); else - record.NetWeight = record.Weight - record.Discont; + record.Discont = (context.HookWeight ?? 0) * Math.Ceiling(record.Pics); + record.NetWeight = record.Weight - record.Discont; record.Date = DateTime.Now; record.Selected = true; CarcassInStoreBL.InsertRecord(record); diff --git a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml index db63692..2331b42 100644 --- a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml +++ b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml @@ -213,7 +213,8 @@ - + + diff --git a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs index a26752d..f634e48 100644 --- a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs +++ b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs @@ -259,7 +259,10 @@ namespace B3DealerClient.Windows.CarcassSaleOutWindow_ record.Goods_Name = context.Dmo.Goods_Name; record.Weight = context.Weight; record.SecondNumber = context.Number; - record.Discont = (context.HookWeight ?? 0) * Math.Ceiling(record.SecondNumber); + if (weightUnit.IsChecked == true) + record.Discont = Math.Ceiling(record.SecondNumber / 2) * (context.HookWeight ?? 0); + else + record.Discont = (context.HookWeight ?? 0) * Math.Ceiling(record.SecondNumber); record.NetWeight = record.Weight - record.Discont; record.Date = DateTime.Now; record.Selected = true;