From 2ee440d9e85eccd73d2c3d4cbfe42cb8c1c25ec0 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 28 六月 2025 14:35:24 +0800
Subject: [PATCH] 1.在stroedJob和Fetchout Job中增加Port的校验; 2.在物料调度中增加检测物料是否已经处理完成的校验;
---
SourceCode/Bond/Servo/Servo.vcxproj | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 795cd89..4eddc5d 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>
@@ -198,16 +199,37 @@
<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" />
@@ -293,7 +315,11 @@
<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" />
@@ -301,24 +327,49 @@
<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" />
@@ -403,21 +454,31 @@
<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