Browse Source

添加打包推荐人

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
074504da80
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 5
      BBWY.Client/Models/APIModel/Response/PackTask/PackServiceResponse.cs
  3. 27
      BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
  4. 13
      BBWY.Client/Views/PackTask/ServiceWindow.xaml

2
BBWY.Client/GlobalContext.cs

@ -9,7 +9,7 @@ namespace BBWY.Client
{ {
ShopServiceGroupList = new List<string>(); ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>(); ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10121"; ClientVersion = "10122";
} }
private User user; private User user;

5
BBWY.Client/Models/APIModel/Response/PackTask/PackServiceResponse.cs

@ -57,6 +57,11 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
/// 增量配件数量 /// 增量配件数量
/// </summary> /// </summary>
public int? IncrementPartCount { get; set; } public int? IncrementPartCount { get; set; }
/// <summary>
/// 推荐打包人(skuid)
/// </summary>
public string SuggestPackUserName { get; set; }
} }
public class PackServiceDTO public class PackServiceDTO

27
BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs

@ -35,6 +35,14 @@ namespace BBWY.Client.ViewModels.PackTask
public class PackServiceViewModel : BaseVM, IDenpendency public class PackServiceViewModel : BaseVM, IDenpendency
{ {
private string suggestPackUserName;
/// <summary>
/// 打包人
/// </summary>
public string SuggestPackUserName { get => suggestPackUserName; set { Set(ref suggestPackUserName, value); } }
private int? floorDragNumber; private int? floorDragNumber;
public int? FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } } public int? FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } }
@ -182,9 +190,6 @@ namespace BBWY.Client.ViewModels.PackTask
public void InitPrintList() public void InitPrintList()
{ {
TaskImage = MyPrintHelper.GetBarcodeImage(TaskId.ToString(), 300, 60); TaskImage = MyPrintHelper.GetBarcodeImage(TaskId.ToString(), 300, 60);
BarcodeImage = MyPrintHelper.GetBarcodeImage(SkuId, 300, 60); BarcodeImage = MyPrintHelper.GetBarcodeImage(SkuId, 300, 60);
@ -290,6 +295,7 @@ namespace BBWY.Client.ViewModels.PackTask
if (res.Success) if (res.Success)
{ {
SuggestPackUserName = res.Data.SuggestPackUserName;
IncrementPartCount = res.Data.IncrementPartCount == null ? 0 : res.Data.IncrementPartCount.Value; IncrementPartCount = res.Data.IncrementPartCount == null ? 0 : res.Data.IncrementPartCount.Value;
if (res.Data != null && res.Data.IncrementItemList.Count() > 0) if (res.Data != null && res.Data.IncrementItemList.Count() > 0)
@ -609,14 +615,25 @@ namespace BBWY.Client.ViewModels.PackTask
packTaskDetail.ConsumableList = disConsumableServiceList; packTaskDetail.ConsumableList = disConsumableServiceList;
var res = packDetailService.SetPackTaskDetail(packTaskDetail); var res = packDetailService.SetPackTaskDetail(packTaskDetail);
if (res != null && res.Success)
if (res==null)
{ {
System.Windows.MessageBox.Show("网络异常!");
return;
}
if (!res.Success)
{
System.Windows.MessageBox.Show(res.Msg);
return;
}
// new TipsWindow("上传成功!").Show(); // new TipsWindow("上传成功!").Show();
var win = obj as System.Windows.Window; var win = obj as System.Windows.Window;
if (SetAllFees != null) if (SetAllFees != null)
SetAllFees(); SetAllFees();
win.Close(); win.Close();
}
} }
/// <summary> /// <summary>
/// 更新 打包员 和费用数据 /// 更新 打包员 和费用数据

13
BBWY.Client/Views/PackTask/ServiceWindow.xaml

@ -70,16 +70,23 @@
</Grid.Resources> </Grid.Resources>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"/> <RowDefinition Height="80"/>
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal" Margin="0 5 0 0">
<TextBlock Text="定向收费:" HorizontalAlignment="Left" Margin="19 0 0 0" VerticalAlignment="Center"/> <TextBlock Text="定向收费:" HorizontalAlignment="Left" Margin="19 0 0 0" VerticalAlignment="Center"/>
<c:BTextBox Text="{Binding DirectionalFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100"/> <c:BTextBox Text="{Binding DirectionalFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
<TextBlock Text="推荐打包人: " HorizontalAlignment="Left" Margin="19 0 0 0" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SuggestPackUserName}" Foreground="Red" HorizontalAlignment="Left" Margin="0 0 0 0" VerticalAlignment="Center"/>
</StackPanel>
</StackPanel>
<ScrollViewer x:Name="scrolls" Grid.Row="1" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" Height="640"> <ScrollViewer x:Name="scrolls" Grid.Row="1" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" Height="650">
<ScrollViewer.Content> <ScrollViewer.Content>
<StackPanel Orientation="Vertical" Grid.Row="1"> <StackPanel Orientation="Vertical" Grid.Row="1">

Loading…
Cancel
Save