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/CRecipesManager.h | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRecipesManager.h b/SourceCode/Bond/Servo/CRecipesManager.h
index 4c35285..e61df75 100644
--- a/SourceCode/Bond/Servo/CRecipesManager.h
+++ b/SourceCode/Bond/Servo/CRecipesManager.h
@@ -1,15 +1,19 @@
#pragma once
#include <map>
#include "CRecipeList.h"
+#include <functional>
#define SS_NONE 0
#define SS_SYNCING 1
-#define SS_COMPLETE 2
-#define SS_TIMEOUT 3
-#define SS_FAILED 4
+#define SS_LIST_COMPLETE 2
+#define SS_PARAMS_COMPLETE 3
+#define SS_TIMEOUT 4
+#define SS_FAILED 5
namespace SERVO {
+ typedef std::function<void(int state)> ONSYNCINGSTATECHANGED;
+
class CRecipesManager
{
public:
@@ -17,12 +21,17 @@
virtual ~CRecipesManager();
public:
+ void setOnSyncingStateChanged(ONSYNCINGSTATECHANGED block);
unsigned TimeoutCheckWorkingProc();
int syncing();
void syncFailed();
+ void syncTimeout();
short decodeRecipeListReport(const char* pszData, size_t size);
short decodeRecipeParameterReport(const char* pszData, size_t size);
CRecipeList* getRecipeListFromTemp(int unitNo);
+ CRecipeList* getRecipeList(int unitNo);
+ bool saveRecipeList(int unitNo, std::string& strFilepath);
+ bool readRecipeList(int unitNo, std::string& strFilepath);
public:
inline void lock() { ::EnterCriticalSection(&m_cs); };
@@ -39,6 +48,7 @@
int m_nTotalParameterCount;
std::map<int, CRecipeList*> m_mapRecipes;
std::map<int, CRecipeList*> m_mapRecipesTemp;
+ ONSYNCINGSTATECHANGED m_onSyncingStateChanged;
};
}
--
Gitblit v1.9.3