From c9315ac0f3566bcfc4c0e8b95c1399e9ca041589 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sat, 19 Aug 2023 00:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=87=87=E8=B4=AD=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Client/GlobalContext.cs                          |  2 +-
 .../ViewModels/Ware/BindingPurchaseProductViewModel.cs | 10 +++++-----
 BBWYB.Client/Views/Ware/WareManager.xaml               |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs
index d0f3150..e3b24d0 100644
--- a/BBWYB.Client/GlobalContext.cs
+++ b/BBWYB.Client/GlobalContext.cs
@@ -22,7 +22,7 @@ namespace BBWYB.Client
     {
         public GlobalContext()
         {
-            BBWYBApiVersion = "10034";
+            BBWYBApiVersion = "10035";
         }
 
         private User user;
diff --git a/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs b/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs
index ea137ac..5a678d6 100644
--- a/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs
+++ b/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs
@@ -276,11 +276,11 @@ namespace BBWYB.Client.ViewModels
 
         private void AddPurchaseProduct(ProductSku productSku)
         {
-            if (productSku.PurchaseSchemeList.Count > 4)
-            {
-                MessageBox.Show("该sku的采购方案已达上限(5)");
-                return;
-            }
+            //if (productSku.PurchaseSchemeList.Count > 4)
+            //{
+            //    MessageBox.Show("该sku的采购方案已达上限(5)");
+            //    return;
+            //}
 
             if (productSku.SelectedPurchaseScheme == null)
             {
diff --git a/BBWYB.Client/Views/Ware/WareManager.xaml b/BBWYB.Client/Views/Ware/WareManager.xaml
index c19224b..fb7aa82 100644
--- a/BBWYB.Client/Views/Ware/WareManager.xaml
+++ b/BBWYB.Client/Views/Ware/WareManager.xaml
@@ -127,7 +127,7 @@
                                     <DataTemplate>
                                         <Border BorderThickness="0,0,0,0" BorderBrush="{StaticResource Border.Brush}"
                                                 Width="{Binding ActualWidth,ElementName=listbox_sku}">
-                                            <Grid Height="150">
+                                            <Grid MinHeight="150">
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="299"/>
                                                     <ColumnDefinition Width="80"/>