Ling
/
EPLAN_PROD_Plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

105040 Update 如果电机型号没有直通线信息，默认强制指定为一种 

更新版本号到1.0.0.27
This commit is contained in:
lihanbo 2025-02-19 13:40:49 +08:00
parent 9e3e71a4ca
commit 1fc8ba3603
8 changed files with 65 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Sinvo.EplanHpD.Plugin.Service/Sinvo.EplanHpD.Plugin.Service.csproj
View File

@ -39,7 +39,7 @@
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|AnyCPU'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|AnyCPU' ">
<OutputPath>bin\Release_WireCheck\</OutputPath> <OutputPath>bin\Release_WireCheck\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -48,15 +48,6 @@
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|AnyCPU'">
<OutputPath>bin\Release_CableLayout\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

22
Sinvo.EplanHpD.Plugin.Test/Sinvo.EplanHpD.Plugin.Test.csproj
View File

@ -74,7 +74,7 @@
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|AnyCPU'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|AnyCPU' ">
<OutputPath>bin\Release_WireCheck\</OutputPath> <OutputPath>bin\Release_WireCheck\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -83,7 +83,7 @@
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x86'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x86' ">
<OutputPath>bin\x86\Release_WireCheck\</OutputPath> <OutputPath>bin\x86\Release_WireCheck\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -92,24 +92,6 @@
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|AnyCPU'">
<OutputPath>bin\Release_CableLayout\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x86'">
<OutputPath>bin\x86\Release_CableLayout\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath> <HintPath>..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>

4
Sinvo.EplanHpD.Plugin.WPFUI/Properties/AssemblyInfo.cs
View File

@ -47,5 +47,5 @@ using System.Windows;
// 修订号 // 修订号
// //
[assembly: AssemblyVersion("1.0.0.25")] [assembly: AssemblyVersion("1.0.0.25")]
[assembly: AssemblyFileVersion("1.0.0.26")] [assembly: AssemblyFileVersion("1.0.0.27")]
[assembly: AssemblyInformationalVersion("1.0.0.26")] [assembly: AssemblyInformationalVersion("1.0.0.27")]

34
Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj
View File

@ -105,7 +105,7 @@
<LangVersion>12.0</LangVersion> <LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|AnyCPU'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|AnyCPU' ">
<OutputPath>bin\Release_WireCheck\</OutputPath> <OutputPath>bin\Release_WireCheck\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -114,7 +114,7 @@
<LangVersion>12.0</LangVersion> <LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x64'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x64' ">
<OutputPath>bin\x64\Release_WireCheck\</OutputPath> <OutputPath>bin\x64\Release_WireCheck\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -124,7 +124,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit> <Prefer32Bit>true</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x86'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x86' ">
<OutputPath>bin\x86\Release_WireCheck\</OutputPath> <OutputPath>bin\x86\Release_WireCheck\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -133,34 +133,6 @@
<LangVersion>12.0</LangVersion> <LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|AnyCPU'">
<OutputPath>bin\Release_CableLayout\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x64'">
<OutputPath>bin\x64\Release_CableLayout\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x86'">
<OutputPath>bin\x86\Release_CableLayout\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="C1.Win.C1FlexGrid.2"> <Reference Include="C1.Win.C1FlexGrid.2">
<HintPath>..\Sinvo.EplanHpD.Plugin\RefDLL\C1.Win.C1FlexGrid.2.dll</HintPath> <HintPath>..\Sinvo.EplanHpD.Plugin\RefDLL\C1.Win.C1FlexGrid.2.dll</HintPath>

9
Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotypeViewModel.cs
View File

@ -447,6 +447,8 @@ public class CableLectotypeViewModel : INotifyPropertyChanged
if (_motor != null) if (_motor != null)
{ {
var passthroughCables = MotorExcelHelper.Instance.GetPassthroughCableCount(_motor.MotorModelStr).FirstOrDefault(); var passthroughCables = MotorExcelHelper.Instance.GetPassthroughCableCount(_motor.MotorModelStr).FirstOrDefault();
if(passthroughCables != null)
{
_passthroughCableCount = passthroughCables.TotalCableCount; _passthroughCableCount = passthroughCables.TotalCableCount;
if (_passthroughCableCount == 2) if (_passthroughCableCount == 2)
{ {
@ -464,6 +466,13 @@ public class CableLectotypeViewModel : INotifyPropertyChanged
IsEnableThreeCableType = false; IsEnableThreeCableType = false;
} }
} }
else
{
// 如果没有对应的信息，默认为两个类型
IsEnableSecCableType = false;
IsEnableThreeCableType = false;
}
}
} }
private string _axison; private string _axison;

60
Sinvo.EplanHpD.Plugin.sln
View File

@ -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|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.ActiveCfg = Release_Scanner|x86
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x86.Build.0 = 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.ActiveCfg = Release_WireAndCable|Any CPU
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|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_WireCheck|x64 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|x64
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|x64 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|x64
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|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.ActiveCfg = Release|Any CPU
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|Any CPU.Build.0 = 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 {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|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.ActiveCfg = Release_Scanner|x86
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x86.Build.0 = 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.ActiveCfg = Release_WireAndCable|Any CPU
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|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_WireCheck|x64 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|x64
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|x64 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|x64
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|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.ActiveCfg = Release|Any CPU
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|Any CPU.Build.0 = 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 {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|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.ActiveCfg = Release_Scanner|x86
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x86.Build.0 = 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.ActiveCfg = Release_WireAndCable|Any CPU
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|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_WireCheck|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_WireCheck|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_WireCheck|x86 {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|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.ActiveCfg = Release|Any CPU
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|Any CPU.Build.0 = 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 {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|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.ActiveCfg = Release_Scanner|x86
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x86.Build.0 = 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.ActiveCfg = Release_WireAndCable|Any CPU
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|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_WireCheck|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_WireCheck|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_WireCheck|x86 {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|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.ActiveCfg = Release|Any CPU
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|Any CPU.Build.0 = 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 {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|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.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_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.ActiveCfg = Release_WireAndCable|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|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_WireCheck|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_WireCheck|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_WireCheck|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_WireCheck|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.ActiveCfg = Release|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|Any CPU.Build.0 = 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 {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|x64.ActiveCfg = Release|Any CPU

6
Sinvo.EplanHpD.Plugin/Properties/AssemblyInfo.cs
View File

@ -28,6 +28,6 @@ using System.Runtime.InteropServices;
// 生成号 // 生成号
// 修订号 // 修订号
// //
[assembly: AssemblyVersion("1.0.0.26")] [assembly: AssemblyVersion("1.0.0.27")]
[assembly: AssemblyFileVersion("1.0.0.24")] [assembly: AssemblyFileVersion("1.0.0.27")]
[assembly: AssemblyInformationalVersion("1.0.0.24-rls")] [assembly: AssemblyInformationalVersion("1.0.0.27-rls")]

37
Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj
View File

@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\..\..\PLMCADI\Release_WireAndCable\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -94,8 +94,8 @@
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|AnyCPU'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|AnyCPU' ">
<OutputPath>bin\Release_WireCheck\</OutputPath> <OutputPath>..\..\..\PLMCADI\Release_WireAndCable\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@ -103,7 +103,7 @@
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x64'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x64' ">
<OutputPath>..\..\..\PLMCADI\Release_WireAndCable\</OutputPath> <OutputPath>..\..\..\PLMCADI\Release_WireAndCable\</OutputPath>
<DefineConstants>TRACE;Release_WireAndCable</DefineConstants> <DefineConstants>TRACE;Release_WireAndCable</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -112,7 +112,7 @@
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x86'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x86' ">
<OutputPath>bin\x86\Release_WireCheck\</OutputPath> <OutputPath>bin\x86\Release_WireCheck\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -121,33 +121,6 @@
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|AnyCPU'">
<OutputPath>bin\Release_CableLayout\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x64'">
<OutputPath>..\..\..\PLMCADI\EPLANProDAddin\</OutputPath>
<DefineConstants>TRACE;Release_CableLayout</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x86'">
<OutputPath>bin\x86\Release_CableLayout\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="EPLAN.Harness.API"> <Reference Include="EPLAN.Harness.API">
<HintPath>RefDLL\EPLAN.Harness.API.dll</HintPath> <HintPath>RefDLL\EPLAN.Harness.API.dll</HintPath>