diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index c5428995..5c13d193 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -236,16 +236,32 @@ namespace BBWY.Client.ViewModels } else if (storageType == StorageType.代发) { - var relationPurchaseOrder = new RelationPurchaseOrder(orderId, null, order.ItemList.Select(osku => new RelationPurchaseOrderSku() + if (order.ItemList.Count > 1) { - Logo = osku.Logo, - ProductId = osku.ProductId, - SkuId = osku.Id, - Quantity = osku.ItemTotal, - Title = osku.Title - }).ToList()); - relationPurchaseOrder.Closed += RelationPurchaseOrder_Closed; - relationPurchaseOrder.ShowDialog(); + MessageBox.Show("多个Sku请拆单", "提示"); + return; + } + var chooseDFType = new ChooseDFType(order.ItemList[0].Id); + if (chooseDFType.ShowDialog() != true) + return; + + if (chooseDFType.DFType == DFType.关联订单) + { + var relationPurchaseOrder = new RelationPurchaseOrder(orderId, null, order.ItemList.Select(osku => new RelationPurchaseOrderSku() + { + Logo = osku.Logo, + ProductId = osku.ProductId, + SkuId = osku.Id, + Quantity = osku.ItemTotal, + Title = osku.Title + }).ToList()); + relationPurchaseOrder.Closed += RelationPurchaseOrder_Closed; + relationPurchaseOrder.ShowDialog(); + } + else if (chooseDFType.DFType == DFType.在线采购) + { + + } } } diff --git a/BBWY.Client/Views/Order/ChooseDFType.xaml.cs b/BBWY.Client/Views/Order/ChooseDFType.xaml.cs index 179d376e..1a6de069 100644 --- a/BBWY.Client/Views/Order/ChooseDFType.xaml.cs +++ b/BBWY.Client/Views/Order/ChooseDFType.xaml.cs @@ -10,10 +10,12 @@ namespace BBWY.Client.Views.Order { public DFType DFType { get; private set; } + public string SkuId { get; private set; } - public ChooseDFType() + public ChooseDFType(string skuId) { InitializeComponent(); + this.SkuId = skuId; } private void btn_purchase_Click(object sender, System.Windows.RoutedEventArgs e)