From 8d6aa6c8309507f566e2c0d710aa863c52fdbf04 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Tue, 9 May 2023 20:59:35 +0800 Subject: [PATCH] 1 --- BBWY.Client/Models/PackTask/PackTaskModel.cs | 54 +------- .../PackTask/PackTaskTotalViewModel.cs | 32 ++++- .../ViewModels/PackTask/TaskListViewModel.cs | 53 ++++---- .../PackTask/WareHouseListViewModel.cs | 24 +--- BBWY.Client/Views/PackTask/PackTaskTotal.xaml | 13 +- .../Views/PackTask/PackTaskTotal.xaml.cs | 117 +++++++++++++++++- .../Views/PackTask/TaskListControl.xaml | 2 +- BBWY.Client/Views/PackTask/WareHouseList.xaml | 2 - .../Views/PackTask/WareHouseList.xaml.cs | 51 +++++--- 9 files changed, 223 insertions(+), 125 deletions(-) diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index 9a2f2a89..21679a23 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -27,10 +27,8 @@ namespace BBWY.Client.Models private long id; public long Id { get => id; set { Set(ref id, value); } } - private readonly PackTaskService packTaskService; - readonly WorkProcessService workProcessService; - readonly IncreateServiceService increateServiceService; - public ICommand SetTaskStatusCommand { get; set; } + + public ICommand PrintBarcodeCommand { get; set; } public ICommand PrintCerCommand { get; set; } @@ -38,31 +36,17 @@ namespace BBWY.Client.Models public ICommand LookBarCommand { get; set; } public ICommand SetServiceCommand { get; set; } - public ConsumableService consumableService; - /// /// 修改任务 /// public ICommand UpdateTaskCommand { get; set; } - /// - /// 删除任务 - /// - public ICommand DeletedTaskCommand { get; set; } + public Action ReflashTask { get; set; } - private void DeletedTask() - { - MessageBoxResult result = MessageBox.Show("确定删除?", "提示", - MessageBoxButton.YesNo, - MessageBoxImage.Warning); - if (result != MessageBoxResult.Yes) return; - packTaskService.DeletedTask(TaskId); - if (ReflashTask != null) - ReflashTask();//刷新界面 - } + private void UpdateTask() { @@ -83,21 +67,14 @@ namespace BBWY.Client.Models - public PackTaskModel(PackTaskService packTaskService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateServiceService) + public PackTaskModel() { - - SetTaskStatusCommand = new RelayCommand(SetTaskStatus); PrintBarcodeCommand = new RelayCommand(PrintBarcode); PrintCerCommand = new RelayCommand(PrintCer); LookBarCommand = new RelayCommand(LookBar); LookCerCommand = new RelayCommand(LookCer); SetServiceCommand = new RelayCommand(SetService); UpdateTaskCommand = new RelayCommand(UpdateTask); - DeletedTaskCommand = new RelayCommand(DeletedTask); - this.packTaskService = packTaskService; - this.consumableService = consumableService; - this.workProcessService = workProcessService; - this.increateServiceService = increateServiceService; } private void SetService() @@ -200,26 +177,7 @@ namespace BBWY.Client.Models //printWindow.Datas = LoadBarLabelModels(); printWindow.Show(); } - - public void SetTaskStatus(long taskId) - { - - if (this.TaskStatus == TaskStateType.已完成) - { - return; - - } - ///修改完成 - var model = packTaskService.UpdateTaskStatus(taskId, 1,""); - if (model != null && model.Success) - { - //var res = batchPurchaseService.UpdatePurchaseOrderState(id, Models.PurchaseOrderState.已完成 ); - - - this.TaskStatus = TaskStateType.已完成; - new TipsWindow("修改成功").Show(); - } - } + /* public Dictionary LoadBarLabelModels() { diff --git a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs index 35909122..5cd3bc6b 100644 --- a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs @@ -5,6 +5,7 @@ using BBWY.Client.Models; using BBWY.Client.Models.PackTask; using BBWY.Client.Views.Order; using BBWY.Client.Views.PackTask; +using BBWY.Common.Extensions; using BBWY.Common.Models; using BBWY.Controls; using GalaSoft.MvvmLight.Command; @@ -72,16 +73,19 @@ namespace BBWY.Client.ViewModels.PackTask public ICommand BatchCheckedCommand { get; set; } - - + //public IList departmentList; + //ShopService shopService; public PackTaskTotalViewModel(PackTaskService packTaskService) { this.packTaskService = packTaskService; - - SearchTaskTotalCommand = new RelayCommand(SearchTaskTotal); + //this.shopService = shopService; + SearchTaskTotalCommand = new RelayCommand(() => + { + SearchTask(1); + }); StartDate = DateTime.Now; - EndDate = DateTime.Now; + EndDate = DateTime.Now; SetSearchDateCommand = new RelayCommand(d => { @@ -102,6 +106,24 @@ namespace BBWY.Client.ViewModels.PackTask ExportCommand = new RelayCommand(Export); SearchTaskTotal(); + + //LoadShopList(); + } + + private void LoadShopList() + { + + //departmentList=new List(); + //var response = shopService.GetDepartmentList(); + //if (!response.Success) + // throw new Exception(response.Msg); + //departmentList = response.Data.Map>(); + + + //var shopList = new List(); + //foreach (var d in departmentList) + // shopList.AddRange(d.ShopList); + } private void Export() diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index 95e90778..da3edc92 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -127,6 +127,11 @@ namespace BBWY.Client.ViewModels.PackTask public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, ProductService productService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateServiceService) { + this.globalContext = globalContext; + this.productService = productService; + this.consumableService = consumableService; + this.workProcessService = workProcessService; + this.increateServiceService = increateServiceService; this.packTaskService = packTaskService; //TaskState = BBWY.Client.Models. TaskState.全部; PackTaskList = new ObservableCollection();//初始化数据 @@ -144,35 +149,28 @@ namespace BBWY.Client.ViewModels.PackTask }); OpenSkuDetailCommand = new RelayCommand(OpenSkuDetail); - CopyTextCommand = new RelayCommand(s => - { - try - { - Clipboard.SetText(s.ToString()); - } - catch (Exception ex) - { - Console.ForegroundColor = ConsoleColor.Red; - Console.WriteLine(ex); - Console.ResetColor(); - } - }); + DeletedTaskCommand = new RelayCommand(DeletedTask); StartTime = DateTime.Now.Date; EndTime = DateTime.Now.Date; IsLoading = false; - - //加载数据 SetTaskState(Models.TaskState.全部); - this.globalContext = globalContext; - this.productService = productService; - this.consumableService = consumableService; - this.workProcessService = workProcessService; - this.increateServiceService = increateServiceService; + } - + + private void DeletedTask(object obj) + { + + MessageBoxResult result = MessageBox.Show("确定删除?", "提示", + MessageBoxButton.YesNo, + MessageBoxImage.Warning); + long taskId = (long)obj; + if (result != MessageBoxResult.Yes) return; + packTaskService.DeletedTask(taskId); + Task.Factory.StartNew(() => SearchTaskList()); + } private void IsLoadCount() @@ -227,11 +225,11 @@ namespace BBWY.Client.ViewModels.PackTask /// public ICommand OpenSkuDetailCommand { get; set; } + /// - /// 复制 + /// 删除任务 /// - public ICommand CopyTextCommand { get; set; } - + public ICommand DeletedTaskCommand { get; set; } public void SetTaskState(TaskState? taskState) { @@ -293,7 +291,7 @@ namespace BBWY.Client.ViewModels.PackTask foreach (var item in dataModel.Items) { - var data = new PackTaskModel(packTaskService, consumableService, workProcessService, increateServiceService) + var data = new PackTaskModel() { Brand = item.Brand, SkuId = item.SkuId, @@ -322,10 +320,7 @@ namespace BBWY.Client.ViewModels.PackTask TaskId = item.TaskId, TaskStatus = (TaskStateType)item.TaskStatus, EndTime = item.CreateTime, - IsWorry = (Worry)item.IsWorry - - - + IsWorry = (Worry)item.IsWorry, }; if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0) { diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 343b6380..05ef70d4 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -190,14 +190,6 @@ namespace BBWY.Client.ViewModels.PackTask this.productService = productService; this.batchPurchaseService = batchPurchaseService; } - - - - - - - - #region 事件绑定 public ICommand SetTaskStatusCommand { get; set; } @@ -241,7 +233,7 @@ namespace BBWY.Client.ViewModels.PackTask string orderId=(string)objList[1]; ///修改完成 var model = packTaskService.UpdateTaskStatus(taskId, 1,orderId); - if (model != null && model.Success&&!string.IsNullOrEmpty(orderId)) + if (model != null && model.Success) SearchTaskList(); } @@ -297,7 +289,7 @@ namespace BBWY.Client.ViewModels.PackTask OrderCount = dataModel.TotalCount; foreach (var item in dataModel.Items) { - var data = new PackTaskModel(packTaskService, consumableService, workProcessService, increateServiceService) + var data = new PackTaskModel() { AcceptName = item.UserName, Availability = (TaskState)item.Availability, @@ -326,9 +318,8 @@ namespace BBWY.Client.ViewModels.PackTask EndTime = item.CreateTime, OrderId= item.OrderId, SkuId = item.SkuId, + SkuName = item.SkuName, - - }; if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0) { @@ -420,14 +411,5 @@ namespace BBWY.Client.ViewModels.PackTask #endregion - - - - - - - - - } } diff --git a/BBWY.Client/Views/PackTask/PackTaskTotal.xaml b/BBWY.Client/Views/PackTask/PackTaskTotal.xaml index f42e6ae6..ad9ac1aa 100644 --- a/BBWY.Client/Views/PackTask/PackTaskTotal.xaml +++ b/BBWY.Client/Views/PackTask/PackTaskTotal.xaml @@ -24,6 +24,12 @@ + + + + + + @@ -31,7 +37,6 @@ - @@ -52,11 +57,11 @@ - + - + - + >(data); + //创建一个ListBoxIem + if (res.Success) + { + if (res.Data != null && res.Data.Length > 0) + { + foreach (var department in res.Data) + { + if (!departments.Contains(department.DePartmentName)) + { + departments.Add(department.DePartmentName); + } + + + + } + } + } + + } + public string QKApiHost { get; set; } + public void SelectionChangeCommand(object sender, SelectionChangedEventArgs e) + { + try + { + var list = (ListBox)sender; + if (list.Items.Count <= 0) + { + return; + } + var value = (ListBoxItem)list.SelectedValue; + var content = (Label)value.Content; + tbDepartment.Text = content.Content.ToString(); + tipBoxDepartment.Visibility = Visibility.Collapsed; + } + catch (Exception) + { + + + } + + } + + + List departments = new List(); + + private void tb_TextChanged(object sender, TextChangedEventArgs e) + { + try + { + var textBoxt = (System.Windows.Controls.TextBox)sender; + //创建一个ListBox + + if (tipBoxDepartment != null && tipBoxDepartment.Items.Count > 0) + { + tipBoxDepartment.Items.Clear(); + + } + + if (departments.Count <= 0) + return; + + if (string.IsNullOrEmpty(textBoxt.Text)) + { + tipBoxDepartment.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; + tipBoxDepartment.Items.Add(item); + } + + } + + tipBoxDepartment.Visibility = Visibility.Visible; + } + catch (Exception) + { + + + } + } } } diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml index dd5a2ec2..84ee9353 100644 --- a/BBWY.Client/Views/PackTask/TaskListControl.xaml +++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml @@ -120,7 +120,7 @@ - diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml index 1182b986..e4e4be88 100644 --- a/BBWY.Client/Views/PackTask/WareHouseList.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml @@ -59,8 +59,6 @@ - - diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs b/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs index 345bbc59..22385b47 100644 --- a/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs +++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs @@ -32,14 +32,39 @@ namespace BBWY.Client.Views.PackTask public WareHouseList() { InitializeComponent(); - var applicationPath = System.IO. Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + + this.Loaded += Load; + } + + private void Load(object sender, RoutedEventArgs e) + { + var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); var builder = new ConfigurationBuilder().SetBasePath(applicationPath).AddJsonFile("BBWYAppSettings.json", false, true); - var Configuration = builder.Build(); - + var Configuration = builder.Build(); + QKApiHost = Configuration.GetSection("QKApiHost").Value; + 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); + } + } + } + } } - string QKApiHost = ""; + public string QKApiHost {get;set;} public void SelectionChangeCommand(object sender, SelectionChangedEventArgs e) { try @@ -57,12 +82,12 @@ namespace BBWY.Client.Views.PackTask catch (Exception) { - + } - + } - - + + List departments = new List(); private void tb_TextChanged(object sender, TextChangedEventArgs e) @@ -78,7 +103,7 @@ namespace BBWY.Client.Views.PackTask } - if (departments.Count<=0) + if (departments.Count <= 0) { HttpClientHelper helper = new HttpClientHelper(QKApiHost); @@ -98,8 +123,6 @@ namespace BBWY.Client.Views.PackTask departments.Add(department.DePartmentName); } - - } } } @@ -120,7 +143,7 @@ namespace BBWY.Client.Views.PackTask item.Content = lb; tipBox.Items.Add(item); } - + } tipBox.Visibility = Visibility.Visible; @@ -128,9 +151,9 @@ namespace BBWY.Client.Views.PackTask catch (Exception) { - + } - + } } }