Merge branch 'clh' into liuyang

mrDarker

2025-09-08 6dc80508b1c0f431007f8a8c947c152ec00c3d15

 SourceCode/Bond/Servo/CMaster.cpp

@@ -767,6 +767,13 @@
                  && pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
                  m_pActiveRobotTask = createTransferTask(pLoadPorts[s], pAligner, primaryType, secondaryType, 1, m_bJobMode);
                  if (m_pActiveRobotTask != nullptr) {
                     CGlass* pGlass = (CGlass*)m_pActiveRobotTask->getContext();
                     if (pGlass->getBuddy() != nullptr) {
                        delete m_pActiveRobotTask;
                        m_pActiveRobotTask = nullptr;
                        continue;
                     }

                     pEFEM->setContext(m_pActiveRobotTask->getContext());
                     goto PORT_GET;
                  }
@@ -2499,7 +2506,9 @@
         m_pControlJob = new CControlJob();
         if (!CControlJob::deserialize(ifs, *m_pControlJob)) return false;
      }

      else {
         return false;
      }

      // 读取 ProcessJob 列表
      uint32_t count = 0;