pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

待完结改成sku隐藏模式

AddValidOverTime
506583276@qq.com 2 years ago
parent
2389240988
commit
175889f2bd
4 changed files with 96 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 4
      BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
  3. 30
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  4. 91
      BBWY.Client/Views/PackTask/WaitCompletedControl.xaml

2
BBWY.Client/GlobalContext.cs
View File

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

4
BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
View File

@ -41,10 +41,12 @@ namespace BBWY.Client.Models.APIModel
public string AcceptUserNames { get; set; } public string AcceptUserNames { get; set; }
private List<WaitTransportSku> waitTransportSkus;
/// <summary> /// <summary>
/// sku列表 /// sku列表
/// </summary> /// </summary>
public List<WaitTransportSku> WaitTransportSkus { get; set; } public List<WaitTransportSku> WaitTransportSkus { get => waitTransportSkus; set {Set(ref waitTransportSkus,value); } }
} }
} }

30
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
View File

@ -310,6 +310,8 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary> /// </summary>
public ObservableCollection<WareWaitCompleted> WaitCompletedList { get => waitCompletedList; set { Set(ref waitCompletedList, value); } } public ObservableCollection<WareWaitCompleted> WaitCompletedList { get => waitCompletedList; set { Set(ref waitCompletedList, value); } }
public List<WareWaitCompleted> WaitCompleteds { get; set; }
private ObservableCollection<WareWaitTransport> waitTransportList; private ObservableCollection<WareWaitTransport> waitTransportList;
/// <summary> /// <summary>
@ -672,6 +674,21 @@ namespace BBWY.Client.ViewModels.PackTask
LoadTransportSkuDataCommand = new RelayCommand<WareWaitTransport>(LoadTransportSkuData); LoadTransportSkuDataCommand = new RelayCommand<WareWaitTransport>(LoadTransportSkuData);
LoadCompletedSkuDataCommand = new RelayCommand<WareWaitCompleted>(LoadCompletedSkuData);
}
private void LoadCompletedSkuData(WareWaitCompleted model)
{
if (model.WaitTransportSkus == null || model.WaitTransportSkus.Count <= 0)
{
var skuDatas = WaitCompleteds.SingleOrDefault(w => w.SealBoxId == model.SealBoxId);
WaitCompletedList.SingleOrDefault(w => w.SealBoxId == model.SealBoxId).WaitTransportSkus = skuDatas.WaitTransportSkus;
}
else
{
WaitCompletedList.SingleOrDefault(w => w.SealBoxId == model.SealBoxId).WaitTransportSkus = null;
}
} }
private void LoadTransportSkuData(WareWaitTransport model) private void LoadTransportSkuData(WareWaitTransport model)
@ -1237,6 +1254,13 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary> /// </summary>
public ICommand LoadTransportSkuDataCommand { get; set; } public ICommand LoadTransportSkuDataCommand { get; set; }
/// <summary>
/// 待完结
/// </summary>
public ICommand LoadCompletedSkuDataCommand { get; set; }
/// <summary> /// <summary>
/// 完成封箱 /// 完成封箱
/// </summary> /// </summary>
@ -1422,17 +1446,21 @@ namespace BBWY.Client.ViewModels.PackTask
stopwatch.Start(); stopwatch.Start();
if (TaskState == Models.TaskState.待出库) if (TaskState == Models.TaskState.待出库)
{ {
PageSize = 20;
WaitCompletedList = new ObservableCollection<WareWaitCompleted>(); WaitCompletedList = new ObservableCollection<WareWaitCompleted>();
var datas = sealBoxService.GetWareWaitCompletedList(null, SearchShopName, taskId, SearchSkuId, sealBoxId, PageIndex, PageSize); var datas = sealBoxService.GetWareWaitCompletedList(null, SearchShopName, taskId, SearchSkuId, sealBoxId, PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success) if (datas != null && datas.Data != null && datas.Success)
{ {
var dataModel = datas.Data; var dataModel = datas.Data;
OrderCount = dataModel.TotalCount; OrderCount = dataModel.TotalCount;
WaitCompleteds = dataModel.WareWaitCompleteds;
foreach (var item in dataModel.WareWaitCompleteds) foreach (var item in dataModel.WareWaitCompleteds)
{ {
var skuItem = item.Copy();
skuItem.WaitTransportSkus = null;//默认不加载
App.Current.Dispatcher.BeginInvoke(new Action(() => App.Current.Dispatcher.BeginInvoke(new Action(() =>
{ {
WaitCompletedList.Add(item); WaitCompletedList.Add(skuItem);
})); }));
} }

91
BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
View File

@ -128,10 +128,10 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}" <Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
MinHeight="100"> >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
<RowDefinition MinHeight="90"/> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="#F2F2F2" > <Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -142,38 +142,65 @@
<ColumnDefinition MinWidth="80"/> <ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11"> <Grid Grid.Column="0" Grid.ColumnSpan="11">
<TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" /> <Grid.ColumnDefinitions>
<c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <ColumnDefinition Width="100"/>
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" <ColumnDefinition Width="200"/>
CommandParameter="{Binding SealBoxId}" <ColumnDefinition Width="200"/>
Margin=" 5,0,7,0"/> <ColumnDefinition Width="200"/>
<TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/> <ColumnDefinition Width="200"/>
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <ColumnDefinition Width="200"/>
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" <ColumnDefinition />
CommandParameter="{Binding ShopName}" </Grid.ColumnDefinitions>
Margin=" 5,0,7,0"/>
<StackPanel Orientation="Horizontal" Grid.Column="0">
<TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" /> <c:BButton Content="{Binding SealBoxId}" 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 Page}}}" CommandParameter="{Binding SealBoxId}"
CommandParameter="{Binding WareName}" Margin=" 5,0,7,0"/>
Margin=" 5,0,7,0"/> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="1">
<TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" /> <c:BButton Content="{Binding ShopName}" 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}}}" CommandParameter="{Binding ShopName}"
CommandParameter="{Binding DepartmentName}" Margin=" 5,0,7,0"/>
Margin=" 5,0,0,0"/> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="2">
<TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
<c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding WareName}"
Margin=" 5,0,7,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="3">
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding DepartmentName}"
Margin=" 5,0,0,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="4">
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
</StackPanel>
</Grid>
<c:BButton Grid.Column="0" Grid.ColumnSpan="6" HorizontalAlignment="Stretch" BorderThickness="0" Panel.ZIndex="-1" Background="Transparent"
Command="{Binding DataContext.LoadCompletedSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding}"
/>
<Grid Grid.Column="5" Panel.ZIndex="-2">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WaitTransportSkus,Converter={StaticResource objConverter},ConverterParameter=#null:∧:∨}" FontWeight="Bold"
Foreground="{StaticResource Text.Link.Color}" FontSize="18"
/>
</Grid>
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
</StackPanel>
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1" Visibility="{Binding WaitTransportSkus,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition/> <RowDefinition/>
<RowDefinition /> <RowDefinition />
@ -192,7 +219,7 @@
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" > ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" >
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>

Write Preview
Loading…
Cancel
Save