From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期三, 14 一月 2026 15:43:40 +0800 Subject: [PATCH] 1.修复以下问题： ProceedWithCarrier 直接发 CCC_PROCESS_START：CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时，收到 ProceedWithCarrier 就调用 master.proceedWithCarrier（仅发送 Cassette Process Start，不校验 PJ/CJ 是否存在、SlotMap 是否验通过）。若 Host 流程异常（未下 PJ/CJ）或本地尚未准备好，会把设备推进加工态但无作业可跑。 --- SourceCode/Bond/Servo/RecipeManager.h | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/SourceCode/Bond/Servo/RecipeManager.h b/SourceCode/Bond/Servo/RecipeManager.h index 2ffba09..70837c0 100644 --- a/SourceCode/Bond/Servo/RecipeManager.h +++ b/SourceCode/Bond/Servo/RecipeManager.h @@ -101,11 +101,13 @@ // 鏇存柊璁惧閰嶆柟ID锛堥�氳繃 PPID 鍜岃澶囧悕绉帮級 bool updateDeviceRecipeIDByName(const std::string& ppid, const std::string& strDeviceName, int nNewRecipeID); - bool addDeviceRecipe(const std::string& deviceName, int nRecipeID, const std::string& strRecipeName); - bool updateDeviceRecipe(const std::string& deviceName, int nRecipeID, const std::string& newName); - std::string getDeviceRecipeName(const std::string& deviceName, int nRecipeID); - bool deleteDeviceRecipe(const std::string& deviceName, int nRecipeID); - std::vector<std::pair<int, std::string>> getDeviceRecipes(const std::string& deviceName); + bool addDeviceRecipe(const std::string& strDeviceName, int nID, const std::string& strName, const std::string& strPara); + bool updateDeviceRecipeName(const std::string& strDeviceName, int nID, const std::string& strNewName); + bool updateDeviceRecipePara(const std::string& strDeviceName, int nID, const std::string& strNewPara); + std::string getDeviceRecipeName(const std::string& strDeviceName, int nID); + std::string getDeviceRecipePara(const std::string& strDeviceName, int nID); + bool deleteDeviceRecipe(const std::string& strDeviceName, int nID); + std::vector<std::pair<int, std::string>> getDeviceRecipes(const std::string& strDeviceName); // 妯℃嫙鎻掑叆鏁版嵁锛堟祴璇曠敤锛� void insertMockData(); -- Gitblit v1.9.3