From 834ee6bb987ca3c42ac7fdb378a046fdced7e5aa Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 22 Oct 2023 13:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=90=8C=E9=85=8D=E4=BB=B6?=
 =?UTF-8?q?=E5=8E=BB=E9=87=8D=E5=A4=8D=EF=BC=8C=E6=89=B9=E9=87=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B7=A8=E9=87=87=E8=B4=AD=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseScheme/PurchaseSchemeBusiness.cs  | 19 ++++++++++++++++---
 .../BatchEditPurchaseSkuActualPriceRequest.cs |  8 ++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

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
         }
 
         /// <summary>
-        /// 查询同spu同采购商的其他配件接口,排除失效配件
+        /// 查询同spu同采购商的其他配件接口,排除失效和重复配件
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
@@ -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<PurchaseSchemeProductSku>()
+                                   .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
     {
-        /// <summary>
-        /// 采购方案Id
-        /// </summary>
-        public long SchemeId { get; set; }
+        ///// <summary>
+        ///// 采购方案Id
+        ///// </summary>
+        ////public long SchemeId { get; set; }
 
         /// <summary>
         /// SkuId