From 0d7a1f976dc090684138c0963be9215ce557cd58 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Thu, 1 Jun 2023 16:25:17 +0800 Subject: [PATCH] 1 --- BBWYB.Client/App.xaml.cs | 1 + BBWYB.Client/GlobalContext.cs | 10 ++--- .../ViewModels/Order/OrderViewModel.cs | 24 ++++++---- .../UpdatePurchaseTaskViewModel.cs | 24 +++++++++- .../UpdatePurchaseTaskWindow.xaml.cs | 44 +++++++++++++++++-- BBWYB.Client/appsettings.json | 2 +- 6 files changed, 84 insertions(+), 21 deletions(-) diff --git a/BBWYB.Client/App.xaml.cs b/BBWYB.Client/App.xaml.cs index dcd5ecf..fed38fb 100644 --- a/BBWYB.Client/App.xaml.cs +++ b/BBWYB.Client/App.xaml.cs @@ -78,6 +78,7 @@ namespace BBWYB.Client serviceCollection.AddTransient(); serviceCollection.AddTransient(); serviceCollection.AddTransient(); + serviceCollection.AddTransient(); serviceCollection.AddMapper(new MappingProfile()); ServiceProvider = serviceCollection.BuildServiceProvider(); base.OnStartup(e); diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs index 78984da..a650f5f 100644 --- a/BBWYB.Client/GlobalContext.cs +++ b/BBWYB.Client/GlobalContext.cs @@ -96,14 +96,14 @@ namespace BBWYB.Client MessageBox.Show("打包任务,不存在或已被删除,请重新发起任务!"); return; } - UpdatePurchaseTaskWindow packTask = new(); + UpdatePurchaseTaskWindow packTask = new(res.Data, originShopName, orderSku); - ViewModelLocator view = new(); - var updatePackTask = view.UpdatePurchaseTask; - var show = updatePackTask.SearchSku(res.Data, originShopName, orderSku); + //ViewModelLocator view = new(); + //var updatePackTask = view.UpdatePurchaseTask; + //var show = updatePackTask.SearchSku(res.Data, originShopName, orderSku); - if (!show) return; + //if (!show) return; //updatePackTask.ReflashWindow = () => //{ diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs index 14d9661..aeafa0e 100644 --- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs +++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs @@ -130,21 +130,27 @@ namespace BBWYB.Client.ViewModels MessageBox.Show("打包任务,不存在或已被删除,请重新发起任务!"); return; } - UpdatePurchaseTaskWindow packTask = new(); + UpdatePurchaseTaskWindow packTask = new(res.Data, OriginShopName, order, () => + { + Task.Factory.StartNew(() => LoadOrder(PageIndex)); - ViewModelLocator view = new(); - var updatePackTask = view.UpdatePurchaseTask; - var show = updatePackTask.SearchSku(res.Data, OriginShopName, order); + }); - if (!show) return; + // packTask.SendToViewModel(res.Data, OriginShopName, order); + //ViewModelLocator view = new(); + //var updatePackTask = view.UpdatePurchaseTask; + //var show = updatePackTask.SearchSku(res.Data, OriginShopName, order); - updatePackTask.ReflashWindow = () => - { - Task.Factory.StartNew(() => LoadOrder(PageIndex)); + //if (!show) return; + + + //updatePackTask.ReflashWindow = () => + //{ + // Task.Factory.StartNew(() => LoadOrder(PageIndex)); - }; + //}; packTask.ShowDialog(); diff --git a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs index 3dd47de..04763d1 100644 --- a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs +++ b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs @@ -15,10 +15,12 @@ using BBWYB.Client.Models.PackPurchaseTask; using BBWYB.Client.Views.PackPurchaseTask; using BBWYB.Client.Models.APIModel; using BBWYB.Client.Models.APIModel.Response.PackPurchaseTask; +using BBWYB.Client.Views.PackPurchaseTaska; +using CommunityToolkit.Mvvm.Messaging; namespace BBWYB.Client.ViewModels { - public class UpdatePurchaseTaskViewModel : BaseVM, IDenpendency + public class UpdatePurchaseTaskViewModel : BaseVM { #region 属性 @@ -425,7 +427,7 @@ namespace BBWYB.Client.ViewModels /// public bool SearchSku(PackTaskResponse obj, string shopname, OrderSku order) { - InitData(); + //InitData(); MarkMessage = obj.MarkMessage; //SkuPurchaseSchemeId = "416647656341573"; @@ -537,6 +539,8 @@ namespace BBWYB.Client.ViewModels string[] increateDatas = config.Increment1?.Split(','); bool isSelected = false; + + IncreateList = new ObservableCollection(); foreach (var item in increates) { isSelected = false; @@ -624,6 +628,22 @@ namespace BBWYB.Client.ViewModels IsNeedBarCode = Need.需要; IsNeedCertificateModel = Need.不需要; + + + bool isSelected; + IncreateList = new ObservableCollection(); + foreach (var item in increates) + { + isSelected = false; + App.Current.Dispatcher.Invoke(() => + { + IncreateList.Add(new IncreateModel + { + IncreateName = item, + IsSelected = isSelected + }); + }); + } } private void OpenSkuDetail(object param) { diff --git a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs index 0dbd6bd..f5f0b1f 100644 --- a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs +++ b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs @@ -1,4 +1,11 @@ -using SJ.Controls; +using BBWYB.Client.Models; +using BBWYB.Client.Models.APIModel.Response.PackPurchaseTask; +using BBWYB.Client.ViewModels; +using BBWYB.Client.Views.Ware; +using BBWYB.Client.Views.WebB; +using CommunityToolkit.Mvvm.Messaging; +using CommunityToolkit.Mvvm.Messaging.Messages; +using SJ.Controls; using System; using System.Collections.Generic; using System.Linq; @@ -20,18 +27,47 @@ namespace BBWYB.Client.Views.PackPurchaseTaska /// public partial class UpdatePurchaseTaskWindow : BWindow { - public UpdatePurchaseTaskWindow() + public UpdatePurchaseTaskWindow(PackTaskResponse packTaskResponse, string shopname, OrderSku order, Action ReflashWindow=null) { InitializeComponent(); - this.Loaded += UpdatePurchaseTaskWindow_Loaded; + + var updatePackTask = (this.DataContext as UpdatePurchaseTaskViewModel); + var show = updatePackTask.SearchSku(packTaskResponse, shopname, order); + if (!show) this.Close(); + + if (ReflashWindow != null) + updatePackTask.ReflashWindow= ReflashWindow; + + //this.Loaded += UpdatePurchaseTaskWindow_Loaded; + //this.Unloaded += UpdatePurchaseTaskWindow_Unloaded; + } + private void UpdatePurchaseTaskWindow_Unloaded(object sender, RoutedEventArgs e) + { + WeakReferenceMessenger.Default.Unregister(this); } private void UpdatePurchaseTaskWindow_Loaded(object sender, RoutedEventArgs e) { - + + WeakReferenceMessenger.Default.Register(this, (o, r) => + { + this.DialogResult = r.Value; + this.Close(); + }); + } + + } + + public class Message_BindingUpdatePurchaseTaskClose : ValueChangedMessage + { + public Message_BindingUpdatePurchaseTaskClose(bool value) : base(value) + { } } + + + } diff --git a/BBWYB.Client/appsettings.json b/BBWYB.Client/appsettings.json index 61bc1a0..80bdfe4 100644 --- a/BBWYB.Client/appsettings.json +++ b/BBWYB.Client/appsettings.json @@ -1,5 +1,5 @@ { - //"BBWYApiHost": "http://localhost:5000", + // "BBWYApiHost": "http://localhost:5000", "BBWYApiHost": "http://bbwyb.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com", "BBWYCApiHost": "http://bbwytest.qiyue666.com",