From 42ee36c81be013966b1bdaf39393f493fbf40964 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Tue, 12 Apr 2022 17:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=B1=E6=9C=89=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=95=86=20=E6=9C=AA=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Ware/WareManagerViewModel.cs       |  1 -
 BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml | 10 +++++-----
 .../PurchaseScheme/PurchaseSchemeBusiness.cs      | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/ViewModels/Ware/WareManagerViewModel.cs b/BBWY.Client/ViewModels/Ware/WareManagerViewModel.cs
index beba19b2..33045492 100644
--- a/BBWY.Client/ViewModels/Ware/WareManagerViewModel.cs
+++ b/BBWY.Client/ViewModels/Ware/WareManagerViewModel.cs
@@ -210,7 +210,6 @@ namespace BBWY.Client.ViewModels
                             s.PurchaseSchemeList.Add(PurchaseScheme.Convert(scheme));
                 }
             });
-
         }
 
         /// <summary>
diff --git a/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml b/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
index 785a6a75..904179b1 100644
--- a/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
+++ b/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
@@ -38,27 +38,27 @@
                                     ElementStyle="{StaticResource middleTextBlock}"/>
                 <DataGridTextColumn Binding="{Binding PurchaserLocation}" Header="发货地" Width="120" HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
                                     ElementStyle="{StaticResource middleTextBlock}"/>
-                <DataGridTemplateColumn Header="操作" Width="120" HeaderStyle="{StaticResource ColumnHeaderStyle_Center}">
+                <DataGridTemplateColumn Header="操作" Width="50" HeaderStyle="{StaticResource ColumnHeaderStyle_Center}">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
+                                    <!--<ColumnDefinition/>
+                                    <ColumnDefinition/>-->
                                 </Grid.ColumnDefinitions>
                                 <c:BButton Content="下单" HorizontalAlignment="Stretch"
                                            Background="#1CC2A2"
                                            Command="{Binding DataContext.PreviewPurchaseCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGrid}}}"
                                            CommandParameter="{Binding }"/>
-                                <c:BButton Content="编辑" Grid.Column="1" HorizontalAlignment="Stretch"
+                                <!--<c:BButton Content="编辑" Grid.Column="1" HorizontalAlignment="Stretch"
                                            Background="#02A7F0"
                                            Command="{Binding DataContext.EditCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGrid}}}"
                                            CommandParameter="{Binding }"/>
                                 <c:BButton Content="删除" Grid.Column="2" HorizontalAlignment="Stretch"
                                            Background="#EC808D"
                                            Command="{Binding DataContext.DeleteCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGrid}}}"
-                                           CommandParameter="{Binding }"/>
+                                           CommandParameter="{Binding }"/>-->
                             </Grid>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
diff --git a/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index 595eb4ba..6da31188 100644
--- a/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -125,6 +125,11 @@ namespace BBWY.Server.Business
             });
         }
 
+        /// <summary>
+        /// 获取采购方案
+        /// </summary>
+        /// <param name="querySchemeRequest"></param>
+        /// <returns></returns>
         public IList<PurchaseSchemeResponse> GetPurchaseSchemeList(QuerySchemeRequest querySchemeRequest)
         {
             var purchaseSchemeList = fsql.Select<PurchaseScheme, Purchaser>().InnerJoin((ps, p) => ps.PurchaserId == p.Id)
@@ -174,6 +179,16 @@ namespace BBWY.Server.Business
             return purchaseSchemeList;
         }
 
+        /// <summary>
+        /// 获取共有采购商
+        /// </summary>
+        /// <param name="querySchemeRequest"></param>
+        /// <returns></returns>
+        public IList<Purchaser> GetSharePurchaser(QuerySchemeRequest querySchemeRequest)
+        { 
+            
+        }
+
         public void DeletePurchaser(DeletePurchaseSchemeRequest deletePurchaseSchemeRequest)
         {
             var purchaseSchemeIdList = fsql.Select<PurchaseScheme>().Where(ps => ps.ProductId == deletePurchaseSchemeRequest.ProductId &&