增加采购方案版本

BBWYB.Common/Log/NLogManager.cs

@@ -29,8 +29,6 @@ namespace BBWYB.Common.Log
                 loggerDictionary.TryAdd(loggerName, logger);
             }
             return logger;
-
-           
         }
     }
 }

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
                             });
                         }
                     }

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)

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;
     }
 }