From 38fdd2e7d1d45a3ffed57fde30031a6a8f04d235 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 05 五月 2025 18:02:20 +0800
Subject: [PATCH] 1.获取配方列表,已处理待测试。

---
 SourceCode/Bond/Servo/CEquipment.cpp |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index aaf7662..054457f 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -887,11 +887,15 @@
 		}
 
 		LOGI("<CEquipment-%s>正在请求单元<%d>主配方列表", m_strName.c_str(), unitNo);
-		pStep->writeShort(unitNo, [&](int code) -> int {
+		if (m_recipesManager.syncing() != 0) {
+			return -2;
+		}
+		pStep->writeShort(unitNo, [&, unitNo](int code) -> int {
 			if (code == WOK) {
 				LOGI("<CEquipment-%s>请求单元<%d>主配方列表成功,正在等待数据.", m_strName.c_str(), unitNo);
 			}
 			else {
+				//m_recipesManager.syncFailed();
 				LOGI("<CEquipment-%s>请求单元<%d>主配方列表失败,code:%d", m_strName.c_str(), unitNo, code);
 			}
 
@@ -899,4 +903,9 @@
 		});
 		return 0;
 	}
+
+	int CEquipment::decodeRecipeListReport(const char* pszData, size_t size)
+	{
+		return m_recipesManager.decodeRecipeListReport(pszData, size);
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.3