1

BBWYB.Client/App.xaml.cs

@@ -78,6 +78,7 @@ namespace BBWYB.Client
             serviceCollection.AddTransient<ChoosePurchaseSchemeViewModel>();
             serviceCollection.AddTransient<OnlinePurchaseViewModel>();
             serviceCollection.AddTransient<EditPriceViewModel>();
+            serviceCollection.AddTransient<UpdatePurchaseTaskViewModel>();
             serviceCollection.AddMapper(new MappingProfile());
             ServiceProvider = serviceCollection.BuildServiceProvider();
             base.OnStartup(e);

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();
+            //ViewModelLocator view = new();
-            var updatePackTask = view.UpdatePurchaseTask;
+            //var updatePackTask = view.UpdatePurchaseTask;
-            var show = updatePackTask.SearchSku(res.Data, originShopName, orderSku);
+            //var show = updatePackTask.SearchSku(res.Data, originShopName, orderSku);
 
 
-            if (!show) return;
+            //if (!show) return;
 
             //updatePackTask.ReflashWindow = () =>
             //{

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 = () =>
+            //if (!show) return;
-            {
+
-                Task.Factory.StartNew(() => LoadOrder(PageIndex));
+
+            //updatePackTask.ReflashWindow = () =>
+            //{
+            //    Task.Factory.StartNew(() => LoadOrder(PageIndex));
 
-            };
+            //};
 
 
             packTask.ShowDialog();

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
         /// </summary>
         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<IncreateModel>();
                     foreach (var item in increates)
                     {
                         isSelected = false;
@@ -624,6 +628,22 @@ namespace BBWYB.Client.ViewModels
 
             IsNeedBarCode = Need.需要;
             IsNeedCertificateModel = Need.不需要;
+
+
+            bool isSelected;
+            IncreateList = new ObservableCollection<IncreateModel>();
+            foreach (var item in increates)
+            {
+                isSelected = false;
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    IncreateList.Add(new IncreateModel
+                    {
+                        IncreateName = item,
+                        IsSelected = isSelected
+                    });
+                });
+            }
         }
         private void OpenSkuDetail(object param)
         {

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
     /// </summary>
     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<Message_BindingUpdatePurchaseTaskClose>(this);
         }
 
         private void UpdatePurchaseTaskWindow_Loaded(object sender, RoutedEventArgs e)
         {
-         
+
+            WeakReferenceMessenger.Default.Register<Message_BindingUpdatePurchaseTaskClose>(this, (o, r) =>
+            {
+                this.DialogResult = r.Value;
+                this.Close();
+            });
+        }
+
       
 
+    }
+
 
+    public class Message_BindingUpdatePurchaseTaskClose : ValueChangedMessage<bool>
+    {
+        public Message_BindingUpdatePurchaseTaskClose(bool value) : base(value)
+        {
         }
     }
+
+
+
 }

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",