From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示
---
SourceCode/Bond/Servo/CEquipment.cpp | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 3de5521..599a79c 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -779,6 +779,16 @@
return 1;
}
+ else if (pStep->getName().compare(STEP_STATUS) == 0) {
+ SERVO::CEqStatusStep* pEqStatusStep = (SERVO::CEqStatusStep*)pStep;
+ if (m_listener.onEqStatusChanged != nullptr) {
+ const unsigned int unitId = pEqStatusStep->getUnitId();
+ const int status = pEqStatusStep->getStatus(unitId);
+ const int reason = pEqStatusStep->getReasonCode(unitId);
+ m_listener.onEqStatusChanged(this, (int)unitId, status, reason);
+ }
+ return 1;
+ }
else if (isCimMessageConfirmStep(pStep)) {
SERVO::CEqReadIntStep* pEqReadIntStep = (SERVO::CEqReadIntStep*)pStep;
int value = pEqReadIntStep->getValue();
@@ -1696,6 +1706,10 @@
{
LOGI("<CEquipment-%s>onSentOutJob.", m_strName.c_str());
+ if (m_listener.onSentOutJob != nullptr) {
+ m_listener.onSentOutJob(this, port, pJobDataS);
+ }
+
return 0;
}
@@ -1889,7 +1903,9 @@
CSVData svData;
int nRet = svData.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
+ Lock();
m_svDatas.push_back(svData);
+ Unlock();
if (m_listener.onSVDataReport != nullptr) {
m_listener.onSVDataReport(this, &svData);
@@ -2283,6 +2299,14 @@
}
}
+ PROCESS_STATE CEquipment::getProcessState(int slotNo) const
+ {
+ if (slotNo <= 0 || slotNo > SLOT_MAX) {
+ return PROCESS_STATE::Ready;
+ }
+ return m_processState[slotNo - 1];
+ }
+
std::vector<SERVO::CSVData>& CEquipment::getSVDatas()
{
return m_svDatas;
--
Gitblit v1.9.3