From cf1497e3bba45ddc3b31cf9768954248bedc0bc1 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 16:03:21 +0800
Subject: [PATCH] 1.修复以下问题：Only-1 Job 支持：isProcessJobsEmpty()/validate 决定了当前实现只支持单个 PJ/CJ。Host 如果按标准一次下多 PJ 或在运行中追加 PJ，会被拒绝但无明确回应，容易引起 Host/设备状态脱节。
---
SourceCode/Bond/Servo/Model.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 5087821..07c66c8 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -10,6 +10,7 @@
#include "RecipeManager.h"
#include "GlassLogDb.h"
#include "CParam.h"
+#include "CJobDataS.h"
#include <algorithm>
#include <iomanip>
#include <sstream>
@@ -167,18 +168,6 @@
setControlState(ControlState::OnlineRemote);
}
};
- listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
- // 鍦ㄦ濉厖甯搁噺鍊硷紝鐩墠浠呮槸鍔�1鍚庤繑鍥�
- for (auto& item : eqcs) {
- sprintf_s(item.szValue, EQCONSTANT_VALUE_MAX, "Test%d", item.id + 1);
- }
- };
- listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
- // 鍦ㄦ淇濆瓨鍜岃缃満鍣ㄥ父閲忓��
- for (auto& item : eqcs) {
- LOGI("onEQConstantRequest: %d, %s", item.id, item.szValue);
- }
- };
listener.onDatetimeSync = [&](void* pFrom, SYSTEMTIME& time) -> void {
LOGI("onDatetimeSync: %d%02d%02d%02d%02d%02d", time.wYear,
time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond);
@@ -244,6 +233,11 @@
// 鐪熸鐨勨�滃紑濮嬧�濈敱 ProceedWithSlotMap 鍐崇瓥瑙﹀彂銆�
// 浠呭綋鏈紑鍚� CompareMapsBeforeProceeding 鏃讹紝鎵嶆部鐢ㄦ棫閫昏緫鐩存帴 Start銆�
LOGI("<CModel>ProceedWithCarrier");
+ if (m_master.getControlJob() == nullptr || m_master.isProcessJobsEmpty()) {
+ strErrorTxt = "rejected - ControlJob/ProcessJob not ready";
+ LOGW("<CModel>ProceedWithCarrier rejected: no CJ/PJ, port=%d", portIndex + 1);
+ return CAACK_5;
+ }
if (pLoadPort == nullptr || !pLoadPort->isCompareMapsBeforeProceeding()) {
m_master.proceedWithCarrier(portIndex);
}
@@ -310,6 +304,10 @@
CString strVarialbleFile;
strVarialbleFile.Format(_T("%s\\VariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+ strVarialbleFile.Format(_T("%s\\DataVariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+ m_hsmsPassive.loadDataVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+ strVarialbleFile.Format(_T("%s\\EquipmentConstantList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+ m_hsmsPassive.loadEquipmentConstants((LPTSTR)(LPCTSTR)strVarialbleFile);
setControlState(m_currentControlState);
refreshDerivedSVs();
m_hsmsPassive.init(this, "APP", 7000);
@@ -510,6 +508,42 @@
notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
};
+ masterListener.onJobReceived = [&](void* pMaster, SERVO::CEquipment* pEquipment, int port, SERVO::CJobDataS* pJobDataS) {
+ (void)pMaster;
+ (void)port;
+ if (pEquipment == nullptr || pJobDataS == nullptr) return;
+ const int eqId = pEquipment->getID();
+ const int recipeId = pJobDataS->getMasterRecipe();
+ std::string recipe = RecipeManager::getInstance().getPPIDById(recipeId);
+ if (recipe.empty()) {
+ recipe = std::to_string(recipeId);
+ }
+ const std::string prev = pEquipment->getCurrentRecipe();
+ if (recipe.empty() || recipe == prev) {
+ pEquipment->setCurrentRecipe(recipe);
+ return;
+ }
+ pEquipment->setCurrentRecipe(recipe);
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
+ m_hsmsPassive.setVariableValue("EQPPExecName", recipe.c_str());
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ const char* recipeVid = nullptr;
+ switch (eqId) {
+ case EQ_ID_Bonder1: recipeVid = "Bonder1CurrentRecipe"; break;
+ case EQ_ID_Bonder2: recipeVid = "Bonder2CurrentRecipe"; break;
+ case EQ_ID_VACUUMBAKE: recipeVid = "VacuumBakeCurrentRecipe"; break;
+ case EQ_ID_BAKE_COOLING: recipeVid = "BakeCoolingCurrentRecipe"; break;
+ case EQ_ID_MEASUREMENT: recipeVid = "MeasurementCurrentRecipe"; break;
+ case EQ_ID_EFEM: recipeVid = "EFEMCurrentRecipe"; break;
+ default: break;
+ }
+ if (recipeVid != nullptr) {
+ m_hsmsPassive.setVariableValue(recipeVid, recipe.c_str());
+ }
+ m_hsmsPassive.requestEventReportSend("RecipeChanged");
+ });
+ };
masterListener.onLoadPortStatusChanged = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short status, __int64 data) {
LOGE("<CModel>onLoadPortStatusChanged. status = %d", status);
static std::map<int, short> s_prevPortStatus;
--
Gitblit v1.9.3