diff --git a/README.md b/README.md index 2ea7b2d..05464b5 100644 --- a/README.md +++ b/README.md @@ -1 +1,14 @@ -# Sinvo.EplanHpD.Plugin \ No newline at end of file +# # EPLAN Harness proD 2.9 线材检查插件说明 + +## 1. 插件功能 +- 线材检查插件用于检查线材的端子、颜色、线径等信息是否符合要求。 +- 检查后会在界面中显示检查结果,并提供导出功能。 +- 提供导出下单表功能,直接按模板导出下单表。 +- 右键直接可跳转3D中线的位置。 + +## 2. 插件使用说明 +- 插件使用前需要先安装EPLAN Harness proD 2.9版本。 + - ![alt text](eplan_about.png) +- 插件分为单芯线扫描装配、单芯线线材检查与伺服电机选型三部分,其中单芯线线材检查与伺服电机选型为同一版本文件,单芯线扫描装配为单独版本文件。 +- 插件数据源均使用共享盘(192.168.1.160)中excel文件,除单芯线扫描装配外,其余功能无法在无局域网情况下使用。 + diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj b/Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj index cf5e6bd..2cc9f8a 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj +++ b/Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj @@ -279,35 +279,36 @@ - - - - - - - + + + + + + + + CableLectotypeUserControl.xaml NotSavedWarningWindow.xaml - + LayoutHelperWindow.xaml - + LectotypeWindow.xaml LoginWindow.xaml - + MainWindow.xaml - + ScannerInfo.xaml - + ScannerWindow.xaml @@ -318,7 +319,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -326,11 +327,11 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + MSBuild:Compile Designer @@ -338,15 +339,15 @@ Designer MSBuild:Compile - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeUserControl.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/CableLectotypeUserControl.xaml similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeUserControl.xaml rename to Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/CableLectotypeUserControl.xaml diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeUserControl.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/CableLectotypeUserControl.xaml.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeUserControl.xaml.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/CableLectotypeUserControl.xaml.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LayoutHelperWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/LayoutHelperWindow.xaml similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/LayoutHelperWindow.xaml rename to Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/LayoutHelperWindow.xaml diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LayoutHelperWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/LayoutHelperWindow.xaml.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/LayoutHelperWindow.xaml.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/LayoutHelperWindow.xaml.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/LectotypeWindow.xaml similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml rename to Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/LectotypeWindow.xaml diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/LectotypeWindow.xaml.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotype/LectotypeWindow.xaml.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/Scanner/ScannerInfo.xaml similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml rename to Sinvo.EplanHpD.Plugin.WPFUI/View/Scanner/ScannerInfo.xaml diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/Scanner/ScannerInfo.xaml.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/View/Scanner/ScannerInfo.xaml.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/Scanner/ScannerWindow.xaml similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerWindow.xaml rename to Sinvo.EplanHpD.Plugin.WPFUI/View/Scanner/ScannerWindow.xaml diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/Scanner/ScannerWindow.xaml.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerWindow.xaml.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/View/Scanner/ScannerWindow.xaml.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/MainWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/WireCheck/MainWindow.xaml similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/MainWindow.xaml rename to Sinvo.EplanHpD.Plugin.WPFUI/View/WireCheck/MainWindow.xaml diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/MainWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/WireCheck/MainWindow.xaml.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/View/MainWindow.xaml.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/View/WireCheck/MainWindow.xaml.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotypeViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotype/CableLectotypeViewModel.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotypeViewModel.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotype/CableLectotypeViewModel.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LayoutHelperViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotype/LayoutHelperViewModel.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LayoutHelperViewModel.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotype/LayoutHelperViewModel.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotype/LectotypeViewModel.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotype/LectotypeViewModel.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LoginViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LoginViewModel.cs new file mode 100644 index 0000000..d4d457e --- /dev/null +++ b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LoginViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel +{ + internal class LoginViewModel + { + } +} diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/Scanner/ScannerViewModel.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/Scanner/ScannerViewModel.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.Check.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/WireCheck/MainViewModel.Check.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.Check.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/WireCheck/MainViewModel.Check.cs diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/WireCheck/MainViewModel.cs similarity index 100% rename from Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs rename to Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/WireCheck/MainViewModel.cs diff --git a/Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs b/Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs index 5da1882..e21223e 100644 --- a/Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs +++ b/Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs @@ -93,7 +93,8 @@ namespace Sinvo.EplanHpD.Plugin Consts.InitConfigs(); #if DEBUG var client = new DynaServerClient(); - client.Login("105040", "blank", "ADMINISTRATOR", "ADMINISTRATOR", "EPLAN"); + // PLM 没有EPLAN的许可,所以只能使用SOLW的类型登录 + client.Login("105040", "blank", "ADMINISTRATOR", "ADMINISTRATOR", "SOLW"); #endif } } diff --git a/eplan_about.png b/eplan_about.png new file mode 100644 index 0000000..3ca13bd Binary files /dev/null and b/eplan_about.png differ