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/CRecipeList.h |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CRecipeList.h b/SourceCode/Bond/Servo/CRecipeList.h
index 7cb4577..6b1ac0d 100644
--- a/SourceCode/Bond/Servo/CRecipeList.h
+++ b/SourceCode/Bond/Servo/CRecipeList.h
@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
 #include <map>
 
 
@@ -12,16 +12,28 @@
 
 	public:
 		int getUnitNo();
-		int addRecipePacket(int totalGroup, int currentGroup, const char* pszData, size_t size);
+		int addRecipePacket(int totalCount,int totalGroup, int currentGroup, const char* pszData, size_t size);
 		int addRecipe(int index, short id);
 		std::map<int, short>& getIds();
+		std::unordered_map<short, std::vector<uint8_t>>& getParamsRawData();
 		void reset();
+		void reset2();
+
+		// 娣诲姞鍙傛暟鍖�
+		int addParamsPacket(int totalCount, int totalGroup, int currentGroup,
+			short unitId, short recipeId,
+			const char* pszData, size_t size);
+
+		// 猸� 鏂板搴忓垪鍖栧拰鍙嶅簭鍒楀寲鍑芥暟
+		bool serialize(const std::string& filename) const;
+		bool deserialize(const std::string& filename);
 
 	private:
 		int m_nUnitNo;
 		int m_nToatlGroupCount;
 		int m_nCurrentGroupCount;
 		std::map<int, short> m_ids;
+		std::unordered_map<short, std::vector<uint8_t>> m_paramsRawData;
 	};
 }
 

--
Gitblit v1.9.3