From 7f9b979882ded8b7ede4ae146cc494841ecd3dc5 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 8 Jun 2022 18:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=BA=97=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/ViewModels/BaseVM.cs              |  9 +++++--
 BBWY.Client/ViewModels/MainViewModel.cs       | 24 +++++++++++++++++--
 .../ViewModels/Order/OrderListViewModel.cs    | 17 +++++++++++++
 BBWY.Client/ViewModels/ViewModelLocator.cs    | 11 +++++++++
 .../ViewModels/Ware/WareManagerViewModel.cs   |  7 ++++++
 .../ViewModels/Ware/WareStockViewModel.cs     |  6 +++++
 BBWY.Client/Views/MainWindow.xaml             |  8 +++++--
 BBWY.Client/Views/SelectShop.xaml             |  3 ++-
 BBWY.Client/Views/SelectShop.xaml.cs          | 17 +++++++++++++
 .../Statistics/StatisticsBusiness.cs          |  1 -
 10 files changed, 95 insertions(+), 8 deletions(-)

diff --git a/BBWY.Client/ViewModels/BaseVM.cs b/BBWY.Client/ViewModels/BaseVM.cs
index 13d7ef43..a657101c 100644
--- a/BBWY.Client/ViewModels/BaseVM.cs
+++ b/BBWY.Client/ViewModels/BaseVM.cs
@@ -19,14 +19,19 @@ namespace BBWY.Client.ViewModels
             UnloadCommand = new RelayCommand(Unload);
         }
 
+        public virtual void Refresh()
+        {
+
+        }
+
         protected virtual void Load()
         {
 
         }
 
         protected virtual void Unload()
-        { 
-            
+        {
+
         }
     }
 }
diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs
index e2b6e278..0aec0822 100644
--- a/BBWY.Client/ViewModels/MainViewModel.cs
+++ b/BBWY.Client/ViewModels/MainViewModel.cs
@@ -72,7 +72,9 @@ namespace BBWY.Client.ViewModels
         #region Commands
         public ICommand ClosingCommand { get; set; }
 
-        public ICommand ChooseShopCommand { get; set; }
+        //public ICommand ChooseShopCommand { get; set; }
+
+        public ICommand OpenSelectShopCommand { get; set; }
         #endregion
 
         #region Methods
@@ -82,7 +84,8 @@ namespace BBWY.Client.ViewModels
             this.mdsApiService = mdsApiService;
             this.logisticsService = logisticsService;
             ClosingCommand = new RelayCommand<System.ComponentModel.CancelEventArgs>(Exit);
-            ChooseShopCommand = new RelayCommand<Shop>((s) => ChooseShop(s));
+            //ChooseShopCommand = new RelayCommand<Shop>((s) => ChooseShop(s));
+            OpenSelectShopCommand = new RelayCommand(OpenSelectShop);
             this.GlobalContext = globalContext;
             ShopList = new ObservableCollection<Shop>();
             MenuList = new ObservableCollection<MenuModel>()
@@ -240,6 +243,23 @@ namespace BBWY.Client.ViewModels
             }
         }
 
+        private void OpenSelectShop()
+        {
+            var selectShop = new SelectShop(GlobalContext.User.DepartmentList);
+            if (selectShop.ShowDialog() == true)
+            {
+                ChooseShop(selectShop.Shop, true);
+                var vm = App.Current.Resources["Locator"] as ViewModelLocator;
+                if (vm.IsCreateOrderList)
+                    vm.OrderList.Refresh();
+                if (vm.IsCreateWareManager)
+                    vm.WareManager.Refresh();
+                if (vm.IsCreateWareStock)
+                    vm.WareStock.Refresh();
+            }
+
+        }
+
         private void ChooseShop(Shop shop, bool _throw = false)
         {
             if (shop.ShopId == 0 ||
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 046cd39d..a1ed0c19 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -156,6 +156,23 @@ namespace BBWY.Client.ViewModels
             SearchOrderCommand.Execute(null);
         }
 
+        public override void Refresh()
+        {
+            OrderList.Clear();
+            if (ToDayOrderAchievement != null)
+            {
+                ToDayOrderAchievement.AdvCost = 0M;
+                ToDayOrderAchievement.DeliveryExpressFreight = 0M;
+                ToDayOrderAchievement.OrderCount = 0;
+                ToDayOrderAchievement.Profit = 0;
+                ToDayOrderAchievement.PurchaseAmount = 0;
+                ToDayOrderAchievement.SaleAmount = 0;
+                ToDayOrderAchievement.SaleAmount = 0M;
+            }
+            PageIndex = 1;
+            OrderCount = 0;
+        }
+
         public void SetOrderState(OrderState? orderState)
         {
             this.OrderState = orderState;
diff --git a/BBWY.Client/ViewModels/ViewModelLocator.cs b/BBWY.Client/ViewModels/ViewModelLocator.cs
index 83cd48e3..3be03b25 100644
--- a/BBWY.Client/ViewModels/ViewModelLocator.cs
+++ b/BBWY.Client/ViewModels/ViewModelLocator.cs
@@ -7,6 +7,14 @@ namespace BBWY.Client.ViewModels
     {
         private IServiceProvider sp;
 
+        public bool IsCreateWareManager { get; private set; }
+
+        public bool IsCreateWareStock { get; private set; }
+
+        public bool IsCreateOrderList { get; private set; }
+
+
+
         public ViewModelLocator()
         {
             sp = (App.Current as App).ServiceProvider;
@@ -27,6 +35,7 @@ namespace BBWY.Client.ViewModels
         {
             get
             {
+                IsCreateWareManager = true;
                 using (var s = sp.CreateScope())
                 {
                     return s.ServiceProvider.GetRequiredService<WareManagerViewModel>();
@@ -38,6 +47,7 @@ namespace BBWY.Client.ViewModels
         {
             get
             {
+                IsCreateWareStock = true;
                 using (var s = sp.CreateScope())
                 {
                     return s.ServiceProvider.GetRequiredService<WareStockViewModel>();
@@ -60,6 +70,7 @@ namespace BBWY.Client.ViewModels
         {
             get
             {
+                IsCreateOrderList = true;
                 using (var s = sp.CreateScope())
                 {
                     return s.ServiceProvider.GetRequiredService<OrderListViewModel>();
diff --git a/BBWY.Client/ViewModels/Ware/WareManagerViewModel.cs b/BBWY.Client/ViewModels/Ware/WareManagerViewModel.cs
index 33045492..8d53fb1d 100644
--- a/BBWY.Client/ViewModels/Ware/WareManagerViewModel.cs
+++ b/BBWY.Client/ViewModels/Ware/WareManagerViewModel.cs
@@ -73,6 +73,13 @@ namespace BBWY.Client.ViewModels
             Task.Factory.StartNew(() => LoadWare(1));
         }
 
+        public override void Refresh()
+        {
+            this.ProductList.Clear();
+            this.ProductCount = 0;
+            PageIndex = 1;
+        }
+
         protected override void Load()
         {
             Console.WriteLine($"{VMId} {DateTime.Now}");
diff --git a/BBWY.Client/ViewModels/Ware/WareStockViewModel.cs b/BBWY.Client/ViewModels/Ware/WareStockViewModel.cs
index b37031b8..fc648a84 100644
--- a/BBWY.Client/ViewModels/Ware/WareStockViewModel.cs
+++ b/BBWY.Client/ViewModels/Ware/WareStockViewModel.cs
@@ -77,6 +77,12 @@ namespace BBWY.Client.ViewModels
             Task.Factory.StartNew(() => LoadWare(1));
         }
 
+        public override void Refresh()
+        {
+            ProductList.Clear();
+            ProductCount = 0;
+            PageSize = 1;
+        }
         private void LoadWare(int pageIndex)
         {
             if (!string.IsNullOrEmpty(SearchSpu) && !string.IsNullOrEmpty(SearchSku))
diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml
index 3cbac7b1..2d1bb93f 100644
--- a/BBWY.Client/Views/MainWindow.xaml
+++ b/BBWY.Client/Views/MainWindow.xaml
@@ -68,11 +68,15 @@
                 </ListBox.ItemTemplate>
             </ListBox>
 
+            <c:BButton Content="切换店铺" VerticalAlignment="Bottom" HorizontalAlignment="Left" Style="{StaticResource LinkButton}" Panel.ZIndex="1" Margin="5,0,0,5"
+                       Visibility="{Binding ShowShopChoosePanel,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+                       Command="{Binding OpenSelectShopCommand}"/>
+
             <Frame x:Name="frame" Navigated="frame_Navigated" NavigationUIVisibility="Hidden"
                    Source="{Binding SelectedMenuModel.Url}"
                    Grid.Column="1"/>
 
-            <Grid Grid.ColumnSpan="2" Background="{StaticResource Border.Background}"
+            <!--<Grid Grid.ColumnSpan="2" Background="{StaticResource Border.Background}"
                   Visibility="{Binding ShowShopChoosePanel,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Grid.RowDefinitions>
@@ -99,7 +103,7 @@
                     </ListBox>
                 </Grid>
 
-            </Grid>
+            </Grid>-->
 
             <Grid Grid.ColumnSpan="2" Background="{StaticResource Border.Background}"
                   Visibility="{Binding ShowWB2RuntimeDownloadPanel,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
diff --git a/BBWY.Client/Views/SelectShop.xaml b/BBWY.Client/Views/SelectShop.xaml
index b54bf15a..123e12a5 100644
--- a/BBWY.Client/Views/SelectShop.xaml
+++ b/BBWY.Client/Views/SelectShop.xaml
@@ -39,7 +39,8 @@
                       DisplayMemberPath="Name"
                       Width="150" Height="25" 
                       HorizontalAlignment="Left" VerticalContentAlignment="Center"
-                      Grid.Column="1" Margin="5,5,0,5"/>
+                      Grid.Column="1" Margin="5,5,0,5"
+                      SelectionChanged="cbx_department_SelectionChanged"/>
 
             <TextBlock Text="店铺" HorizontalAlignment="Right" Grid.Row="1" VerticalAlignment="Center" />
             <ComboBox x:Name="cbx_shop" Width="150" Height="25"  
diff --git a/BBWY.Client/Views/SelectShop.xaml.cs b/BBWY.Client/Views/SelectShop.xaml.cs
index a22b6233..556917bb 100644
--- a/BBWY.Client/Views/SelectShop.xaml.cs
+++ b/BBWY.Client/Views/SelectShop.xaml.cs
@@ -26,11 +26,28 @@ namespace BBWY.Client.Views
         {
             InitializeComponent();
             this.DepartmentList = departmentList;
+            this.Loaded += SelectShop_Loaded;
+            Shop = currentShop;
+        }
+
+        private void SelectShop_Loaded(object sender, RoutedEventArgs e)
+        {
+            var d = cbx_department.SelectedItem as Department2;
+            cbx_shop.ItemsSource = d.ShopList;
+
         }
 
         private void btn_ok_Click(object sender, RoutedEventArgs e)
         {
+            Shop = cbx_shop.SelectedItem as Shop;
+            this.DialogResult = true;
+            this.Close();
+        }
 
+        private void cbx_department_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var d = cbx_department.SelectedItem as Department2;
+            cbx_shop.ItemsSource = d.ShopList;
         }
     }
 }
diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
index 711aceca..22538288 100644
--- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
+++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
@@ -3,7 +3,6 @@ using BBWY.Server.Model;
 using BBWY.Server.Model.Db;
 using BBWY.Server.Model.Db.Mds;
 using BBWY.Server.Model.Dto;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Yitter.IdGenerator;