From 00de54beb608a4763cdef6baf7471b22d1e25070 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Mon, 22 Apr 2019 15:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E6=9D=A1=E6=94=B6=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=20=E6=89=A3=E9=87=8D=E5=8F=96=E5=80=BC=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml | 2 +-
 .../CarcassInStoreWindow_/CarcassInStoreWindow.xaml.cs      | 6 +++---
 .../Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml | 3 ++-
 .../CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs      | 5 ++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

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 @@
           <TextBlock Text="扣钩重："/>
           <TextBox x:Name="hook" Text="{Binding HookWeight,StringFormat=\{0:0.######\}}" PreviewMouseDown="NumberBox_PreviewMouseDown"/>
         </WrapPanel>
-        <local:SwitchCheckBox x:Name="weightUnit" Grid.Row="1" HorizontalAlignment="Right" Text="头" CheckedText="片" Width="90" Margin="10,0"/>
+        <local:SwitchCheckBox x:Name="weightUnit" Grid.Row="1" HorizontalAlignment="Right" Text="头" CheckedText="片" Width="120" Margin="10,0"/>
         <WrapPanel Grid.Column="1" HorizontalAlignment="Center" Margin="0,5">
           <TextBlock Text="供应商："/>
           <TextBlock Text="{Binding Dmo.Supplier_Name}" Width="200" TextWrapping="Wrap" Margin="0,0,10,0" Foreground="Red"/>
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 @@
       <WrapPanel>
         <TextBlock Text="扣钩重"/>
         <TextBox x:Name="hook" Text="{Binding HookWeight,StringFormat=\{0:0.######\}}" PreviewMouseDown="NumberBox_PreviewMouseDown"/>
-      </WrapPanel>
+      </WrapPanel>
+      <local:SwitchCheckBox x:Name="weightUnit" HorizontalAlignment="Right" Text="头" CheckedText="片" Width="120" Margin="10,0"/>
     </StackPanel>
 
     <StackPanel Grid.Row="2" Grid.Column="2">
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;