From fc88ac2dee194417b9912a9fe7e69f3c3d5819ed Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 2 Jun 2023 15:42:11 +0800
Subject: [PATCH] 1
---
.../PurchaseOrder/PurchaseOrderBusiness.cs | 5 -----
.../PurchaseOrder/AssocationOrderCostDetailRequest.cs | 7 +++++++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 3cf65c8..7ce61d5 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -507,7 +507,6 @@ namespace BBWYB.Server.Business
var totalQuantity = purchaseOrder.AssocationOrderCostDetailList.Sum(x => x.PurchaseQuantity);
-
var dbPurchaserOrder = dbPurchaseOrderList.FirstOrDefault(x => x.PurchaseOrderId == purchaseOrder.PurchaseOrderId);
if (dbPurchaserOrder == null)
{
@@ -605,10 +604,6 @@ namespace BBWYB.Server.Business
}
}
- //var totalPurchaseAmount = request.AssociationPurchaseOrderList.Where(x => !dbInvalidPurchaseOrderIdList.Contains(x.PurchaseOrderId))
- // .Sum(p => p.PurchaseAmount + p.PurchaseFreight);
- //var profit = dbOrder.OrderTotalPrice - totalPurchaseAmount - (dbOrderCost?.DeliveryExpressFreight ?? 0); // -orderCost.PlatformCommissionAmount
-
if (dbOrderCost == null)
{
dbOrderCost = new OrderCost()
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/AssocationOrderCostDetailRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/AssocationOrderCostDetailRequest.cs
index bec6e2e..3b0ef13 100644
--- a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/AssocationOrderCostDetailRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/AssocationOrderCostDetailRequest.cs
@@ -9,6 +9,13 @@
public string SkuId { get; set; }
+ ///
+ /// 采购方案Id
+ ///如果属于新增采购单, 则此参数必填
+ ///如果采购单已存在,则此参数留空
+ ///
+ public long? PurchaseSchemeId { get; set; }
+
///
/// 采购货款
///