Browse Source

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

2.关联订单支持输入小数
3.允许多个Sku的订单进行代发-关联订单
qianyi
shanji 3 years ago
parent
commit
116f616092
  1. 3
      BBWY.Client/Models/Enums.cs
  2. 7
      BBWY.Client/ViewModels/Order/OrderListViewModel.cs
  3. 18
      BBWY.Client/Views/Order/ChooseDFType.xaml.cs
  4. 3
      BBWY.Client/Views/Order/RelationPurchaseOrder.xaml
  5. 3
      BBWY.Server.Model/Enums.cs

3
BBWY.Client/Models/Enums.cs

@ -7,7 +7,8 @@
{
= 0,
= 1,
= 2
= 2,
= 3
}
/// <summary>

7
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;

18
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)

3
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}"/>

3
BBWY.Server.Model/Enums.cs

@ -9,7 +9,8 @@
{
= 0,
= 1,
= 2
= 2,
= 3
}
/// <summary>

Loading…
Cancel
Save