From 10f48622c553729352dce9a4484def4bfeaa1083 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 02 七月 2025 14:51:33 +0800
Subject: [PATCH] 1.将OnPanelDataReport相关功能由EFEM移到Aligner; 2.Glass增加最初来源Port和Slot，以便在Aligner检测NG时加退； 3.物流调度增加一个参数，是否检测OK作为调度依据。 4.Alginer检测NG,送回原处；
---
SourceCode/Bond/Servo/Servo.vcxproj | 92 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 4e0f9d1..c3e7398 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -46,6 +46,7 @@
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
+ <EnableASAN>false</EnableASAN>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@@ -115,7 +116,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
- <AdditionalIncludeDirectories>.;..;..\DatabaseSDK\include;..\MELSECSDK\include;.\CCLinkPerformance;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;..;..\DatabaseSDK\include;..\MELSECSDK\include;.\CCLinkPerformance;.\GridControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -134,8 +135,8 @@
</ResourceCompile>
<PostBuildEvent>
<Command>if exist "\\DESKTOP-IODBVIQ\Servo\Debug\" (
- xcopy /Y /D "$(OutDir)*.exe" "\\DESKTOP-IODBVIQ\Servo\Debug\"
- xcopy /Y /D "$(OutDir)*.pdb" "\\DESKTOP-IODBVIQ\Servo\Debug\"
+ xcopy /Y /D "$(OutDir)Servo.exe" "\\DESKTOP-IODBVIQ\Servo\Debug\"
+ xcopy /Y /D "$(OutDir)Servo.pdb" "\\DESKTOP-IODBVIQ\Servo\Debug\"
)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -198,7 +199,38 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="CBaseDlg.h" />
+ <ClInclude Include="CEquipmentPage3.h" />
<ClInclude Include="CGlassPool.h" />
+ <ClInclude Include="ChangePasswordDlg.h" />
+ <ClInclude Include="CMyStatusbar.h" />
+ <ClInclude Include="CPageLinkSignal.h" />
+ <ClInclude Include="CRobotCmdContainerDlg.h" />
+ <ClInclude Include="CRobotCmdTestDlg.h" />
+ <ClInclude Include="CPagePortStatus.h" />
+ <ClInclude Include="CPortStatusReport.h" />
+ <ClInclude Include="CRobotTaskDlg.h" />
+ <ClInclude Include="GridControl\CellRange.h" />
+ <ClInclude Include="GridControl\GridCell.h" />
+ <ClInclude Include="GridControl\GridCellBase.h" />
+ <ClInclude Include="GridControl\GridCellButton.h" />
+ <ClInclude Include="GridControl\GridCtrl.h" />
+ <ClInclude Include="GridControl\GridDropTarget.h" />
+ <ClInclude Include="GridControl\GridInPlaceEdit.h" />
+ <ClInclude Include="GridControl\GridMemDC.h" />
+ <ClInclude Include="GridControl\NewCellTypes\GridCellCheck.h" />
+ <ClInclude Include="GridControl\NewCellTypes\GridCellCombo.h" />
+ <ClInclude Include="GridControl\NewCellTypes\GridCellDateTime.h" />
+ <ClInclude Include="GridControl\NewCellTypes\GridCellNumeric.h" />
+ <ClInclude Include="GridControl\NewCellTypes\GridURLCell.h" />
+ <ClInclude Include="GridControl\TitleTip.h" />
+ <ClInclude Include="CRobotTask.h" />
+ <ClInclude Include="CSlot.h" />
+ <ClInclude Include="HorizontalLine.h" />
+ <ClInclude Include="InputDialog.h" />
+ <ClInclude Include="JobSlotGrid.h" />
+ <ClInclude Include="LoginDlg.h" />
+ <ClInclude Include="MsgDlg.h" />
<ClInclude Include="PageRecipe.h" />
<ClInclude Include="CDoubleGlass.h" />
<ClInclude Include="CProcessData.h" />
@@ -282,21 +314,63 @@
<ClInclude Include="LogEdit.h" />
<ClInclude Include="MapPosWnd.h" />
<ClInclude Include="Model.h" />
+ <ClInclude Include="PageRobotCmd.h" />
+ <ClInclude Include="PageTransferLog.h" />
+ <ClInclude Include="PortConfigurationDlg.h" />
<ClInclude Include="ProductionLogManager.h" />
+ <ClInclude Include="RecipeDeviceBindDlg.h" />
+ <ClInclude Include="RecipeManager.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="SECSRuntimeManager.h" />
<ClInclude Include="SecsTestDlg.h" />
<ClInclude Include="Servo.h" />
+ <ClInclude Include="ServoCommo.h" />
<ClInclude Include="ServoDlg.h" />
<ClInclude Include="ServoGraph.h" />
+ <ClInclude Include="ServoMemDC.h" />
<ClInclude Include="stdafx.h" />
+ <ClInclude Include="SystemLogManager.h" />
+ <ClInclude Include="SystemLogManagerDlg.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="TerminalDisplayDlg.h" />
<ClInclude Include="ToolUnits.h" />
+ <ClInclude Include="TransferManager.h" />
+ <ClInclude Include="TopToolbar.h" />
+ <ClInclude Include="UserManager.h" />
+ <ClInclude Include="UserManagerDlg.h" />
<ClInclude Include="VerticalLine.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="CBaseDlg.cpp" />
+ <ClCompile Include="CEquipmentPage3.cpp" />
<ClCompile Include="CGlassPool.cpp" />
+ <ClCompile Include="ChangePasswordDlg.cpp" />
+ <ClCompile Include="CMyStatusbar.cpp" />
+ <ClCompile Include="CPageLinkSignal.cpp" />
+ <ClCompile Include="CRobotCmdContainerDlg.cpp" />
+ <ClCompile Include="CRobotCmdTestDlg.cpp" />
+ <ClCompile Include="CPagePortStatus.cpp" />
+ <ClCompile Include="CPortStatusReport.cpp" />
+ <ClCompile Include="CRobotTaskDlg.cpp" />
+ <ClCompile Include="GridControl\GridCell.cpp" />
+ <ClCompile Include="GridControl\GridCellBase.cpp" />
+ <ClCompile Include="GridControl\GridCellButton.cpp" />
+ <ClCompile Include="GridControl\GridCtrl.cpp" />
+ <ClCompile Include="GridControl\GridDropTarget.cpp" />
+ <ClCompile Include="GridControl\GridInPlaceEdit.cpp" />
+ <ClCompile Include="GridControl\NewCellTypes\GridCellCheck.cpp" />
+ <ClCompile Include="GridControl\NewCellTypes\GridCellCombo.cpp" />
+ <ClCompile Include="GridControl\NewCellTypes\GridCellDateTime.cpp" />
+ <ClCompile Include="GridControl\NewCellTypes\GridCellNumeric.cpp" />
+ <ClCompile Include="GridControl\NewCellTypes\GridURLCell.cpp" />
+ <ClCompile Include="GridControl\TitleTip.cpp" />
+ <ClCompile Include="CRobotTask.cpp" />
+ <ClCompile Include="CSlot.cpp" />
+ <ClCompile Include="HorizontalLine.cpp" />
+ <ClCompile Include="InputDialog.cpp" />
+ <ClCompile Include="JobSlotGrid.cpp" />
+ <ClCompile Include="LoginDlg.cpp" />
+ <ClCompile Include="MsgDlg.cpp" />
<ClCompile Include="PageRecipe.cpp" />
<ClCompile Include="CDoubleGlass.cpp" />
<ClCompile Include="CProcessData.cpp" />
@@ -379,20 +453,32 @@
<ClCompile Include="LogEdit.cpp" />
<ClCompile Include="MapPosWnd.cpp" />
<ClCompile Include="Model.cpp" />
+ <ClCompile Include="PageRobotCmd.cpp" />
+ <ClCompile Include="PageTransferLog.cpp" />
+ <ClCompile Include="PortConfigurationDlg.cpp" />
<ClCompile Include="ProductionLogManager.cpp" />
+ <ClCompile Include="RecipeDeviceBindDlg.cpp" />
+ <ClCompile Include="RecipeManager.cpp" />
<ClCompile Include="SECSRuntimeManager.cpp" />
<ClCompile Include="SecsTestDlg.cpp" />
<ClCompile Include="Servo.cpp" />
<ClCompile Include="ServoDlg.cpp" />
<ClCompile Include="ServoGraph.cpp" />
+ <ClCompile Include="ServoMemDC.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
+ <ClCompile Include="SystemLogManager.cpp" />
+ <ClCompile Include="SystemLogManagerDlg.cpp" />
<ClCompile Include="TerminalDisplayDlg.cpp" />
<ClCompile Include="ToolUnits.cpp" />
+ <ClCompile Include="TransferManager.cpp" />
+ <ClCompile Include="TopToolbar.cpp" />
+ <ClCompile Include="UserManager.cpp" />
+ <ClCompile Include="UserManagerDlg.cpp" />
<ClCompile Include="VerticalLine.cpp" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3