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/CPath.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPath.h b/SourceCode/Bond/Servo/CPath.h
index 832ee07..61f8955 100644
--- a/SourceCode/Bond/Servo/CPath.h
+++ b/SourceCode/Bond/Servo/CPath.h
@@ -7,11 +7,12 @@
 	{
 	public:
 		CPath();
-		CPath(unsigned int nEqId, unsigned int nUnit);
+		CPath(unsigned int nEqId, unsigned int nUnit, unsigned int nSlot);
 		virtual ~CPath();
 
 	public:
 		void getDescription(std::string& strOut);
+		void getSimpleDescription(std::string& strOut);
 		void serialize(CArchive& ar);
 		CPath* getPrev();
 		CPath* getNext();
@@ -20,6 +21,7 @@
 		CPath* getHeadPath();
 		unsigned int getEqID();
 		unsigned int getUnit();
+		unsigned int getSlot();
 		void setInTime(ULONGLONG time);
 		ULONGLONG getInTime();
 		void setOutTime(ULONGLONG time);
@@ -32,6 +34,7 @@
 	private:	
 		unsigned int m_nEqID;
 		unsigned int m_nUnit;
+		unsigned int m_nSlot;
 		ULONGLONG m_timeIn;
 		ULONGLONG m_timeOut;
 		BOOL m_bProcessed;

--
Gitblit v1.9.3