From 30458c0bca8066d98ca901b5065832a44a7e970e Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 16 七月 2020 15:47:22 +0800
Subject: [PATCH] 测量结果 查询+导出功能
---
src/Bro.M071.Process/Bro.M071.Process.csproj | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/src/Bro.M071.Process/Bro.M071.Process.csproj b/src/Bro.M071.Process/Bro.M071.Process.csproj
index c4f1e16..d744dfa 100644
--- a/src/Bro.M071.Process/Bro.M071.Process.csproj
+++ b/src/Bro.M071.Process/Bro.M071.Process.csproj
@@ -12,6 +12,8 @@
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -79,6 +81,9 @@
<Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
</Reference>
+ <Reference Include="EPPlus, Version=4.5.3.3, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\EPPlus.4.5.3.3\lib\net40\EPPlus.dll</HintPath>
+ </Reference>
<Reference Include="halcondotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\libs\halcon12\halcondotnet.dll</HintPath>
@@ -90,8 +95,14 @@
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
+ <Reference Include="PostSharp, Version=6.2.7.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\PostSharp.Redist.6.2.7\lib\net45\PostSharp.dll</HintPath>
+ </Reference>
+ <Reference Include="PresentationCore" />
<Reference Include="System" />
+ <Reference Include="System.configuration" />
<Reference Include="System.Core" />
+ <Reference Include="System.Security" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -110,13 +121,33 @@
<Compile Include="M071Config.cs" />
<Compile Include="M071Models.cs" />
<Compile Include="M071Process.cs" />
+ <Compile Include="M071Process_MotionCard.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="UI\KeyIndicator.cs" />
<Compile Include="UI\M071Node.cs" />
+ <Compile Include="UI\M071_DataForm.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UI\M071_DataForm.Designer.cs">
+ <DependentUpon>M071_DataForm.cs</DependentUpon>
+ </Compile>
<Compile Include="UI\M071_MainForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\M071_MainForm.Designer.cs">
<DependentUpon>M071_MainForm.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UI\M071_PatchInsertMeasurement.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UI\M071_PatchInsertMeasurement.Designer.cs">
+ <DependentUpon>M071_PatchInsertMeasurement.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UI\M071_ShortcutFrm.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UI\M071_ShortcutFrm.Designer.cs">
+ <DependentUpon>M071_ShortcutFrm.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
@@ -127,6 +158,22 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
+ <EmbeddedResource Include="UI\M071_DataForm.resx">
+ <DependentUpon>M071_DataForm.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UI\M071_MainForm.resx">
+ <DependentUpon>M071_MainForm.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UI\M071_PatchInsertMeasurement.resx">
+ <DependentUpon>M071_PatchInsertMeasurement.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UI\M071_ShortcutFrm.resx">
+ <DependentUpon>M071_ShortcutFrm.cs</DependentUpon>
+ </EmbeddedResource>
+ <None Include="App.config">
+ <SubType>Designer</SubType>
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
@@ -147,6 +194,14 @@
<Project>{1A3CBFE7-3F78-42C3-95C5-10360450DBEA}</Project>
<Name>Bro.Common.Model</Name>
</ProjectReference>
+ <ProjectReference Include="..\Bro.M071.DBManager\Bro.M071.DBManager.csproj">
+ <Project>{230B0FFF-F6AF-45FE-AAF7-B4B66250DD58}</Project>
+ <Name>Bro.M071.DBManager</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Bro.M071.Model\Bro.M071.Model.csproj">
+ <Project>{AD645C48-5811-4B1E-B81F-D35D5E6B577F}</Project>
+ <Name>Bro.M071.Model</Name>
+ </ProjectReference>
<ProjectReference Include="..\Bro.Process\Bro.Process.csproj">
<Project>{197C5AA8-9609-4D1C-B1E3-5879006EAAF4}</Project>
<Name>Bro.Process</Name>
--
Gitblit v1.8.0