Browse Source

需求单No.143456 --4、【仓库称重客户端】的‘白条发货’中 增加按钮‘撤销’

master
wangshaoyang 6 years ago
parent
commit
e05b6560e5
3 changed files with 25 additions and 4 deletions
  1. +6
    -0
      B3DealerClient/BL/CarcassSaleOutBL.cs
  2. +4
    -3
      B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml
  3. +15
    -1
      B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs

+ 6
- 0
B3DealerClient/BL/CarcassSaleOutBL.cs View File

@ -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));


+ 4
- 3
B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml View File

@ -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"/>


+ 15
- 1
B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs View File

@ -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();
}
}
}

Loading…
Cancel
Save