Browse Source

显示封箱id

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
a559b3023a
  1. 2
      BBWY.Client/App.xaml
  2. 65
      BBWY.Client/Converters/TaskStateToBooleanConvert.cs
  3. 2
      BBWY.Client/GlobalContext.cs
  4. 6
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  5. 64
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  6. 16
      BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
  7. 17
      BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
  8. 31
      BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
  9. 46
      BBWY.Client/Views/PackTask/TaskList.xaml
  10. 45
      BBWY.Client/Views/PackTask/WareHouseList.xaml
  11. 10
      BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml
  12. 136
      BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
  13. 6
      BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml
  14. 21
      BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml

2
BBWY.Client/App.xaml

@ -24,6 +24,8 @@
<ctr:EnumToBooleanConverter x:Key="enumToBooleanConverter"/> <ctr:EnumToBooleanConverter x:Key="enumToBooleanConverter"/>
<ctr:IntToStringConverter x:Key="intToStringConverter"/> <ctr:IntToStringConverter x:Key="intToStringConverter"/>
<ctr:EnumToColorConverter x:Key="enumToColorConverter"/> <ctr:EnumToColorConverter x:Key="enumToColorConverter"/>
<ctr:TaskStateToBooleanConvert x:Key="taskStateToBoolean"/>
</ResourceDictionary> </ResourceDictionary>
</Application.Resources> </Application.Resources>
</Application> </Application>

65
BBWY.Client/Converters/TaskStateToBooleanConvert.cs

@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Windows.Data;
namespace BBWY.Client.Converters
{
public class TaskStateToBooleanConvert : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
string[] parray = parameter.ToString().ToLower().Split(':');//参数拆分
string valueStr = value == null ? string.Empty : value.ToString().ToLower();
string returnValue = string.Empty;
try
{
if (string.IsNullOrEmpty(valueStr))
{
returnValue = parray[0].Contains("#null") ? parray[1] : parray[2];
}
else if (parray[0].Contains("|"))
{
returnValue = parray[0].Split('|').Contains(valueStr) ? parray[1] : parray[2];
}
else
{
returnValue = parray[0].Equals(valueStr) ? parray[1] : parray[2];
}
if (returnValue.Equals("#source", StringComparison.CurrentCultureIgnoreCase))
return value;
return returnValue;
}
catch (Exception ex)
{
Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine($"ObjectConverter {ex.Message} {parameter}");
Console.ResetColor();
}
return parray[2];
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
var returnValue = "otherValue";
string[] parray = parameter.ToString().ToLower().Split(':');
if (value == null)
return returnValue;
var valueStr = value.ToString().ToLower();
if (valueStr != parray[1])
return returnValue;
else
{
var resData = parray[0].Contains('|') ? parray[0].Split('|')[0] : parray[0];
if (resData == "#null")
{
return null;
}
return resData;
}
}
}
}

2
BBWY.Client/GlobalContext.cs

@ -13,7 +13,7 @@ namespace BBWY.Client
{ {
ShopServiceGroupList = new List<string>(); ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>(); ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10134"; ClientVersion = "10135";
} }
private User user; private User user;

6
BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@ -123,13 +123,13 @@ namespace BBWY.Client.ViewModels.PackTask
private string searchSkuId; private string searchSkuId;
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } } public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
public TaskState? taskState; private TaskState? taskState;
/// <summary> /// <summary>
/// 任务状态 /// 任务状态
/// </summary> /// </summary>
public TaskState? TaskState public TaskState? TaskState
{ {
get => taskState; private set get => taskState; set
{ {
Set(ref taskState, value); Set(ref taskState, value);
} }
@ -578,7 +578,7 @@ namespace BBWY.Client.ViewModels.PackTask
} }
else else
{ {
MessageBox.Show("查不到数据"); if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
} }
IsLoadCount(); IsLoadCount();

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

@ -121,13 +121,13 @@ namespace BBWY.Client.ViewModels.PackTask
private string searchSkuId; private string searchSkuId;
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } } public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
public TaskState? taskState; private TaskState? taskState;
/// <summary> /// <summary>
/// 任务状态 /// 任务状态
/// </summary> /// </summary>
public TaskState? TaskState public TaskState? TaskState
{ {
get => taskState; private set get => taskState; set
{ {
Set(ref taskState, value); Set(ref taskState, value);
} }
@ -266,6 +266,7 @@ namespace BBWY.Client.ViewModels.PackTask
IsLoading = false; IsLoading = false;
SetTaskStatusCommand = new RelayCommand<object>(SetTaskStatus); SetTaskStatusCommand = new RelayCommand<object>(SetTaskStatus);
TaskState = null;
//加载数据 //加载数据
SetTaskState(null); SetTaskState(null);
@ -277,15 +278,15 @@ namespace BBWY.Client.ViewModels.PackTask
CompeteFallWareCommand = new RelayCommand<object>(CompeteFallWare); CompeteFallWareCommand = new RelayCommand<object>(CompeteFallWare);
SealBoxConfigureType = SealBoxConfigureType.; SealBoxConfigureType = SealBoxConfigureType.;
PositionState = PositionState.; PositionState = PositionState.;
SetSealBoxConfigureTypeCommand = new RelayCommand<SealBoxConfigureType>(s => SetSealBoxConfigureTypeCommand = new RelayCommand<SealBoxConfigureType>(s =>
{ {
PageIndex = 1; PageIndex = 1;
SealBoxConfigureType = s; SealBoxConfigureType = s;
PositionState = s == SealBoxConfigureType. ? PositionState. : PositionState.; PositionState = s == SealBoxConfigureType. ? PositionState. : PositionState.;
Task.Factory.StartNew(() => SearchTaskList()); Task.Factory.StartNew(() => SearchTaskList());
}); });
LookBoxConfigureCommand = new RelayCommand<object>(LookBoxConfigure); LookBoxConfigureCommand = new RelayCommand<object>(LookBoxConfigure);
@ -303,10 +304,10 @@ namespace BBWY.Client.ViewModels.PackTask
MessageBoxButton.YesNo, MessageBoxButton.YesNo,
MessageBoxImage.Warning); MessageBoxImage.Warning);
if (result != MessageBoxResult.Yes) return; if (result != MessageBoxResult.Yes) return;
var res = packTaskService.StoreGetBySelf(packTaskmodel.TaskId); var res = packTaskService.StoreGetBySelf(packTaskmodel.TaskId);
if (!res.Success) if (!res.Success)
{ {
System.Windows.MessageBox.Show(res.Msg,"错误信息"); System.Windows.MessageBox.Show(res.Msg, "错误信息");
return; return;
} }
Task.Factory.StartNew(() => SearchTaskList()); Task.Factory.StartNew(() => SearchTaskList());
@ -320,7 +321,7 @@ namespace BBWY.Client.ViewModels.PackTask
// System.Windows.MessageBox.Show($"暂不支持删除采购组的任务,如要删除,请到采购列表取消订单:{packTaskmodel.OrderId}"); // System.Windows.MessageBox.Show($"暂不支持删除采购组的任务,如要删除,请到采购列表取消订单:{packTaskmodel.OrderId}");
// return; // return;
//} //}
MessageBoxResult result =System.Windows.MessageBox.Show($"确定取消任务{packTaskmodel.TaskId}?", "提示", MessageBoxResult result = System.Windows.MessageBox.Show($"确定取消任务{packTaskmodel.TaskId}?", "提示",
MessageBoxButton.YesNo, MessageBoxButton.YesNo,
MessageBoxImage.Warning); MessageBoxImage.Warning);
if (result != MessageBoxResult.Yes) return; if (result != MessageBoxResult.Yes) return;
@ -350,13 +351,13 @@ namespace BBWY.Client.ViewModels.PackTask
}; };
if (fallware.WareType == WareType.) if (fallware.WareType == WareType.)
{ {
//加载模板数据 //加载模板数据
} }
if (fallware.WareType == WareType.) if (fallware.WareType == WareType.)
{ {
} }
//打印 //打印
} }
private void LookBoxConfigure(object obj) private void LookBoxConfigure(object obj)
@ -404,11 +405,11 @@ namespace BBWY.Client.ViewModels.PackTask
var model = obj as WaitFallWareModel; var model = obj as WaitFallWareModel;
var res = sealBoxService.WareCompeteFallWare(model.SealBoxId); var res = sealBoxService.WareCompeteFallWare(model.SealBoxId);
if (res != null&&res.Success) if (res != null && res.Success)
{ {
ReflashTask();return; ReflashTask(); return;
} }
if (res==null) if (res == null)
{ {
System.Windows.MessageBox.Show("网络异常"); System.Windows.MessageBox.Show("网络异常");
return; return;
@ -422,7 +423,7 @@ namespace BBWY.Client.ViewModels.PackTask
var model = (SealBoxModel)obj; var model = (SealBoxModel)obj;
if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState. || s.TaskState == Models.TaskState.)) if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState. || s.TaskState == Models.TaskState.))
{ {
System.Windows.MessageBox.Show("无法封箱,存在未封箱的任务"); System.Windows.MessageBox.Show("无法封箱,存在未打包完成的任务");
return; return;
} }
@ -480,7 +481,7 @@ namespace BBWY.Client.ViewModels.PackTask
/// 设置分箱数量 /// 设置分箱数量
/// </summary> /// </summary>
public ICommand SetSealBoxCommand { get; set; } public ICommand SetSealBoxCommand { get; set; }
/// <summary> /// <summary>
/// 打印封箱数据 /// 打印封箱数据
@ -629,7 +630,7 @@ namespace BBWY.Client.ViewModels.PackTask
if (TaskState == Models.TaskState.) if (TaskState == Models.TaskState.)
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
WaitFallWareList = new ObservableCollection<WaitFallWareModel>(); WaitFallWareList = new ObservableCollection<WaitFallWareModel>();
var datas = sealBoxService.SearchWareFallWareConfigureList(PositionState, SearchShopName, taskId, SearchSkuId, PageIndex, PageSize); var datas = sealBoxService.SearchWareFallWareConfigureList(PositionState, SearchShopName, taskId, SearchSkuId, PageIndex, PageSize);
@ -652,9 +653,9 @@ namespace BBWY.Client.ViewModels.PackTask
WareName = item.WareName, WareName = item.WareName,
SealBoxCount = item.SealBoxCount, SealBoxCount = item.SealBoxCount,
SealBoxId = item.SealBoxId, SealBoxId = item.SealBoxId,
BoxConfigureData = item.BoxConfigureData, BoxConfigureData = item.BoxConfigureData,
ProductCount = item.ProductCount, ProductCount = item.ProductCount,
WareType = item.WareType, WareType = item.WareType,
}); });
})); }));
@ -667,17 +668,16 @@ namespace BBWY.Client.ViewModels.PackTask
} }
IsLoadCount(); IsLoadCount();
IsLoadFallWareCount(); IsLoadFallWareCount();
IsLoading = false; IsLoading = false;
}); });
else if (TaskState == Models.TaskState.) else if (TaskState == Models.TaskState.)
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
//var randNum = new Random().Next(81, 90);
var randNum = 90;
if (SealBoxConfigureType == SealBoxConfigureType.)
var randNum = new Random().Next(81, 90);
if(SealBoxConfigureType== SealBoxConfigureType.)
{ {
WaitSealBoxModels = new ObservableCollection<SealBoxModel>(); WaitSealBoxModels = new ObservableCollection<SealBoxModel>();
@ -730,7 +730,7 @@ namespace BBWY.Client.ViewModels.PackTask
App.Current.Dispatcher.BeginInvoke(new Action(() => App.Current.Dispatcher.BeginInvoke(new Action(() =>
{ {
WareNoSealBoxModels.Add(new WareNoSealBoxModel WareNoSealBoxModels.Add(new WareNoSealBoxModel
{ {
AcceptUserName = string.Join("|", item.AcceptUserNames), AcceptUserName = string.Join("|", item.AcceptUserNames),
DepartmentName = item.DepartmentName, DepartmentName = item.DepartmentName,
@ -742,7 +742,7 @@ namespace BBWY.Client.ViewModels.PackTask
}).ToList(), }).ToList(),
ShopId = item.ShopId, ShopId = item.ShopId,
ShopName = item.ShopName, ShopName = item.ShopName,
}); });
})); }));

16
BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml

@ -95,9 +95,15 @@
<StackPanel Orientation="Horizontal" Grid.Column="0" > <StackPanel Orientation="Horizontal" Grid.Column="0" >
<TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
<c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding WareName}" CommandParameter="{Binding WareName}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
<c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SealBoxId}"
Margin=" 5,0,7,0"/>
</StackPanel> </StackPanel>
<Grid Grid.Column="1"> <Grid Grid.Column="1">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/> <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
@ -137,7 +143,7 @@
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"> <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}"> <MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SkuId"/> <Binding Path="SkuId"/>
@ -152,7 +158,7 @@
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -173,7 +179,7 @@
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -214,7 +220,7 @@
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PrewOrder}"/> <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PrewOrder}"/>
</Grid> </Grid>
<Grid Grid.Column="4"> <Grid Grid.Column="4">
<c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"/> <c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
</Grid> </Grid>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>

17
BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml

@ -90,9 +90,16 @@
<StackPanel Orientation="Horizontal" Grid.Column="0" > <StackPanel Orientation="Horizontal" Grid.Column="0" >
<TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
<c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding WareName}" CommandParameter="{Binding WareName}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
<c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SealBoxId}"
Margin=" 5,0,7,0"/>
</StackPanel> </StackPanel>
<Grid Grid.Column="1"> <Grid Grid.Column="1">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/> <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
@ -130,7 +137,7 @@
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"> <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}"> <MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SkuId"/> <Binding Path="SkuId"/>
@ -145,7 +152,7 @@
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -166,7 +173,7 @@
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -201,7 +208,7 @@
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
<Grid Grid.Column="2"> <Grid Grid.Column="2">
<c:BButton Style="{StaticResource LinkButton}" Content="设置" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"/> <c:BButton Style="{StaticResource LinkButton}" Content="设置" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
</Grid> </Grid>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>

31
BBWY.Client/Views/FallWare/WaitFallWareControl.xaml

@ -89,22 +89,26 @@
<TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/> <TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ShopName}" CommandParameter="{Binding ShopName}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="14,0,0,0" />
<c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding WareName}" CommandParameter="{Binding WareName}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
<c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SealBoxId}"
Margin=" 5,0,7,0"/>
<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/> <TextBlock VerticalAlignment="Center" Text="部门:" Margin="16,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding DepartmentName}" CommandParameter="{Binding DepartmentName}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
@ -142,11 +146,10 @@
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"> <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}"> <MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/> <Binding Path="SkuId"/>
<Binding Path="Id"/>
</MultiBinding> </MultiBinding>
</b:InvokeCommandAction.CommandParameter> </b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction> </b:InvokeCommandAction>
@ -158,7 +161,7 @@
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -186,7 +189,7 @@
<Run Text="货号:" /> <Run Text="货号:" />
</TextBlock> </TextBlock>
<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" <c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ProductNo}" CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -195,7 +198,7 @@
<Run Text="任务ID:" /> <Run Text="任务ID:" />
</TextBlock> </TextBlock>
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -270,7 +273,7 @@
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="完成" <c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="完成"
Command="{Binding DataContext.CompeteFallWareCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.CompeteFallWareCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding}" CommandParameter="{Binding}"
Visibility="{Binding BoxConfigureData,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" Visibility="{Binding BoxConfigureData,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
> >

46
BBWY.Client/Views/PackTask/TaskList.xaml

@ -103,30 +103,54 @@
</Grid> </Grid>
<StackPanel Grid.Row="1" Grid.RowSpan="1" HorizontalAlignment="Left" Orientation="Horizontal"> <StackPanel Grid.Row="1" Grid.RowSpan="1" HorizontalAlignment="Left" Orientation="Horizontal">
<RadioButton Height="35" Width="126" VerticalAlignment="Center" x:Name="qb" IsChecked="True" Content="全部" Command="{Binding SetTaskStateCommand}" />
<RadioButton Height="35" Width="126" VerticalAlignment="Center" x:Name="qb" Content="全部" Command="{Binding SetTaskStateCommand}"
IsChecked="{Binding TaskState,Converter={StaticResource taskStateToBoolean},ConverterParameter=#null:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.未到货}" Content="未到货" Tag="{Binding NoArrivedCount,Mode=TwoWay}" />
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.未到货}" Content="未到货" Tag="{Binding NoArrivedCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.部分到货}" Content="部分到货" Tag="{Binding SomeArrivedCount,Mode=TwoWay}"/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.部分到货}" Content="部分到货" Tag="{Binding SomeArrivedCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=部分到货:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待质检" />
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待质检"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"/> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待封箱}" Content="待封箱" Tag="{Binding WaitSealBoxCount,Mode=TwoWay}"/> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待封箱}" Content="待封箱" Tag="{Binding WaitSealBoxCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"/> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待完结" Tag="{Binding WaitOutbound,Mode=TwoWay}"/> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待完结" Tag="{Binding WaitOutbound,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已完成}" Content="已完成" /> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已完成}" Content="已完成"
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.商家自取}" Content="商家自取" /> IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已完成:True:False}"
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已取消}" Content="已取消" /> />
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.商家自取}" Content="商家自取"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=商家自取:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已取消}" Content="已取消"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已取消:True:False}"
/>
<Button Content="发布任务" Height="35" Width="120" Margin="30 0 0 0" <Button Content="发布任务" Height="35" Width="120" Margin="30 0 0 0"

45
BBWY.Client/Views/PackTask/WareHouseList.xaml

@ -140,31 +140,52 @@
</Grid> </Grid>
<StackPanel Grid.Row="1" Grid.RowSpan="1" HorizontalAlignment="Left" Orientation="Horizontal"> <StackPanel Grid.Row="1" Grid.RowSpan="1" HorizontalAlignment="Left" Orientation="Horizontal">
<RadioButton Height="35" Width="126" VerticalAlignment="Center" x:Name="qb" IsChecked="True" Content="全部" Command="{Binding SetTaskStateCommand}" /> <RadioButton Height="35" Width="126" VerticalAlignment="Center" x:Name="qb" Content="全部" Command="{Binding SetTaskStateCommand}"
IsChecked="{Binding TaskState,Mode=TwoWay,Converter={StaticResource taskStateToBoolean},ConverterParameter=#null:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.未到货}" Content="未到货" Tag="{Binding NoArrivedCount,Mode=TwoWay}" /> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.未到货}" Content="未到货" Tag="{Binding NoArrivedCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.部分到货}" Content="部分到货" Tag="{Binding SomeArrivedCount,Mode=TwoWay}"/> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.部分到货}" Content="部分到货" Tag="{Binding SomeArrivedCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=部分到货:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待质检" /> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待质检"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"/> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待封箱}" Content="待封箱" Tag="{Binding WaitSealBoxCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待封箱}" Content="待封箱" Tag="{Binding WaitSealBoxCount,Mode=TwoWay}"/> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"/> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待出库" Tag="{Binding WaitOutbound,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待出库" Tag="{Binding WaitOutbound,Mode=TwoWay}"/> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已完成}" Content="已完成"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已完成:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已完成}" Content="已完成" /> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.商家自取}" Content="商家自取"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=商家自取:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.商家自取}" Content="商家自取" /> <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已取消}" Content="已取消"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已取消:True:False}"
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已取消}" Content="已取消" /> />

10
BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml

@ -90,7 +90,7 @@
<StackPanel Orientation="Horizontal" Grid.Column="0" > <StackPanel Orientation="Horizontal" Grid.Column="0" >
<TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
<c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding WareName}" CommandParameter="{Binding WareName}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
</StackPanel> </StackPanel>
@ -130,7 +130,7 @@
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"> <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}"> <MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SkuId"/> <Binding Path="SkuId"/>
@ -145,7 +145,7 @@
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -166,7 +166,7 @@
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -204,7 +204,7 @@
<Grid Grid.Column="2"> <Grid Grid.Column="2">
<c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.UpdateSealBoxConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"/> <c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.UpdateSealBoxConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
</Grid> </Grid>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>

136
BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml

@ -92,7 +92,7 @@
<TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/> <TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ShopName}" CommandParameter="{Binding ShopName}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
@ -102,7 +102,7 @@
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding DepartmentName}" CommandParameter="{Binding DepartmentName}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
@ -120,123 +120,111 @@
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding SealBoxSkus}" <ListBox x:Name="listbox_orerSku" ItemsSource="{Binding SealBoxSkus}" Grid.ColumnSpan="2"
Style="{StaticResource NoScrollViewListBoxStyle}" Style="{StaticResource NoScrollViewListBoxStyle}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" > ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" >
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> <Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="400"/>
<ColumnDefinition/> <ColumnDefinition Width="80"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<!--{Binding Logo}--> <!--{Binding Logo}-->
<c:BAsyncImage UrlSource="{Binding Logo}" <c:BAsyncImage UrlSource="{Binding Logo}"
Width="80" DecodePixelWidth="80" Width="80" DecodePixelWidth="80"
VerticalAlignment="Top" Margin="11,10,0,10" VerticalAlignment="Top" Margin="11,10,0,10"
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"> <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}"> <MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SkuId"/> <Binding Path="SkuId"/>
</MultiBinding> </MultiBinding>
</b:InvokeCommandAction.CommandParameter> </b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction> </b:InvokeCommandAction>
</b:EventTrigger> </b:EventTrigger>
</b:Interaction.Triggers> </b:Interaction.Triggers>
</c:BAsyncImage> </c:BAsyncImage>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,15,0,10"> <StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,15,0,10">
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis"> <TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip> <TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding SkuTitle,Mode=TwoWay}"/> <TextBlock Text="{Binding SkuTitle,Mode=TwoWay}"/>
</ToolTip> </ToolTip>
</TextBlock.ToolTip> </TextBlock.ToolTip>
<Run Text="SKU名称:"/> <Run Text="SKU名称:"/>
<Run Text="{Binding SkuTitle}"/> <Run Text="{Binding SkuTitle}"/>
</TextBlock> </TextBlock>
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,13,0 0"> <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,13,0 0">
<Run Text="品名:"/> <Run Text="品名:"/>
<Run Text="{Binding BrandName}"/> <Run Text="{Binding BrandName}"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10"> <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
<StackPanel Orientation="Horizontal" > <StackPanel Orientation="Horizontal" >
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="货号:" />
</TextBlock> </TextBlock>
<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" <c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ProductNo}" CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5"> <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="任务ID:" /> <Run Text="任务ID:" />
</TextBlock> </TextBlock>
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
<!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0"> <!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
<Run Text="任务状态:"/> <Run Text="任务状态:"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Red:black}" Text="{Binding TaskState}"/> <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Red:black}" Text="{Binding TaskState}"/>
</TextBlock>--> </TextBlock>-->
</StackPanel> </StackPanel>
</Grid>
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/> </Grid>
<ListBox x:Name="listbox_skuCount" ItemsSource="{Binding SealBoxSkus}" <Grid Grid.Column="1" >
Style="{StaticResource NoScrollViewListBoxStyle}" Grid.Column="1" <TextBlock x:Name="txt_storeName"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" >
<ListBox.ItemTemplate>
<DataTemplate>
<Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_skuCount}">
<Grid>
<TextBlock x:Name="txt_storeName"
Text="{Binding SkuCount}" Text="{Binding SkuCount}"
TextWrapping="Wrap" TextWrapping="Wrap"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
/> />
</Grid>
</Grid> </Grid>
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> <Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
<Grid Grid.Column="2" > <Grid Grid.Column="2" >
</Grid> </Grid>

6
BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml

@ -94,7 +94,7 @@
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"> <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}"> <MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SkuId"/> <Binding Path="SkuId"/>
@ -109,7 +109,7 @@
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -147,7 +147,7 @@
<StackPanel Orientation="Horizontal" Margin="10 10 0 13"> <StackPanel Orientation="Horizontal" Margin="10 10 0 13">
<TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="40 0 0 0"> <TextBlock Style="{StaticResource middleTextBlock}" Margin="40 0 0 0">

21
BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml

@ -102,9 +102,12 @@
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding WareName}" CommandParameter="{Binding WareName}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
<!--<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>--> <c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding SealBoxId}"
Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
@ -145,7 +148,7 @@
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"> <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}"> <MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SkuId"/> <Binding Path="SkuId"/>
@ -160,7 +163,7 @@
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" /> <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -188,7 +191,7 @@
<Run Text="货号:" /> <Run Text="货号:" />
</TextBlock> </TextBlock>
<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" <c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ProductNo}" CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -197,7 +200,7 @@
<Run Text="任务ID:" /> <Run Text="任务ID:" />
</TextBlock> </TextBlock>
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
@ -246,7 +249,7 @@
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="设置" <c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="设置"
Command="{Binding DataContext.SetSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.SetSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding}" CommandParameter="{Binding}"
> >
@ -265,7 +268,7 @@
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="完成" <c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="完成"
Command="{Binding DataContext.CompeteSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.CompeteSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding}" CommandParameter="{Binding}"
> >

Loading…
Cancel
Save