From f570b4c4d63bd773c2a05aecab7791004a2b5a08 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 7 Sep 2023 18:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=87=E8=B4=AD=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Common/Log/NLogManager.cs                            | 2 --
 .../PurchaseOrder/PurchaseOrderBusiness.cs                 | 3 ++-
 .../PurchaseScheme/PurchaseSchemeBusiness.cs               | 7 +++++++
 .../Request/QiKu/QiKuPackTaskSkuPurchaseSchemeIdRequest.cs | 5 +++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/BBWYB.Common/Log/NLogManager.cs b/BBWYB.Common/Log/NLogManager.cs
index 54c00a6..698aede 100644
--- a/BBWYB.Common/Log/NLogManager.cs
+++ b/BBWYB.Common/Log/NLogManager.cs
@@ -29,8 +29,6 @@ namespace BBWYB.Common.Log
                 loggerDictionary.TryAdd(loggerName, logger);
             }
             return logger;
-
-           
         }
     }
 }
diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 3ddb21a..51e2bda 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -489,7 +489,8 @@ namespace BBWYB.Server.Business
                             notifyQikuPackSchemeParamList.Add(new QiKuPackTaskSkuPurchaseSchemeIdRequest()
                             {
                                 SkuId = orderSku.BelongSkuId,
-                                SkuPurchaseSchemeId = cargoParam.SchemeId.ToString()
+                                SkuPurchaseSchemeId = cargoParam.SchemeId.ToString(),
+                                SchemeVersion = cargoParam.SchemeVersion ?? 1
                             });
                         }
                     }
diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index 7a53413..5affc42 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -206,6 +206,7 @@ namespace BBWYB.Server.Business
             List<PurchaseSchemeGroup> dbSchemeGroupList = null;
             List<PurchaseScheme> dbPurchaseSchemeList = null;
             List<long> deleteSchemeIdList = new List<long>();
+
             #region 数据验证
             if ((batchCURDSchemeRequest.EditPurchaseSchemeList == null || batchCURDSchemeRequest.EditPurchaseSchemeList.Count == 0) &&
                 (batchCURDSchemeRequest.AddPurchaseSchemeList == null || batchCURDSchemeRequest.AddPurchaseSchemeList.Count == 0))
@@ -338,6 +339,10 @@ namespace BBWYB.Server.Business
             IInsert<PurchaseSchemeGroupIndex>? insertPurchaseSchemeGroupIndex = null;
             IUpdate<PurchaseSchemeGroupIndex>? updatePurchaseSchemeGroupIndex = null;
 
+            List<HistoryPurchaseScheme> insertHistoryPSList = new List<HistoryPurchaseScheme>();
+            List<HistoryPurchaseScheme> insertHistoryPSPList = new List<HistoryPurchaseScheme>();
+            List<HistoryPurchaseScheme> insertHistoryPSSList = new List<HistoryPurchaseScheme>();
+
 
             if (batchCURDSchemeRequest.AddPurchaseSchemeList != null && batchCURDSchemeRequest.AddPurchaseSchemeList.Count > 0)
             {
@@ -423,6 +428,8 @@ namespace BBWYB.Server.Business
             if (batchCURDSchemeRequest.EditPurchaseSchemeList != null && batchCURDSchemeRequest.EditPurchaseSchemeList.Count > 0)
             {
                 ExtractNewPurchaser(batchCURDSchemeRequest.EditPurchaseSchemeList, newPurchaserList);
+                var editSchemeIdList = batchCURDSchemeRequest.EditPurchaseSchemeList.Select(ps => ps.Id).ToList();
+                List<PurchaseScheme> dbPurchaseSchemes = fsql.Select<PurchaseScheme>().Where(ps => editSchemeIdList.Contains(ps.Id)).ToList();
 
                 deletePartsSchemeIdList.AddRange(batchCURDSchemeRequest.EditPurchaseSchemeList.Select(ps => ps.Id));
                 foreach (var psReq in batchCURDSchemeRequest.EditPurchaseSchemeList)
diff --git a/BBWYB.Server.Model/Dto/Request/QiKu/QiKuPackTaskSkuPurchaseSchemeIdRequest.cs b/BBWYB.Server.Model/Dto/Request/QiKu/QiKuPackTaskSkuPurchaseSchemeIdRequest.cs
index 8bde0fe..08ce525 100644
--- a/BBWYB.Server.Model/Dto/Request/QiKu/QiKuPackTaskSkuPurchaseSchemeIdRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/QiKu/QiKuPackTaskSkuPurchaseSchemeIdRequest.cs
@@ -5,5 +5,10 @@
         public string SkuId { get; set; }
 
         public string SkuPurchaseSchemeId { get; set; }
+
+        /// <summary>
+        /// 采购方案版本
+        /// </summary>
+        public long? SchemeVersion { get; set; } = 1;
     }
 }