diff --git a/BBWY.Client/Models/Order/OrderDropShipping.cs b/BBWY.Client/Models/Order/OrderDropShipping.cs index d985ee44..c0d0f082 100644 --- a/BBWY.Client/Models/Order/OrderDropShipping.cs +++ b/BBWY.Client/Models/Order/OrderDropShipping.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -38,6 +39,7 @@ namespace BBWY.Client.Models } } + [JsonIgnore] public string PurchaseFreightStr { get => purchaseFreightStr; set @@ -67,6 +69,7 @@ namespace BBWY.Client.Models OnPurchaseAmountChanged?.Invoke(); } + [JsonIgnore] public Action OnPurchaseAmountChanged { get; set; } public object Clone() diff --git a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs b/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs index 35af9b7a..1dad14bb 100644 --- a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs +++ b/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs @@ -86,6 +86,7 @@ namespace BBWY.Client.Views.Order AddOrderDropShippingCommand = new RelayCommand(() => OrderDropShippingList.Add(new OrderDropShipping() { + OrderId = this.OrderId, BuyerAccount = PurchaseAccountList.FirstOrDefault()?.AccountName, OnPurchaseAmountChanged = OnPurchaseAmountChanged })); diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index b90cd770..6540b26a 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -1054,12 +1054,21 @@ namespace BBWY.Server.Business { deletePurchaseOrder.ExecuteAffrows(); deleteOrderCostDetail.ExecuteAffrows(); - foreach (var updateOrderSku in updateOrderSkuList) - updateOrderSku.ExecuteAffrows(); + foreach (var update in updateOrderSkuList) + update.ExecuteAffrows(); fsql.Insert(insertPurchaseOrderList).ExecuteAffrows(); fsql.Insert(insertOrderCostDetailList).ExecuteAffrows(); insertOrderCost?.ExecuteAffrows(); updateOrderCost?.ExecuteAffrows(); + if (insertOrderDropShippingList.Count() > 0) + fsql.Insert(insertOrderDropShippingList).ExecuteAffrows(); + if (updateOrderDropShippingList.Count() > 0) + { + foreach (var update in updateOrderDropShippingList) + { + fsql.Update().SetSource(update).IgnoreColumns(new string[] { "CreateTime", "ShopId" }); + } + } if (dbOrder.StorageType != Enums.StorageType.代发) {