diff --git a/BBWY.Client/APIServices/QiKu/PackTaskService.cs b/BBWY.Client/APIServices/QiKu/PackTaskService.cs index ff06dc66..4afc9182 100644 --- a/BBWY.Client/APIServices/QiKu/PackTaskService.cs +++ b/BBWY.Client/APIServices/QiKu/PackTaskService.cs @@ -11,6 +11,7 @@ using System; using System.Collections.Generic; using System.Net.Http; using System.Runtime.Serialization; +using System.Threading.Tasks; using System.Windows.Documents; namespace BBWY.Client.APIServices @@ -58,7 +59,7 @@ namespace BBWY.Client.APIServices ShopId = globalContext.User.Shop.ShopId.ToString() }, null, HttpMethod.Post); } - public ApiResponse GetWareHouseList(string WayBillNo=null,string SourceExpressName=null, int? isWorry = null, string departmentName = null, string skuId = null, string taskId = null, + public ApiResponse GetWareHouseList(string WayBillNo = null, string SourceExpressName = null, int? isWorry = null, string departmentName = null, string skuId = null, string taskId = null, DateTime? startTime = null, DateTime? endTime = null, TaskState? TaskState = null, @@ -87,14 +88,14 @@ namespace BBWY.Client.APIServices PageIndex = pageIndex, PageSize = pageSize, ShopName = ShopName, - WayBillNo= WayBillNo, - SourceExpressName=SourceExpressName, + WayBillNo = WayBillNo, + SourceExpressName = SourceExpressName, }, null, HttpMethod.Post); } - - public ApiResponse GetTaskAllCount(string shopId=null) + + public ApiResponse GetTaskAllCount(string shopId = null) { return SendRequest(globalContext.QKApiHost, $"api/PackTask/GetProductSkuCount?shopId={shopId}", null @@ -172,7 +173,7 @@ namespace BBWY.Client.APIServices return SendRequest(globalContext.QKApiHost, "api/PackTask/SetPackTaskState", new { taskId = taskId, - TaskState= taskState + TaskState = taskState } , null, HttpMethod.Post); } @@ -206,25 +207,6 @@ namespace BBWY.Client.APIServices , null, HttpMethod.Get); } - /// - /// 获取任务的服务 - /// - /// - public ApiResponse GetTaskService(long taskId) - { - return SendRequest(globalContext.QKApiHost, $"api/PackTask/GetTaskService?TaskId={taskId}",null - , null, HttpMethod.Get); - } - /// - /// 上传 更新任务的服务数据 - /// - /// - public ApiResponse UploadService(UploadServiceRequest uploadService) - { - return SendRequest(globalContext.QKApiHost, "api/PackTask/UploadService", uploadService - , null, HttpMethod.Post); - } - public ApiResponse ShopTotal(string skuId = null, string taskId = null, DateTime? startTime = null, @@ -282,8 +264,8 @@ namespace BBWY.Client.APIServices /// /// /// - public ApiResponse TotalPackUserSalary(string PackUserName = null, DateTime? StartTime = null, DateTime? EndTime=null, int PageIndex=1 - , int PageSize=10) + public ApiResponse TotalPackUserSalary(string PackUserName = null, DateTime? StartTime = null, DateTime? EndTime = null, int PageIndex = 1 + , int PageSize = 10) { return SendRequest(globalContext.QKApiHost, "api/PackTask/TotalPackUserSalary", new { @@ -295,55 +277,12 @@ namespace BBWY.Client.APIServices }, null, HttpMethod.Post); } - /// - /// 获取待封箱列表 - /// - /// - /// - public ApiResponse SearchWaitSealBoxList(string ShopName = null, long? TaskId=null, string SkuId = null, int PageIndex = 1 - , int PageSize = 10) - { - return SendRequest(globalContext.QKApiHost, "api/PackTask/SearchWaitSealBoxList", new - { - ShopName, - TaskId, - SkuId, - PageIndex, - PageSize - }, null, HttpMethod.Post); - } - - /// - /// 完成封箱 - /// - /// - /// - public ApiResponse CompeteSealBox( CompeteSealBox CompeteSealBoxs) + public ApiResponse StoreGetBySelf(long taskId) { - return SendRequest(globalContext.QKApiHost, "api/PackTask/CompeteSealBox", CompeteSealBoxs, null, HttpMethod.Post); - } - - - /// - /// 获取待落仓列表 - /// - /// - /// - public ApiResponse SearchWaitFallWareList(string ShopName = null, long? TaskId = null, string SkuId = null, int PageIndex = 1 - , int PageSize = 10) - { - return SendRequest(globalContext.QKApiHost, "api/PackTask/SearchWaitFallWareList", new - { - ShopName, - TaskId, - SkuId, - PageIndex, - PageSize - }, null, HttpMethod.Post); + return SendRequest(globalContext.QKApiHost, $"api/PackTask/StoreGetBySelf?TaskId={taskId}", null, null, HttpMethod.Post); } - } public class CompeteSealBox diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index 9e0ff3b9..8fb1852f 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -242,7 +242,8 @@ 已完成 = 6, 已取消 = 7, 待落仓 = 8, - 待完结 = 9 + 待完结 = 9, + 商家自取 = 10 } diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index 71f12f0d..d8df6827 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -258,7 +258,7 @@ namespace BBWY.Client.ViewModels.PackTask SetTaskState(null); this.sealBoxService = sealBoxService; - SealBoxConfigureType = SealBoxConfigureType.已配置; + SealBoxConfigureType = SealBoxConfigureType.待配置; SetFallWareConfiguredCommand = new RelayCommand(SetFallWareConfigured); } diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 3f41aaec..479ece99 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -24,6 +24,7 @@ using BBWY.Client.Models.PackTask; using BBWY.Client.Views.SealBox; using BBWY.Client.Views.FallWare; using BBWY.Client.Models.FallWare; +using WebSocketSharp; namespace BBWY.Client.ViewModels.PackTask { @@ -274,8 +275,8 @@ namespace BBWY.Client.ViewModels.PackTask SetSealBoxCommand = new RelayCommand(SetSealBox); CompeteFallWareCommand = new RelayCommand(CompeteFallWare); - SealBoxConfigureType = SealBoxConfigureType.已配置; - PositionState = PositionState.已配置待落仓; + SealBoxConfigureType = SealBoxConfigureType.待配置; + PositionState = PositionState.待落仓; SetSealBoxConfigureTypeCommand = new RelayCommand(s => { PageIndex = 1; @@ -289,8 +290,43 @@ namespace BBWY.Client.ViewModels.PackTask LookBoxConfigureCommand = new RelayCommand(LookBoxConfigure); PrintBoxConfigureCommand = new RelayCommand(PrintBoxConfigure); + + DeletedTaskCommand = new RelayCommand(DeletedTask); + + StoreGetBySelfCommand = new RelayCommand(StoreGetBySelf); } + private void StoreGetBySelf(object obj) + { + var packTaskmodel = (PackTaskModel)obj; + MessageBoxResult result = System.Windows.MessageBox.Show($"确定商家自取,任务id:{packTaskmodel.TaskId}?", "提示", + MessageBoxButton.YesNo, + MessageBoxImage.Warning); + if (result != MessageBoxResult.Yes) return; + var res = packTaskService.StoreGetBySelf(packTaskmodel.TaskId); + if (!res.Success) + { + System.Windows.MessageBox.Show(res.Msg,"错误信息"); + return; + } + Task.Factory.StartNew(() => SearchTaskList()); + } + + private void DeletedTask(object obj) + { + var packTaskmodel = (PackTaskModel)obj; + //if (!packTaskmodel.OrderId.IsNullOrEmpty()) + //{ + // System.Windows.MessageBox.Show($"暂不支持删除采购组的任务,如要删除,请到采购列表取消订单:{packTaskmodel.OrderId}"); + // return; + //} + MessageBoxResult result =System.Windows.MessageBox.Show($"确定取消任务{packTaskmodel.TaskId}?", "提示", + MessageBoxButton.YesNo, + MessageBoxImage.Warning); + if (result != MessageBoxResult.Yes) return; + packTaskService.DeletedTask(packTaskmodel.TaskId); + Task.Factory.StartNew(() => SearchTaskList()); + } /// /// todo: 打印数据 @@ -452,12 +488,21 @@ namespace BBWY.Client.ViewModels.PackTask public ICommand PrintBoxConfigureCommand { get; set; } + /// + /// 删除任务 + /// + public ICommand DeletedTaskCommand { get; set; } - /// - /// 完成封箱 - /// - /// - private void CompeteSealBox(object obj) + + /// + /// 商家自取 + /// + public ICommand StoreGetBySelfCommand { get; set; } + /// + /// 完成封箱 + /// + /// + private void CompeteSealBox(object obj) { var model = (SealBoxModel)obj; diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index c300761e..89564fd5 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs @@ -112,19 +112,35 @@ namespace BBWY.Client.ViewModels { }; - public ObservableCollection PreCompeteTimeDayList { get => preCompeteTimeDayList; set { Set(ref preCompeteTimeDayList, value); } } + public ObservableCollection PreCompeteTimeDayList + { + get => preCompeteTimeDayList; set + { + + Set(ref preCompeteTimeDayList, value); + + } + } private ObservableCollection preCompeteTimeHourList = new ObservableCollection { - "12点前","18点前","22点前" + }; public ObservableCollection PreCompeteTimeHourList { get => preCompeteTimeHourList; set { Set(ref preCompeteTimeHourList, value); } } // public string preCompeteTimeDay; - public string PreCompeteTimeDay { get => preCompeteTimeDay; set { Set(ref preCompeteTimeDay, value); } } + public string PreCompeteTimeDay + { + get => preCompeteTimeDay; set + { + Set(ref preCompeteTimeDay, value); + PreCompeteTimeDayOnChanged();// + } + } + public string preCompeteTimeHour; public string PreCompeteTimeHour { get => preCompeteTimeHour; set { Set(ref preCompeteTimeHour, value); } } @@ -453,7 +469,7 @@ namespace BBWY.Client.ViewModels } request.BarcodeId = BarCodeModel.Id; } - if(PurchaseSkuList != null && PurchaseSkuList.Count > 0&&purchaseSkuList.Any(p=> p.IsNeedCer)) //(IsNeedCertificateModel == Need.需要) + if (PurchaseSkuList != null && PurchaseSkuList.Count > 0 && purchaseSkuList.Any(p => p.IsNeedCer)) //(IsNeedCertificateModel == Need.需要) { //if () //{ @@ -591,6 +607,94 @@ namespace BBWY.Client.ViewModels } + // "12点前","18点前","22点前" + private void PreCompeteTimeDayOnChanged() + { + var now = DateTime.Now; + if (now.Hour < 12) + { + if (PreCompeteTimeDay=="今天") + { + PreCompeteTimeHourList.Clear(); + PreCompeteTimeHourList.Add("12点前"); + PreCompeteTimeHourList.Add("18点前"); + PreCompeteTimeHourList.Add("22点前"); + PreCompeteTimeHour = "12点前"; + } + + + if (PreCompeteTimeDay == "明天") + { + PreCompeteTimeHourList.Clear(); + PreCompeteTimeHourList.Add("12点前"); + PreCompeteTimeHour = "12点前"; + } + + + } + else if (now.Hour < 18) + { + if (PreCompeteTimeDay == "今天") + { + PreCompeteTimeHourList.Clear(); + PreCompeteTimeHourList.Add("18点前"); + PreCompeteTimeHourList.Add("22点前"); + + PreCompeteTimeHour = "18点前"; + } + + + if (PreCompeteTimeDay == "明天") + { + PreCompeteTimeHourList.Clear(); + PreCompeteTimeHourList.Add("12点前"); + PreCompeteTimeHourList.Add("18点前"); + PreCompeteTimeHour = "12点前"; + } + } + else if (now.Hour < 22) + { + if (PreCompeteTimeDay == "今天") + { + PreCompeteTimeHourList.Clear(); + PreCompeteTimeHourList.Add("22点前"); + PreCompeteTimeHour = "22点前"; + } + + + if (PreCompeteTimeDay == "明天") + { + PreCompeteTimeHourList.Clear(); + PreCompeteTimeHourList.Add("12点前"); + PreCompeteTimeHourList.Add("18点前"); + PreCompeteTimeHourList.Add("22点前"); + PreCompeteTimeHour = "12点前"; + } + } + else + { + if (PreCompeteTimeDay == "明天") + { + PreCompeteTimeHourList.Clear(); + PreCompeteTimeHourList.Add("12点前"); + PreCompeteTimeHourList.Add("18点前"); + PreCompeteTimeHourList.Add("22点前"); + PreCompeteTimeHour = "12点前"; + } + + if (PreCompeteTimeDay == "后天") + { + PreCompeteTimeHourList.Clear(); + PreCompeteTimeHourList.Add("12点前"); + PreCompeteTimeHour = "12点前"; + } + } + + + + + + } private void SetBarCode() @@ -663,7 +767,7 @@ namespace BBWY.Client.ViewModels IsNeedCertificateModel = Need.需要; return; } - var skus = PurchaseSkuList.SingleOrDefault(p =>p.CerDTO!=null&& p.CerDTO.PurchaseSkuId == s.PurchaseSkuId); + var skus = PurchaseSkuList.SingleOrDefault(p => p.CerDTO != null && p.CerDTO.PurchaseSkuId == s.PurchaseSkuId); skus.CerDTO = s; skus.IsSetCertificate = false; skus.IsNeedCer = PackCerState == PackCerState.合格证信息; @@ -746,12 +850,12 @@ namespace BBWY.Client.ViewModels var packTaskRes = packPurchaseTaskService.GetQualityTask(model.TaskId); - if (packTaskRes==null) + if (packTaskRes == null) { MessageBox.Show("网络异常!"); return; } - if (!packTaskRes.Success || packTaskRes.Data==null) + if (!packTaskRes.Success || packTaskRes.Data == null) { MessageBox.Show(packTaskRes.Msg); return; @@ -853,7 +957,7 @@ namespace BBWY.Client.ViewModels PreCompeteTimeDayList.Add("明天"); PreCompeteTimeDay = "今天"; - PreCompeteTimeHour = "12点前"; + } else if (hour < 18) @@ -861,22 +965,20 @@ namespace BBWY.Client.ViewModels PreCompeteTimeDayList.Add("今天"); PreCompeteTimeDayList.Add("明天"); PreCompeteTimeDay = "今天"; - PreCompeteTimeHour = "18点前"; + } else if (hour < 22) { PreCompeteTimeDayList.Add("今天"); PreCompeteTimeDayList.Add("明天"); PreCompeteTimeDay = "今天"; - PreCompeteTimeHour = "22点前"; + } else { - PreCompeteTimeDayList.Add("今天"); PreCompeteTimeDayList.Add("明天"); PreCompeteTimeDayList.Add("后天"); PreCompeteTimeDay = "明天"; - PreCompeteTimeHour = "12点前"; } diff --git a/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs b/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs index 7a37c917..7d6554fe 100644 --- a/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs +++ b/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs @@ -189,6 +189,24 @@ namespace BBWY.Client.ViewModels.SealBox IList SetSealBoxConfiguredDatas = new List(); foreach (var sealBoxConfigureModel in SealBoxConfigureModelList) { + + if (sealBoxConfigureModel.WareHourseDatas==null|| !sealBoxConfigureModel.WareHourseDatas.Any(w=>w.Count>0)) + { + continue; + } + + + + //判断存在0的报错 + + if (sealBoxConfigureModel.WareHourseDatas.Any(w=>w.Count==0)) + { + System.Windows.MessageBox.Show($"任务id:{sealBoxConfigureModel.TaskId}中,存在未配置的数据"); + return; + } + + + ////todo: 到分箱界面判断 //if (sealBoxConfigureModel.WareHourseDatas.Select(s => s.WareId).Distinct().Count() != sealBoxConfigureModel.WareHourseDatas.Count()) //{ diff --git a/BBWY.Client/Views/PackTask/TaskList.xaml b/BBWY.Client/Views/PackTask/TaskList.xaml index a1f7d582..cca6f192 100644 --- a/BBWY.Client/Views/PackTask/TaskList.xaml +++ b/BBWY.Client/Views/PackTask/TaskList.xaml @@ -124,7 +124,7 @@ - + diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml index 3234acd5..1bc4859b 100644 --- a/BBWY.Client/Views/PackTask/TaskListControl.xaml +++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml @@ -46,7 +46,7 @@ - + diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml index e2aefe15..cc62b64f 100644 --- a/BBWY.Client/Views/PackTask/WareHouseList.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml @@ -162,6 +162,8 @@ + + diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs b/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs index 0ec3f9a1..748c52fb 100644 --- a/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs +++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs @@ -34,14 +34,7 @@ namespace BBWY.Client.Views.PackTask public WareHouseList() { InitializeComponent(); - - - //Messenger.Default.Register(this,"AcceptGlobalContext", g => { globalContext = g; LoadShops(g); }); this.Loaded += Load; - - // this.Unloaded += WareHouseList_Unloaded; - - // GlobalContext.User.DepartmentList } //private void WareHouseList_Unloaded(object sender, RoutedEventArgs e) @@ -55,6 +48,8 @@ namespace BBWY.Client.Views.PackTask { this.globalContext = globalContext; shops = globalContext.User.ShopList.Select(s => s.ShopName).ToList(); + departments=globalContext.User.DepartmentList.Select(s=>s.Name).ToList(); + } private void Load(object sender, RoutedEventArgs e) @@ -62,7 +57,7 @@ namespace BBWY.Client.Views.PackTask try { - var model = new ViewModelLocator().Main; + var model = (App.Current.Resources["Locator"] as ViewModelLocator).Main; LoadShops(model.GlobalContext); } @@ -72,40 +67,43 @@ namespace BBWY.Client.Views.PackTask } + //try + //{ + // var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + // var builder = new ConfigurationBuilder().SetBasePath(applicationPath).AddJsonFile("BBWYAppSettings.json", false, true); + // var Configuration = builder.Build(); - try - { - var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - var builder = new ConfigurationBuilder().SetBasePath(applicationPath).AddJsonFile("BBWYAppSettings.json", false, true); - var Configuration = builder.Build(); + // QKApiHost = Configuration.GetSection("QKApiHost").Value; - QKApiHost = Configuration.GetSection("QKApiHost").Value; - HttpClientHelper helper = new HttpClientHelper(QKApiHost); + // if (QKApiHost.IsNullOrEmpty()) QKApiHost = "http://qiku.qiyue666.com"; - string url = $"{QKApiHost}/api/PackTask/GetAllDepartment";//获取所有数据 - var data = helper.Get(url); - var res = JsonConvert.DeserializeObject>(data); - //创建一个ListBoxIem - if (res.Success) - { - if (res.Data != null && res.Data.Count() > 0) - { - foreach (var department in res.Data) - { - if (!departments.Contains(department.DePartmentName)) - { - departments.Add(department.DePartmentName); - } - } - } - } - } - catch (Exception) - { + // HttpClientHelper helper = new HttpClientHelper(QKApiHost); + // string url = $"{QKApiHost}/api/PackTask/GetAllDepartment";//获取所有数据 + // var data = helper.Get(url); - } + // var res = JsonConvert.DeserializeObject>(data); + // //创建一个ListBoxIem + // if (res.Success) + // { + // if (res.Data != null && res.Data.Count() > 0) + // { + // foreach (var department in res.Data) + // { + // if (!departments.Contains(department.DePartmentName)) + // { + // departments.Add(department.DePartmentName); + // } + // } + // } + // } + //} + //catch (Exception) + //{ + + + //} } @@ -136,67 +134,70 @@ namespace BBWY.Client.Views.PackTask List shops = new List(); private void tb_TextChanged(object sender, TextChangedEventArgs e) { - try - { - var textBoxt = (TextBox)sender; - //创建一个ListBox - if (tipBox != null && tipBox.Items.Count > 0) + if (tipBox != null) + try { - tipBox.Items.Clear(); + var textBoxt = (TextBox)sender; + //创建一个ListBox - } - - if (departments.Count <= 0) - { - HttpClientHelper helper = new HttpClientHelper(QKApiHost); + if (tipBox != null && tipBox.Items.Count > 0) + { + tipBox.Items.Clear(); - string url = $"{QKApiHost}/api/PackTask/GetAllDepartment";//获取所有数据 - var data = helper.Get(url); + } - var res = JsonConvert.DeserializeObject>(data); - //创建一个ListBoxIem - if (res.Success) + if (departments.Count <= 0) { - if (res.Data != null && res.Data.Count() > 0) + if (QKApiHost.IsNullOrEmpty()) QKApiHost = "http://qiku.qiyue666.com"; + HttpClientHelper helper = new HttpClientHelper(QKApiHost); + + string url = $"{QKApiHost}/api/PackTask/GetAllDepartment";//获取所有数据 + var data = helper.Get(url); + + var res = JsonConvert.DeserializeObject>(data); + //创建一个ListBoxIem + if (res.Success) { - foreach (var department in res.Data) + if (res.Data != null && res.Data.Count() > 0) { - if (!departments.Contains(department.DePartmentName)) + foreach (var department in res.Data) { - departments.Add(department.DePartmentName); - } + if (!departments.Contains(department.DePartmentName)) + { + departments.Add(department.DePartmentName); + } + } } } } - } - if (string.IsNullOrEmpty(textBoxt.Text)) - { - tipBox.Visibility = Visibility.Collapsed; - return; - } - foreach (var department in departments) - { - if (department.Contains(textBoxt.Text)) + if (string.IsNullOrEmpty(textBoxt.Text)) { - ListBoxItem item = new ListBoxItem(); - Label lb = new Label(); - lb.Content = department; - item.Content = lb; - tipBox.Items.Add(item); + tipBox.Visibility = Visibility.Collapsed; + return; } + foreach (var department in departments) + { + if (department.Contains(textBoxt.Text)) + { + ListBoxItem item = new ListBoxItem(); + Label lb = new Label(); + lb.Content = department; + item.Content = lb; + tipBox.Items.Add(item); + } - } + } - tipBox.Visibility = Visibility.Visible; - } - catch (Exception) - { + tipBox.Visibility = Visibility.Visible; + } + catch (Exception) + { - } + } } @@ -236,8 +237,8 @@ namespace BBWY.Client.Views.PackTask } } - if (tipBoxShop!=null) - tipBoxShop.Visibility = Visibility.Visible; + if (tipBoxShop != null) + tipBoxShop.Visibility = Visibility.Visible; } catch (Exception) { diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml index 62dc7c9f..ba67d719 100644 --- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml @@ -130,9 +130,15 @@ - + + + + - @@ -196,7 +202,7 @@ - + - + @@ -278,7 +284,7 @@ - + @@ -387,7 +393,7 @@ - + - - - + + + @@ -417,31 +423,25 @@ - - - - + /> - + + @@ -457,7 +457,7 @@ - @@ -466,12 +466,12 @@ CommandParameter="{Binding}" Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" > - + - + diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml b/BBWY.Client/Views/QualityTask/QualityWindow.xaml index 13ea3ad1..c857ffb4 100644 --- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml +++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml @@ -139,9 +139,9 @@ - + - +