1.采购方案列表增加方案版本

2.在线下单增加方案版本

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -392,7 +392,8 @@ namespace BBWYB.Server.Business
                         PurchaseSpecId = cargoParam.SpecId,
                         Quantity = cargoParam.Quantity,
                         SchemeId = cargoParam.SchemeId,
-                        SourceSkuId = orderSku?.BelongSkuId
+                        SourceSkuId = orderSku?.BelongSkuId,
+                        SchemeVersion = cargoParam.SchemeVersion ?? 1
                     });
                 }
                 #endregion
@@ -863,6 +864,7 @@ namespace BBWYB.Server.Business
                                     PurchaseProductId = cargoParam.ProductId,
                                     PurchaseSpecId = cargoParam.SpecId,
                                     SchemeId = cargoParam.SchemeId,
+                                    SchemeVersion = cargoParam.SchemeVersion ?? 1,
                                     Quantity = assOrderCostDetail.PurchaseQuantity,
                                     SourceSkuId = dbOrderSku.BelongSkuId
                                 };
@@ -3124,6 +3126,7 @@ namespace BBWYB.Server.Business
                                 ProductId = pss.PurchaseProductId,
                                 SkuId = pss.PurchaseSkuId,
                                 SchemeId = pss.SkuPurchaseSchemeId,
+                                SchemeVersion = scheme.Version,
                                 SpecId = pss.PurchaseSkuSpecId,
                                 Quantity = itemTotal * (pss.PurchaseRatio ?? 1)
                             }));

BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs

@@ -64,6 +64,11 @@ namespace BBWYB.Server.Model.Db
 		/// </summary>
 		public long? SchemeId { get; set; }
 
+		/// <summary>
+		/// 采购方案版本
+		/// </summary>
+		public int SchemeVersion { get; set; } = 1;
+
 		/// <summary>
 		/// 来源SkuId (JD)
 		/// </summary>

BBWYB.Server.Model/Db/PurchaseScheme/OrderPurchaseRelationInfo.cs

@@ -1,40 +0,0 @@
-using FreeSql.DataAnnotations;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace BBWYB.Server.Model.Db.PurchaseScheme
-{
-    [Table(Name = "orderpurchaserelationinfo", DisableSyncStructure = true)]
-    public class OrderPurchaseRelationInfo
-    {
-        [Column( IsPrimary = true)]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 采购单Id
-        /// </summary>
-        public string PurchaseOrderId { get; set; }
-        /// <summary>
-        /// 订单Id
-        /// </summary>
-        public string OrderId { get; set; }
-
-        /// <summary>
-        /// 采购方案Id
-        /// </summary>
-        public string SchemeId { get; set; }
-        /// <summary>
-        /// 采购spu
-        /// </summary>
-        public string PurchaseProductId { get; set; }
-        /// <summary>
-        /// 采购sku
-        /// </summary>
-        public string PurchaseSkuId { get; set; }
-    }
-}

BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs

@@ -70,6 +70,12 @@ namespace BBWYB.Server.Model
         [Column(DbType = "bigint")]
         public long SchemeGroupId { get; set; } = 0;
 
+        /// <summary>
+        /// 方案版本
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Version { get; set; } = 1;
+
         [Column(IsIgnore = true)]
         public List<PurchaseSchemeProduct> PurchaseSchemeProductList { get; set; }
     }

BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseScheme.cs

@@ -0,0 +1,89 @@
+using FreeSql.DataAnnotations;
+
+namespace BBWYB.Server.Model.Db
+{
+
+    /// <summary>
+    /// 历史采购方案表
+    /// </summary>
+    [Table(Name = "historypurchasescheme", DisableSyncStructure = true)]
+    public partial class HistoryPurchaseScheme
+    {
+        /// <summary>
+        /// 历史流水Id
+        /// </summary>
+        [Column(DbType = "bigint", IsPrimary = true)]
+        public long HistoryId { get; set; }
+
+        [Column(DbType = "datetime")]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 采购默认成本
+        /// </summary>
+
+        public decimal? DefaultCost { get; set; }
+
+        /// <summary>
+        /// 慧眼标的Id
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string HYBDId { get; set; }
+
+        /// <summary>
+        /// 慧眼采购方案Id
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string HYSchemeId { get; set; }
+
+        /// <summary>
+        /// 采购方案Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long? Id { get; set; }
+
+        /// <summary>
+        /// 上次采购成本
+        /// </summary>
+        [Column(DbType = "decimal(18,2)")]
+        public decimal? LastPurchasePriceCost { get; set; }
+
+        /// <summary>
+        /// 上次采购时间
+        /// </summary>
+        [Column(DbType = "datetime")]
+        public DateTime? LastPurchaseTime { get; set; }
+
+        [Column(StringLength = 50, IsNullable = false)]
+        public string ProductId { get; set; }
+
+        /// <summary>
+        /// 采购商Id
+        /// </summary>
+        [Column(StringLength = 20)]
+        public string PurchaserId { get; set; }
+
+        /// <summary>
+        /// 方案分组Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long? SchemeGroupId { get; set; }
+
+        /// <summary>
+        /// 店铺Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long ShopId { get; set; }
+
+        [Column(StringLength = 50, IsNullable = false)]
+        public string SkuId { get; set; }
+
+        /// <summary>
+        /// 采购方案版本
+        /// </summary>
+        [Column(DbType = "int")]
+        public int? Version { get; set; } = 1;
+
+    }
+
+}

BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseSchemeProduct.cs

@@ -0,0 +1,65 @@
+using FreeSql.DataAnnotations;
+
+namespace BBWYB.Server.Model.Db
+{
+
+    /// <summary>
+    /// 采购方案商品表
+    /// </summary>
+    [ Table(Name = "historypurchaseschemeproduct", DisableSyncStructure = true)]
+	public partial class HistoryPurchaseSchemeProduct {
+
+		/// <summary>
+		/// 历史流水Id
+		/// </summary>
+		[Column(DbType = "bigint", IsPrimary = true)]
+		public long HistoryId { get; set; }
+
+		[Column(DbType = "datetime")]
+		public DateTime? CreateTime { get; set; }
+
+		/// <summary>
+		/// 采购商品流水Id
+		/// </summary>
+		[Column(DbType = "bigint")]
+		public long? Id { get; set; }
+
+		[Column(StringLength = 50)]
+		public string ProductId { get; set; }
+
+		/// <summary>
+		/// 采购商品Id
+		/// </summary>
+		[Column(StringLength = 50)]
+		public string PurchaseProductId { get; set; }
+
+		/// <summary>
+		/// 商家Id
+		/// </summary>
+		[Column(StringLength = 50)]
+		public string PurchaserId { get; set; }
+
+		/// <summary>
+		/// 采购商品链接
+		/// </summary>
+		[Column(StringLength = 500)]
+		public string PurchaseUrl { get; set; }
+
+		[Column(StringLength = 50)]
+		public string SkuId { get; set; }
+
+		/// <summary>
+		/// Sku采购方案Id
+		/// </summary>
+		[Column(DbType = "bigint")]
+		public long? SkuPurchaseSchemeId { get; set; }
+
+		/// <summary>
+		/// 采购方案版本
+		/// </summary>
+		[Column(DbType = "int")]
+		public int? Version { get; set; } = 1;
+
+	}
+
+}

BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseSchemeProductsku.cs

@@ -0,0 +1,77 @@
+using FreeSql.DataAnnotations;
+
+namespace BBWYB.Server.Model.Db
+{
+
+    /// <summary>
+    /// 采购方案sku表
+    /// </summary>
+    [Table(Name = "historypurchaseschemeproductsku", DisableSyncStructure = true)]
+	public partial class HistoryPurchaseSchemeProductSku {
+
+		/// <summary>
+		/// 历史流水Id
+		/// </summary>
+		[Column(DbType = "bigint", IsPrimary = true)]
+		public long HistoryId { get; set; }
+
+		/// <summary>
+		/// 实际单价(人工设置)
+		/// </summary>
+		[Column(DbType = "decimal(18,2)")]
+		public decimal? ActualPrice { get; set; } = 0.00M;
+
+		[Column(DbType = "datetime")]
+		public DateTime? CreateTime { get; set; }
+
+		/// <summary>
+		/// 采购sku流水Id
+		/// </summary>
+		[Column(DbType = "bigint")]
+		public long? Id { get; set; }
+
+		[Column(StringLength = 50, IsNullable = false)]
+		public string ProductId { get; set; }
+
+		/// <summary>
+		/// 采购商品Id
+		/// </summary>
+		[Column(StringLength = 50, IsNullable = false)]
+		public string PurchaseProductId { get; set; }
+
+		/// <summary>
+		/// 采购比例
+		/// </summary>
+		[Column(DbType = "int")]
+		public int? PurchaseRatio { get; set; } = 1;
+
+		/// <summary>
+		/// 采购商品的SkuId
+		/// </summary>
+		[Column(StringLength = 50)]
+		public string PurchaseSkuId { get; set; }
+
+		/// <summary>
+		/// 采购商品Sku的SpecId
+		/// </summary>
+		[Column(StringLength = 50)]
+		public string PurchaseSkuSpecId { get; set; }
+
+		[Column(StringLength = 50, IsNullable = false)]
+		public string SkuId { get; set; }
+
+		/// <summary>
+		/// Sku采购方案Id
+		/// </summary>
+		[Column(DbType = "bigint")]
+		public long SkuPurchaseSchemeId { get; set; }
+
+		/// <summary>
+		/// 采购方案版本
+		/// </summary>
+		[Column(DbType = "int")]
+		public int? Version { get; set; } = 1;
+
+	}
+
+}

BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs

@@ -31,6 +31,11 @@
         /// </summary>
         public long SchemeId { get; set; }
 
+        /// <summary>
+        /// 采购方案版本
+        /// </summary>
+        public int? SchemeVersion { get; set; } = 1;
+
         /// <summary>
         /// 配件的采购比例 不传值默认1
         /// </summary>