From 3f7054e31f5ab6fc5f8849caeeec5cd6c1ae4ce2 Mon Sep 17 00:00:00 2001
From: CaesarBao <baogq@mesnac.com>
Date: Tue, 3 Jun 2025 11:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E9=98=B2?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WPF/MainWindow.xaml                 |  2 +-
 SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml  |  4 ++--
 .../IndexPage/ChangeTypeViewModel.cs          | 19 ++++++++++++++++++-
 SlnMesnac.WPF/appsettings.json                |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml
index 323f37e..9c09c0b 100644
--- a/SlnMesnac.WPF/MainWindow.xaml
+++ b/SlnMesnac.WPF/MainWindow.xaml
@@ -66,7 +66,7 @@
                         <Button Content="最小化" x:Name="Minimized"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
                         <Button Content="退  出" x:Name="Exit"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>
                         <Button Content="型号切换"   x:Name="ChangeType"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=ChangeType}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
-                        <Button Content="代码生成" Visibility="Visible"  x:Name="Generate"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Generate}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
+                        <Button Content="代码生成" Visibility="Hidden"  x:Name="Generate"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Generate}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
 
                     </StackPanel>
 
diff --git a/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml b/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml
index d902f62..ef381a2 100644
--- a/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml
+++ b/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml
@@ -123,7 +123,7 @@
 
                     </UniformGrid>
                     <UniformGrid Grid.Row="2">
-                        <DataGrid x:Name="listDataGrid1"  Grid.Row="0" ItemsSource="{Binding ChangeTypePanel}" Background="#00000000" 
+                        <DataGrid x:Name="listDataGrid1"  Grid.Row="0" ItemsSource="{Binding ChangeTypePanel2}" Background="#00000000" 
                        ColumnHeaderHeight="35"   Height="{Binding Path=ActualHeight, ElementName=ScanPanel}" 
                       RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"  FontSize="20"
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" 
@@ -135,7 +135,7 @@
                                 <DataGridTemplateColumn Header="操作" Width="1.5*">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
-                                            <Button Content="切换" Height="40" Width="100"  Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                            <Button Content="切换" Height="40" Width="100"  Command="{Binding DataContext.UpdateCommand1, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
                     CommandParameter="{Binding dictLabel}"/>
                                         </DataTemplate>
                                     </DataGridTemplateColumn.CellTemplate>
diff --git a/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs
index 872bb68..e1ca6c3 100644
--- a/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs
@@ -23,6 +23,7 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
         public ChangeTypeViewModel()
         {
             UpdateCommand = new RelayCommand<object>(t => Update(t));
+            UpdateCommand1 = new RelayCommand<object>(t => Update1(t));
             _dataService = App.ServiceProvider.GetService<Isys_dict_dataService>();
             ProductType = _appSettings.ReadAppSettings("ChangeTypeConfig:ProductType");
             try
@@ -46,18 +47,26 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
         {
             string materialType = parameter as string;
             ProductType = materialType;
+
             _appSettings.WriteAppSettings("ChangeTypeConfig", "ProductType", ProductType);
         }
-
+        private void Update1(object parameter)
+        {
+            string materialType = parameter as string;
+            KTProductType = materialType;
+            _appSettings.WriteAppSettings("ChangeTypeConfig", "KTProductType", KTProductType);
+        }
         private async void LoadDataAsync()
         {
            List<sys_dict_data> sys_Dict_Datas = await _dataService.GetProductType();
             if (sys_Dict_Datas != null && sys_Dict_Datas.Count > 0)
             {
                 ChangeTypePanel.Clear();
+                ChangeTypePanel2.Clear();
                 foreach (var item in sys_Dict_Datas)
                 {
                     ChangeTypePanel.Add(item);
+                    ChangeTypePanel2.Add(item);
                 }
             }
         }
@@ -65,6 +74,7 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
         /// 
         /// </summary>
         public RelayCommand<object> UpdateCommand { get; set; }
+        public RelayCommand<object> UpdateCommand1 { get; set; }
         private string _ProductType;
         public string ProductType
         {
@@ -96,5 +106,12 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
             get => _ChangeTypePanel;
             set => SetProperty(ref _ChangeTypePanel, value);
         }
+
+        private ObservableCollection<sys_dict_data> _ChangeTypePanel2 = new ObservableCollection<sys_dict_data>();
+        public ObservableCollection<sys_dict_data> ChangeTypePanel2
+        {
+            get => _ChangeTypePanel2;
+            set => SetProperty(ref _ChangeTypePanel2, value);
+        }
     }
 }
diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json
index 5c6dcef..1190500 100644
--- a/SlnMesnac.WPF/appsettings.json
+++ b/SlnMesnac.WPF/appsettings.json
@@ -81,6 +81,6 @@
   "ChangeTypeConfig": {
     "ProductType": "E34F",
     "KTProductType": "E34F",
-    "OpenFlag": "0"
+    "OpenFlag": "1"
   }
 }