1

BBWYB.Server.API/Controllers/PurchaseOrderController.cs

@@ -48,6 +48,16 @@ namespace BBWYB.Server.API.Controllers
             return purchaseOrderBusiness.GetAssociationPurchaseOrderList(orderId);
         }
 
+        /// <summary>
+        /// 关联采购单
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpPost]
+        public void AssociatePurchaseOrder([FromBody] IList<AssociationPurchaseOrderRequest> request)
+        {
+            purchaseOrderBusiness.AssociatePurchaseOrder(request);
+        }
+
         /// <summary>
         /// 1688回调
         /// </summary>

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -54,7 +54,7 @@ namespace BBWYB.Server.Business
                 }
 
                 select = select.WhereIf(request.OrderState != null && request.OrderState != Enums.OrderState.待配置, (o, ocs, oct) => o.OrderState == request.OrderState)
-                               .WhereIf(request.OrderState == Enums.OrderState.待配置, (o, ocs, oct) =>o.OrderState != Enums.OrderState.已取消&&o.PackConfigState!=null)//&&o.OrderState> Enums.OrderState.等待采购 
+                               .WhereIf(request.OrderState == Enums.OrderState.待配置, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 && o.PackConfigState != null)//&&o.OrderState> Enums.OrderState.等待采购 
                                .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate)
                                .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate)
                                .WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct) => o.ClientOrderId == request.ClientOrderId)
@@ -113,7 +113,7 @@ namespace BBWYB.Server.Business
                 Profit = oct.Profit,
                 PurchaseAmount = oct.PurchaseAmount,
                 IsManualEdited = oct.IsManualEdited,
-                PackConfigState= o.PackConfigState,
+                PackConfigState = o.PackConfigState,
             };
         }
 
@@ -148,7 +148,7 @@ namespace BBWYB.Server.Business
                 #endregion
 
                 #region 处理采购信息
-                var orderPurchaseInfoList = fsql.Select<OrderPurchaseInfo>().Where(op => orderIdList.Contains(op.OrderId)).ToList<OrderPurchaseInfoResponse>();
+                var orderPurchaseInfoList = fsql.Select<OrderPurchaseInfo>().Where(op => orderIdList.Contains(op.OrderId) && op.IsEnabled == true).ToList<OrderPurchaseInfoResponse>();
                 var orderPurchaseSkuInfoList = fsql.Select<OrderPurchaseSkuInfo>().Where(o => orderIdList.Contains(o.OrderId)).ToList();
 
                 foreach (var order in orderList)

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -406,7 +406,8 @@ namespace BBWYB.Server.Business
                     PurchasePlatform = purchaseOrder.PurchasePlatform.Value,
                     PurchaserId = purchaseOrder.PurchaserId,
                     PurchaserName = purchaseOrder.PurchaserName,
-                    PurchaserOrderId = purchaseOrder.PurchaseOrderId
+                    PurchaserOrderId = purchaseOrder.PurchaseOrderId,
+                    IsEnabled = purchaseOrder.IsEnabled
                 };
 
                 var currentOrderCostDetailList = orderCostDetailList.Where(ocd => ocd.PurchaseOrderId == purchaseOrder.PurchaseOrderId).ToList();
@@ -437,6 +438,15 @@ namespace BBWYB.Server.Business
             return list;
         }
 
+        /// <summary>
+        /// 关联订单
+        /// </summary>
+        /// <param name="request"></param>
+        public void AssociatePurchaseOrder(IList<AssociationPurchaseOrderRequest> request)
+        {
+
+        }
+
         #region 1688CallBack
         public void CallbackFrom1688(string jsonStr)
         {

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

@@ -91,6 +91,9 @@ namespace BBWYB.Server.Model.Db
         /// </summary>
         [Column(StringLength = 500)]
         public string BelongSkuIds { get; set; }
+
+        [Column(DbType = "bit")]
+        public bool IsEnabled { get; set; } = true;
     }
 
 }

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

@@ -0,0 +1,32 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class AssocationOrderCostDetailRequest
+    {
+        /// <summary>
+        /// 订单Id
+        /// </summary>
+        public string OrderId { get; set; }
+
+        public string SkuId { get; set; }
+
+        /// <summary>
+        /// 采购货款
+        /// </summary>
+        public decimal SkuAmount { get; set; }
+
+        /// <summary>
+        /// 采购运费
+        /// </summary>
+        public decimal PurchaseFreight { get; set; }
+
+        /// <summary>
+        /// 采购数量
+        /// </summary>
+        public int PurchaseQuantity { get; set; }
+
+        /// <summary>
+        /// 采购单价
+        /// </summary>
+        public decimal PurchasePrice { get; set; }
+    }
+}

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

@@ -0,0 +1,52 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class AssociationPurchaseOrderRequest
+    {
+        public AssociationPurchaseOrderRequest()
+        {
+            AssocationOrderCostDetailList = new List<AssocationOrderCostDetailRequest>();
+        }
+
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        public string PurchaserOrderId { get; set; }
+
+        public Enums.Platform PurchasePlatform { get; set; }
+
+        /// <summary>
+        /// 买家账号Id (如果采购平台为不支持的平台，此Id可填空)
+        /// </summary>
+        public string PurchaseAccountId { get; set; }
+
+        /// <summary>
+        /// 买家账号
+        /// </summary>
+        public string PurchaseAccountName { get; set; }
+
+        /// <summary>
+        /// 商家Id
+        /// </summary>
+        public string PurchaserId { get; set; }
+
+        /// <summary>
+        /// 商家名称
+        /// </summary>
+        public string PurchaserName { get; set; }
+
+        /// <summary>
+        /// 采购金额
+        /// </summary>
+        public decimal PurchaseAmount { get; set; }
+
+        /// <summary>
+        /// 采购运费
+        /// </summary>
+        public decimal PurchaseFreight { get; set; }
+
+        /// <summary>
+        /// 订单成本明细列表
+        /// </summary>
+        public IList<AssocationOrderCostDetailRequest> AssocationOrderCostDetailList { get; set; }
+    }
+}

BBWYB.Server.Model/Dto/Response/PurchaseOrder/AssociationPurchaseOrderResponse.cs

@@ -45,6 +45,11 @@
         /// </summary>
         public decimal PurchaseFreight { get; set; }
 
+        /// <summary>
+        /// 是否有效(以此判定是否为历史采购单)
+        /// </summary>
+        public bool IsEnabled { get; set; }
+
         /// <summary>
         /// 订单成本明细列表
         /// </summary>