From 867888458abdc029cbf31b6058edfefe30a20722 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 16:38:24 +0800
Subject: [PATCH] 1.修复重启后，由于PJ不是列队中，导致无法创建调度任务的问题。 2.修复CPjPage2点Port2的物料类型，Port1也跟着变的问题。
---
SourceCode/Bond/Servo/HsmsPassive.cpp | 397 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 325 insertions(+), 72 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index df2aaeb..c795494 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -665,6 +665,27 @@
maxId = item->getVarialbleId();
}
}
+ for (auto item : m_dataVariabels) {
+ if (item && item->getVarialbleId() > maxId) {
+ maxId = item->getVarialbleId();
+ }
+ }
+ return maxId;
+}
+
+unsigned int CHsmsPassive::getMaxDataVariableId() const
+{
+ unsigned int maxId = 0;
+ for (auto item : m_variabels) {
+ if (item && item->getVarialbleId() > maxId) {
+ maxId = item->getVarialbleId();
+ }
+ }
+ for (auto item : m_dataVariabels) {
+ if (item && item->getVarialbleId() > maxId) {
+ maxId = item->getVarialbleId();
+ }
+ }
return maxId;
}
@@ -895,6 +916,75 @@
if (filepath.empty()) return -3;
return writeVariablesToFile(filepath);
+}
+
+int CHsmsPassive::deleteDataVariable(int dvid)
+{
+ Lock();
+ auto it = std::find_if(m_dataVariabels.begin(), m_dataVariabels.end(), [=](SERVO::CDataVariable* v) {
+ return v != nullptr && v->getVarialbleId() == (unsigned int)dvid;
+ });
+ if (it == m_dataVariabels.end()) {
+ Unlock();
+ return -1;
+ }
+ delete *it;
+ m_dataVariabels.erase(it);
+ auto filepath = m_strDataVariableFilepath;
+ Unlock();
+
+ if (filepath.empty()) return -2;
+ return writeDataVariablesToFile(filepath);
+}
+
+int CHsmsPassive::addDataVariable(const char* pszName, const char* pszFormat, const char* pszRemark, int& outId)
+{
+ if (pszName == nullptr || pszFormat == nullptr) return -1;
+ std::string fmt = pszFormat;
+ std::transform(fmt.begin(), fmt.end(), fmt.begin(), ::toupper);
+ if (!isValidFormat(fmt)) return -2;
+
+ Lock();
+ int maxId = 0;
+ for (auto v : m_dataVariabels) {
+ if (v != nullptr && static_cast<int>(v->getVarialbleId()) > maxId) {
+ maxId = static_cast<int>(v->getVarialbleId());
+ }
+ }
+ outId = maxId + 1;
+
+ SERVO::CDataVariable* pNew = new SERVO::CDataVariable(std::to_string(outId).c_str(), pszName, fmt.c_str(), pszRemark ? pszRemark : "");
+ m_dataVariabels.push_back(pNew);
+ auto filepath = m_strDataVariableFilepath;
+ Unlock();
+
+ if (filepath.empty()) return -3;
+ return writeDataVariablesToFile(filepath);
+}
+
+int CHsmsPassive::updateDataVariable(int dvid, const char* pszName, const char* pszFormat, const char* pszRemark)
+{
+ if (pszName == nullptr || pszFormat == nullptr) return -1;
+ std::string fmt = pszFormat;
+ std::transform(fmt.begin(), fmt.end(), fmt.begin(), ::toupper);
+ if (!isValidFormat(fmt)) return -2;
+
+ Lock();
+ auto it = std::find_if(m_dataVariabels.begin(), m_dataVariabels.end(), [=](SERVO::CDataVariable* v) {
+ return v != nullptr && v->getVarialbleId() == (unsigned int)dvid;
+ });
+ if (it == m_dataVariabels.end()) {
+ Unlock();
+ return -4;
+ }
+ (*it)->setName(pszName);
+ (*it)->setFormat(fmt.c_str());
+ (*it)->setRemark(pszRemark ? pszRemark : "");
+ auto filepath = m_strDataVariableFilepath;
+ Unlock();
+
+ if (filepath.empty()) return -3;
+ return writeDataVariablesToFile(filepath);
}
int CHsmsPassive::writeVariablesToFile(const std::string& filepath)
@@ -1457,7 +1547,7 @@
int CHsmsPassive::addCollectionEvent(unsigned int CEID, const char* name, const char* desc, const std::vector<unsigned int>& rptids)
{
- if (getEvent((unsigned short)CEID) != nullptr) {
+ if (getEvent((unsigned int)CEID) != nullptr) {
return -1;
}
auto* pEvent = new SERVO::CCollectionEvent(CEID, name, desc, const_cast<std::vector<unsigned int>&>(rptids));
@@ -1498,7 +1588,7 @@
m_collectionEvents.clear();
}
-SERVO::CCollectionEvent* CHsmsPassive::getEvent(unsigned short CEID)
+SERVO::CCollectionEvent* CHsmsPassive::getEvent(unsigned int CEID)
{
for (auto item : m_collectionEvents) {
if (item->getEventId() == CEID) {
@@ -1646,10 +1736,18 @@
replySelectedEquipmentStatusData(pMessage);
}
else if (nStream == 1 && pHeader->function == 11) {
- replyStatusVariableNamelistRequest(pMessage);
+ // [EAP_MAPPING][S1F11] Status Variable namelist request -> S1F12.
+ // If customer requires swapping SV/DV mapping, this is one of the two switch points.
+ // Swap target with S1F21 branch below.
+ // replyStatusVariableNamelistRequest(pMessage);
+ replyDataVariableNamelistRequest(pMessage);
}
else if (nStream == 1 && pHeader->function == 21) {
- replyDataVariableNamelistRequest(pMessage);
+ // [EAP_MAPPING][S1F21] Data Variable namelist request -> S1F22.
+ // If customer requires swapping SV/DV mapping, this is one of the two switch points.
+ // Swap target with S1F11 branch above.
+ // replyDataVariableNamelistRequest(pMessage);
+ replyStatusVariableNamelistRequest(pMessage);
}
else if (nStream == 1 && pHeader->function == 23) {
replyCollectionEventNamelistRequest(pMessage);
@@ -1819,7 +1917,16 @@
if (pszBuffer == nullptr) {
index += sizeof(int);
for (auto item : m_listActionSpooling) {
- index += item->serialize(pszBuffer, nBufferSize);
+ if (item == nullptr || item->getSendMessage() == nullptr) {
+ LOGE("<HSMS>skip spooling item: null send message");
+ continue;
+ }
+ int nRet = item->serialize(nullptr, 0);
+ if (nRet <= 0) {
+ LOGE("<HSMS>skip spooling item: serialize failed");
+ continue;
+ }
+ index += nRet;
}
index += calcSpoolCfgSize();
@@ -1827,15 +1934,31 @@
return index;
}
else {
- int nTemp, nRet;
+ int nTemp = 0;
+ int nRet = 0;
- nTemp = (int)m_listActionSpooling.size();
+ for (auto item : m_listActionSpooling) {
+ if (item == nullptr || item->getSendMessage() == nullptr) {
+ continue;
+ }
+ if (item->serialize(nullptr, 0) > 0) {
+ ++nTemp;
+ }
+ }
+
memcpy(&pszBuffer[index], &nTemp, sizeof(int));
index += sizeof(int);
for (auto item : m_listActionSpooling) {
+ if (item == nullptr || item->getSendMessage() == nullptr) {
+ LOGE("<HSMS>skip spooling item: null send message");
+ continue;
+ }
nRet = item->serialize(&pszBuffer[index], nBufferSize);
- if (nRet <= 0) break;
+ if (nRet <= 0) {
+ LOGE("<HSMS>skip spooling item: serialize failed");
+ continue;
+ }
index += nRet;
}
@@ -1881,7 +2004,10 @@
for (int i = 0; i < nTemp; i++) {
CHsmsAction* pAction = new CHsmsAction();
nRet = pAction->unserialize(&pszBuffer[index], nBufferSize - index);
- if (nRet <= 0) break;
+ if (nRet <= 0 || pAction->getSendMessage() == nullptr) {
+ delete pAction;
+ break;
+ }
index += nRet;
m_listActionSpooling.push_back(pAction);
}
@@ -1962,6 +2088,11 @@
Unlock();
if (!selected) {
IMessage* pMsg = pAction->getSendMessage();
+ if (pMsg == NULL) {
+ LOGE("<HSMS>spooling drop: null send message");
+ delete pAction;
+ continue;
+ }
uint8_t streamId = 0;
uint8_t functionId = 0;
if (pMsg && pMsg->getHeader()) {
@@ -1983,9 +2114,14 @@
if (pAction->isNeedWaitReply()) {
// 濡傛灉闇�瑕佺瓑寰呭洖澶�
+ IMessage* pMessage = pAction->getSendMessage();
+ if (pMessage == NULL) {
+ LOGE("<HSMS>drop action: null send message");
+ delete pAction;
+ continue;
+ }
Lock();
m_pActiveAction = pAction;
- IMessage* pMessage = pAction->getSendMessage();
Unlock();
ASSERT(pMessage);
@@ -2009,9 +2145,14 @@
Unlock();
}
else {
+ IMessage* pMessage = pAction->getSendMessage();
+ if (pMessage == NULL) {
+ LOGE("<HSMS>drop action: null send message");
+ delete pAction;
+ continue;
+ }
Lock();
m_listActionSent.push_back(pAction);
- IMessage* pMessage = pAction->getSendMessage();
Unlock();
ASSERT(pMessage);
@@ -2054,11 +2195,15 @@
Lock();
CHsmsAction* pAction = new CHsmsAction(ACTION_HELLO, FALSE, m_nActionTimeout);
- m_listAction.push_back(pAction);
IMessage* pMessage = NULL;
- HSMS_Create1Message(pMessage, m_nSessionId, 1 | REPLY, 1, ++m_nSystemByte);
- ASSERT(pMessage);
+ if (HSMS_Create1Message(pMessage, m_nSessionId, 1 | REPLY, 1, ++m_nSystemByte) != 0 || pMessage == NULL) {
+ LOGE("<HSMS>S1F1 create message failed");
+ delete pAction;
+ Unlock();
+ return ER_CREATED_MESSAGE;
+ }
pAction->setSendMessage(pMessage);
+ m_listAction.push_back(pAction);
SetEvent(m_hCimWorkEvent);
Unlock();
@@ -2164,31 +2309,50 @@
HSMS_Create1Message(pMessage, m_nSessionId, 1, 4, pRecv->getHeader()->systemBytes);
ASSERT(pMessage);
- unsigned char SVU1 = 0;
- unsigned short SVID = 0;
+ std::vector<unsigned int> reqIds;
ISECS2Item* pBody = pRecv->getBody();
if (pBody == nullptr || pBody->getType() != SITYPE::L) {
- pMessage->getBody()->addU1Item(SVU1, "SV");
goto MYREPLY;
}
- if (!pBody->getSubItemU2(0, SVID)) {
- // also accept I2 or U4 to be tolerant with host implementations
- if (!pBody->getSubItemI2(0, (short&)SVID)) {
- unsigned int svidU4 = 0;
- if (!pBody->getSubItemU4(0, svidU4)) {
- pMessage->getBody()->addU1Item(SVU1, "SV");
- goto MYREPLY;
- }
- SVID = static_cast<unsigned short>(svidU4);
+
+ // S1F3 supports batch query: {L:n SVID}. S1F4 must return {L:n SV} in the same order.
+ const int reqSize = pBody->getSubItemSize();
+ for (int i = 0; i < reqSize; ++i) {
+ unsigned int idU4 = 0;
+ unsigned short idU2 = 0;
+ short idI2 = 0;
+ if (pBody->getSubItemU4(i, idU4)) {
+ reqIds.push_back(idU4);
+ }
+ else if (pBody->getSubItemU2(i, idU2)) {
+ reqIds.push_back(static_cast<unsigned int>(idU2));
+ }
+ else if (pBody->getSubItemI2(i, idI2) && idI2 >= 0) {
+ reqIds.push_back(static_cast<unsigned int>(idI2));
}
}
- SERVO::CVariable* pVariable = getVariable((int)SVID);
- if (pVariable == nullptr) {
- pMessage->getBody()->addU1Item(SVU1, "SV");
- goto MYREPLY;
+ // L:0 means "all SVIDs".
+ if (reqIds.empty()) {
+ Lock();
+ for (auto* v : m_variabels) {
+ if (v != nullptr) {
+ reqIds.push_back(static_cast<unsigned int>(v->getVarialbleId()));
+ }
+ }
+ Unlock();
}
- addVariableValueToItem(pMessage->getBody(), pVariable);
+
+ for (auto id : reqIds) {
+ SERVO::CVariable* pVariable = getVariable((int)id);
+ if (pVariable != nullptr) {
+ addVariableValueToItem(pMessage->getBody(), pVariable);
+ }
+ else {
+ // Unknown SVID placeholder.
+ pMessage->getBody()->addU1Item(0, "SV");
+ }
+ }
MYREPLY:
m_pPassive->sendMessage(pMessage);
@@ -2202,32 +2366,44 @@
return 0;
}
-// S1F11
+// S1F21
int CHsmsPassive::replyStatusVariableNamelistRequest(IMessage* pRecv)
{
+ // [EAP_MAPPING][SV_HANDLER]
+ // Current behavior: handles S1F11 and replies S1F12 with SVID/SVNAME/UNITS.
+ // If customer requires SV/DV swap, this function body can be swapped with
+ // replyDataVariableNamelistRequest (or dispatch branches can be swapped instead).
if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
return ER_NOTSELECT;
}
- std::vector<unsigned short> reqIds;
+ std::vector<unsigned int> reqIds;
ISECS2Item* pBody = pRecv->getBody();
if (pBody != nullptr && pBody->getType() == SITYPE::L) {
const int sz = pBody->getSubItemSize();
for (int i = 0; i < sz; ++i) {
- unsigned short id = 0;
- if (pBody->getSubItemU2(i, id)) {
+ unsigned int id = 0;
+ unsigned short idU2 = 0;
+ short idI2 = 0;
+ if (pBody->getSubItemU4(i, id)) {
reqIds.push_back(id);
+ }
+ else if (pBody->getSubItemU2(i, idU2)) {
+ reqIds.push_back(static_cast<unsigned int>(idU2));
+ }
+ else if (pBody->getSubItemI2(i, idI2) && idI2 >= 0) {
+ reqIds.push_back(static_cast<unsigned int>(idI2));
}
}
}
// Build response list items: {L:3 SVID, SVNAME, UNITS}
- std::vector<unsigned short> svids;
- std::set<unsigned short> requested(reqIds.begin(), reqIds.end());
+ std::vector<unsigned int> svids;
+ std::set<unsigned int> requested(reqIds.begin(), reqIds.end());
Lock();
if (reqIds.empty()) {
for (auto v : m_variabels) {
- svids.push_back(static_cast<unsigned short>(v->getVarialbleId()));
+ svids.push_back(static_cast<unsigned int>(v->getVarialbleId()));
}
}
else {
@@ -2239,13 +2415,13 @@
Unlock();
IMessage* pMessage = NULL;
- HSMS_Create1Message(pMessage, m_nSessionId, 1, 12, pRecv->getHeader()->systemBytes);
+ HSMS_Create1Message(pMessage, m_nSessionId, 1, 22, pRecv->getHeader()->systemBytes);
ASSERT(pMessage);
ISECS2Item* pList = pMessage->getBody(); // Body is L[n] of {SVID, SVNAME, UNITS}
for (auto id : svids) {
ISECS2Item* pEntry = pList->addItem();
- pEntry->addU2Item(id, "SVID");
+ pEntry->addU4Item(id, "SVID");
SERVO::CVariable* v = getVariable((int)id);
if (v != nullptr) {
pEntry->addItem(v->getName().c_str(), "SVNAME");
@@ -2311,31 +2487,43 @@
file.Close();
return 0;
}
-// S1F21/S1F22 - Data Variable Namelist
+// S1F11/S1F12 - Data Variable Namelist
int CHsmsPassive::replyDataVariableNamelistRequest(IMessage* pRecv)
{
+ // [EAP_MAPPING][DV_HANDLER]
+ // Current behavior: handles S1F21 and replies S1F22 with DVID/DVNAME/UNITS.
+ // If customer requires SV/DV swap, this function body can be swapped with
+ // replyStatusVariableNamelistRequest (or dispatch branches can be swapped instead).
if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
return ER_NOTSELECT;
}
- std::vector<unsigned short> reqIds;
+ std::vector<unsigned int> reqIds;
ISECS2Item* pBody = pRecv->getBody();
if (pBody != nullptr && pBody->getType() == SITYPE::L) {
const int sz = pBody->getSubItemSize();
for (int i = 0; i < sz; ++i) {
- unsigned short id = 0;
- if (pBody->getSubItemU2(i, id)) {
+ unsigned int id = 0;
+ unsigned short idU2 = 0;
+ short idI2 = 0;
+ if (pBody->getSubItemU4(i, id)) {
reqIds.push_back(id);
+ }
+ else if (pBody->getSubItemU2(i, idU2)) {
+ reqIds.push_back(static_cast<unsigned int>(idU2));
+ }
+ else if (pBody->getSubItemI2(i, idI2) && idI2 >= 0) {
+ reqIds.push_back(static_cast<unsigned int>(idI2));
}
}
}
- std::vector<unsigned short> dvids;
- std::set<unsigned short> requested(reqIds.begin(), reqIds.end());
+ std::vector<unsigned int> dvids;
+ std::set<unsigned int> requested(reqIds.begin(), reqIds.end());
Lock();
if (reqIds.empty()) {
for (auto v : m_dataVariabels) {
- if (v) dvids.push_back(static_cast<unsigned short>(v->getVarialbleId()));
+ if (v) dvids.push_back(static_cast<unsigned int>(v->getVarialbleId()));
}
}
else {
@@ -2344,13 +2532,13 @@
Unlock();
IMessage* pMessage = NULL;
- HSMS_Create1Message(pMessage, m_nSessionId, 1, 22, pRecv->getHeader()->systemBytes);
+ HSMS_Create1Message(pMessage, m_nSessionId, 1, 12, pRecv->getHeader()->systemBytes);
ASSERT(pMessage);
ISECS2Item* pList = pMessage->getBody(); // L[n] of {DVID, DVNAME, UNITS}
for (auto id : dvids) {
ISECS2Item* pEntry = pList->addItem();
- pEntry->addU2Item(id, "DVID");
+ pEntry->addU4Item(id, "DVID");
SERVO::CDataVariable* v = getDataVariable((int)id);
if (v != nullptr) {
pEntry->addItem(v->getName().c_str(), "DVNAME");
@@ -2378,22 +2566,26 @@
return ER_NOTSELECT;
}
- std::vector<unsigned short> reqIds;
+ std::vector<unsigned int> reqIds;
ISECS2Item* pBody = pRecv->getBody();
if (pBody != nullptr && pBody->getType() == SITYPE::L) {
const int sz = pBody->getSubItemSize();
for (int i = 0; i < sz; ++i) {
- unsigned short id = 0;
- if (pBody->getSubItemU2(i, id)) {
+ unsigned int id = 0;
+ unsigned short idU2 = 0;
+ if (pBody->getSubItemU4(i, id)) {
reqIds.push_back(id);
+ }
+ else if (pBody->getSubItemU2(i, idU2)) {
+ reqIds.push_back(static_cast<unsigned int>(idU2));
}
}
}
struct CEInfo {
- unsigned short id{ 0 };
+ unsigned int id{ 0 };
std::string name;
- std::vector<unsigned short> vids;
+ std::vector<unsigned int> vids;
};
std::vector<CEInfo> ceInfos;
{
@@ -2402,13 +2594,13 @@
for (auto e : m_collectionEvents) {
if (e == nullptr) continue;
CEInfo info;
- info.id = static_cast<unsigned short>(e->getEventId());
+ info.id = static_cast<unsigned int>(e->getEventId());
info.name = e->getName();
- std::set<unsigned short> vidSet;
+ std::set<unsigned int> vidSet;
for (auto rpt : e->getReports()) {
if (rpt == nullptr) continue;
for (auto vid : rpt->getVids()) {
- vidSet.insert(static_cast<unsigned short>(vid));
+ vidSet.insert(static_cast<unsigned int>(vid));
}
}
info.vids.assign(vidSet.begin(), vidSet.end());
@@ -2419,14 +2611,14 @@
for (auto id : reqIds) {
CEInfo info;
info.id = id;
- SERVO::CCollectionEvent* e = getEvent(id);
+ SERVO::CCollectionEvent* e = getEvent(static_cast<unsigned int>(id));
if (e != nullptr) {
info.name = e->getName();
- std::set<unsigned short> vidSet;
+ std::set<unsigned int> vidSet;
for (auto rpt : e->getReports()) {
if (rpt == nullptr) continue;
for (auto vid : rpt->getVids()) {
- vidSet.insert(static_cast<unsigned short>(vid));
+ vidSet.insert(static_cast<unsigned int>(vid));
}
}
info.vids.assign(vidSet.begin(), vidSet.end());
@@ -2444,11 +2636,11 @@
ISECS2Item* pList = pMessage->getBody(); // Body is L[n] of {CEID, CENAME, L[VIDs]}
for (const auto& info : ceInfos) {
ISECS2Item* pEntry = pList->addItem();
- pEntry->addU2Item(info.id, "CEID");
+ pEntry->addU4Item(info.id, "CEID");
pEntry->addItem(info.name.c_str(), "CENAME"); // empty if unknown
ISECS2Item* pVidList = pEntry->addItem();
for (auto vid : info.vids) {
- pVidList->addU2Item(vid, "VID");
+ pVidList->addU4Item(vid, "VID");
}
}
@@ -3315,6 +3507,26 @@
// 瑙ｉ噴鏁版嵁锛屽緱鍒癈ProcessJob
+ // 瀹归噺鍓嶇疆妫�鏌ワ細褰撳墠瀹炵幇浠呮敮鎸佸崟鎵� PJ 闆嗗悎锛屽鏋滃凡鏈� PJ/CJ锛岀洿鎺ヨ繑鍥� ACKA=false
+ if (m_pModel != nullptr && !m_pModel->getMaster().isProcessJobsEmpty()) {
+ IMessage* pMessage = NULL;
+ HSMS_Create1Message(pMessage, m_nSessionId, 16, 16, ++m_nSystemByte);
+ ASSERT(pMessage);
+ pMessage->getBody()->addItem(); // PRJOBID list 涓虹┖
+ ISECS2Item* pItemErrors = pMessage->getBody()->addItem();
+ pItemErrors->addBoolItem(false, "ACKA");
+ ISECS2Item* pItemErrors2 = pItemErrors->addItem();
+ auto err = pItemErrors2->addItem();
+ err->addU4Item(1000, "ERRCODE");
+ err->addItem("PJobSpace=0 (existing ProcessJob/ControlJob)", "ERRTEXT");
+ m_pPassive->sendMessage(pMessage);
+ LOGI("<HSMS>[SEND]sessionId:%d, sType:%d systemBytes:%d",
+ pMessage->getHeader()->sessionId, pMessage->getHeader()->sType, pMessage->getHeader()->systemBytes);
+ LogSecsMessageBrief("<HSMS>[SEND]", pMessage);
+ HSMS_Destroy1Message(pMessage);
+ return 0;
+ }
+
ISECS2Item* pItemPjs, * pItemPj,* pItemCarriers, * pItemCarrier, *pItemSlots, *pItemRecipes;
unsigned short DATAID;
const char* pszPrjobid, *pszMF, *pszCarrierId, *pszRecipeName;
@@ -3366,7 +3578,11 @@
}
- // 鍥炲鎶ユ枃
+ ASSERT(m_listener.onPRJobMultiCreate != nullptr);
+ int nRet = m_listener.onPRJobMultiCreate(this, pjs);
+
+
+ // 鍥炲鎶ユ枃锛堝湪鏍￠獙/钀藉簱鍚庡啀鍥炲锛屼互渚垮甫涓婄湡瀹炵殑 issues锛�
IMessage* pMessage = NULL;
HSMS_Create1Message(pMessage, m_nSessionId, 16, 16, ++m_nSystemByte);
ASSERT(pMessage);
@@ -3392,15 +3608,15 @@
}
}
}
+ else {
+ pItemErrors->addBoolItem(true, "ACKA");
+ pItemErrors->addItem(); // 绌哄垪琛�
+ }
m_pPassive->sendMessage(pMessage);
LOGI("<HSMS>[SEND]sessionId:%d, sType:%d systemBytes:%d",
pMessage->getHeader()->sessionId, pMessage->getHeader()->sType, pMessage->getHeader()->systemBytes);
LogSecsMessageBrief("<HSMS>[SEND]", pMessage);
HSMS_Destroy1Message(pMessage);
-
-
- ASSERT(m_listener.onPRJobMultiCreate != nullptr);
- int nRet = m_listener.onPRJobMultiCreate(this, pjs);
// 閲婃斁鏈夐棶棰�(鏈坊鍔犲埌master)鐨勫唴瀛�
@@ -3422,8 +3638,12 @@
CHsmsAction* pAction = new CHsmsAction(ACTION_ALARM_REPORT, TRUE, m_nActionTimeout);
IMessage* pMessage = NULL;
- HSMS_Create1Message(pMessage, m_nSessionId, 5 | REPLY, 1, ++m_nSystemByte);
- ASSERT(pMessage);
+ if (HSMS_Create1Message(pMessage, m_nSessionId, 5 | REPLY, 1, ++m_nSystemByte) != 0 || pMessage == NULL) {
+ LOGE("<HSMS>S5F1 create message failed");
+ delete pAction;
+ Unlock();
+ return ER_CREATED_MESSAGE;
+ }
ISECS2Item* pItem = pMessage->getBody();
pItem->addBinaryItem(szALCD, 1, "ALCD");
pItem->addU4Item(ALID, "ALID");
@@ -3455,6 +3675,10 @@
if (pEvent == nullptr) {
return ER_NO_EVENT;
}
+ // 瑙﹀彂 PauseEvent 妫�娴嬫々锛堢敱 Master 璐熻矗瀹為檯绛栫暐锛�
+ if (m_pModel != nullptr) {
+ m_pModel->getMaster().handleCollectionEvent(CEID);
+ }
SERVO::CReport* pReport = pEvent->getFirstReport();
@@ -3462,8 +3686,12 @@
Lock();
CHsmsAction* pAction = new CHsmsAction(ACTION_EVENT_REPORT, TRUE, m_nActionTimeout);
IMessage* pMessage = NULL;
- HSMS_Create1Message(pMessage, m_nSessionId, 6 | REPLY, 11, ++m_nSystemByte);
- ASSERT(pMessage);
+ if (HSMS_Create1Message(pMessage, m_nSessionId, 6 | REPLY, 11, ++m_nSystemByte) != 0 || pMessage == NULL) {
+ LOGE("<HSMS>S6F11 create message failed");
+ delete pAction;
+ Unlock();
+ return ER_CREATED_MESSAGE;
+ }
ISECS2Item* pItem = pMessage->getBody();
// pItem->addU2Item(++DATAID, "DATAID"); // 鏍规嵁鍒殑鏃ュ織鏄剧ずDATAID鎭掍负0锛屾墍浠ユ垜浠厛鐓т娇鐢�0
pItem->addU2Item(0, "DATAID");
@@ -3598,7 +3826,32 @@
int CHsmsPassive::requestEventReportSend_OCR_PanelID_Read_OK()
{
- return requestEventReportSend("OCR_PanelID_Read_OK");
+ return requestEventReportSend_OCR_PanelID_Read(1);
+}
+
+int CHsmsPassive::requestEventReportSend_OCR_PanelID_Read(short vcrResult)
+{
+ const char* eventName = "OCR_PanelID_Read_OK";
+ switch (vcrResult) {
+ case 1: // OK & Match
+ eventName = "OCR_PanelID_Read_OK";
+ break;
+ case 2: // OK & Mismatch
+ eventName = "OCR_PanelID_Read_Mismatch";
+ break;
+ case 3: // Fail & KeyIn Match
+ eventName = "OCR_PanelID_Read_NG";
+ break;
+ case 4: // Fail & KeyIn Mismatch
+ eventName = "OCR_PanelID_Read_NG_Mismatch";
+ break;
+ default:
+ LOGE("<CHsmsPassive>Unknown VCR result=%d, fallback to OCR_PanelID_Read_OK", vcrResult);
+ eventName = "OCR_PanelID_Read_OK";
+ break;
+ }
+
+ return requestEventReportSend(eventName);
}
int CHsmsPassive::requestEventReportSend_LoadPortNotAssoc()
--
Gitblit v1.9.3