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/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