From 116f616092e6a00c1abf2d35112f602db8d768ba Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 11 Feb 2022 19:39:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=87=87=E8=B4=AD=E5=B9=B3=E5=8F=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8B=BC=E5=A4=9A=E5=A4=9A=E9=80=89=E9=A1=B9=202.?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AE=A2=E5=8D=95=E6=94=AF=E6=8C=81=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E5=B0=8F=E6=95=B0=203.=E5=85=81=E8=AE=B8=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AASku=E7=9A=84=E8=AE=A2=E5=8D=95=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=BB=A3=E5=8F=91-=E5=85=B3=E8=81=94=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Models/Enums.cs                    |  3 ++-
 .../ViewModels/Order/OrderListViewModel.cs     |  7 +------
 BBWY.Client/Views/Order/ChooseDFType.xaml.cs   | 18 +++++++++++++++---
 .../Views/Order/RelationPurchaseOrder.xaml     |  3 ++-
 BBWY.Server.Model/Enums.cs                     |  3 ++-
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index 1993bced..f446b363 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -7,7 +7,8 @@
     {
         淘宝 = 0,
         京东 = 1,
-        阿里巴巴 = 2
+        阿里巴巴 = 2,
+        拼多多 = 3
     }
 
     /// <summary>
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index dd8c6f24..0cd47141 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -238,12 +238,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (storageType == StorageType.代发)
             {
-                if (order.ItemList.Count > 1)
-                {
-                    MessageBox.Show("多个Sku请拆单", "提示");
-                    return;
-                }
-                var chooseDFType = new ChooseDFType(order.ItemList[0].Id);
+                var chooseDFType = new ChooseDFType(order.ItemList.Count > 1);
                 if (chooseDFType.ShowDialog() != true)
                     return;
 
diff --git a/BBWY.Client/Views/Order/ChooseDFType.xaml.cs b/BBWY.Client/Views/Order/ChooseDFType.xaml.cs
index 1a6de069..2f0b55a0 100644
--- a/BBWY.Client/Views/Order/ChooseDFType.xaml.cs
+++ b/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)
diff --git a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml b/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml
index 2b3a5529..04b10983 100644
--- a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml
+++ b/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}"/>
 
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 3fbe8f3a..59a0570a 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -9,7 +9,8 @@
         {
             淘宝 = 0,
             京东 = 1,
-            阿里巴巴 = 2
+            阿里巴巴 = 2,
+            拼多多 = 3
         }
 
         /// <summary>