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

Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

AddValidOverTime
shanji 2 years ago
parent
b5ea53a858 44d506bbe4
commit
5d29d65844
6 changed files with 61 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 6
      BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
  3. 7
      BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs
  4. 13
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml
  5. 47
      BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml
  6. 13
      BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml

2
BBWY.Client/GlobalContext.cs
View File

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

6
BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
View File

@ -70,6 +70,11 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public decimal TotalConsumableFees { get => totalConsumableFees; set { Set(ref totalConsumableFees, value); } }
private decimal totalFees;
/// <summary>
/// 总耗材费
/// </summary>
public decimal TotalFees { get => totalFees; set { Set(ref totalFees, value); } }
public ICommand SetSearchDateCommand { get; set; }
@ -221,6 +226,7 @@ namespace BBWY.Client.ViewModels.PackTask
OrderCount = res.Data.TotalCount;
TotalConsumableFees = res.Data.TotalConsumableFees;
TotalPackDiscountFees = res.Data.TotalPackDiscountFees;
TotalFees = TotalConsumableFees + TotalPackDiscountFees;
foreach (var shopTotal in res.Data.ShopTotals)
{
if (!shopTotal.ProcessComboName.IsNullOrEmpty())

7
BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs
View File

@ -62,6 +62,12 @@ namespace BBWY.Client.ViewModels.TotalPackTask
/// </summary>
public decimal TotalConsumableFees { get => totalConsumableFees; set { Set(ref totalConsumableFees, value); } }
private decimal totalFees;
/// <summary>
/// 总耗材费
/// </summary>
public decimal TotalFees { get => totalFees; set { Set(ref totalFees, value); } }
public ICommand SetSearchDateCommand { get; set; }
@ -155,6 +161,7 @@ namespace BBWY.Client.ViewModels.TotalPackTask
OrderCount = res.Data.TotalCount;
TotalConsumableFees = res.Data.TotalConsumableFees;
TotalPackDiscountFees = res.Data.TotalPackDiscountFees;
TotalFees = TotalConsumableFees + TotalPackDiscountFees;
foreach (var shopTotal in res.Data.ShopTotals)
{
if (!shopTotal.ProcessComboName.IsNullOrEmpty())

13
BBWY.Client/Views/PackTask/PackTaskTotal.xaml
View File

@ -103,23 +103,28 @@
</Grid>
<Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0" Background="{StaticResource Button.Background}" Width="420"
<Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0" Background="{StaticResource Button.Background}" Width="450"
Visibility="{Binding OrderCount,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition Width="90"/>
</Grid.ColumnDefinitions>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
<TextBlock Text="包装服务费" Foreground="White"/>
<TextBlock Text="{Binding TotalPackDiscountFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
<TextBlock Text="包装耗材费" Foreground="White"/>
<TextBlock Text="{Binding TotalConsumableFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
<TextBlock Text="总费用" Foreground="White"/>
<TextBlock Text="{Binding TotalFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="3">
<TextBlock Text="总任务量" Foreground="White"/>
<TextBlock Text="{Binding OrderCount}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>

47
BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml
View File

@ -208,9 +208,9 @@
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="180" Height="68">
<TextBox Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="0" Width="180" Height="68"
<TextBox Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" Height="30" BorderBrush="{StaticResource Border.Brush}"
IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
BorderThickness="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
</TextBox>
<Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right"/>
@ -280,14 +280,14 @@
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="200" Height="32">
<Grid Width="220" Height="32">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding WareName}" Style="{StaticResource middleTextBlock}"/>
<c:BButton Style="{StaticResource LinkButton}" Content="批量MAX"
<c:BButton Style="{StaticResource LinkButton}" Content="批量MAX设置"
CommandParameter="{Binding WareId}" Command="{Binding DataContext.BatchSetWareMaxCountCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type c:BWindow}}}"
Grid.Column="1" HorizontalAlignment="Left"/>
<Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" Grid.ColumnSpan="2"/>
@ -379,14 +379,16 @@
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="200" Height="68">
<Grid Width="220" Height="68">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="50"/>
</Grid.ColumnDefinitions>
<TextBox Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="0" Width="155" Height="68"
<TextBox Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" Height="30" BorderBrush="{StaticResource Border.Brush}"
IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
BorderThickness="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"/>
VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
</TextBox>
<Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" Grid.Column="1"/>
<c:BButton Style="{StaticResource LinkButton}" Content="MAX" FontSize="14" Foreground="Gray"
IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
@ -455,19 +457,18 @@
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="155" Height="32">
<Grid Width="180" Height="32">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding WareName}" Style="{StaticResource middleTextBlock}"/>
<c:BButton Style="{StaticResource LinkButton}" Content="批量MAX"
<c:BButton Style="{StaticResource LinkButton}" Content="批量MAX设置"
CommandParameter="{Binding WareId}" Command="{Binding DataContext.BatchSetWareMaxCountCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type c:BWindow}}}"
Grid.Column="1" HorizontalAlignment="Left"/>
<Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" Grid.ColumnSpan="2"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
@ -554,14 +555,16 @@
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="155" Height="68">
<Grid Width="180" Height="68">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="50"/>
</Grid.ColumnDefinitions>
<TextBox Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="0" Width="155" Height="68"
<TextBox Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" Height="30" BorderBrush="{StaticResource Border.Brush}"
IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
BorderThickness="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"/>
VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
</TextBox>
<Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" Grid.Column="1"/>
<c:BButton Style="{StaticResource LinkButton}" Content="MAX" FontSize="14" Foreground="Gray"
IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
@ -630,14 +633,14 @@
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="155" Height="32">
<Grid Width="180" Height="32">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding WareName}" Style="{StaticResource middleTextBlock}"/>
<c:BButton Style="{StaticResource LinkButton}" Content="批量MAX"
<c:BButton Style="{StaticResource LinkButton}" Content="批量MAX设置"
CommandParameter="{Binding WareId}" Command="{Binding DataContext.BatchSetWareMaxCountCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type c:BWindow}}}"
Grid.Column="1" HorizontalAlignment="Left"/>
<Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" Grid.ColumnSpan="2"/>
@ -723,14 +726,16 @@
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="155" Height="68">
<Grid Width="180" Height="68">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="50"/>
</Grid.ColumnDefinitions>
<TextBox Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="0" Width="155" Height="68"
<TextBox Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" Height="30" BorderBrush="{StaticResource Border.Brush}"
IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
BorderThickness="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"/>
VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
</TextBox>
<Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" Grid.Column="1"/>
<c:BButton Style="{StaticResource LinkButton}" Content="MAX" FontSize="14" Foreground="Gray"
IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"

13
BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml
View File

@ -100,23 +100,28 @@
</Grid>
<Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0" Background="{StaticResource Button.Background}" Width="420"
<Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0" Background="{StaticResource Button.Background}" Width="450"
Visibility="{Binding OrderCount,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition Width="90"/>
</Grid.ColumnDefinitions>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
<TextBlock Text="包装服务费" Foreground="White"/>
<TextBlock Text="{Binding TotalPackDiscountFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
<TextBlock Text="包装耗材费" Foreground="White"/>
<TextBlock Text="{Binding TotalConsumableFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
<TextBlock Text="总费用" Foreground="White"/>
<TextBlock Text="{Binding TotalFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="3">
<TextBlock Text="总任务量" Foreground="White"/>
<TextBlock Text="{Binding OrderCount}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>

Write Preview
Loading…
Cancel
Save