From e05b6560e5de8be307ed5a0b3f0b988e9a264eff Mon Sep 17 00:00:00 2001
From: wangshaoyang <18303387296@139.com>
Date: Sat, 18 May 2019 10:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.143456=20--4?=
 =?UTF-8?q?=E3=80=81=E3=80=90=E4=BB=93=E5=BA=93=E7=A7=B0=E9=87=8D=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E3=80=91=E7=9A=84=E2=80=98=E7=99=BD=E6=9D=A1?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E2=80=99=E4=B8=AD=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E2=80=98=E6=92=A4=E9=94=80=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3DealerClient/BL/CarcassSaleOutBL.cs            |  6 ++++++
 .../CarcassSaleOutWindow.xaml                    |  7 ++++---
 .../CarcassSaleOutWindow.xaml.cs                 | 16 +++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/B3DealerClient/BL/CarcassSaleOutBL.cs b/B3DealerClient/BL/CarcassSaleOutBL.cs
index 03a685e..a11bdea 100644
--- a/B3DealerClient/BL/CarcassSaleOutBL.cs
+++ b/B3DealerClient/BL/CarcassSaleOutBL.cs
@@ -81,6 +81,12 @@ namespace B3DealerClient.BL
       RpcFacade.Call<int>(MethodPath + "FinishAssign", JsonConvert.SerializeObject(target), id);
     }
 
+		public static void RevokeFinishAssign(long id)
+		{
+			var target = GetBillRecords(id);
+			RpcFacade.Call<int>(MethodPath + "RevokeFinishAssign", JsonConvert.SerializeObject(target), id);
+		}
+
     public static IEnumerable<CarcassSaleOut_Record> GetBillRecords(long billID)
     {
       var query = new DmoQuery(typeof(CarcassSaleOut_Record));
diff --git a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml
index 137305b..e44941e 100644
--- a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml
+++ b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml
@@ -200,7 +200,7 @@
 				</DataGrid.RowStyle>
 				<DataGrid.Columns>
 					<DataGridTextColumn Binding="{Binding Goods_Name}" Header="存货名称" Width="1.0*"/>
-					<DataGridTextColumn Binding="{Binding Date ,StringFormat=\{0:HH:mm\}}" Header="称重时间" Width="0.8*"/>
+					<DataGridTextColumn Binding="{Binding Date ,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="称重时间" Width="0.8*"/>
 					<DataGridTextColumn Binding="{Binding Weight, StringFormat=\{0:0.######\}}" Header="称重重量" Width="0.6*"/>
 					<DataGridTextColumn Binding="{Binding SecondNumber, StringFormat=\{0:0.######\}}" Header="辅数量" Width="0.6*"/>
 					<DataGridTextColumn Binding="{Binding Discont ,StringFormat=\{0:0.######\}}" Header="扣重" Width="0.6*"/>
@@ -276,8 +276,9 @@
 					<Setter Property="Margin" Value="10,0"/>
 				</Style>
 			</WrapPanel.Resources>
-			<Button Content="删除选中" Style="{StaticResource deleteBtn}" IsEnabled="{Binding CanDelete}" PreviewMouseDown="DeleteBtn_PreviewMouseDown"/>
-			<Button Content="称重记录" IsEnabled="{Binding Dmo ,Converter={StaticResource NullIsFalseConverter}}" PreviewMouseDown="ViewBtn_PreviewMouseDown"/>
+			<Button Content="删除选中" Style="{StaticResource deleteBtn}" Width="90" Height="45" IsEnabled="{Binding CanDelete}" PreviewMouseDown="DeleteBtn_PreviewMouseDown"/>
+			<Button Content="称重记录" IsEnabled="{Binding Dmo ,Converter={StaticResource NullIsFalseConverter}}" Width="90" Height="45" PreviewMouseDown="ViewBtn_PreviewMouseDown"/>
+			<Button Content="撤销配货" IsEnabled="{Binding Dmo ,Converter={StaticResource TrueToFalseConverter}}" Width="90" Height="45" PreviewMouseDown="Button_PreviewMouseDown"/>
 			<Button Content="配货完成" IsEnabled="{Binding Dmo ,Converter={StaticResource TrueToFalseConverter}}" PreviewMouseDown="FinishBtn_PreviewMouseDown"/>
 		</WrapPanel>
 		<Button Grid.Row="3" Grid.Column="2" Content="称重/读取" Width="120" Height="55" IsEnabled="{Binding CanSave}" PreviewMouseDown="SaveBtn_PreviewMouseDown"/>
diff --git a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs
index 654a456..bb7a656 100644
--- a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs
+++ b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs
@@ -327,10 +327,24 @@ namespace B3DealerClient.Windows.CarcassSaleOutWindow_
 			var dig = new DriverGoodsLineDialog(context.Date.Value, storeID);
 			if (dig.ShowDialog() == true)
 			{
-				context.DriverGoodsLine = dig.Result;	
+				context.DriverGoodsLine = dig.Result;
 				pageIndex = 0;
 				BindCustomerPanel();
 			}
 		}
+
+		//撤销按钮
+		private void Button_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+		{
+			var targets = context.DmoList.Where(x => x.ID == context.Dmo.ID);
+			var r = MessageBox.Show("确认撤销吗？", "撤销确认", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+			if (r != MessageBoxResult.OK)
+				return;
+			CarcassSaleOutBL.RevokeFinishAssign(context.Dmo.ID);
+      foreach (var item in targets)
+        item.AssignFinished = false;
+      context.Dmo = context.Dmo;
+			BindCustomerPanel();			
+		}
   }
 }