From da9df9d46ed3fc50e0c03497bd9f76b8aa1a4595 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:37:48 +0800
Subject: [PATCH] 1.修复以下问题： 作业前置条件不足导致 PJ 验证失败：onPRJobMultiCreate 调 CMaster::setProcessJobs，CProcessJob::validate 要求“当前没有其它 PJ”（issue 1000），且 carrierPresent/slotUsable 必须为真。只要本地还有未结批的 PJ/CJ 或载具/槽位状态未就绪（ID 未绑、Slot 未使能），Host 发送的 CreateMultiPJ 会直接被丢弃（返回 size=0），但当前代码没有向 Host 回 ACK/NAK，Host 会误以为创建成功。

---
 SourceCode/Bond/Servo/Servo.vcxproj |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 363766f..3f876a1 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -222,6 +222,7 @@
     <ClInclude Include="..\jsoncpp\include\json\value.h" />
     <ClInclude Include="..\jsoncpp\include\json\writer.h" />
     <ClInclude Include="..\jsoncpp\lib_json\json_batchallocator.h" />
+    <ClInclude Include="AccordionWnd.h" />
     <ClInclude Include="CBaseDlg.h" />
     <ClInclude Include="CCarrierSlotGrid.h" />
     <ClInclude Include="CCarrierSlotSelector.h" />
@@ -233,6 +234,7 @@
     <ClInclude Include="CControlJobManagerDlg.h" />
     <ClInclude Include="CCustomCheckBox.h" />
     <ClInclude Include="CCollectionEvent.h" />
+    <ClInclude Include="CEventEditDlg.h" />
     <ClInclude Include="CEquipmentPage3.h" />
     <ClInclude Include="CExpandableListCtrl.h" />
     <ClInclude Include="CGlassPool.h" />
@@ -240,14 +242,21 @@
     <ClInclude Include="ClientListDlg.h" />
     <ClInclude Include="CMyStatusbar.h" />
     <ClInclude Include="CPageCollectionEvent.h" />
+    <ClInclude Include="CPageCtrlState.h" />
     <ClInclude Include="CPageGlassList.h" />
     <ClInclude Include="CPageLinkSignal.h" />
+    <ClInclude Include="CPageProdOverview.h" />
     <ClInclude Include="CPageReport.h" />
     <ClInclude Include="CPageVarialbles.h" />
+    <ClInclude Include="CPageDataVarialbles.h" />
+    <ClInclude Include="CPanelProduction.h" />
+    <ClInclude Include="HmLabel.h" />
+    <ClInclude Include="ProductionStats.h" />
     <ClInclude Include="CParam.h" />
     <ClInclude Include="CCjPage1.h" />
     <ClInclude Include="CProcessDataListDlg.h" />
     <ClInclude Include="CReport.h" />
+    <ClInclude Include="CReportEditDlg.h" />
     <ClInclude Include="CRobotCmdContainerDlg.h" />
     <ClInclude Include="CRobotCmdTestDlg.h" />
     <ClInclude Include="CPagePortStatus.h" />
@@ -260,6 +269,7 @@
     <ClInclude Include="CUserEdit2Dlg.h" />
     <ClInclude Include="CUserXLogDlg.h" />
     <ClInclude Include="CVariable.h" />
+    <ClInclude Include="CVariableEditDlg2.h" />
     <ClInclude Include="DeviceRecipeParamDlg.h" />
     <ClInclude Include="GlassJson.h" />
     <ClInclude Include="GlassLogDb.h" />
@@ -440,6 +450,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="AccordionWnd.cpp" />
     <ClCompile Include="CBaseDlg.cpp" />
     <ClCompile Include="CCarrierSlotGrid.cpp" />
     <ClCompile Include="CCarrierSlotSelector.cpp" />
@@ -451,6 +462,7 @@
     <ClCompile Include="CControlJobManagerDlg.cpp" />
     <ClCompile Include="CCustomCheckBox.cpp" />
     <ClCompile Include="CCollectionEvent.cpp" />
+    <ClCompile Include="CEventEditDlg.cpp" />
     <ClCompile Include="CEquipmentPage3.cpp" />
     <ClCompile Include="CExpandableListCtrl.cpp" />
     <ClCompile Include="CGlassPool.cpp" />
@@ -458,14 +470,22 @@
     <ClCompile Include="ClientListDlg.cpp" />
     <ClCompile Include="CMyStatusbar.cpp" />
     <ClCompile Include="CPageCollectionEvent.cpp" />
+    <ClCompile Include="CPageCtrlState.cpp" />
     <ClCompile Include="CPageGlassList.cpp" />
     <ClCompile Include="CPageLinkSignal.cpp" />
+    <ClCompile Include="CPageProdOverview.cpp" />
     <ClCompile Include="CPageReport.cpp" />
     <ClCompile Include="CPageVarialbles.cpp" />
+    <ClCompile Include="CPageDataVarialbles.cpp" />
+    <ClCompile Include="ConfigurationProduction.cpp" />
+    <ClCompile Include="CPanelProduction.cpp" />
+    <ClCompile Include="HmLabel.cpp" />
+    <ClCompile Include="ProductionStats.cpp" />
     <ClCompile Include="CParam.cpp" />
     <ClCompile Include="CCjPage1.cpp" />
     <ClCompile Include="CProcessDataListDlg.cpp" />
     <ClCompile Include="CReport.cpp" />
+    <ClCompile Include="CReportEditDlg.cpp" />
     <ClCompile Include="CRobotCmdContainerDlg.cpp" />
     <ClCompile Include="CRobotCmdTestDlg.cpp" />
     <ClCompile Include="CPagePortStatus.cpp" />
@@ -478,6 +498,7 @@
     <ClCompile Include="CUserEdit2Dlg.cpp" />
     <ClCompile Include="CUserXLogDlg.cpp" />
     <ClCompile Include="CVariable.cpp" />
+    <ClCompile Include="CVariableEditDlg2.cpp" />
     <ClCompile Include="DeviceRecipeParamDlg.cpp" />
     <ClCompile Include="GlassJson.cpp" />
     <ClCompile Include="GlassLogDb.cpp" />
@@ -651,4 +672,4 @@
     <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>

--
Gitblit v1.9.3