1.采购平台增加拼多多选项

2.关联订单支持输入小数
3.允许多个Sku的订单进行代发-关联订单

BBWY.Client/Models/Enums.cs

@@ -7,7 +7,8 @@
     {
         淘宝 = 0,
         京东 = 1,
-        阿里巴巴 = 2
+        阿里巴巴 = 2,
+        拼多多 = 3
     }
 
     /// <summary>

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -238,12 +238,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (storageType == StorageType.代发)
             {
-                if (order.ItemList.Count > 1)
+                var chooseDFType = new ChooseDFType(order.ItemList.Count > 1);
-                {
-                    MessageBox.Show("多个Sku请拆单", "提示");
-                    return;
-                }
-                var chooseDFType = new ChooseDFType(order.ItemList[0].Id);
                 if (chooseDFType.ShowDialog() != true)
                     return;
 

BBWY.Client/Views/Order/ChooseDFType.xaml.cs

@@ -10,12 +10,24 @@ namespace BBWY.Client.Views.Order
     {
 
         public DFType DFType { get; private set; }
-        public string SkuId { get; private set; }
 
-        public ChooseDFType(string skuId)
+        private bool isDisablePurchaseOnline;
+
+        public ChooseDFType(bool isDisablePurchaseOnline)
         {
             InitializeComponent();
-            this.SkuId = skuId;
+            this.isDisablePurchaseOnline = isDisablePurchaseOnline;
+            this.Loaded += ChooseDFType_Loaded;
+        }
+
+        private void ChooseDFType_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            if (isDisablePurchaseOnline)
+            {
+                btn_purchase.IsEnabled = false;
+                btn_purchase.DisableText = "采购商品";
+            }
+
         }
 
         private void btn_purchase_Click(object sender, System.Windows.RoutedEventArgs e)

BBWY.Client/Views/Order/RelationPurchaseOrder.xaml

@@ -122,7 +122,8 @@
                                 <TextBlock Text="{Binding Title}" Grid.Column="1" VerticalAlignment="Center" Margin="5,0,0,0"
                                            TextWrapping="Wrap"/>
                             </StackPanel>
-                            <c:BTextBox Grid.Column="1" Margin="5,0" Text="{Binding SingleSkuAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                            <c:BTextBox Grid.Column="1" Margin="5,0" 
+                                        Text="{Binding SingleSkuAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}"/>
 
                             <TextBlock Text="{Binding Quantity}" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
 

BBWY.Server.Model/Enums.cs

@@ -9,7 +9,8 @@
         {
             淘宝 = 0,
             京东 = 1,
-            阿里巴巴 = 2
+            阿里巴巴 = 2,
+            拼多多 = 3
         }
 
         /// <summary>