diff --git a/BBWY.Client/APIServices/PackTaskService.cs b/BBWY.Client/APIServices/PackTaskService.cs index 3eab3eed..cde370c8 100644 --- a/BBWY.Client/APIServices/PackTaskService.cs +++ b/BBWY.Client/APIServices/PackTaskService.cs @@ -49,7 +49,7 @@ namespace BBWY.Client.APIServices ShopId = globalContext.User.Shop.ShopId.ToString() }, null, HttpMethod.Post); } - public ApiResponse GetWareHouseList(int? IsWorry=null,string departmentName = null, string skuId = null, string taskId = null, + public ApiResponse GetWareHouseList(int? isWorry=null,string departmentName = null, string skuId = null, string taskId = null, DateTime? startTime = null, DateTime? endTime = null, TaskState? availability = null, @@ -61,7 +61,7 @@ namespace BBWY.Client.APIServices { return SendRequest(globalContext.QKApiHost, "api/PackTask/GetPackTaskList", new { - IsWorry=IsWorry, + IsWorry=isWorry, DepartmentName = departmentName, SkuId = skuId, TaskId = taskId, diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 4b11de8a..11b9782b 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -1,5 +1,6 @@ using BBWY.Client.Models; using BBWY.Client.ViewModels; +using BBWY.Client.ViewModels.PackTask; using BBWY.Common.Extensions; using BBWY.Common.Http; using BBWY.Common.Models; @@ -56,10 +57,10 @@ namespace BBWY.Client //} #if DEBUG //仓库组测试 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek"; + // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek"; //齐越山鸡 - // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; //刷单组测试 //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs"; @@ -111,6 +112,7 @@ namespace BBWY.Client IServiceCollection serviceCollection = new ServiceCollection(); serviceCollection.AddHttpClient(); + serviceCollection.AddTransient(); serviceCollection.AddHttpClient("gzip").ConfigurePrimaryHttpMessageHandler(handler => new HttpClientHandler() { AutomaticDecompression = System.Net.DecompressionMethods.GZip diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index e1b3dcff..9622efaf 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -4,6 +4,6 @@ "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", - "QKApiHost": "http://localhost:8080" - //"QKApiHost": "http://qiku.qiyue666.com" + //"QKApiHost": "http://localhost:8080" + "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index 8ecb804e..70bc9fdc 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -60,7 +60,8 @@ namespace BBWY.Client.Models private void SetService() { //加载数据 - ServiceWindow service = new ServiceWindow(packTaskService, TaskId, SkuCount, consumableService, workProcessService, increateServiceService);//设置 + + ServiceWindow service = new ServiceWindow(packTaskService, TaskId, SkuCount, consumableService, workProcessService, increateServiceService);//设置 service.model.SetAllFees = new Action>((feesItem, packUsers) => { FeesItemResponse = feesItem; diff --git a/BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs b/BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs index 945d7cda..cda054a4 100644 --- a/BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs @@ -20,7 +20,7 @@ namespace BBWY.Client.ViewModels.PackTask { - + private bool isOpenAdd = true; public bool IsOpenAdd { get => isOpenAdd; set { Set(ref isOpenAdd, value); } } @@ -57,15 +57,15 @@ namespace BBWY.Client.ViewModels.PackTask - // public Action ReflashDatas { get; set; } - + // public Action ReflashDatas { get; set; } + public ConsumableViewModel(ConsumableService consumableService) { - + this.consumableService = consumableService; ConsumableModel = new ConsumableModel(consumableService); - // ConsumableModel.ReflashDatas = ReflashDatas; + // ConsumableModel.ReflashDatas = ReflashDatas; ConsumableList = new ObservableCollection(); AddConsumableCommand = new RelayCommand(AddConsumable); SearchConsumableCommand = new RelayCommand(SearchConsumable); @@ -129,16 +129,20 @@ namespace BBWY.Client.ViewModels.PackTask { //ConsumableModel = new ConsumableModel(consumableService); //IsOpenAdd = true; - var model = new ConsumableModel(consumableService) { //ReflashDatas = ReflashDatas - }; - model.ReflashDatas = new Action(() => { + var model = new ConsumableModel(consumableService) + { //ReflashDatas = ReflashDatas + + }; + + model.ReflashDatas = new Action(() => + { SearchConsumable(); - Messenger.Default.Send(true, "ReflashList"); + Messenger.Default.Send(true); }); - - EditConsumable add = new EditConsumable(model); + + EditConsumable add = new EditConsumable(model); add.ShowDialog(); - + } } } diff --git a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs index 0a8c7add..400372e9 100644 --- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs @@ -7,6 +7,7 @@ using BBWY.Client.Views.PackTask; using BBWY.Common.Models; using BBWY.Common.Trigger; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using NPOI.Util; using Org.BouncyCastle.Asn1.Crmf; using System; @@ -14,14 +15,18 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Data; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; +using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Input; +using System.Windows.Media.TextFormatting; +using System.Windows.Navigation; namespace BBWY.Client.ViewModels.PackTask { - public class CreatePackTaskViewModel : BaseVM, IDenpendency + public class CreatePackTaskViewModel : BaseVM { private bool isLoading = false; public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } @@ -341,11 +346,48 @@ namespace BBWY.Client.ViewModels.PackTask + public void InitData() + { + + Logo = string.Empty; + SearchSkuId = ""; + SkuId = ""; + SkuCount = 0; + SkuName = string.Empty; + ProductNo= string.Empty; + Brand =string.Empty; + brandName = string.Empty; + this.MarkMessage = ""; + IsSetBarCode = true; + IsSetCertificate =true; + BarCodeModel = null; + CertificateModel = null; + SkuTitle= string.Empty; + GoodsNumber = 0; + string[] increates = new string[] { "气泡纸", "气泡袋", "POP袋", "折纸箱", "气泡纸封边", "彩盒", "剪胶", "剪彩带", "快递袋", "收纳盒", "纸箱子", "装纸箱", "封边", "胶带", "折彩盒" }; + IncreateList = new ObservableCollection(); + foreach (var item in increates) + { + IncreateList.Add(new IncreateModel + { + IncreateName = item, + IsSelected = false + }); + } + } + public CreatePackTaskViewModel(PackTaskService packTaskService, GlobalContext globalContext, ProductService productService) { + Messenger.Default.Register(this, "InitData", message => { + + InitData(); + }); + //RaisePropertyChanged(string.Empty); + //this.RaisePropertyChanged(nameof(CreatePackTaskViewModel)); + this.productService = productService; this.packTaskService = packTaskService; - + AccepUserId = globalContext.User.Id.ToString(); IsSetBarCode = true; @@ -367,7 +409,11 @@ namespace BBWY.Client.ViewModels.PackTask //查询sku - SearchSkuCommand = new RelayCommand(SearchSku); + SearchSkuCommand = new RelayCommand(() => + { + Task.Factory.StartNew(() => { SearchSku(); }); + + }); CreateTaskCommand = new RelayCommand(CreateTask); this.globalContext = globalContext; SetBarCodeCommand = new RelayCommand(SetBarCode); @@ -411,7 +457,7 @@ namespace BBWY.Client.ViewModels.PackTask if (!string.IsNullOrEmpty(key.Trim())) { keyWordShopList = keyWordShopList.Where(s => s.IncreateName.Contains(key)).ToList(); - + } if (keyWordShopList.Count() > 0) { @@ -603,22 +649,22 @@ namespace BBWY.Client.ViewModels.PackTask /// /// 发布任务 /// - public void CreateTask( object obj) + public void CreateTask(object obj) { - - if (string.IsNullOrEmpty( SkuId)) + + if (string.IsNullOrEmpty(SkuId)) { new TipsWindow("请先搜索SkuId!").ShowDialog(); return; } string increateStr = ""; - var increates =IncreateList.Where(i => i.IsSelected).Select(i => i.IncreateName); - if (increates!=null&& increates.Count()>0) + var increates = IncreateList.Where(i => i.IsSelected).Select(i => i.IncreateName); + if (increates != null && increates.Count() > 0) { increateStr = string.Join(",", increates); } - + var createTaskModel = new Models.APIModel.Request.CreateTaskRequest { @@ -642,7 +688,7 @@ namespace BBWY.Client.ViewModels.PackTask }; if (IsNeedBarCode == "需要") { - if (BarCodeModel==null|| BarCodeModel.Id <= 0) + if (BarCodeModel == null || BarCodeModel.Id <= 0) { new TipsWindow("请设置条形码模板").ShowDialog(); return; @@ -651,7 +697,7 @@ namespace BBWY.Client.ViewModels.PackTask } if (IsNeedCertificateModel == "需要") { - if (CertificateModel==null|| CertificateModel.Id <= 0) + if (CertificateModel == null || CertificateModel.Id <= 0) { new TipsWindow("请设置合格证模板").ShowDialog(); return; @@ -679,6 +725,11 @@ namespace BBWY.Client.ViewModels.PackTask /// public void SearchSku() { + + + + + IsLoading = true; SkuId = searchSkuId; ApiResponse productApiResponse = null; diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index 5f8bec42..6917f92e 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -346,7 +346,8 @@ namespace BBWY.Client.ViewModels.PackTask /// public void CreateTask() { - CreatePackTask create = new CreatePackTask(packTaskService, globalContext, productService); + CreatePackTask create = new CreatePackTask(); + create.SendData(); create.Show(); } diff --git a/BBWY.Client/ViewModels/ViewModelLocator.cs b/BBWY.Client/ViewModels/ViewModelLocator.cs index 8b3e2d1f..0b9d7e8c 100644 --- a/BBWY.Client/ViewModels/ViewModelLocator.cs +++ b/BBWY.Client/ViewModels/ViewModelLocator.cs @@ -1,6 +1,9 @@ using BBWY.Client.ViewModels.PackTask; +using GalaSoft.MvvmLight.Ioc; using Microsoft.Extensions.DependencyInjection; using System; +using System.Windows.Navigation; +using static System.Formats.Asn1.AsnWriter; namespace BBWY.Client.ViewModels { @@ -16,13 +19,41 @@ namespace BBWY.Client.ViewModels - + public ViewModelLocator() { sp = (App.Current as App).ServiceProvider; } + + + + //public static PackServiceViewModel PackServiceViewModel => SimpleIoc.Default.GetInstance(); + + //public static PackServiceViewModel CreateNewPackServiceViewModel() + //{ + // SimpleIoc.Default.Unregister(); + // SimpleIoc.Default.Register(); + // return PackServiceViewModel; + //} + + + + + + + + + + + + + + + + + public MainViewModel Main { get @@ -113,7 +144,7 @@ namespace BBWY.Client.ViewModels } } } - + public PackServiceViewModel PackServiceList { @@ -143,7 +174,7 @@ namespace BBWY.Client.ViewModels { get { - + using (var s = sp.CreateScope()) { return s.ServiceProvider.GetRequiredService(); @@ -151,17 +182,38 @@ namespace BBWY.Client.ViewModels } } + + + + + + //CreatePackTaskViewModel viewModel = null; + public CreatePackTaskViewModel CreateTaskView { + + get - { + { + + // return sp.GetRequiredService(); + using (var s = sp.CreateScope()) { - return s.ServiceProvider.GetRequiredService(); + //if (viewModel == null) + // viewModel = s.ServiceProvider.GetRequiredService(); + + + + var viewModel = s.ServiceProvider.GetRequiredService(); + + //bool areSame = object.ReferenceEquals(viewModel, sp.GetRequiredService()); + + return viewModel; } } } - + public ChoosePurchaseSchemeViewModel ChoosePurchaseScheme { diff --git a/BBWY.Client/Views/PackTask/Consumable.xaml b/BBWY.Client/Views/PackTask/Consumable.xaml index 9ce61d20..747cc362 100644 --- a/BBWY.Client/Views/PackTask/Consumable.xaml +++ b/BBWY.Client/Views/PackTask/Consumable.xaml @@ -52,7 +52,7 @@ - @@ -155,8 +155,8 @@ - - + diff --git a/BBWY.Client/Views/PackTask/Consumable.xaml.cs b/BBWY.Client/Views/PackTask/Consumable.xaml.cs index 96a51ecd..cca20d92 100644 --- a/BBWY.Client/Views/PackTask/Consumable.xaml.cs +++ b/BBWY.Client/Views/PackTask/Consumable.xaml.cs @@ -48,21 +48,17 @@ namespace BBWY.Client.Views.PackTask QKApiHost = Configuration.GetSection("QKApiHost").Value; - Messenger.Default.Register(this, "ReFlashList", (x) => + + Messenger.Default.Register(this, message => { + GetList(); }); - this.Unloaded += BindingPurchaseProduct_Unloaded; - } - private void BindingPurchaseProduct_Unloaded(object sender, RoutedEventArgs e) - { - Messenger.Default.Unregister(this); + } - - string QKApiHost = ""; @@ -148,20 +144,21 @@ namespace BBWY.Client.Views.PackTask //创建一个ListBoxIem if (res.Success) { + if (res.Data != null && res.Data.Count() > 0) { + consumables = new List(); foreach (var department in res.Data) { if (!consumables.Contains(department.Name)) { consumables.Add(department.Name); } - - - } } } } } + + } diff --git a/BBWY.Client/Views/PackTask/CreatePackTask.xaml b/BBWY.Client/Views/PackTask/CreatePackTask.xaml index 8ddfe36b..eba1b829 100644 --- a/BBWY.Client/Views/PackTask/CreatePackTask.xaml +++ b/BBWY.Client/Views/PackTask/CreatePackTask.xaml @@ -11,14 +11,15 @@ xmlns:hc="https://handyorg.github.io/handycontrol" mc:Ignorable="d" xmlns:sys="clr-namespace:System;assembly=mscorlib" - CloseButtonVisibility="Visible" CloseButtonColor="{StaticResource WindowButtonColor}" + DataContext="{Binding CreateTaskView,Source={StaticResource Locator}}" MinButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed" RightButtonGroupMargin="0,5,5,0" Title="CreatePackTask" Height="350" Width="1500"> - + + @@ -306,8 +307,8 @@ - - + + @@ -318,9 +319,9 @@ - + - + diff --git a/BBWY.Client/Views/PackTask/CreatePackTask.xaml.cs b/BBWY.Client/Views/PackTask/CreatePackTask.xaml.cs index 957dafee..4d8f6808 100644 --- a/BBWY.Client/Views/PackTask/CreatePackTask.xaml.cs +++ b/BBWY.Client/Views/PackTask/CreatePackTask.xaml.cs @@ -1,7 +1,10 @@ using BBWY.Client.APIServices; +using BBWY.Client.ViewModels; using BBWY.Client.ViewModels.PackTask; using BBWY.Common.Models; using BBWY.Controls; +using GalaSoft.MvvmLight.Messaging; +using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; using System.Text; @@ -12,6 +15,7 @@ using System.Windows.Documents; using System.Windows.Input; using System.Windows.Media; using System.Windows.Media.Imaging; +using System.Windows.Navigation; using System.Windows.Shapes; namespace BBWY.Client.Views.PackTask @@ -22,12 +26,28 @@ namespace BBWY.Client.Views.PackTask public partial class CreatePackTask : BWindow,IDenpendency { - CreatePackTaskViewModel model = null; - public CreatePackTask(PackTaskService packTaskService,GlobalContext globalContext,ProductService productService) + //CreatePackTaskViewModel model = null;//PackTaskService packTaskService,GlobalContext globalContext,ProductService productService + public CreatePackTask() { InitializeComponent(); - model = new CreatePackTaskViewModel(packTaskService, globalContext, productService); - DataContext = model; + // ViewModelLocator vm = new ViewModelLocator(); + //this.DataContext = vm.CreateTaskView; + // vm.CreateTaskView.Refresh(); + + + //model = new CreatePackTaskViewModel(packTaskService, globalContext, productService); + //DataContext = model; } + + public void SendData() + { + Messenger.Default.Send(true,"InitData"); + } + + + + + + } } diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs b/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs index 8687f613..636f17d1 100644 --- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs +++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs @@ -1,4 +1,5 @@ using BBWY.Client.APIServices; +using BBWY.Client.ViewModels; using BBWY.Client.ViewModels.PackTask; using BBWY.Controls; using Org.BouncyCastle.Asn1.Ocsp; @@ -22,7 +23,6 @@ namespace BBWY.Client.Views.PackTask public partial class ServiceWindow : BWindow { - public PackServiceViewModel model { get; set; } public PackTaskService packTaskService; public ConsumableService consumableService; @@ -40,8 +40,15 @@ namespace BBWY.Client.Views.PackTask model.TaskId = taskId; model.TaskCount = taskCount; this.DataContext = model; - } + + //public PackServiceViewModel model { get; set; } + //public ServiceWindow() + //{ + // InitializeComponent(); + // model = ViewModelLocator.CreateNewPackServiceViewModel(); + // this.DataContext = model; + //} } } diff --git a/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs b/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs index 15ba6888..62a1137a 100644 --- a/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs +++ b/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs @@ -1,4 +1,5 @@ -using BBWY.Controls; +using BBWY.Client.Models; +using BBWY.Controls; using System; using System.Collections.Generic; using System.Text; @@ -18,9 +19,10 @@ namespace BBWY.Client.Views.PackTask /// public partial class SetBarCodeWindow : BWindow { - public SetBarCodeWindow() + public SetBarCodeWindow( ) { InitializeComponent(); + } } } diff --git a/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs b/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs index e4d987fd..5d378ca6 100644 --- a/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs +++ b/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs @@ -1,4 +1,6 @@ -using BBWY.Controls; +using BBWY.Client.Models; +using BBWY.Controls; +using Org.BouncyCastle.Ocsp; using System; using System.Collections.Generic; using System.Text; diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml index d53c7a88..ff0720e3 100644 --- a/BBWY.Client/Views/PackTask/TaskListControl.xaml +++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml @@ -104,7 +104,7 @@ - + - + diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml index d9209493..ad729ac6 100644 --- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml @@ -104,7 +104,7 @@ - +