From 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 27 八月 2025 13:47:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/HsmsPassive.cpp |  719 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 662 insertions(+), 57 deletions(-)

diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 902f236..e96e8a8 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -48,6 +48,7 @@
 	m_listener.onCommand = nullptr;
 	m_listener.onEQConstantRequest = nullptr;
 	m_listener.onEQConstantSend = nullptr;
+	m_pActiveAction = nullptr;
 	InitializeCriticalSection(&m_criticalSection);
 }
 
@@ -62,6 +63,10 @@
 		delete item;
 	}
 	m_listActionSent.clear();
+	for (auto item : m_listActionSpooling) {
+		delete item;
+	}
+	m_listActionSpooling.clear();
 	Unlock();
 
 	if (m_hCimWorkEvent != NULL) {
@@ -96,6 +101,43 @@
 		m_strSoftRev = m_strSoftRev.substr(0, 20);
 	}
 
+}
+
+void CHsmsPassive::addVariableValueToItem(ISECS2Item* pParent, SERVO::CVariable* pVariable)
+{
+	ASSERT(pParent);
+	ASSERT(pVariable);
+
+
+	ISECS2Item* pItemList;
+	SERVO::SVFromat format = pVariable->getFormat();
+	switch (format)
+	{
+	case SERVO::SVFromat::U1:
+		pParent->addU1Item((unsigned char)pVariable->getIntValue(), "SV");
+		break;
+	case SERVO::SVFromat::U2:
+		pParent->addU2Item((unsigned char)pVariable->getIntValue(), "SV");
+		break;
+	case SERVO::SVFromat::I2:
+		pParent->addI2Item((unsigned char)pVariable->getIntValue(), "SV");
+		break;
+	case SERVO::SVFromat::A20:
+	case SERVO::SVFromat::A50:
+		pParent->addItem(pVariable->getValue().c_str(), "SV");
+		break;
+	case SERVO::SVFromat::L:
+		pItemList = pParent->addItem();
+		{
+			auto vars = pVariable->getVarsValue();
+			for (auto v : vars) {
+				addVariableValueToItem(pItemList, &v);
+			}
+		}
+		break;
+	default:
+		break;
+	}
 }
 
 void CHsmsPassive::linkEventReport(unsigned int CEID, unsigned int RPTID)
@@ -151,11 +193,24 @@
 {
 	LOGI("onRecvMsg:%s", pMessage->toString());
 	Lock();
+	if (m_pActiveAction != nullptr &&
+		(m_pActiveAction->getSendMessage()->getHeader()->systemBytes == pMessage->getHeader()->systemBytes)) {
+		SetEvent(m_pActiveAction->getEvent());
+		LOGI("CHsmsPassive::褰撳墠绛夊緟鏈夊洖澶�");
+		TRACE("CHsmsPassive::褰撳墠绛夊緟鏈夊洖澶峔n");
+		Unlock();
+		return 0;
+	}
+	Unlock();
+
+
+	Lock();
 	CHsmsAction* pAction = nullptr;
 	for (auto iter = m_listActionSent.begin(); iter != m_listActionSent.end(); iter++) {
 		if ((*iter)->getSendMessage()->getHeader()->systemBytes == pMessage->getHeader()->systemBytes) {
 			LOGI("CHsmsPassive::鎵惧埌");
 			pAction = (*iter);
+			SetEvent(pAction->getEvent());
 			m_listActionSent.erase(iter);
 			break;
 		}
@@ -238,12 +293,47 @@
 	return nullptr;
 }
 
+SERVO::CVariable* CHsmsPassive::getVariable(const char* pszName)
+{
+	for (auto item : m_variabels) {
+		if (item->getName().compare(pszName) == 0) {
+			return item;
+		}
+	}
+
+	return nullptr;
+}
+
 void CHsmsPassive::clearAllVariabel()
 {
 	for (auto item : m_variabels) {
 		delete item;
 	}
 	m_variabels.clear();
+}
+
+void CHsmsPassive::setVariableValue(const char* pszName, __int64 value)
+{
+	auto v = getVariable(pszName);
+	if (v != nullptr) {
+		v->setValue(value);
+	}
+}
+
+void CHsmsPassive::setVariableValue(const char* pszName, const char* value)
+{
+	auto v = getVariable(pszName);
+	if (v != nullptr) {
+		v->setValue(value);
+	}
+}
+
+void CHsmsPassive::setVariableValue(const char* pszName, std::vector<SERVO::CVariable>& vars)
+{
+	auto v = getVariable(pszName);
+	if (v != nullptr) {
+		v->setValue(vars);
+	}
 }
 
 int CHsmsPassive::loadReports(const char* pszFilepath)
@@ -460,17 +550,17 @@
 	};
 	auto onRecvSysMessage = [&](void* pFrom, IMessage* pMessage) -> void {
 		LOGI("<HSMS>onRecvSysMessage:sessionId:%d, sType:%d systemBytes:%d",
-			pMessage->getHeader()->sessionId, pMessage->getHeader()->sType, pMessage->getHeader()->systemBytes);
+		pMessage->getHeader()->sessionId, pMessage->getHeader()->sType, pMessage->getHeader()->systemBytes);
 		onRecvMsg(pMessage);
 		if (MSG_LINKTEST_REQ == pMessage->getHeader()->sType) {
-			/*
-			Sleep(10);
-			if (!m_bAreYouThereRequest) {
-				m_bAreYouThereRequest = TRUE;
-				requestYouThere();
-			}
-			*/
+		/*
+		Sleep(10);
+		if (!m_bAreYouThereRequest) {
+			m_bAreYouThereRequest = TRUE;
+			requestYouThere();
 		}
+		*/
+}
 	};
 
 	auto onError = [&](void* pFrom, int error) -> void {
@@ -490,6 +580,9 @@
 		if (nStream == 1 && pHeader->function == 1) {
 			// S1F1
 			replyAreYouThere(pMessage);
+		}
+		else if (nStream == 1 && pHeader->function == 3) {
+			replySelectedEquipmentStatusData(pMessage);
 		}
 		else if (nStream == 1 && pHeader->function == 13) {
 			replyEstablishCommunications(pMessage);
@@ -524,14 +617,26 @@
 		else if (nStream == 2 && pHeader->function == 43) {
 			replyConfigureSpooling(pMessage);
 		}
+		else if (nStream == 3 && pHeader->function == 17) {
+			replyCarrierAction(pMessage);
+		}
 		else if (nStream == 5 && pHeader->function == 3) {
 			replyEanbleDisableAlarmReport(pMessage);
+		}
+		else if (nStream == 6 && pHeader->function == 23) {
+			replyPurgeSpooledData(pMessage);
 		}
 		else if (nStream == 7 && pHeader->function == 19) {
 			replyQueryPPIDList(pMessage);
 		}
 		else if (nStream == 10 && pHeader->function == 3) {
 			replyTerminalDisplay(pMessage);
+		}
+		else if (nStream == 14 && pHeader->function == 9) {
+			replyCreateObj(pMessage);
+		}
+		else if (nStream == 16 && pHeader->function == 15) {
+			replyPRJobMultiCreate(pMessage);
 		}
 	};
 
@@ -552,6 +657,42 @@
 	SetTimer(NULL, 1, 1000, (TIMERPROC)HsmsPassiveTimerProc);
 
 	return 0;
+}
+
+int CHsmsPassive::loadCacheFromFile(const char* pszFilepath)
+{
+	m_strCacheFilepath = pszFilepath;
+
+	CFile file;
+	if (!file.Open(m_strCacheFilepath.c_str(), CFile::modeRead) ) {
+		return -1;
+	}
+
+	int nBufSize = file.GetLength();
+	char* pszBuffer = new char[nBufSize];
+	file.Read(pszBuffer, nBufSize);
+	file.Close();
+	int nRet = unserialize(pszBuffer, nBufSize);
+	delete[] pszBuffer;
+
+	return nRet;
+}
+
+int CHsmsPassive::saveCache()
+{
+	CFile file;
+	if (!file.Open(m_strCacheFilepath.c_str(), CFile::modeWrite | CFile::modeCreate)) {
+		return -1;
+	}
+
+	int nSize = serialize(nullptr, 0);
+	char* pszBuffer = new char[nSize];
+	int nRet = serialize(pszBuffer, nSize);
+	file.Write(pszBuffer, nSize);
+	file.Close();
+	delete[] pszBuffer;
+
+	return nRet;
 }
 
 int CHsmsPassive::term()
@@ -577,6 +718,53 @@
 	return 0;
 }
 
+int CHsmsPassive::serialize(char* pszBuffer, int nBufferSize)
+{
+	int index = 0;
+	if (pszBuffer == nullptr) {
+		index += sizeof(int);
+		for (auto item : m_listActionSpooling) {
+			index += item->serialize(pszBuffer, nBufferSize);
+		}
+
+		return index;
+	}
+	else {
+		int nTemp, nRet;
+
+		nTemp = (int)m_listActionSpooling.size();
+		memcpy(&pszBuffer[index], &nTemp, sizeof(int));
+		index += sizeof(int);
+
+		for (auto item : m_listActionSpooling) {
+			nRet = item->serialize(&pszBuffer[index], nBufferSize);
+			if (nRet <= 0) break;
+			index += nRet;
+		}
+
+		return index;
+	}
+}
+
+int CHsmsPassive::unserialize(const char* pszBuffer, int nBufferSize)
+{
+	int index = 0, nTemp, nRet = 0;
+
+	if (index + sizeof(int) > nBufferSize) return -1;
+	memcpy(&nTemp, &pszBuffer[index], sizeof(int));
+	index += sizeof(int);
+
+	for (int i = 0; i < nTemp; i++) {
+		CHsmsAction* pAction = new CHsmsAction();
+		nRet = pAction->unserialize(&pszBuffer[index], nBufferSize - index);
+		if (nRet <= 0) break;
+		index += nRet;
+		m_listActionSpooling.push_back(pAction);
+	}
+
+	return index + nRet;
+}
+
 unsigned CHsmsPassive::OnCimWork()
 {
 	while (m_bCimWorking) {
@@ -595,17 +783,26 @@
 		while (!list.empty()) {
 			Lock();
 			CHsmsAction* pAction = list.front();
+			if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+				m_listActionSpooling.push_back(pAction);
+				Unlock();
+				continue;
+			}
 			Unlock();
 			list.pop_front();
 			TRACE("OnCimWork 004.\n");
 
-			IMessage* pMessage = pAction->getSendMessage();
-			ASSERT(pMessage);
-			m_pPassive->sendMessage(pMessage);
-			LOGI("<HSMS> [SEND] SysByte=%u sessionId:%d", pMessage->getHeader()->systemBytes, pMessage->getHeader()->sessionId);
-
 			if (pAction->isNeedWaitReply()) {
 				// 濡傛灉闇�瑕佺瓑寰呭洖澶�
+				Lock();
+				m_pActiveAction = pAction;
+				IMessage* pMessage = pAction->getSendMessage();
+				Unlock();
+
+				ASSERT(pMessage);
+				m_pPassive->sendMessage(pMessage);
+				LOGI("<HSMS> [SEND] SysByte=%u sessionId:%d", pMessage->getHeader()->systemBytes, pMessage->getHeader()->sessionId);
+
 				int nRet = WaitForSingleObject(pAction->getEvent(), pAction->getTimeout() * 1000);
 				if (nRet == WAIT_TIMEOUT) {
 					TRACE("Timeout...\n");
@@ -616,18 +813,22 @@
 						//pContext->setEvent();
 					}
 				}
-
-				delete pAction;
-				pAction = NULL;
-				TRACE("delete m_pCurrentAction, next...\n");
+				Lock();
+				delete m_pActiveAction;
+				m_pActiveAction = nullptr;
+				Unlock();
 			}
 			else {
 				Lock();
 				m_listActionSent.push_back(pAction);
+				IMessage* pMessage = pAction->getSendMessage();
 				Unlock();
+
+				ASSERT(pMessage);
+				m_pPassive->sendMessage(pMessage);
+				LOGI("<HSMS> [SEND] SysByte=%u sessionId:%d", pMessage->getHeader()->systemBytes, pMessage->getHeader()->sessionId);
+
 			}
-
-
 		}
 
 		TRACE("OnCimWork \n");
@@ -732,6 +933,7 @@
 	return 0;
 }
 
+// S1F13
 int CHsmsPassive::replyEstablishCommunications(IMessage* pRecv)
 {
 	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
@@ -750,6 +952,46 @@
 	m_pPassive->sendMessage(pMessage);
 	LOGI("<HSMS>[SECS Msg SEND]%s", pMessage->toString());
 	HSMS_Destroy1Message(pMessage);
+
+	return 0;
+}
+
+// S1F3
+int CHsmsPassive::replySelectedEquipmentStatusData(IMessage* pRecv)
+{
+	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+		return ER_NOTSELECT;
+	}
+
+	IMessage* pMessage = NULL;
+	HSMS_Create1Message(pMessage, m_nSessionId, 1, 4, pRecv->getHeader()->systemBytes);
+	ASSERT(pMessage);
+
+	unsigned char SVU1 = 0;
+	unsigned int SVID = 0;
+	ISECS2Item* pBody = pRecv->getBody();
+	if (pBody == nullptr || pBody->getType() != SITYPE::L) {
+		pMessage->getBody()->addU1Item(SVU1, "SV");
+		goto MYREPLY;
+	}
+	if (!pBody->getSubItemU4(0, SVID)) {
+		pMessage->getBody()->addU1Item(SVU1, "SV");
+		goto MYREPLY;
+	}
+
+	SERVO::CVariable* pVariable = getVariable(SVID);
+	if (pVariable == nullptr) {
+		pMessage->getBody()->addU1Item(SVU1, "SV");
+		goto MYREPLY;
+	}
+	addVariableValueToItem(pMessage->getBody(), pVariable);
+
+MYREPLY:
+	m_pPassive->sendMessage(pMessage);
+	LOGI("<HSMS>[SECS Msg SEND]%s", pMessage->toString());
+	HSMS_Destroy1Message(pMessage);
+
+
 
 	return 0;
 }
@@ -974,7 +1216,7 @@
 
 	// 妫�楠岀粨鏋滄槸鍚︽纭�
 	for (auto item : m_collectionEvents) {
-		LOGE("=== ceid:%d, prtid:%d", item->getEventId(), item->getPortID());
+		LOGE("=== ceid:%d, prtid:%d", item->getEventId(), item->getFirstPortID());
 	}
 	
 MYREPLY:
@@ -1116,6 +1358,57 @@
 	return 0;
 }
 
+// S3F17
+int CHsmsPassive::replyCarrierAction(IMessage* pRecv)
+{
+	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+		return ER_NOTSELECT;
+	}
+
+	unsigned char CAACK = CAACK_0;
+	unsigned int ERRCODE = 0;
+	std::string strError = "no error";
+	if (m_listener.onCarrierAction == nullptr) {
+		CAACK = 5;
+		ERRCODE = CAACK_5;
+		strError = "Not supported";
+		goto MYREPLY;
+	}
+
+
+	ISECS2Item* pBody = pRecv->getBody();
+	if (pBody == nullptr || pBody->getType() != SITYPE::L) ER_PARAM_ERROR;
+
+	unsigned int DATAID;
+	unsigned char PTN;
+	const char* pszCarrierAction, *pszCarrierId;
+	pBody->getSubItemU4(0, DATAID);
+	pBody->getSubItemString(1, pszCarrierAction);
+	pBody->getSubItemString(2, pszCarrierId);
+	pBody->getSubItemU1(3, PTN);
+	ERRCODE = m_listener.onCarrierAction(this,
+		DATAID, 
+		pszCarrierAction,
+		pszCarrierId, 
+		PTN,
+		strError);
+	CAACK = ERRCODE;
+
+	// 鍥炲
+MYREPLY:
+	IMessage* pMessage = NULL;
+	HSMS_Create1Message(pMessage, m_nSessionId, 3, 18, pRecv->getHeader()->systemBytes);
+	pMessage->getBody()->addU1Item(CAACK, "CAACK");
+	ISECS2Item* pErrItem = pMessage->getBody()->addItem();
+	pErrItem->addU4Item(ERRCODE, "ERRCODE");
+	pErrItem->addItem(strError.c_str(), "ERRTEXT");
+	m_pPassive->sendMessage(pMessage);
+	LOGI("<HSMS>[SECS Msg SEND]S3F18 (SysByte=%u)", pMessage->getHeader()->systemBytes);
+	HSMS_Destroy1Message(pMessage);
+	
+	return 0;
+}
+
 // S5F3
 int CHsmsPassive::replyEanbleDisableAlarmReport(IMessage* pRecv)
 {
@@ -1149,25 +1442,67 @@
 	return 0;
 }
 
+// S6F23
+int CHsmsPassive::replyPurgeSpooledData(IMessage* pRecv)
+{
+	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+		return ER_NOTSELECT;
+	}
+	ISECS2Item* pBody = pRecv->getBody();
+	if (pBody == nullptr || pBody->getType() != SITYPE::U1) ER_PARAM_ERROR;
+	unsigned char RSDC;		// 0 - transmit; 1 - purge;
+	pBody->getU1(RSDC);
+	if (RSDC != 0 && RSDC != 1) ER_PARAM_ERROR;
+	
+	BYTE ACK = 0;		// 0 - ok;	1 - retryable busy;	2 - no spool data;
+	if (m_listActionSpooling.empty()) {
+		ACK = 2;
+	}
+	replyAck(6, 24, pRecv->getHeader()->systemBytes, ACK, "RSDA");
+
+
+	// 涓㈠純
+	if (RSDC == 1) {
+		Lock();
+		for (auto item : m_listActionSpooling) {
+			delete item;
+		}
+		m_listActionSpooling.clear();
+		Unlock();
+	}
+	else {
+		Lock();
+		for (auto item : m_listActionSpooling) {
+			m_listAction.push_back(item);
+		}
+		m_listActionSpooling.clear();
+		Unlock();
+		SetEvent(m_hCimWorkEvent);
+	}
+
+	return 0;
+}
+
 // S7F19
 int CHsmsPassive::replyQueryPPIDList(IMessage* pRecv)
 {
 	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
 		return ER_NOTSELECT;
 	}
-
+	if (m_listener.onQueryPPIDList == nullptr) {
+		return ER_NO_PPID_LIST;
+	}
 
 	IMessage* pMessage = NULL;
 	HSMS_Create1Message(pMessage, m_nSessionId, 7, 20, pRecv->getHeader()->systemBytes);
 	ASSERT(pMessage);
 
 	ISECS2Item* pItem = pMessage->getBody();
-	pItem->addItem("banana1", "PPID1");
-	pItem->addItem("banana2", "PPID2");
-	pItem->addF8Item(-123.45, "PPID2");
-	pItem->addF4Item(-568.99f, "PPID2");
-	pItem->addF8Item(456.456, "PPID2");
-	pItem->addF4Item(123.123f, "PPID2");
+	auto ppids = m_listener.onQueryPPIDList(this);
+	for (auto item : ppids) {
+		pItem->addItem(item.c_str(), "PPID");
+	}
+
 	m_pPassive->sendMessage(pMessage);
 	LOGI("<HSMS>[SECS Msg SEND]S7F20 (SysByte=%u)", pMessage->getHeader()->systemBytes);
 	HSMS_Destroy1Message(pMessage);
@@ -1206,19 +1541,254 @@
 	return 0;
 }
 
-// S5F1
-int CHsmsPassive::requestAlarmReport(int ALCD, int ALID, const char* ALTX)
+// S14F9
+int CHsmsPassive::replyCreateObj(IMessage* pRecv)
 {
 	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
 		return ER_NOTSELECT;
 	}
+	ISECS2Item* pBody = pRecv->getBody();
+	if (pBody == nullptr || pBody->getType() != SITYPE::L) ER_PARAM_ERROR;
+	
 
+	// 鏄惁鍒涘缓鎴愬姛骞跺噯澶囧洖澶嶆姤鏂�
+	bool bCreateOk = false;
+	IMessage* pReply = NULL;
+	HSMS_Create1Message(pReply, m_nSessionId, 14, 10, ++m_nSystemByte);
+	ASSERT(pReply);
+
+
+
+	// 瑙ｉ噴鏁版嵁锛屽緱鍒癈ontrolJob
+	ISECS2Item* pItemAttrs, * pItemAttr, *pItemAttrData;
+	const char* pszObjSpec, *pszObjType, *pszAttrId, *pszProcessJobId;
+	std::string strObjName, strObjId;
+	if (!pBody->getSubItemString(0, pszObjSpec)) return ER_PARAM_ERROR;
+	if (!pBody->getSubItemString(1, pszObjType)) return ER_PARAM_ERROR;
+
+	pReply->getBody()->addItem(pszObjSpec, "OBJSPEC");
+	ISECS2Item* pReplyItemAttrs = pReply->getBody()->addItem();
+	ISECS2Item* pReplyItemAcks = pReply->getBody()->addItem();
+	ISECS2Item* pReplyItemAck = pReplyItemAcks->addU1Item(0, "OBJACK");
+	ISECS2Item* pReplyItemErrs = pReplyItemAcks->addItem();
+
+	// 褰撳墠鍙鐞嗙被鍚勪负ControlJob
+	if (_strcmpi(pszObjType, "ControlJob") == 0) {
+
+		// 绫籭d
+		std::regex re("^([^:]+):([^>]+)>");
+		std::smatch match;
+		std::string strObjSpec(pszObjSpec);
+		if (!std::regex_search(strObjSpec, match, re)) {
+			ISECS2Item* pItemError = pReplyItemErrs->addItem();
+			pItemError->addU4Item(2001, "ERRCODE");
+			pItemError->addItem("鍙傛暟鎴栨姤鏂囦笉姝ｇ‘", "ERRTEXT");
+			goto MYREPLY;
+		}
+
+		if (match[1].compare("ControlJob") != 0) {
+			ISECS2Item* pItemError = pReplyItemErrs->addItem();
+			pItemError->addU4Item(2001, "ERRCODE");
+			pItemError->addItem("涓嶆敮鎸佺殑OBJ", "ERRTEXT");
+			goto MYREPLY;
+		}
+		strObjId = match[2];
+
+		// 鍒涘缓绫籆ControlJob
+		SERVO::CControlJob controlJob(strObjId);
+
+		// 绫诲睘鎬�
+		pItemAttrs = pBody->getSubItem(2);
+		if (pItemAttrs == nullptr) return ER_PARAM_ERROR;
+		for (int i = 0; i < pItemAttrs->getSubItemSize(); i++) {
+			pItemAttr = pItemAttrs->getSubItem(i);
+			if (pItemAttr == nullptr) continue;
+			if (!pItemAttr->getSubItemString(0, pszAttrId)) continue;
+			if (_strcmpi(pszAttrId, CJ_ATTR_PRIORITY) == 0) {
+				uint8_t priority;
+				if (pItemAttr->getSubItemU1(1, priority)) {
+					controlJob.setPriority(priority);
+				}
+			}
+			else if (_strcmpi(pszAttrId, CJ_ATTR_PRJOBLIST) == 0) {
+				pItemAttrData = pItemAttr->getSubItem(1);
+				if (pItemAttrData != nullptr && pItemAttrData->getType() == SITYPE::L) {
+					for (int i = 0; i < pItemAttrData->getSubItemSize(); i++) {
+						if (pItemAttrData->getSubItemString(i, pszProcessJobId)) {
+							std::string strProcessJobId(pszProcessJobId);
+							controlJob.addPJ(strProcessJobId);
+						}
+					}
+				}
+			}
+		}
+
+
+		ASSERT(m_listener.onControlJobCreate != nullptr);
+		int nRet = m_listener.onControlJobCreate(this, controlJob);
+		bCreateOk = nRet == 0;
+
+		// 娣诲姞鏂板缓绫荤殑鍚勭灞炴�у埌鍥炲鎶ユ枃涓�
+		if(bCreateOk) {
+			{
+				ISECS2Item* pReplyItemAttr = pReplyItemAttrs->addItem();
+				pReplyItemAttr->addItem(CJ_ATTR_PRIORITY, "ATTRID");
+				pReplyItemAttr->addU1Item(controlJob.priority(), "ATTRDATA");
+			}
+
+			{
+				ISECS2Item* pReplyItemAttr = pReplyItemAttrs->addItem();
+				pReplyItemAttr->addItem(CJ_ATTR_PRJOBLIST, "ATTRID");
+				ISECS2Item* pItemPjs = pReplyItemAttr->addItem();
+				auto pjIds = controlJob.pjIds();
+				for (auto id : pjIds) {
+					pItemPjs->addItem(id.c_str(), "PRJOBID");
+				}
+			}
+		}
+		else {
+			auto issues = controlJob.issues();
+			for (auto i : issues) {
+				ISECS2Item* pItemError = pReplyItemErrs->addItem();
+				pItemError->addU4Item(i.code, "ERRCODE");
+				pItemError->addItem(i.text.c_str(), "ERRTEXT");
+			}
+		}
+	}
+
+
+	else {
+		ISECS2Item* pItemError = pReplyItemErrs->addItem();
+		pItemError->addU4Item(2001, "ERRCODE");
+		pItemError->addItem("涓嶆敮鎸佺殑OBJ", "ERRTEXT");
+	}
+
+
+	// 瀹屽杽鎶ユ枃骞跺洖澶�
+MYREPLY:
+	pReplyItemAck->setU1(bCreateOk ? 0 : 1, "OBJACK");
+	m_pPassive->sendMessage(pReply);
+	LOGI("<HSMS>[SECS Msg SEND]S14F10 (SysByte=%u)", pReply->getHeader()->systemBytes);
+	HSMS_Destroy1Message(pReply);
+
+
+	return 0;
+}
+
+// S16F15
+int CHsmsPassive::replyPRJobMultiCreate(IMessage* pRecv)
+{
+	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+		return ER_NOTSELECT;
+	}
+	ISECS2Item* pBody = pRecv->getBody();
+	if (pBody == nullptr || pBody->getType() != SITYPE::L) ER_PARAM_ERROR;
+
+
+	// 瑙ｉ噴鏁版嵁锛屽緱鍒癈ProcessJob
+	ISECS2Item* pItemPjs, * pItemPj,* pItemCarriers, * pItemCarrier, *pItemSlots, *pItemRecipes;
+	unsigned int DATAID;
+	const char* pszPrjobid, *pszMF, *pszCarrierId, *pszRecipeName;
+	std::string strCarrierId;
+	unsigned int len;
+	unsigned char slot, PRRECIPEMETHOD;
+	std::vector<unsigned char> slots;
+	std::vector<SERVO::CProcessJob*> pjs;
+
+	if (!pBody->getSubItemU4(0, DATAID)) return ER_PARAM_ERROR;
+	pItemPjs = pBody->getSubItem(1);
+	if (pItemPjs == nullptr) return ER_PARAM_ERROR;
+	for (int i = 0; i < pItemPjs->getSubItemSize(); i++) {
+		pItemPj = pItemPjs->getSubItem(i);
+		if (pItemPj == nullptr) continue;
+		if (!pItemPj->getSubItemString(0, pszPrjobid)) continue;
+		if (!pItemPj->getSubItemBinary(1, pszMF, len)) continue;
+		pItemCarriers = pItemPj->getSubItem(2);
+		if (pItemCarriers == nullptr) continue;
+		pItemRecipes = pItemPj->getSubItem(3);
+		if (pItemRecipes == nullptr) continue;
+		SERVO::CProcessJob* pj = new SERVO::CProcessJob(pszPrjobid);
+		int size = pItemCarriers->getSubItemSize();
+		for (int j = 0; j < size; j++) {
+			pItemCarrier = pItemCarriers->getSubItem(j);
+			strCarrierId.clear();
+			if (pItemCarrier->getSubItemString(0, pszCarrierId)) {
+				strCarrierId = pszCarrierId;
+			}
+
+			slots.clear();
+			pItemSlots = pItemCarrier->getSubItem(1);
+			if (pItemSlots != nullptr) {
+				int size2 = pItemSlots->getSubItemSize();
+				for (int k = 0; k < size2; k++) {
+					if (pItemSlots->getSubItemU1(k, slot)) {
+						slots.push_back(slot);
+					}
+				}
+			}
+			pj->addCarrier(strCarrierId, slots);
+		}
+		if (pItemRecipes->getSubItemU1(0, PRRECIPEMETHOD)
+			&& pItemRecipes->getSubItemString(1, pszRecipeName)) {
+			pj->setRecipe(SERVO::RecipeMethod(PRRECIPEMETHOD), std::string(pszRecipeName));
+		}
+
+		pjs.push_back(pj);
+	}
+
+	ASSERT(m_listener.onPRJobMultiCreate != nullptr);
+	int nRet = m_listener.onPRJobMultiCreate(this, pjs);
+
+
+	// 鍥炲鎶ユ枃
+	IMessage* pMessage = NULL;
+	HSMS_Create1Message(pMessage, m_nSessionId, 16, 16, ++m_nSystemByte);
+	ASSERT(pMessage);
+	ISECS2Item* pItemPrjobIds = pMessage->getBody()->addItem();
+	ISECS2Item* pItemErrors = pMessage->getBody()->addItem();
+	bool bHasError = false;
+	for (auto p : pjs) {
+		if (p->issues().empty()) {
+			pItemPrjobIds->addItem(p->id().c_str(), "PRJOBID");
+		}
+		else {
+			bHasError = true;
+		}
+	}
+	if (bHasError) {
+		pItemErrors->addBoolItem(false, "ACKA");
+		ISECS2Item* pItemErrors2 = pItemErrors->addItem();
+		for (auto p : pjs) {
+			if (!p->issues().empty()) {
+				ISECS2Item* pItemErr = pItemErrors2->addItem();
+				pItemErr->addU4Item(p->issues()[0].code, "ERRCODE");
+				pItemErr->addItem(("<" + p->id() + ">" + p->issues()[0].text).c_str(), "ERRTEXT");
+			}
+		}
+	}
+	m_pPassive->sendMessage(pMessage);
+	LOGI("<HSMS>[SECS Msg SEND]S16F16 (SysByte=%u)", pMessage->getHeader()->systemBytes);
+	HSMS_Destroy1Message(pMessage);
+
+
+	// 閲婃斁鏈夐棶棰�(鏈坊鍔犲埌master)鐨勫唴瀛�
+	for (auto p : pjs) {
+		if(!p->issues().empty()) delete p;
+	}
+	pjs.clear();
+
+	return 0;
+}
+
+// S5F1
+int CHsmsPassive::requestAlarmReport(int ALCD, int ALID, const char* ALTX)
+{
 	char szALCD[1];
 	szALCD[0] = ALCD & 0xff;
 
 	Lock();
 	CHsmsAction* pAction = new CHsmsAction(ACTION_ALARM_REPORT, TRUE, m_nActionTimeout);
-	m_listAction.push_back(pAction);
+
 	IMessage* pMessage = NULL;
 	HSMS_Create1Message(pMessage, m_nSessionId, 5 | REPLY, 1, ++m_nSystemByte);
 	ASSERT(pMessage);
@@ -1227,63 +1797,98 @@
 	pItem->addU4Item(ALID, "ALID");
 	pItem->addItem(ALTX, "ALTX");
 	pAction->setSendMessage(pMessage);
-
-	SetEvent(m_hCimWorkEvent);
-	Unlock();
-
-	int size = pAction->serialize(nullptr, 0);;
-	if (size > 0) {
-		char* pszBuffer = new char[size];
-		pAction->serialize(pszBuffer, size);
-		AfxMessageBox("abc");
-
-		CHsmsAction* pAction2 = new CHsmsAction();
-		pAction2->unserialize(pszBuffer, size);
-		AfxMessageBox("def");
-		m_pPassive->sendMessage(pAction2->getSendMessage());
+	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+		m_listActionSpooling.push_back(pAction);
 	}
+	else {
+		m_listAction.push_back(pAction);
+		SetEvent(m_hCimWorkEvent);
+	}
+	Unlock();
 
 	return ER_NOERROR;
 }
 
 // S6F11
-int CHsmsPassive::requestEventReportSend(unsigned int DATAID, unsigned int CEID, const std::vector<std::string>& values)
+static unsigned int DATAID = 1;
+int CHsmsPassive::requestEventReportSend(unsigned int CEID)
 {
-	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
-		return ER_NOTSELECT;
-	}
-
 	SERVO::CCollectionEvent* pEvent = getEvent(CEID);
 	if (pEvent == nullptr) {
 		return ER_NO_EVENT;
 	}
-	if (pEvent == nullptr) {
+
+	SERVO::CReport* pReport = pEvent->getFirstReport();
+	if (pReport == nullptr) {
 		return ER_UNLINK_EVENT_REPORT;
 	}
 
+
 	Lock();
 	CHsmsAction* pAction = new CHsmsAction(ACTION_EVENT_REPORT, TRUE, m_nActionTimeout);
-	m_listAction.push_back(pAction);
 	IMessage* pMessage = NULL;
 	HSMS_Create1Message(pMessage, m_nSessionId, 6 | REPLY, 11, ++m_nSystemByte);
 	ASSERT(pMessage);
 	ISECS2Item* pItem = pMessage->getBody();
-	pItem->addU4Item(DATAID, "DATAID");
+	pItem->addU4Item(++DATAID, "DATAID");
 	pItem->addU4Item(CEID, "CEID");
 	ISECS2Item* pItemList1 = pItem->addItem();
 	ISECS2Item* pItemList2 = pItemList1->addItem();
-	pItemList2->addU4Item(pEvent->getPortID(), "RPTID");
+	pItemList2->addU4Item(pReport->getReportId(), "RPTID");
 	ISECS2Item* pItemList3 = pItemList2->addItem();
-	for (auto item : values) {
-		pItemList3->addItem(item.c_str(), "V");
+
+	auto vars = pReport->getVariables();
+	for (auto var : vars) {
+		addVariableValueToItem(pItemList3, var);
 	}
 	pAction->setSendMessage(pMessage);
-
-	SetEvent(m_hCimWorkEvent);
+	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+		m_listActionSpooling.push_back(pAction);
+	}
+	else {
+		m_listAction.push_back(pAction);
+		SetEvent(m_hCimWorkEvent);
+	}
 	Unlock();
 	
 	return ER_NOERROR;
 }
 
+int CHsmsPassive::requestEventReportSend(const char* pszEventName)
+{
+	SERVO::CCollectionEvent* pEvent = nullptr;
+	for (auto e : m_collectionEvents) {
+		if (e->getName().compare(pszEventName) == 0) {
+			pEvent = e;
+			break;
+		}
+	}
+	if (pEvent == nullptr) {
+		return ER_NO_EVENT;
+	}
+	return requestEventReportSend(pEvent->getEventId());
+}
+
+int CHsmsPassive::requestEventReportSend_CarrierID_Readed()
+{
+	return requestEventReportSend("CarrierID_Readed");
+}
+
+int CHsmsPassive::requestEventReportSend_PJ_Queued()
+{
+	return requestEventReportSend("PJ_Queued");
+}
+
+int CHsmsPassive::requestEventReportSend_PJ_Start()
+{
+	return requestEventReportSend("PJ_Start");
+}
+
+int CHsmsPassive::requestEventReportSend_PJ_End()
+{
+	return requestEventReportSend("PJ_End");
+}
+
+
 
 

--
Gitblit v1.9.3