diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 57fc92e..3ddb21a 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/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) })); diff --git a/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs b/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs index 66af1a8..2712ae5 100644 --- a/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs +++ b/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs @@ -64,6 +64,11 @@ namespace BBWYB.Server.Model.Db /// public long? SchemeId { get; set; } + /// + /// 采购方案版本 + /// + public int SchemeVersion { get; set; } = 1; + /// /// 来源SkuId (JD) /// diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/OrderPurchaseRelationInfo.cs b/BBWYB.Server.Model/Db/PurchaseScheme/OrderPurchaseRelationInfo.cs deleted file mode 100644 index 629c939..0000000 --- a/BBWYB.Server.Model/Db/PurchaseScheme/OrderPurchaseRelationInfo.cs +++ /dev/null @@ -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; } - - /// - /// 采购单Id - /// - public string PurchaseOrderId { get; set; } - /// - /// 订单Id - /// - public string OrderId { get; set; } - - /// - /// 采购方案Id - /// - public string SchemeId { get; set; } - /// - /// 采购spu - /// - public string PurchaseProductId { get; set; } - /// - /// 采购sku - /// - public string PurchaseSkuId { get; set; } - } -} diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs index 4b9e582..2880073 100644 --- a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs +++ b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs @@ -70,6 +70,12 @@ namespace BBWYB.Server.Model [Column(DbType = "bigint")] public long SchemeGroupId { get; set; } = 0; + /// + /// 方案版本 + /// + [Column(DbType = "int")] + public int Version { get; set; } = 1; + [Column(IsIgnore = true)] public List PurchaseSchemeProductList { get; set; } } diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseScheme.cs b/BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseScheme.cs new file mode 100644 index 0000000..d9798b2 --- /dev/null +++ b/BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseScheme.cs @@ -0,0 +1,89 @@ +using FreeSql.DataAnnotations; + +namespace BBWYB.Server.Model.Db +{ + + /// + /// 历史采购方案表 + /// + [Table(Name = "historypurchasescheme", DisableSyncStructure = true)] + public partial class HistoryPurchaseScheme + { + /// + /// 历史流水Id + /// + [Column(DbType = "bigint", IsPrimary = true)] + public long HistoryId { get; set; } + + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 采购默认成本 + /// + + public decimal? DefaultCost { get; set; } + + /// + /// 慧眼标的Id + /// + [Column(StringLength = 50)] + public string HYBDId { get; set; } + + /// + /// 慧眼采购方案Id + /// + [Column(StringLength = 50)] + public string HYSchemeId { get; set; } + + /// + /// 采购方案Id + /// + [Column(DbType = "bigint")] + public long? Id { get; set; } + + /// + /// 上次采购成本 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? LastPurchasePriceCost { get; set; } + + /// + /// 上次采购时间 + /// + [Column(DbType = "datetime")] + public DateTime? LastPurchaseTime { get; set; } + + [Column(StringLength = 50, IsNullable = false)] + public string ProductId { get; set; } + + /// + /// 采购商Id + /// + [Column(StringLength = 20)] + public string PurchaserId { get; set; } + + /// + /// 方案分组Id + /// + [Column(DbType = "bigint")] + public long? SchemeGroupId { get; set; } + + /// + /// 店铺Id + /// + [Column(DbType = "bigint")] + public long ShopId { get; set; } + + [Column(StringLength = 50, IsNullable = false)] + public string SkuId { get; set; } + + /// + /// 采购方案版本 + /// + [Column(DbType = "int")] + public int? Version { get; set; } = 1; + + } + +} diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseSchemeProduct.cs b/BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseSchemeProduct.cs new file mode 100644 index 0000000..982cc45 --- /dev/null +++ b/BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseSchemeProduct.cs @@ -0,0 +1,65 @@ +using FreeSql.DataAnnotations; + +namespace BBWYB.Server.Model.Db +{ + + /// + /// 采购方案商品表 + /// + [ Table(Name = "historypurchaseschemeproduct", DisableSyncStructure = true)] + public partial class HistoryPurchaseSchemeProduct { + + /// + /// 历史流水Id + /// + [Column(DbType = "bigint", IsPrimary = true)] + public long HistoryId { get; set; } + + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 采购商品流水Id + /// + [Column(DbType = "bigint")] + public long? Id { get; set; } + + [Column(StringLength = 50)] + public string ProductId { get; set; } + + /// + /// 采购商品Id + /// + [Column(StringLength = 50)] + public string PurchaseProductId { get; set; } + + /// + /// 商家Id + /// + [Column(StringLength = 50)] + public string PurchaserId { get; set; } + + /// + /// 采购商品链接 + /// + [Column(StringLength = 500)] + public string PurchaseUrl { get; set; } + + [Column(StringLength = 50)] + public string SkuId { get; set; } + + /// + /// Sku采购方案Id + /// + [Column(DbType = "bigint")] + public long? SkuPurchaseSchemeId { get; set; } + + /// + /// 采购方案版本 + /// + [Column(DbType = "int")] + public int? Version { get; set; } = 1; + + } + +} diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseSchemeProductsku.cs b/BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseSchemeProductsku.cs new file mode 100644 index 0000000..95eba67 --- /dev/null +++ b/BBWYB.Server.Model/Db/PurchaseScheme/history/HistoryPurchaseSchemeProductsku.cs @@ -0,0 +1,77 @@ +using FreeSql.DataAnnotations; + +namespace BBWYB.Server.Model.Db +{ + + /// + /// 采购方案sku表 + /// + [Table(Name = "historypurchaseschemeproductsku", DisableSyncStructure = true)] + public partial class HistoryPurchaseSchemeProductSku { + + /// + /// 历史流水Id + /// + [Column(DbType = "bigint", IsPrimary = true)] + public long HistoryId { get; set; } + + /// + /// 实际单价(人工设置) + /// + [Column(DbType = "decimal(18,2)")] + public decimal? ActualPrice { get; set; } = 0.00M; + + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 采购sku流水Id + /// + [Column(DbType = "bigint")] + public long? Id { get; set; } + + [Column(StringLength = 50, IsNullable = false)] + public string ProductId { get; set; } + + /// + /// 采购商品Id + /// + [Column(StringLength = 50, IsNullable = false)] + public string PurchaseProductId { get; set; } + + /// + /// 采购比例 + /// + [Column(DbType = "int")] + public int? PurchaseRatio { get; set; } = 1; + + /// + /// 采购商品的SkuId + /// + [Column(StringLength = 50)] + public string PurchaseSkuId { get; set; } + + /// + /// 采购商品Sku的SpecId + /// + [Column(StringLength = 50)] + public string PurchaseSkuSpecId { get; set; } + + [Column(StringLength = 50, IsNullable = false)] + public string SkuId { get; set; } + + /// + /// Sku采购方案Id + /// + [Column(DbType = "bigint")] + public long SkuPurchaseSchemeId { get; set; } + + /// + /// 采购方案版本 + /// + [Column(DbType = "int")] + public int? Version { get; set; } = 1; + + } + +} diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs index 22bbb7b..2286220 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs @@ -31,6 +31,11 @@ /// public long SchemeId { get; set; } + /// + /// 采购方案版本 + /// + public int? SchemeVersion { get; set; } = 1; + /// /// 配件的采购比例 不传值默认1 ///