1

BBWY.Client/APIServices/PurchaseService.cs

@@ -13,15 +13,28 @@ namespace BBWY.Client.APIServices
         /// <summary>
         /// 获取采购方案
         /// </summary>
-        /// <param name="productIdList"></param>
+        /// <param name="skuIdList"></param>
         /// <param name="purchaserId"></param>
         /// <param name="shopId"></param>
+        /// <param name="schemeId"></param>
+        /// <param name="platform"></param>
         /// <returns></returns>
-        public ApiResponse<IList<PurchaseSchemeResponse>> GetPurchaseSchemeList(IList<string> skuIdList, string purchaserId, long shopId)
+        public ApiResponse<IList<PurchaseSchemeResponse>> GetPurchaseSchemeList(IList<string> skuIdList = null,
+                                                                                string purchaserId = "",
+                                                                                long? shopId = null,
+                                                                                long? schemeId = null,
+                                                                                Platform? platform = null)
         {
             return SendRequest<IList<PurchaseSchemeResponse>>(globalContext.BBYWApiHost,
                                                               "api/PurchaseScheme/GetPurchaseSchemeList",
-                                                              new { skuIdList, purchaserId, shopId },
+                                                              new
+                                                              {
+                                                                  skuIdList,
+                                                                  purchaserId,
+                                                                  shopId,
+                                                                  schemeId,
+                                                                  platform
+                                                              },
                                                               null,
                                                               HttpMethod.Post);
         }

BBWY.Client/Models/Enums.cs

@@ -9,7 +9,8 @@
         京东 = 1,
         阿里巴巴 = 2,
         拼多多 = 3,
-        微信 = 4
+        微信 = 4,
+        拳探 = 10
     }
 
     /// <summary>

BBWY.Client/Models/Product/Product.cs

@@ -8,6 +8,7 @@ namespace BBWY.Client.Models
         public Product()
         {
             PurchaserList = new ObservableCollection<Purchaser>();
+            PurchasePlatformList = new List<PurchasePlatformModel>();
         }
 
         /// <summary>
@@ -34,5 +35,16 @@ namespace BBWY.Client.Models
         /// 采购商集合
         /// </summary>
         public IList<Purchaser> PurchaserList { get; set; }
+
+        /// <summary>
+        /// 采购平台集合
+        /// </summary>
+        public IList<PurchasePlatformModel> PurchasePlatformList { get; set; }
+
+        public void CreatePlatformList()
+        {
+            PurchasePlatformList.Add(new PurchasePlatformModel() { ProductId = this.Id, PurchasePlatform = Platform.阿里巴巴 });
+            PurchasePlatformList.Add(new PurchasePlatformModel() { ProductId = this.Id, PurchasePlatform = Platform.拳探 });
+        }
     }
 }

BBWY.Client/Models/Product/PurchasePlatformModel.cs

@@ -0,0 +1,9 @@
+namespace BBWY.Client.Models
+{
+    public class PurchasePlatformModel
+    {
+        public string ProductId { get; set; }
+
+        public Platform PurchasePlatform { get; set; }
+    }
+}

BBWY.Client/Models/Product/Purchaser.cs

@@ -19,5 +19,7 @@
         public string ProductId { get; set; }
 
         public string Location { get; set; }
+
+        //public Platform Platform { get; set; }
     }
 }

BBWY.Client/ViewModels/Ware/WareManagerViewModel.cs

@@ -140,6 +140,7 @@ namespace BBWY.Client.ViewModels
             var waitList = new List<EventWaitHandle>();
             foreach (var p in productList)
             {
+                p.CreatePlatformList();
                 var ewh = new ManualResetEvent(false);
                 waitList.Add(ewh);
                 Task.Factory.StartNew(() => LoadSku(p, ewh));

BBWY.Client/Views/Ware/WareManager.xaml

@@ -8,7 +8,7 @@
       xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
       xmlns:ctr="clr-namespace:BBWY.Client.Converters"
       mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
+      d:DesignHeight="1080" d:DesignWidth="1920"
       Title="WareManager"
       DataContext="{Binding WareManager,Source={StaticResource Locator}}">
     <b:Interaction.Triggers>
@@ -46,7 +46,8 @@
                     Background="#F2F2F2">
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="351"/>
+                        <ColumnDefinition Width="300"/>
+                        <ColumnDefinition Width="80"/>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
@@ -56,13 +57,14 @@
                         <ColumnDefinition Width="110"/>
                     </Grid.ColumnDefinitions>
                     <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="商品1" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="商品2" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="商品3" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="商品4" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="毛利" Grid.Column="5"  Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="采购商" Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="操作" Grid.Column="7"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="采购平台" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="商品1" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="商品2" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="商品3" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="商品4" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="毛利" Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="采购商" Grid.Column="7"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="操作" Grid.Column="8"  Style="{StaticResource middleTextBlock}"/>
 
 
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>

BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs

@@ -21,7 +21,15 @@ namespace BBWY.Server.Business
             foreach (var scheme in purchaserSchemeList)
             {
                 if (newPurchaserIdList.Any(p => p == scheme.PurchaserId) && !addPurchaserList.Any(p => p.Id == scheme.PurchaserId))
-                    addPurchaserList.Add(new Purchaser() { Id = scheme.PurchaserId, Name = scheme.PurchaserName, Location = scheme.PurchaserLocation });
+                {
+                    addPurchaserList.Add(new Purchaser()
+                    {
+                        Id = scheme.PurchaserId,
+                        Name = scheme.PurchaserName,
+                        Location = scheme.PurchaserLocation,
+                        Platform = scheme.PurchasePlatform
+                    });
+                }
             }
         }
 
@@ -48,7 +56,7 @@ namespace BBWY.Server.Business
             {
                 ExtractNewPurchaser(batchCURDSchemeRequest.AddPurchaseSchemeList, newPurchaserList);
 
-                addPurchaseSchemeList = batchCURDSchemeRequest.AddPurchaseSchemeList.Map<List<Model.Db.PurchaseScheme>>();
+                addPurchaseSchemeList = batchCURDSchemeRequest.AddPurchaseSchemeList.Map<List<PurchaseScheme>>();
 
                 foreach (var scheme in addPurchaseSchemeList)
                 {
@@ -130,11 +138,18 @@ namespace BBWY.Server.Business
         /// <returns></returns>
         public IList<PurchaseSchemeResponse> GetPurchaseSchemeList(QuerySchemeRequest querySchemeRequest)
         {
-            var purchaseSchemeList = fsql.Select<PurchaseScheme, Purchaser>().InnerJoin((ps, p) => ps.PurchaserId == p.Id)
-                                         .Where((ps, p) => ps.ShopId == querySchemeRequest.ShopId)
+            var select = fsql.Select<PurchaseScheme, Purchaser>().InnerJoin((ps, p) => ps.PurchaserId == p.Id);
+            if (querySchemeRequest.SchemeId != null && querySchemeRequest.SchemeId != 0)
+                select = select.Where((ps, p) => ps.Id == querySchemeRequest.SchemeId);
+            else
+            {
+                select = select.WhereIf(querySchemeRequest.ShopId != null && querySchemeRequest.ShopId != 0, (ps, p) => ps.ShopId == querySchemeRequest.ShopId)
                                .WhereIf(querySchemeRequest.SkuIdList != null && querySchemeRequest.SkuIdList.Count() > 0, (ps, p) => querySchemeRequest.SkuIdList.Contains(ps.SkuId))
                                .WhereIf(!string.IsNullOrEmpty(querySchemeRequest.PurchaserId), (ps, p) => ps.PurchaserId == querySchemeRequest.PurchaserId)
-                                         .ToList((ps, p) => new PurchaseSchemeResponse()
+                               .WhereIf(querySchemeRequest.PurchasePlatform != null, (ps, p) => ps.PurchasePlatform == querySchemeRequest.PurchasePlatform);
+            }
+
+            var purchaseSchemeList = select.ToList((ps, p) => new PurchaseSchemeResponse
             {
                 Id = ps.Id,
                 ProductId = ps.ProductId,
@@ -148,6 +163,7 @@ namespace BBWY.Server.Business
                 CreateTime = ps.CreateTime,
                 PurchasePlatform = ps.PurchasePlatform
             });
+
             if (purchaseSchemeList.Count > 0)
             {
                 var purchaseSchemeIdList = purchaseSchemeList.Select(p => p.Id).ToList();

BBWY.Server.Model/Db/PurchaseScheme/Purchaser.cs

@@ -28,6 +28,12 @@ namespace BBWY.Server.Model.Db
         [Column(StringLength = 50)]
         public string Location { get; set; }
 
+        /// <summary>
+        /// 采购平台
+        /// </summary>
+        [Column(MapType = typeof(int?))]
+        public Enums.Platform? Platform { get; set; }
+
     }
 
 }

BBWY.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs

@@ -1,12 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 
 namespace BBWY.Server.Model.Dto
 {
     public class QuerySchemeRequest
     {
-        public long ShopId { get; set; }
+        /// <summary>
+        /// 采购方案Id
+        /// </summary>
+        public long? SchemeId { get; set; }
+
+        public long? ShopId { get; set; }
 
         public IList<string> SkuIdList { get; set; }
 
@@ -14,5 +17,10 @@ namespace BBWY.Server.Model.Dto
         /// 采购商Id, 可空
         /// </summary>
         public string PurchaserId { get; set; }
+
+        /// <summary>
+        /// 采购平台
+        /// </summary>
+        public Enums.Platform? PurchasePlatform { get; set; }
     }
 }

BBWY.Server.Model/Enums.cs

@@ -11,7 +11,8 @@
             京东 = 1,
             阿里巴巴 = 2,
             拼多多 = 3,
-            微信 = 4
+            微信 = 4,
+            拳探 = 10
         }
 
         /// <summary>