LAPTOP-SNT8I5JK\Boounion
2025-06-20 5ee30b85c394e60b5ac4169a8093a8089345189a
SourceCode/Bond/Servo/CMaster.cpp
@@ -879,11 +879,22 @@
                  LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
               }
            }
            // 是否回撤
            else if (m_pActiveRobotTask->isRestoring() &&
               m_pActiveRobotTask->getSrcPosition() == p->getID()) {
               CGlass* pGlass = p->getGlassFromSlot(m_pActiveRobotTask->getSrcSlot());
               if (pGlass == nullptr) {
                  bOk = TRUE;
                  slot = m_pActiveRobotTask->getSrcSlot();
                  LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
               }
            }
         }
         unlock();
         if (!bOk) {
            LOGE("<CMaster>onPreFethedOutJob, 数据校验失败.");
            LOGE("<CMaster>onPreStoredJob, 数据校验失败.");
         }
         return bOk;
@@ -932,6 +943,25 @@
               }
               delete m_pActiveRobotTask;
               m_pActiveRobotTask = nullptr;
            }
            else if (m_pActiveRobotTask != nullptr
               && m_pActiveRobotTask->isRestoring()
               && m_pActiveRobotTask->getSrcPosition() == p->getID()) {
               m_pActiveRobotTask->stored();
               m_pActiveRobotTask->restored();
               LOGI("回撤完成...");
               // 完成此条搬送任务,但要把数据和消息上抛应用层
               unlock();
               lock();
               if (m_listener.onRobotTaskEvent != nullptr) {
                  m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_RESTORE);
               }
               delete m_pActiveRobotTask;
               m_pActiveRobotTask = nullptr;
               stop();
            }
            unlock();
         }
@@ -1462,6 +1492,18 @@
      return 0;
   }
   int CMaster::restoreCurrentTask()
   {
      lock();
      if (m_pActiveRobotTask != nullptr) {
         m_pActiveRobotTask->restore();
      }
      unlock();
      return 0;
   }
   void CMaster::setPortType(unsigned int index, BOOL enable, int type, int mode,
      int cassetteType, int transferMode, BOOL autoChangeEnable)
   {