From 5fdecbdb693c45edec7e50631d22a9c6a4c1a7cf Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 23 Feb 2023 17:30:41 +0800
Subject: [PATCH] 1

---
 BBWY.Client/Views/Ware/WareManager.xaml       | 43 +++++++++++++++++--
 .../PlatformSDK/JDBusiness.cs                 |  2 +-
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/BBWY.Client/Views/Ware/WareManager.xaml b/BBWY.Client/Views/Ware/WareManager.xaml
index c0259d13..e42c7707 100644
--- a/BBWY.Client/Views/Ware/WareManager.xaml
+++ b/BBWY.Client/Views/Ware/WareManager.xaml
@@ -112,7 +112,6 @@
                                 <c:BButton HorizontalAlignment="Right" Content="添加采购商" Width="110"
                                            Command="{Binding DataContext.AddPurchaserCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" CommandParameter="{Binding }"/>
                             </Grid>
-                            <!--<Border  Grid.ColumnSpan="2" BorderBrush="{StaticResource Border.Brush}" BorderThickness="0,0,0,1"/>-->
 
                             <ListBox x:Name="listbox_sku" Grid.Row="1" ItemsSource="{Binding SkuList}" 
                                      Style="{StaticResource NoScrollViewListBoxStyle}"
@@ -122,11 +121,12 @@
                                      BorderBrush="{StaticResource Border.Brush}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
-                                        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource Border.Brush}"
+                                        <Border BorderThickness="0,0,0,0" BorderBrush="{StaticResource Border.Brush}"
                                                 Width="{Binding ActualWidth,ElementName=listbox_sku}">
                                             <Grid Height="150">
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="350"/>
+                                                    <ColumnDefinition Width="300"/>
+                                                    <ColumnDefinition Width="80"/>
                                                     <ColumnDefinition/>
                                                 </Grid.ColumnDefinitions>
                                                 <!--SKU信息-->
@@ -157,7 +157,7 @@
 
                                                 <!--采购方案-->
                                                 <ListBox x:Name="listbox_purchaseSchemeList" ItemsSource="{Binding PurchaseSchemeList}"
-                                                         Grid.Column="1"
+                                                         Grid.Column="2"
                                                          ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                                                          BorderThickness="1,0"
                                                          BorderBrush="{StaticResource Border.Brush}"
@@ -220,6 +220,9 @@
                                                         </DataTemplate>
                                                     </ListBox.ItemTemplate>
                                                 </ListBox>
+
+                                                <Border Height="1" VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}"/>
+                                                <Border Grid.Column="2" Height="1" VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}"/>
                                             </Grid>
                                         </Border>
 
@@ -227,6 +230,38 @@
                                 </ListBox.ItemTemplate>
                             </ListBox>
 
+                            <ListBox x:Name="listbox_purchasePlatform" ItemsSource="{Binding PurchasePlatformList}"
+                                     SelectedItem="{Binding SelectedPurchasePlatformModel,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                     Style="{StaticResource NoScrollViewListBoxStyle}"
+                                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                                     Grid.Row="1"
+                                     Width="80"
+                                     HorizontalAlignment="Left"
+                                     Margin="300,0,0,0" BorderThickness="1,0,0,1" BorderBrush="{StaticResource Border.Brush}">
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid x:Name="grid_purchasePlatform" Width="{Binding ActualWidth,ElementName=listbox_purchasePlatform,Converter={StaticResource widthConverter},ConverterParameter=7}" Margin="5,5,5,0" Height="25"
+                                              Background="{StaticResource Button.Normal.Background}">
+                                            <TextBlock x:Name="txt_Platform" Text="{Binding PurchasePlatform}" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                                           Foreground="{StaticResource Text.Color}"/>
+                                            <b:Interaction.Triggers>
+                                                <b:EventTrigger EventName="MouseLeftButtonDown">
+                                                    <b:InvokeCommandAction Command="{Binding DataContext.SwitchStorageTypeCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+                                                                                               CommandParameter="{Binding }"/>
+                                                </b:EventTrigger>
+                                            </b:Interaction.Triggers>
+                                        </Grid>
+                                        <DataTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBoxItem}}}"
+                                                                             Value="True">
+                                                <Setter TargetName="grid_purchasePlatform" Property="Background" Value="{StaticResource Button.Selected.Background}"/>
+                                                <Setter TargetName="txt_Platform" Property="Foreground" Value="White"/>
+                                            </DataTrigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+
                             <ListBox x:Name="listbox_purchaser" ItemsSource="{Binding PurchaserList}"
                                      Grid.Row="1" Grid.Column="1"
                                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
index 87d70d25..9bbac574 100644
--- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
@@ -411,7 +411,7 @@ namespace BBWY.Server.Business
             return jarray.Select(j => new LogisticsResponse()
             {
                 Id = j.Value<string>("id"),
-                Name = j.Value<string>("name"),
+                Name = j.Value<string>("name").Trim(),
             }).ToList();
         }