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/CEFEM.cpp | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index eff68be..6b0548f 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -1,8 +1,9 @@
#include "stdafx.h"
#include "CEFEM.h"
+
namespace SERVO {
- CEFEM::CEFEM()
+ CEFEM::CEFEM() : CEquipment()
{
}
@@ -28,6 +29,13 @@
CEquipment::term();
}
+ // 必须要实现的虚函数，在此初始化Pin列表
+ void CEFEM::initPins()
+ {
+ // 加入Pin初始化代码
+ LOGI("<CEFEM>initPins");
+ }
+
void CEFEM::onTimer(UINT nTimerid)
{
CEquipment::onTimer(nTimerid);
@@ -42,4 +50,19 @@
{
__super::getAttributeVector(attrubutes);
}
+
+ int CEFEM::recvIntent(CPin* pPin, CIntent* pIntent)
+ {
+ return __super::recvIntent(pPin, pIntent);
+ }
+
+ BOOL CEFEM::glassWillArrive(CGlass* pGlass)
+ {
+ BOOL bRet = __super::glassWillArrive(pGlass);
+ if (!bRet) {
+ return FALSE;
+ }
+
+ return m_glassList.empty();
+ }
}
--
Gitblit v1.9.3