Browse Source

打包端添加确认收货操作

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
88e8a45af9
  1. 4
      BBWY.Client/BBWYAppSettings.json
  2. 8
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  3. 23
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml

4
BBWY.Client/BBWYAppSettings.json

@ -4,6 +4,6 @@
"MDSApiHost": "http://mdsapi.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "", "JOSApiHost": "",
"1688ApiHost": "", "1688ApiHost": "",
// "QKApiHost": "http://localhost:8080" "QKApiHost": "http://localhost:8080"
"QKApiHost": "http://qiku.qiyue666.com" // "QKApiHost": "http://qiku.qiyue666.com"
} }

8
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@ -341,8 +341,14 @@ namespace BBWY.Client.ViewModels.PackTask
switch (packTaskState) switch (packTaskState)
{ {
case PackTaskState.: case PackTaskState.:
break;
case PackTaskState.: case PackTaskState.:
if (System.Windows.MessageBox.Show("是否确认收货?","提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning) != MessageBoxResult.Yes)
return;
res = packTaskService.SetPackTaskState(taskId, PackTaskState.);
break; break;
case PackTaskState.: case PackTaskState.:
break; break;

23
BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@ -454,6 +454,29 @@
</b:EventTrigger> </b:EventTrigger>
</b:Interaction.Triggers> </b:Interaction.Triggers>
</c:BButton> </c:BButton>
<Grid
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}"
>
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="确认收货"
Visibility="{Binding OrderId,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="TaskId" />
<Binding Path="TaskState"/>
<Binding Path="OrderId"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
</Grid>
</StackPanel> </StackPanel>

Loading…
Cancel
Save