diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index 931a9b2..8e15c73 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -154,7 +154,7 @@ namespace BBWYB.Server.Business
}
///
- /// 获取采购方案(不含采购配配件基本信息)
+ /// 获取采购方案
///
///
///
@@ -172,19 +172,12 @@ namespace BBWYB.Server.Business
if (request.PurchasePlatform != null || !string.IsNullOrEmpty(request.PurchaserId))
{
- //var childSelect = fsql.Select()
- // .InnerJoin((psp, p) => psp.PurchaserId == p.Id)
- // .WhereIf(request.PurchasePlatform != null, (psp, p) => p.Platform == request.PurchasePlatform)
- // .WhereIf(!string.IsNullOrEmpty(request.PurchaserId), (psp, p) => psp.PurchaserId == request.PurchaserId);
- //select = select.Where(ps => childSelect.Where((psp, p) => psp.SkuPurchaseSchemeId == ps.Id).Any());
-
select = select.Where(ps => fsql.Select()
.InnerJoin((psp, p) => psp.PurchaserId == p.Id)
.WhereIf(request.PurchasePlatform != null, (psp, p) => p.Platform == request.PurchasePlatform)
.WhereIf(!string.IsNullOrEmpty(request.PurchaserId), (psp, p) => psp.PurchaserId == request.PurchaserId)
.Where((psp, p) => psp.SkuPurchaseSchemeId == ps.Id).Any());
}
- //.WhereIf(querySchemeRequest.PurchasePlatform != null, ps => ps.PurchasePlatform == querySchemeRequest.PurchasePlatform);
}
var sql = select.ToSql();
var purchaseSchemeList = select.ToList();
@@ -247,6 +240,26 @@ namespace BBWYB.Server.Business
}
}
#endregion
+
+ #region 获取采购方案基本信息
+ if (request.IncludePurchaseSkuBasicInfo == 1)
+ {
+ foreach (var schemeProduct in schemeProductList)
+ {
+ try
+ {
+ var basicInfo = GetPurchaseSkuBasicInfo(new PurchaseSkuBasicInfoRequest()
+ {
+
+ });
+ }
+ catch
+ {
+
+ }
+ }
+ }
+ #endregion
}
}
return purchaseSchemeList;
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs
index 59e2088..0c2c4f1 100644
--- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs
@@ -19,13 +19,18 @@ namespace BBWYB.Server.Model.Dto
public IList SkuIdList { get; set; }
///
- /// 采购商Id, 可空
+ /// 采购商Id, 只要其中一个采购商品满足采购商条件则命中查询
///
public string PurchaserId { get; set; }
///
- /// 采购平台
+ /// 采购平台, 只要其中一个采购商品满足平台条件则命中查询
///
public Enums.Platform? PurchasePlatform { get; set; }
+
+ ///
+ /// 是否包含采购配件的基本信息(单价,Logo,标题等) 是=1 否=0或null
+ ///
+ public int? IncludePurchaseSkuBasicInfo { get; set; }
}
}
diff --git a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductSkuResponse.cs
index 7374eaa..30942ea 100644
--- a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductSkuResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductSkuResponse.cs
@@ -1,10 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BBWYB.Server.Model.Dto
+namespace BBWYB.Server.Model.Dto
{
public class PurchaseSchemeProductSkuResponse : Model.Db.PurchaseSchemeProductSku
{
+
+ ///
+ /// 采购SKU标题 仅在查询条件IncludePurchaseSkuBasicInfo=1时具备该值
+ ///
+ public string PurchaseSkuTitle { get; set; }
+
+ ///
+ /// 采购SKULogo 仅在查询条件IncludePurchaseSkuBasicInfo=1时具备该值
+ ///
+ public string PurchaseSkuLogo { get; set; }
+
+ ///
+ /// 采购SKU单价 仅在查询条件IncludePurchaseSkuBasicInfo=1时具备该值
+ ///
+ public decimal? PurchaseSkuPrice { get; set; }
}
}