diff --git a/Sinvo.EplanHpD.Plugin.Service/Sinvo.EplanHpD.Plugin.Service.csproj b/Sinvo.EplanHpD.Plugin.Service/Sinvo.EplanHpD.Plugin.Service.csproj index 48cbf16..c61e782 100644 --- a/Sinvo.EplanHpD.Plugin.Service/Sinvo.EplanHpD.Plugin.Service.csproj +++ b/Sinvo.EplanHpD.Plugin.Service/Sinvo.EplanHpD.Plugin.Service.csproj @@ -39,7 +39,7 @@ 7.3 prompt - + bin\Release_WireCheck\ TRACE true @@ -48,15 +48,6 @@ 7.3 prompt - - bin\Release_CableLayout\ - TRACE - true - pdbonly - AnyCPU - 7.3 - prompt - diff --git a/Sinvo.EplanHpD.Plugin.Test/Sinvo.EplanHpD.Plugin.Test.csproj b/Sinvo.EplanHpD.Plugin.Test/Sinvo.EplanHpD.Plugin.Test.csproj index 9c20541..f64be79 100644 --- a/Sinvo.EplanHpD.Plugin.Test/Sinvo.EplanHpD.Plugin.Test.csproj +++ b/Sinvo.EplanHpD.Plugin.Test/Sinvo.EplanHpD.Plugin.Test.csproj @@ -74,7 +74,7 @@ 7.3 prompt - + bin\Release_WireCheck\ TRACE true @@ -83,7 +83,7 @@ 7.3 prompt - + bin\x86\Release_WireCheck\ TRACE true @@ -92,24 +92,6 @@ 7.3 prompt - - bin\Release_CableLayout\ - TRACE - true - pdbonly - AnyCPU - 7.3 - prompt - - - bin\x86\Release_CableLayout\ - TRACE - true - pdbonly - x86 - 7.3 - prompt - ..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/Properties/AssemblyInfo.cs b/Sinvo.EplanHpD.Plugin.WPFUI/Properties/AssemblyInfo.cs index 24cdc6f..68d1cee 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/Properties/AssemblyInfo.cs +++ b/Sinvo.EplanHpD.Plugin.WPFUI/Properties/AssemblyInfo.cs @@ -47,5 +47,5 @@ using System.Windows; // 修订号 // [assembly: AssemblyVersion("1.0.0.25")] -[assembly: AssemblyFileVersion("1.0.0.26")] -[assembly: AssemblyInformationalVersion("1.0.0.26")] \ No newline at end of file +[assembly: AssemblyFileVersion("1.0.0.27")] +[assembly: AssemblyInformationalVersion("1.0.0.27")] \ No newline at end of file diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj b/Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj index 868b283..6cc56af 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj +++ b/Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj @@ -105,7 +105,7 @@ 12.0 prompt - + bin\Release_WireCheck\ TRACE true @@ -114,7 +114,7 @@ 12.0 prompt - + bin\x64\Release_WireCheck\ TRACE true @@ -124,7 +124,7 @@ prompt true - + bin\x86\Release_WireCheck\ TRACE true @@ -133,34 +133,6 @@ 12.0 prompt - - bin\Release_CableLayout\ - TRACE - true - pdbonly - AnyCPU - 12.0 - prompt - - - bin\x64\Release_CableLayout\ - TRACE - true - pdbonly - x64 - 12.0 - prompt - true - - - bin\x86\Release_CableLayout\ - TRACE - true - pdbonly - x86 - 12.0 - prompt - ..\Sinvo.EplanHpD.Plugin\RefDLL\C1.Win.C1FlexGrid.2.dll diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotypeViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotypeViewModel.cs index b923ace..09872a8 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotypeViewModel.cs +++ b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotypeViewModel.cs @@ -447,19 +447,28 @@ public class CableLectotypeViewModel : INotifyPropertyChanged if (_motor != null) { var passthroughCables = MotorExcelHelper.Instance.GetPassthroughCableCount(_motor.MotorModelStr).FirstOrDefault(); - _passthroughCableCount = passthroughCables.TotalCableCount; - if (_passthroughCableCount == 2) + if(passthroughCables != null) { - IsEnableSecCableType = true; - IsEnableThreeCableType = false; + _passthroughCableCount = passthroughCables.TotalCableCount; + if (_passthroughCableCount == 2) + { + IsEnableSecCableType = true; + IsEnableThreeCableType = false; + } + if (_passthroughCableCount == 3) + { + IsEnableSecCableType = true; + IsEnableThreeCableType = true; + } + if (_passthroughCableCount == 1) + { + IsEnableSecCableType = false; + IsEnableThreeCableType = false; + } } - if (_passthroughCableCount == 3) - { - IsEnableSecCableType = true; - IsEnableThreeCableType = true; - } - if (_passthroughCableCount == 1) + else { + // 如果没有对应的信息，默认为两个类型 IsEnableSecCableType = false; IsEnableThreeCableType = false; } diff --git a/Sinvo.EplanHpD.Plugin.sln b/Sinvo.EplanHpD.Plugin.sln index d44b291..5d977be 100644 --- a/Sinvo.EplanHpD.Plugin.sln +++ b/Sinvo.EplanHpD.Plugin.sln @@ -41,12 +41,12 @@ Global {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x64.Build.0 = Release_Scanner|x64 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x86.Build.0 = Release_Scanner|x86 - {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU - {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU - {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|x64 - {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|x64 - {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86 - {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86 + {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU + {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU + {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|x64 + {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|x64 + {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86 + {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|x86 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|Any CPU.ActiveCfg = Release|Any CPU {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|Any CPU.Build.0 = Release|Any CPU {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|x64.ActiveCfg = Release|x64 @@ -65,12 +65,12 @@ Global {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x64.Build.0 = Release_Scanner|x64 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x86.Build.0 = Release_Scanner|x86 - {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU - {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU - {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|x64 - {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|x64 - {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86 - {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86 + {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU + {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU + {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|x64 + {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|x64 + {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86 + {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|x86 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|Any CPU.Build.0 = Release|Any CPU {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|x64.ActiveCfg = Release|x64 @@ -89,12 +89,12 @@ Global {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86 {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x86.Build.0 = Release_Scanner|x86 - {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU - {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU - {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|Any CPU - {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|Any CPU - {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86 - {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86 + {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU + {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU + {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|Any CPU + {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|Any CPU + {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86 + {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|x86 {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|Any CPU.Build.0 = Release|Any CPU {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|x64.ActiveCfg = Release|Any CPU @@ -113,12 +113,12 @@ Global {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86 {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x86.Build.0 = Release_Scanner|x86 - {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU - {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU - {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|Any CPU - {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|Any CPU - {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86 - {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86 + {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU + {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU + {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|Any CPU + {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|Any CPU + {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86 + {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|x86 {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|Any CPU.ActiveCfg = Release|Any CPU {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|Any CPU.Build.0 = Release|Any CPU {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|x64.ActiveCfg = Release|Any CPU @@ -137,12 +137,12 @@ Global {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x86.ActiveCfg = Release_Scanner|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x86.Build.0 = Release_Scanner|Any CPU - {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU - {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU - {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|Any CPU - {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|Any CPU - {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|Any CPU - {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|Any CPU + {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU + {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU + {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|Any CPU + {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|Any CPU + {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|Any CPU + {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|Any CPU.Build.0 = Release|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|x64.ActiveCfg = Release|Any CPU diff --git a/Sinvo.EplanHpD.Plugin/Properties/AssemblyInfo.cs b/Sinvo.EplanHpD.Plugin/Properties/AssemblyInfo.cs index 650660d..63ce21a 100644 --- a/Sinvo.EplanHpD.Plugin/Properties/AssemblyInfo.cs +++ b/Sinvo.EplanHpD.Plugin/Properties/AssemblyInfo.cs @@ -28,6 +28,6 @@ using System.Runtime.InteropServices; // 生成号 // 修订号 // -[assembly: AssemblyVersion("1.0.0.26")] -[assembly: AssemblyFileVersion("1.0.0.24")] -[assembly: AssemblyInformationalVersion("1.0.0.24-rls")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.0.27")] +[assembly: AssemblyFileVersion("1.0.0.27")] +[assembly: AssemblyInformationalVersion("1.0.0.27-rls")] \ No newline at end of file diff --git a/Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj b/Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj index a979cf1..7590993 100644 --- a/Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj +++ b/Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj @@ -18,7 +18,7 @@ true full false - bin\Debug\ + ..\..\..\PLMCADI\Release_WireAndCable\ DEBUG;TRACE prompt 4 @@ -94,8 +94,8 @@ latest prompt - - bin\Release_WireCheck\ + + ..\..\..\PLMCADI\Release_WireAndCable\ TRACE true pdbonly @@ -103,7 +103,7 @@ latest prompt - + ..\..\..\PLMCADI\Release_WireAndCable\ TRACE;Release_WireAndCable true @@ -112,7 +112,7 @@ 7.3 prompt - + bin\x86\Release_WireCheck\ TRACE true @@ -121,33 +121,6 @@ latest prompt - - bin\Release_CableLayout\ - TRACE - true - pdbonly - AnyCPU - latest - prompt - - - ..\..\..\PLMCADI\EPLANProDAddin\ - TRACE;Release_CableLayout - true - pdbonly - x64 - 7.3 - prompt - - - bin\x86\Release_CableLayout\ - TRACE - true - pdbonly - x86 - latest - prompt - RefDLL\EPLAN.Harness.API.dll