From a8dcd5bd9c04462633514e91cee4b9e39c20b806 Mon Sep 17 00:00:00 2001
From: "SINVO\\yangshunli" <yangshunli@sinvo.cn>
Date: Wed, 12 Feb 2025 10:15:34 +0800
Subject: [PATCH] =?UTF-8?q?105067=20=E7=82=B9=E5=87=BB=E9=83=A8=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E7=AE=A1=E8=84=9A=E8=83=BD=E8=BF=BD=E8=B8=AA=E5=88=B0?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E9=83=A8=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/ScanCableModel.cs                  | 20 ++++++++
 .../View/ScannerInfo.xaml                     | 48 ++++++++++++++-----
 .../View/ScannerInfo.xaml.cs                  | 47 ++++++++++++++++++
 .../ViewModel/ScannerViewModel.cs             |  8 ++--
 4 files changed, 107 insertions(+), 16 deletions(-)

diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/Models/ScanCableModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/Models/ScanCableModel.cs
index c3b3463..98ab154 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/Models/ScanCableModel.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/Models/ScanCableModel.cs
@@ -133,6 +133,26 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Models
                 OnPropertyChanged(nameof(E_part));
             }
         }
+        public string _s_PartID;
+        public string S_PartID
+        {
+            get => _s_PartID;
+            set
+            {
+                _s_PartID = value;
+                OnPropertyChanged(nameof(S_PartID));
+            }
+        }
+        private string _e_PartID;
+        public string E_PartID
+        {
+            get => _e_PartID;
+            set
+            {
+                _e_PartID = value;
+                OnPropertyChanged(nameof(E_PartID));
+            }
+        }
 
         public BaseOccurrence S_partObj { get; set; }
         public BaseOccurrence E_partObj { get; set; }
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml
index b82f932..46755c7 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml
@@ -35,7 +35,7 @@
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
-            <ColumnDefinition Width="2.5*" />
+            <ColumnDefinition Width="1.5*" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <StackPanel
@@ -55,39 +55,61 @@
 
         </StackPanel>
         <TextBlock Grid.Row="1" Text="部件1:" />
-        <TextBlock
+        <Button
+            Name="button1"
             Grid.Row="1"
-            Margin="50,0,0,0"
-            Text="{Binding S_part}" />
+            Click="Button_Click">
+            <TextBlock
+                Grid.Row="1"
+                Margin="50,0,0,0"
+                Text="{Binding S_part}" />
+        </Button>
+
+
         <TextBlock Grid.Row="2" Text="管脚1:" />
-        <TextBlock
+        <Button
+            Name="button2"
             Grid.Row="2"
             Margin="50,0,0,0"
-            Text="{Binding S_pin}" />
+            Click="Button_Click_1">
+            <TextBlock
+                Grid.Row="2"
+                Margin="0,0,0,0"
+                Text="{Binding S_pin}" />
+        </Button>
         <TextBlock
             Grid.Row="1"
             Grid.RowSpan="2"
             Grid.Column="1"
             Margin="0,15,0,0"
-            Text="&lt;-------------------------------------------------------------------------------------&gt;" />
+            Text="&lt;---------------------------------------------------------------&gt;" />
         <TextBlock
             Grid.Row="1"
             Grid.Column="2"
             Text="部件2:" />
-        <TextBlock
+
+        <Button
             Grid.Row="1"
             Grid.Column="2"
-            Margin="50,0,0,0"
-            Text="{Binding E_part}" />
+            Margin="50,0,0,0" Click="Button_Click_2">
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="2"
+                Margin="50,0,0,0"
+                Text="{Binding E_part}" />
+        </Button>
+
         <TextBlock
             Grid.Row="2"
             Grid.Column="2"
             Text="管脚2:" />
-        <TextBlock
+        <Button
             Grid.Row="2"
             Grid.Column="2"
-            Margin="50,0,0,0"
-            Text="{Binding E_pin}" />
+            Margin="50,0,0,0" Click="Button_Click_3">
+            <TextBlock Text="{Binding E_pin}" />
+        </Button>
+
 
     </Grid>
 
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs
index 666673e..7547173 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs
@@ -57,5 +57,52 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
         {
 
         }
+
+
+        /// <summary>
+        /// 部件1
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(_scannerViewModel.S_part)) ;
+            else
+            {
+                _scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().S_PartID);
+            }
+        }
+        /// <summary>
+        /// 管脚1
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(_scannerViewModel.S_pin)) ;
+            else
+            {
+                _scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().S_pinID);
+            }
+        }
+
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(_scannerViewModel.E_part)) ;
+            else
+            {
+                _scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().E_PartID);
+            }
+        }
+
+        private void Button_Click_3(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(_scannerViewModel.E_pin)) ;
+            else
+            {
+                _scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().E_pinID);
+            }
+
+        }
     }
 }
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs
index 2c3d235..6b6533a 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs
@@ -246,7 +246,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel
             {
                 S_pin = scanCableModel.E_Pin;
                 E_pin = scanCableModel.E_Pin;
-                S_part = scanCableModel.S_part;
+             
                 Length = scanCableModel.Length;
                 Name = scanCableModel.Name;
                 Code = scanCableModel.Code;
@@ -263,6 +263,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel
                          var parent = oriOcc.Parents?.FirstOrDefault();
                          var grandparent = parent.Parents?.FirstOrDefault();
                          scanCableModel.S_partObj = grandparent;
+                         scanCableModel.S_PartID = grandparent.ID;
                          scanCableModel.S_part = grandparent.Name;
                          S_part = scanCableModel.S_part;
                      }
@@ -272,6 +273,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel
                          var parent = oriOcc.Parents?.FirstOrDefault();
                          var grandparent = parent.Parents?.FirstOrDefault();
                          scanCableModel.E_partObj = grandparent;
+                         scanCableModel.E_PartID = grandparent.ID;
                          scanCableModel.E_part = grandparent.Name;
                          E_part = scanCableModel.E_part;
                      }
@@ -391,7 +393,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel
         /// 将设计器聚焦到对应的线
         /// </summary>
         /// <param name="occId"></param>
-        private void ToSourceById(string occId)
+        public void ToSourceById(string occId)
         {
             // 从设计器中获取线实例
             var occWire = _currentFlexDesigner.GetOccurrenceByID(occId);
@@ -427,7 +429,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel
         /// 将设计器聚焦到对应的线
         /// </summary>
         /// <param name="occId"></param>
-        private void ToSourceById(ScanCableModel scanedWire)
+        public void ToSourceById(ScanCableModel scanedWire)
         {
             var occId = scanedWire.Id;
             // 从设计器中获取线实例