From 96579a48b3b558f5ce58cffe372b1f563a9e62ce Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 03 九月 2025 17:23:56 +0800
Subject: [PATCH] 1.配方列表和配方参数获取合并在线程中获取，并更新状态到对话框； 2.配方参数获取； 3.Bonder, AOI, 真空烘烤, 冷却烧烤配方参数解释。
---
SourceCode/Bond/Servo/CRecipesManager.cpp | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRecipesManager.cpp b/SourceCode/Bond/Servo/CRecipesManager.cpp
index 354aaac..48ba9d1 100644
--- a/SourceCode/Bond/Servo/CRecipesManager.cpp
+++ b/SourceCode/Bond/Servo/CRecipesManager.cpp
@@ -169,7 +169,7 @@
}
m_mapRecipes = m_mapRecipesTemp;
m_mapRecipesTemp.clear();
- m_nSyncStatus = SS_COMPLETE;
+ m_nSyncStatus = SS_LIST_COMPLETE;
unlock();
if (m_onSyncingStateChanged != nullptr) {
@@ -230,17 +230,14 @@
- // 找到对应CRecipeList, 找不到则新建
- /*
+ // 找到对应CRecipeList, 找不到则返回NG
lock();
CRecipeList* pRecipeList = getRecipeListFromTemp(unitNo);
if (pRecipeList == nullptr) {
- pRecipeList = new CRecipeList(unitNo);
- m_mapRecipesTemp[unitNo] = pRecipeList;
+ unlock();
+ return MRLRC_NG;
}
unlock();
- ASSERT(pRecipeList);
- */
/*
1: Create
@@ -248,7 +245,6 @@
3: Delete
4: Request from EAS
*/
- /*
if (reportType == RT_CREATE) {
}
@@ -259,26 +255,19 @@
}
else if (reportType == RT_REQUEST_FROM_EAS) {
- int nRet = pRecipeList->addRecipePacket(toatlGroupCount, currentGroupCount, pszIdsData, 250 * 2);
+ int nRet = pRecipeList->addParamsPacket(totalParameterCount, toatlGroupCount, currentGroupCount,
+ unitNo, localRecipeId,
+ pszParameterData, 250 * 2);
if (MRLRC_CURRENT_RECIPE_COMPLETE == nRet) {
lock();
- if (m_nTotalMasterRecipeCount == m_mapRecipesTemp.size()) {
- for (auto item : m_mapRecipes) {
- delete item.second;
- }
- m_mapRecipes = m_mapRecipesTemp;
- m_mapRecipesTemp.clear();
- m_nSyncStatus = SS_COMPLETE;
- unlock();
- return MRLRC_OK;
- }
+ m_nSyncStatus = SS_PARAMS_COMPLETE;
unlock();
+ return MRLRC_OK;
}
- else if (MRLRC_CONTINUE == nRet) {
- return MRLRC_CONTINUE;
- }
+
+ return nRet;
}
- */
+
return MRLRC_OK;
}
--
Gitblit v1.9.3