From 2edc3c54ba7a42d5e9bb9120b9881d418e6bd408 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 13 八月 2021 09:38:29 +0800
Subject: [PATCH] 1. GTS回原点修改，避免来回 2. 添加单键测量结果补偿 3. 部分条件限制，日志修改 4. 来料检debug，添加退出条件判断
---
src/Bro.M071.Process/Bro.M071.Process.csproj | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/Bro.M071.Process/Bro.M071.Process.csproj b/src/Bro.M071.Process/Bro.M071.Process.csproj
index e8c6f29..8f9aab1 100644
--- a/src/Bro.M071.Process/Bro.M071.Process.csproj
+++ b/src/Bro.M071.Process/Bro.M071.Process.csproj
@@ -81,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>
@@ -95,8 +98,11 @@
<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" />
@@ -115,21 +121,23 @@
<Compile Include="M071Config.cs" />
<Compile Include="M071Models.cs" />
<Compile Include="M071Process.cs" />
+ <Compile Include="M071Process_MES.cs" />
<Compile Include="M071Process_MotionCard.cs" />
+ <Compile Include="M071Process_OfflineTest.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>
@@ -146,11 +154,11 @@
<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>
@@ -179,10 +187,6 @@
<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>
@@ -196,5 +200,8 @@
<Name>Bro.UI.Model.Winform</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <WCFMetadata Include="Connected Services\" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.8.0