diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index 5dd3cd7..1381560 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -1304,7 +1304,7 @@ namespace BBWYB.Server.Business
}
///
- /// 查询同spu同采购商的其他配件接口,排除失效配件
+ /// 查询同spu同采购商的其他配件接口,排除失效和重复配件
///
///
///
@@ -1330,7 +1330,13 @@ namespace BBWYB.Server.Business
if (samePspList.Any())
{
purchaseProductIdList.AddRange(samePspList.Select(psp => psp.PurchaseProductId));
- purchaseSchemeProductSkuList.AddRange(samePspList.SelectMany(psp => psp.PurchaseSchemeProductSkuList));
+ var currentPssList = samePspList.SelectMany(psp => psp.PurchaseSchemeProductSkuList);
+ foreach (var currentPss in currentPssList)
+ {
+ if (purchaseSchemeProductSkuList.Any(x => x.PurchaseSkuId == currentPss.PurchaseSkuId))
+ continue;
+ purchaseSchemeProductSkuList.Add(currentPss);
+ }
}
}
purchaseProductIdList = purchaseProductIdList.Distinct().ToList();
@@ -1388,7 +1394,14 @@ namespace BBWYB.Server.Business
{
if (request.ItemList == null || request.ItemList.Count() == 0)
throw new BusinessException("缺少参数");
- var schemeIdList = request.ItemList.Select(x => x.SchemeId).Distinct().ToList();
+ //var schemeIdList = request.ItemList.Select(x => x.SchemeId).Distinct().ToList();
+
+ var purchseSkuIdList = request.ItemList.Select(x => x.PurchaseSkuId).Distinct().ToList();
+
+ var schemeIdList = fsql.Select()
+ .Where(pss => purchseSkuIdList.Contains(pss.PurchaseSkuId))
+ .Distinct()
+ .ToList(pss => pss.SkuPurchaseSchemeId);
var purchaseSchemeList = GetPurchaseSchemeList(new QuerySchemeRequest()
{
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/BatchEditPurchaseSkuActualPriceRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/BatchEditPurchaseSkuActualPriceRequest.cs
index 5d3b3d8..349e8b0 100644
--- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/BatchEditPurchaseSkuActualPriceRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/BatchEditPurchaseSkuActualPriceRequest.cs
@@ -7,10 +7,10 @@
public class BatchEditPurchaseSkuActualPriceItemRequest
{
- ///
- /// 采购方案Id
- ///
- public long SchemeId { get; set; }
+ /////
+ ///// 采购方案Id
+ /////
+ ////public long SchemeId { get; set; }
///
/// SkuId