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.cpp |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/Servo.cpp b/SourceCode/Bond/Servo/Servo.cpp
index 60c2b8a..c46246e 100644
--- a/SourceCode/Bond/Servo/Servo.cpp
+++ b/SourceCode/Bond/Servo/Servo.cpp
@@ -17,6 +17,9 @@
 #include "MapPosWnd.h"
 #include "HmTab.h"
 #include "CControlJobManagerDlg.h"
+#include "ToolUnits.h"
+#include "CUserManager2.h"
+#include "AccordionWnd.h"
 
 
 // 澹版槑鍏ㄥ眬鍙橀噺锛岀敤浜庣鐞� GDI+ 鍒濆鍖�
@@ -102,6 +105,11 @@
 	m_model.setWorkDir((LPTSTR)(LPCTSTR)m_strAppDir);
 
 
+	// 鐢ㄦ埛鏁版嵁搴撶鐞�
+	CString strDir = m_strAppDir + _T("\\DB");
+	CUserManager2::getInstance().init((LPTSTR)(LPCTSTR)strDir);
+
+
 	// 娉ㄥ唽鎺т欢
 	CServoGraph::RegisterWndClass();
 	CVerticalLine::RegisterWndClass();
@@ -109,6 +117,7 @@
 	CEqsGraphWnd::RegisterWndClass();
 	CMapPosWnd::RegisterWndClass();
 	CHmTab::RegisterWndClass();
+	CAccordionWnd::RegisterWndClass();
 
 
 	// 鍒濆鍖朢x搴�
@@ -233,6 +242,7 @@
 	m_model.term();
 	HSMS_Term();
 	RX_Term();
+	UX_Shutdown();
 
 	// 娓呯悊 GDI+
 	TermGDIPlus();

--
Gitblit v1.9.3