diff --git a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs index 840a9c4..debd730 100644 --- a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs +++ b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs @@ -38,6 +38,17 @@ namespace BBWYB.Server.API.Controllers return purchaseSchemeBusiness.GetPurchaseSchemeList(querySchemeRequest); } + /// + /// 获取Sku采购方案数量 + /// + /// + /// + [HttpPost] + public IList GetPurchaseSchemeCountList([FromBody] QuerySchemeCountRequest request) + { + return purchaseSchemeBusiness.GetPurchaseSchemeCountList(request); + } + ///// ///// 删除采购商 ///// @@ -102,14 +113,14 @@ namespace BBWYB.Server.API.Controllers return purchaseSchemeBusiness.RefreshPurchaseScheme(request); } - /// - /// 修改采购配件比例 - /// - /// - [HttpPost] - public void EditPurchaseRatio([FromBody]EditPurchaseRatioRequest request) - { - purchaseSchemeBusiness.EditPurchaseRatio(request); - } + ///// + ///// 修改采购配件比例 + ///// + ///// + //[HttpPost] + //public void EditPurchaseRatio([FromBody]EditPurchaseRatioAndActualPriceRequest request) + //{ + // purchaseSchemeBusiness.EditPurchaseRatio(request); + //} } } diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 5c2a6c5..5bce4dd 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -635,8 +635,8 @@ namespace BBWYB.Server.Business fsql.Insert(insertOrderPurchaseRelationInfoList).ExecuteAffrows(); updateOrderCost?.ExecuteAffrows(); insertOrderCost?.ExecuteAffrows(); - //if (updatePurchaseTimeSchemeIdList.Count() > 0) - // fsql.Update(updatePurchaseTimeSchemeIdList).Set(p => p.LastPurchaseTime, DateTime.Now).ExecuteAffrows(); + if (updatePurchaseTimeSchemeIdList.Count() > 0) + fsql.Update(updatePurchaseTimeSchemeIdList).Set(p => p.LastPurchaseTime, DateTime.Now).ExecuteAffrows(); fsql.Update(request.OrderId).Set(o => o.OrderState, dbOrder.OrderState) .SetIf(!string.IsNullOrEmpty(request.Remark), o => o.PurchaseRemark, request.Remark) .Set(o => o.IsPurchased, true) @@ -650,20 +650,20 @@ namespace BBWYB.Server.Business } }); - #region 更新采购方案最新价格 - Task.Factory.StartNew(() => - { - try - { - purchaseSchemeBusiness.RefreshPurchaseScheme(new RefreshSchemeRequest() - { - SchemeIdList = updatePurchaseTimeSchemeIdList - }); - } - catch { } + //#region 更新采购方案最新价格 + //Task.Factory.StartNew(() => + //{ + // try + // { + // purchaseSchemeBusiness.RefreshPurchaseScheme(new RefreshSchemeRequest() + // { + // SchemeIdList = updatePurchaseTimeSchemeIdList + // }); + // } + // catch { } - }, CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); - #endregion + //}, CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); + //#endregion } /// @@ -3140,7 +3140,7 @@ namespace BBWYB.Server.Business SkuId = pss.PurchaseSkuId, SchemeId = pss.SkuPurchaseSchemeId, SpecId = pss.PurchaseSkuSpecId, - Quantity = (itemTotal * pss.PurchaseRatio) ?? 1 + Quantity = itemTotal * (pss.PurchaseRatio ?? 1) })); } break; diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index f19868c..9477a0c 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -61,67 +61,101 @@ namespace BBWYB.Server.Business if (batchCURDSchemeRequest.EditPurchaseSchemeList.Any(ps => ps.PurchaseSchemeProductList.Any(pp => string.IsNullOrEmpty(pp.PurchaserId) || string.IsNullOrEmpty(pp.PurchaserName)))) throw new BusinessException("编辑方案中有采购商Id/Name/Location为空"); + if (batchCURDSchemeRequest.EditPurchaseSchemeList.Count() > 0 && batchCURDSchemeRequest.EditPurchaseSchemeList.Any(ps => ps.Id == 0)) + throw new BusinessException("编辑方案中采购方案缺少Id"); - List addPurchaseSchemeList = null; + List addPurchaseSchemeList = new List(); List addPurchaseSchemeProductList = new List(); List addPurchaseSchemeProductSkuList = new List(); List newPurchaserList = new List(); List deletePurchaseSchemeIdList = new List(); + List> updatePurchaseSchemeList = new List>(); - #region 新增采购方案 if (batchCURDSchemeRequest.AddPurchaseSchemeList.Count > 0) { ExtractNewPurchaser(batchCURDSchemeRequest.AddPurchaseSchemeList, newPurchaserList); - addPurchaseSchemeList = batchCURDSchemeRequest.AddPurchaseSchemeList.Map>(); - - foreach (var scheme in addPurchaseSchemeList) + foreach (var psReq in batchCURDSchemeRequest.AddPurchaseSchemeList) { - scheme.Id = idGenerator.NewLong(); - scheme.CreateTime = DateTime.Now; - - foreach (var purchaseProduct in scheme.PurchaseSchemeProductList) + var ps = new PurchaseScheme() { - purchaseProduct.Id = idGenerator.NewLong(); - purchaseProduct.CreateTime = DateTime.Now; - purchaseProduct.SkuPurchaseSchemeId = scheme.Id; - foreach (var purchaseProductSku in purchaseProduct.PurchaseSchemeProductSkuList) + CreateTime = DateTime.Now, + Id = idGenerator.NewLong(), + ProductId = psReq.ProductId, + SkuId = psReq.SkuId, + ShopId = psReq.ShopId + }; + addPurchaseSchemeList.Add(ps); + foreach (var pspReq in psReq.PurchaseSchemeProductList) + { + var psp = pspReq.Map(); + psp.Id = idGenerator.NewLong(); + psp.CreateTime = DateTime.Now; + psp.SkuPurchaseSchemeId = ps.Id; + addPurchaseSchemeProductList.Add(psp); + + foreach (var pssReq in pspReq.PurchaseSchemeProductSkuList) { - purchaseProductSku.Id = idGenerator.NewLong(); - purchaseProductSku.CreateTime = DateTime.Now; - purchaseProductSku.SkuPurchaseSchemeId = scheme.Id; + var pss = pssReq.Map(); + pss.Id = idGenerator.NewLong(); + pss.CreateTime = DateTime.Now; + pss.SkuPurchaseSchemeId = ps.Id; + addPurchaseSchemeProductSkuList.Add(pss); + ps.DefaultCost += ((pssReq.ActualPrice ?? pssReq.DefaultPrice) ?? 0) * (pssReq.PurchaseRatio ?? 1); } - addPurchaseSchemeProductSkuList.AddRange(purchaseProduct.PurchaseSchemeProductSkuList); } - addPurchaseSchemeProductList.AddRange(scheme.PurchaseSchemeProductList); } } - #endregion #region 更新采购方案 if (batchCURDSchemeRequest.EditPurchaseSchemeList.Count > 0) { - //ExtractNewPurchaser(batchCURDSchemeRequest.EditPurchaseSchemeList, newPurchaserList); deletePurchaseSchemeIdList.AddRange(batchCURDSchemeRequest.EditPurchaseSchemeList.Select(ps => ps.Id)); - - var editPurchaseSchemeList = batchCURDSchemeRequest.EditPurchaseSchemeList.Map>(); - foreach (var scheme in editPurchaseSchemeList) + foreach (var psReq in batchCURDSchemeRequest.EditPurchaseSchemeList) { - foreach (var purchaseProduct in scheme.PurchaseSchemeProductList) + var schemeId = psReq.Id; + var defaultCost = 0M; + foreach (var pspReq in psReq.PurchaseSchemeProductList) { - purchaseProduct.Id = idGenerator.NewLong(); - purchaseProduct.CreateTime = DateTime.Now; - purchaseProduct.SkuPurchaseSchemeId = scheme.Id; - foreach (var purchaseProductSku in purchaseProduct.PurchaseSchemeProductSkuList) + var psp = pspReq.Map(); + psp.Id = idGenerator.NewLong(); + psp.CreateTime = DateTime.Now; + psp.SkuPurchaseSchemeId = schemeId; + addPurchaseSchemeProductList.Add(psp); + + foreach (var pssReq in pspReq.PurchaseSchemeProductSkuList) { - purchaseProductSku.Id = idGenerator.NewLong(); - purchaseProductSku.CreateTime = DateTime.Now; - purchaseProductSku.SkuPurchaseSchemeId = scheme.Id; + var pss = pssReq.Map(); + pss.Id = idGenerator.NewLong(); + pss.CreateTime = DateTime.Now; + pss.SkuPurchaseSchemeId = schemeId; + addPurchaseSchemeProductSkuList.Add(pss); + defaultCost += ((pssReq.ActualPrice ?? pssReq.DefaultPrice) ?? 0) * (pssReq.PurchaseRatio ?? 1); } - addPurchaseSchemeProductSkuList.AddRange(purchaseProduct.PurchaseSchemeProductSkuList); } - addPurchaseSchemeProductList.AddRange(scheme.PurchaseSchemeProductList); + var psupdate = fsql.Update(schemeId) + .Set(ps => ps.DefaultCost, defaultCost); + updatePurchaseSchemeList.Add(psupdate); } + + //var editPurchaseSchemeList = batchCURDSchemeRequest.EditPurchaseSchemeList.Map>(); + //foreach (var scheme in editPurchaseSchemeList) + //{ + // foreach (var purchaseProduct in scheme.PurchaseSchemeProductList) + // { + // purchaseProduct.Id = idGenerator.NewLong(); + // purchaseProduct.CreateTime = DateTime.Now; + // purchaseProduct.SkuPurchaseSchemeId = scheme.Id; + // foreach (var purchaseProductSku in purchaseProduct.PurchaseSchemeProductSkuList) + // { + // purchaseProductSku.Id = idGenerator.NewLong(); + // purchaseProductSku.CreateTime = DateTime.Now; + // purchaseProductSku.SkuPurchaseSchemeId = scheme.Id; + // } + // addPurchaseSchemeProductSkuList.AddRange(purchaseProduct.PurchaseSchemeProductSkuList); + // } + // addPurchaseSchemeProductList.AddRange(scheme.PurchaseSchemeProductList); + //} } #endregion @@ -150,7 +184,11 @@ namespace BBWYB.Server.Business fsql.Insert(addPurchaseSchemeProductList).ExecuteAffrows(); if (addPurchaseSchemeProductSkuList.Count > 0) fsql.Insert(addPurchaseSchemeProductSkuList).ExecuteAffrows(); - + if (updatePurchaseSchemeList.Count() > 0) + { + foreach (var update in updatePurchaseSchemeList) + update.ExecuteAffrows(); + } }); } @@ -284,49 +322,40 @@ namespace BBWYB.Server.Business return purchaseSchemeList; } + public IList GetPurchaseSchemeCountList(QuerySchemeCountRequest request) + { + var list = fsql.Select().Where(ps => ps.ShopId == request.ShopId && + request.SkuIdList.Contains(ps.SkuId)) + .GroupBy(ps => ps.SkuId) + .ToList(g => new PurchaseSchemeCountResponse() + { + SkuId = g.Key, + SchemeCount = g.Count() + }); + return list; + } + public IList RefreshPurchaseScheme(RefreshSchemeRequest request) { var purchaseSchemeList = GetPurchaseSchemeList(new QuerySchemeRequest() { - SchemeIdList = request.SchemeIdList + SchemeIdList = request.SchemeIdList, + IncludePurchaseSkuBasicInfo = 1 }); List> updatePurchaseSchemeList = new List>(); - foreach (var purchaseScheme in purchaseSchemeList) + foreach (var ps in purchaseSchemeList) { - var amount = 0M; - var purchasePlatformGroups = purchaseScheme.PurchaseSchemeProductList.GroupBy(p => p.PurchasePlatform); - foreach (var purchasePlatformGroup in purchasePlatformGroups) + var defaultCost = 0M; + foreach (var psp in ps.PurchaseSchemeProductList) { - var purchaseProductIds = purchasePlatformGroup.Select(p => p.PurchaseProductId).ToArray(); - var purchaseSkuIds = new List(); - foreach (var purchaseProduct in purchaseScheme.PurchaseSchemeProductList) - { - purchaseSkuIds.AddRange(purchaseProduct.PurchaseSchemeProductSkuList.Select(ps => ps.PurchaseSkuId)); - } - var purchaseSkuBasicInfoList = BatchGetPurchaseSkuBasicInfo(new BatchPurchaseSkuBasicInfoRequest() - { - FirstApiMode = Enums.PurchaseProductAPIMode.Spider, - PriceMode = Enums.PurchaseOrderMode.批发, - Params = new List() + foreach (var pss in psp.PurchaseSchemeProductSkuList) { - new BatchPurchaseSkuBasicInfoParamRequest() - { - Platform = purchasePlatformGroup.Key.Value, - PurchaseProductIds = purchaseProductIds, - PurchaseSkuIds = purchaseSkuIds - } + defaultCost += ((pss.ActualPrice ?? pss.PurchaseSkuPrice) ?? 0) * (pss.PurchaseRatio ?? 1); } - }); - amount += purchaseSkuBasicInfoList.Sum(p => p.ItemList.Sum(s => s.Price)); } - - if (purchaseScheme.RealCost != amount || - purchaseScheme.DefaultCost != amount) + if (ps.DefaultCost != defaultCost) { - purchaseScheme.RealCost = amount; - purchaseScheme.DefaultCost = amount; - var update = fsql.Update(purchaseScheme.Id).Set(p => p.RealCost, amount) - .Set(p => p.DefaultCost, amount); + var update = fsql.Update(ps.Id).Set(p => p.DefaultCost, defaultCost); updatePurchaseSchemeList.Add(update); } } @@ -440,15 +469,20 @@ namespace BBWYB.Server.Business return list; } - public void EditPurchaseRatio(EditPurchaseRatioRequest request) - { - if (request.Ratio < 1) - request.Ratio = 1; - fsql.Update().Set(pss => pss.PurchaseRatio, request.Ratio) - .Where(pss => pss.SkuPurchaseSchemeId == request.SchemeId && - pss.SkuId == request.SkuId && - pss.PurchaseSkuId == request.PurchaseSkuId) - .ExecuteAffrows(); - } + //public void EditPurchaseRatio(EditPurchaseRatioAndActualPriceRequest request) + //{ + // if (request.Ratio < 1) + // request.Ratio = 1; + + + // fsql.Update().Set(pss => pss.PurchaseRatio, request.Ratio) + // .Set(pss => pss.ActualPrice, request.ActualPrice) + // .Where(pss => pss.SkuPurchaseSchemeId == request.SchemeId && + // pss.SkuId == request.SkuId && + // pss.PurchaseSkuId == request.PurchaseSkuId) + // .ExecuteAffrows(); + + + //} } } diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs index 356d97b..7fd4b57 100644 --- a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs +++ b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs @@ -26,6 +26,11 @@ namespace BBWYB.Server.Model public decimal DefaultCost { get; set; } = 0.0M; + /// + /// 上次采购成本 + /// + public decimal LastPurchasePriceCost { get; set; } = 0.0M; + [Column(StringLength = 50, IsNullable = false)] public string ProductId { get; set; } @@ -35,12 +40,6 @@ namespace BBWYB.Server.Model //[Column(StringLength = 20)] //public string PurchaserId { get; set; } - /// - /// 采购实际成本 - /// - - public decimal RealCost { get; set; } = 0.0M; - [Column(StringLength = 50, IsNullable = false)] public string SkuId { get; set; } diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/Purchaseschemeproductsku.cs b/BBWYB.Server.Model/Db/PurchaseScheme/Purchaseschemeproductsku.cs index af819ee..8d4a605 100644 --- a/BBWYB.Server.Model/Db/PurchaseScheme/Purchaseschemeproductsku.cs +++ b/BBWYB.Server.Model/Db/PurchaseScheme/Purchaseschemeproductsku.cs @@ -50,7 +50,12 @@ namespace BBWYB.Server.Model.Db /// 采购比例 /// [Column(DbType = "int(1)", IsNullable = true)] - public int? PurchaseRatio { get; set; } + public int? PurchaseRatio { get; set; } = 1; + + /// + /// 实际单价 + /// + public decimal? ActualPrice { get; set; } = 0.00M; } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseRatioRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseRatioAndActualPriceRequest.cs similarity index 68% rename from BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseRatioRequest.cs rename to BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseRatioAndActualPriceRequest.cs index 0eebc71..a72e569 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseRatioRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseRatioAndActualPriceRequest.cs @@ -1,6 +1,6 @@ namespace BBWYB.Server.Model.Dto { - public class EditPurchaseRatioRequest + public class EditPurchaseRatioAndActualPriceRequest { public long SchemeId { get; set; } @@ -9,5 +9,7 @@ public string PurchaseSkuId { get; set; } public int Ratio { get; set; } + + public decimal ActualPrice { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseSchemeRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseSchemeRequest.cs index f82c2fb..a5c8f9b 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseSchemeRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/EditPurchaseSchemeRequest.cs @@ -2,6 +2,9 @@ { public class EditPurchaseSchemeRequest: InputPurchaseSchemeRequest { + /// + /// 采购方案Id + /// public long Id { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs index e9bf736..e8ea75e 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs @@ -2,13 +2,8 @@ { public class InputPurchaseSchemeProductRequest { - /// - /// 店铺商品Id - /// public string ProductId { get; set; } - /// - /// 店铺商品SkuId - /// + public string SkuId { get; set; } /// /// 采购商品Id diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs index 14b9bb5..1a6050a 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs @@ -1,13 +1,10 @@ namespace BBWYB.Server.Model.Dto { public class InputPurchaseSchemeProductSkuRequest - {/// - /// 店铺商品Id - /// + { + public string ProductId { get; set; } - /// - /// 店铺商品Sku - /// + public string SkuId { get; set; } /// /// 采购商品Id @@ -18,7 +15,7 @@ /// public string PurchaseSkuId { get; set; } /// - /// 采购Ske SpecId (1688独有) + /// 采购SpecId (1688独有) /// public string PurchaseSkuSpecId { get; set; } @@ -26,5 +23,15 @@ /// 采购配比 /// public int? PurchaseRatio { get; set; } + + /// + /// 实际单价(人工填写的单价，未填写传0或null) + /// + public decimal? ActualPrice { get; set; } + + /// + /// 默认单价(采购配件基本信息接口里的单价) + /// + public decimal? DefaultPrice { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs index bfce735..6a11c88 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs @@ -4,40 +4,10 @@ namespace BBWYB.Server.Model.Dto { public class InputPurchaseSchemeRequest { - public string ShopId { get; set; } + public long ShopId { get; set; } public string ProductId { get; set; } public string SkuId { get; set; } - /// - /// 采购默认成本 - /// - public decimal? DefaultCost { get; set; } - /// - /// 采购实际成本 - /// - public decimal? RealCost { get; set; } - ///// - ///// 采购商Id - ///// - //public string PurchaserId { get; set; } - - ///// - ///// 采购商Id - ///// - //public string PurchaserId2 { get; set; } - - ///// - ///// 采购商名称 - ///// - //public string PurchaserName { get; set; } - ///// - ///// 采购商发货地 - ///// - //public string PurchaserLocation { get; set; } - ///// - ///// 采购平台 - ///// - //public Enums.Platform PurchasePlatform { get; set; } = Enums.Platform.阿里巴巴; - + public IList PurchaseSchemeProductList { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeCountRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeCountRequest.cs new file mode 100644 index 0000000..063f392 --- /dev/null +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeCountRequest.cs @@ -0,0 +1,8 @@ +namespace BBWYB.Server.Model.Dto +{ + public class QuerySchemeCountRequest + { + public long? ShopId { get; set; } + public IList SkuIdList { get; set; } + } +} diff --git a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeCountResponse.cs b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeCountResponse.cs new file mode 100644 index 0000000..746ad2b --- /dev/null +++ b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeCountResponse.cs @@ -0,0 +1,9 @@ +namespace BBWYB.Server.Model.Dto +{ + public class PurchaseSchemeCountResponse + { + public string SkuId { get; set; } + + public int SchemeCount { get; set; } + } +} diff --git a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeResponse.cs b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeResponse.cs index 2b62f1a..e1c617b 100644 --- a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeResponse.cs @@ -12,8 +12,6 @@ namespace BBWYB.Server.Model.Dto //public string PurchaserLocation { get; set; } - public decimal LastPurchasePriceCost { get => RealCost; } - public new List PurchaseSchemeProductList { get; set; } public List PurchaserList { get; set; }