From 8b7ef19a4adfdb157b8ea4b32ffcc7b46b314abd Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 22 Mar 2024 11:48:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=A5=E4=BB=B7=E9=99=90?=
 =?UTF-8?q?=E5=AE=9Aspu=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseScheme/PurchaseSchemeBusiness.cs              | 7 ++++++-
 .../SkuOptimization/OptimizationBusiness.cs               | 8 +++++++-
 .../BatchEditPurchaseSkuActualPriceRequest.cs             | 5 +++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index ec8354b..6ad788f 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -1592,9 +1592,14 @@ namespace BBWYB.Server.Business
 
 
             var schemeRelationList = fsql.Select<PurchaseSchemeProductSku>()
+                                         .WhereIf(!string.IsNullOrEmpty(request.ProductId), pss => pss.ProductId == request.ProductId)
                                          .Where(pss => purchseSkuIdList.Contains(pss.PurchaseSkuId))
                                          .Distinct()
-                                         .ToList(pss => new { pss.SkuPurchaseSchemeId, pss.PurchaseSkuId });
+                                         .ToList(pss => new
+                                         {
+                                             pss.SkuPurchaseSchemeId,
+                                             pss.PurchaseSkuId
+                                         });
             var schemeIdList = schemeRelationList.Select(x => x.SkuPurchaseSchemeId).Distinct().ToList();
 
             var purchaseSchemeList = GetPurchaseSchemeList(new QuerySchemeRequest()
diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs
index d8d8941..cb0a146 100644
--- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs
+++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs
@@ -362,7 +362,13 @@ namespace BBWYB.Server.Business
             var noJoinCompetitiveTenderPurchaseSchemeList = relationPurchaseSchemeList.Where(ps => !competitiveTenderTaskList.Any(ct => ct.SchemeId == ps.Id)).ToList();
             //var noJoinCompetitiveTenderPurchaseSchemeIdList = noJoinCompetitiveTenderPurchaseSchemeList.Select(x => x.Id).ToList();
             //批量更新配件
-            purchaseSchemeBusiness.BatchEditPurchaseSkuActualPrice(request.Map<BatchEditPurchaseSkuActualPriceRequest>(), uInfo);
+
+            {
+                var batchEditPurchaseSkuActualPriceRequest = request.Map<BatchEditPurchaseSkuActualPriceRequest>();
+                batchEditPurchaseSkuActualPriceRequest.ProductId = spuOptimizationTask.ProductId;
+                purchaseSchemeBusiness.BatchEditPurchaseSkuActualPrice(batchEditPurchaseSkuActualPriceRequest, uInfo);
+            }
+          
 
             if (noJoinCompetitiveTenderPurchaseSchemeList.Count() > 0)
             {
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/BatchEditPurchaseSkuActualPriceRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/BatchEditPurchaseSkuActualPriceRequest.cs
index 61e9185..a43d86d 100644
--- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/BatchEditPurchaseSkuActualPriceRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/BatchEditPurchaseSkuActualPriceRequest.cs
@@ -2,6 +2,11 @@
 {
     public class BatchEditPurchaseSkuActualPriceRequest
     {
+        /// <summary>
+        /// 可选条件
+        /// </summary>
+        public string ProductId { get; set; }
+
         public IList<BatchEditPurchaseSkuActualPriceItemRequest> ItemList { get; set; }
     }