From a1bf060d50da3c27b54bcc349e8b53769b39ef89 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 03 六月 2025 17:31:33 +0800
Subject: [PATCH] 1.增加Aligner --> Bonder1 | Bonder2的搬送检测逻辑； 2.优化搬送逻辑。搬送要分优先考虑的主类型和次要类型。一种情况，如果不分主次，一直搬G1, 等到Bonder1和Bonder2都放了G1, Aligner也放了G1, Bonder1和Bonder2需要的G2就过不来了（在Aligner阻塞了）。另外从生产效率上来说，也应该根据需求，尽快使其中一台Bonder的两片玻璃匹配以使其能尽快开始生产加工。

---
 SourceCode/Bond/Servo/CRecipesManager.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CRecipesManager.h b/SourceCode/Bond/Servo/CRecipesManager.h
index 489e2a5..4c35285 100644
--- a/SourceCode/Bond/Servo/CRecipesManager.h
+++ b/SourceCode/Bond/Servo/CRecipesManager.h
@@ -20,7 +20,8 @@
 		unsigned TimeoutCheckWorkingProc();
 		int syncing();
 		void syncFailed();
-		int decodeRecipeListReport(const char* pszData, size_t size);
+		short decodeRecipeListReport(const char* pszData, size_t size);
+		short decodeRecipeParameterReport(const char* pszData, size_t size);
 		CRecipeList* getRecipeListFromTemp(int unitNo);
 
 	public:
@@ -35,6 +36,7 @@
 		CRITICAL_SECTION m_cs;		// 同步锁
 		int m_nSyncStatus;
 		int m_nTotalMasterRecipeCount;
+		int m_nTotalParameterCount;
 		std::map<int, CRecipeList*> m_mapRecipes;
 		std::map<int, CRecipeList*> m_mapRecipesTemp;
 	};

--
Gitblit v1.9.3