diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 70ffd36f..7cc3b287 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -9,7 +9,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10121"; + ClientVersion = "10122"; } private User user; diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/PackServiceResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/PackServiceResponse.cs index 64f726e6..a2e87af8 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/PackServiceResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/PackServiceResponse.cs @@ -57,6 +57,11 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask /// 增量配件数量 /// public int? IncrementPartCount { get; set; } + + /// + /// 推荐打包人(skuid) + /// + public string SuggestPackUserName { get; set; } } public class PackServiceDTO diff --git a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs index 8f79d6a5..a821ab98 100644 --- a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs @@ -35,6 +35,14 @@ namespace BBWY.Client.ViewModels.PackTask public class PackServiceViewModel : BaseVM, IDenpendency { + + + private string suggestPackUserName; + /// + /// 打包人 + /// + public string SuggestPackUserName { get => suggestPackUserName; set { Set(ref suggestPackUserName, value); } } + private int? floorDragNumber; public int? FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } } @@ -182,9 +190,6 @@ namespace BBWY.Client.ViewModels.PackTask public void InitPrintList() { - - - TaskImage = MyPrintHelper.GetBarcodeImage(TaskId.ToString(), 300, 60); BarcodeImage = MyPrintHelper.GetBarcodeImage(SkuId, 300, 60); @@ -290,6 +295,7 @@ namespace BBWY.Client.ViewModels.PackTask if (res.Success) { + SuggestPackUserName = res.Data.SuggestPackUserName; IncrementPartCount = res.Data.IncrementPartCount == null ? 0 : res.Data.IncrementPartCount.Value; if (res.Data != null && res.Data.IncrementItemList.Count() > 0) @@ -319,7 +325,7 @@ namespace BBWY.Client.ViewModels.PackTask BasicPackServiceList.Add(packService); if (packService.Name != "贴条码") PackServiceList.Add(packService);//加载工序服务列表 - + }); } } @@ -589,8 +595,8 @@ namespace BBWY.Client.ViewModels.PackTask if (disIncrementProcessList == null) return; - if (disBasicPackProcessList.Select(d=>d.ItemName).Distinct().Count()==1&& disBasicPackProcessList.Select(d => d.ItemName).Contains("贴条码") - && disIncrementProcessList.Count>0) + if (disBasicPackProcessList.Select(d => d.ItemName).Distinct().Count() == 1 && disBasicPackProcessList.Select(d => d.ItemName).Contains("贴条码") + && disIncrementProcessList.Count > 0) { System.Windows.MessageBox.Show("只有一道贴码工序,无法添加增值包装工序"); return; @@ -609,14 +615,25 @@ namespace BBWY.Client.ViewModels.PackTask packTaskDetail.ConsumableList = disConsumableServiceList; 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(); var win = obj as System.Windows.Window; if (SetAllFees != null) SetAllFees(); win.Close(); - } + } /// /// 更新 打包员 和费用数据 diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml b/BBWY.Client/Views/PackTask/ServiceWindow.xaml index 7c00f11e..d288ce9d 100644 --- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml +++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml @@ -70,19 +70,26 @@ - + - - - + + + + + + + + + + - + - +