From cbe189228810812547d16a3211ab0b174831f609 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 24 三月 2025 11:56:04 +0800
Subject: [PATCH] 1.修复一个闪退问题(Glass列表为空仍要下传导致)； 2.在CEquipment派生类中实现限制上游移动（如下在加工且加工数量有限制）；
---
SourceCode/Bond/Servo/CBonder.cpp | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index e67978f..1bb185f 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -48,22 +48,23 @@
CEquipment::serialize(ar);
}
- int CBonder::recvSample(CPin* pPin, CSample* pSample)
+ void CBonder::getAttributeVector(CAttributeVector& attrubutes)
{
- ASSERT(pPin);
+ __super::getAttributeVector(attrubutes);
+ }
- CPin* pFromPin = pPin->getConnectedPin();
- ASSERT(pFromPin);
+ int CBonder::recvIntent(CPin* pPin, CIntent* pIntent)
+ {
+ return __super::recvIntent(pPin, pIntent);
+ }
- CEquipment* pFromEq = pFromPin->getEquipment();
- ASSERT(pFromEq);
+ BOOL CBonder::glassWillArrive(CGlass* pGlass)
+ {
+ BOOL bRet = __super::glassWillArrive(pGlass);
+ if (!bRet) {
+ return FALSE;
+ }
-
- LOGI("<CBonder><%s-%s>收到来自<%s.%s>的Sample",
- this->getName().c_str(), pPin->getName().c_str(),
- pFromEq->getName().c_str(), pFromPin->getName().c_str());
-
- delete pSample;
- return 0;
+ return m_glassList.empty();
}
}
--
Gitblit v1.9.3