From d801f8999ad7cdbee7a5652b4bb512c47b9a2668 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 04 六月 2025 18:05:01 +0800
Subject: [PATCH] 1.搬送条件检测，增加一个条件，必须是已加工处理完成的Glass才符合搬出条件。 2.根据1，为CGlass增加相应工位的处理标志位，及标志位在后processDataReport修改为TRUE，以符合搬出条件；
---
SourceCode/Bond/Servo/CRobotTask.cpp | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRobotTask.cpp b/SourceCode/Bond/Servo/CRobotTask.cpp
index 17113b4..4b2a970 100644
--- a/SourceCode/Bond/Servo/CRobotTask.cpp
+++ b/SourceCode/Bond/Servo/CRobotTask.cpp
@@ -42,10 +42,29 @@
return strOut;
}
+ std::string CRobotTask::getSimpleDescription() const
+ {
+ std::string strOut = "CRobotTask<ID:";
+ strOut = strOut + std::to_string(m_robotCmdParam.sequenceNo);
+ strOut = strOut + ",Arm:";
+ strOut = strOut + std::to_string(m_robotCmdParam.armNo);
+ strOut = strOut + ",GetPossion:";
+ strOut = strOut + std::to_string(m_robotCmdParam.getPosition);
+ strOut = strOut + ",GetSlot:";
+ strOut = strOut + std::to_string(m_robotCmdParam.getSlotNo);
+ strOut = strOut + ",PutPossion:";
+ strOut = strOut + std::to_string(m_robotCmdParam.putPosition);
+ strOut = strOut + ",PutSlot:";
+ strOut = strOut + std::to_string(m_robotCmdParam.putSlotNo);
+ strOut = strOut + ">";
+
+ return strOut;
+ }
+
void CRobotTask::setContext(CContext* pContext)
{
- if (pContext != nullptr) {
- pContext->release();
+ if (m_pContext != nullptr) {
+ m_pContext->release();
}
m_pContext = pContext;
@@ -120,6 +139,21 @@
return m_state;
}
+ void CRobotTask::completed()
+ {
+ m_state = ROBOT_TASK_STATE::Completed;
+ }
+
+ void CRobotTask::error()
+ {
+ m_state = ROBOT_TASK_STATE::Error;
+ }
+
+ void CRobotTask::abort()
+ {
+ m_state = ROBOT_TASK_STATE::Abort;
+ }
+
int CRobotTask::getSrcPosition()
{
return m_robotCmdParam.getPosition;
--
Gitblit v1.9.3