1.可折叠ListCtrl应用到GlassList页，优化，模拟数据测试等；

LAPTOP-SNT8I5JK\Boounion

2025-09-11 eaf39ceeef11c5685ddbb840541460e5dc5fccaa

 SourceCode/Bond/Servo/CMaster.cpp

@@ -131,7 +131,7 @@
         BoardVersion version{};
         int nRet = m_cclink.GetBoardVersion(version);
         if (nRet == 0) {
            LOGI("版本信息：%s.", version.toString().c_str());
            LOGD("版本信息：%s.", version.toString().c_str());
         }
         else {
            LOGE("获取CC-Link版本信息失败.");
@@ -140,7 +140,7 @@
         BoardStatus status;
         nRet = m_cclink.GetBoardStatus(status);
         if (nRet == 0) {
            LOGI("状态：%s.", status.toString().c_str());
            LOGD("状态：%s.", status.toString().c_str());
         }
         else {
            LOGE("获取CC-Link状态失败.");
@@ -422,7 +422,7 @@
                  TRACE("a0001\n", writeCode, retCode);
               });
            if (nRet != 0) {
               LOGI("<Master>EFEM切换Start状态失败");
               LOGE("<Master>EFEM切换Start状态失败");
               m_strLastError = "EFEM切换Start状态失败.";
               goto WAIT;
            }
@@ -435,7 +435,7 @@
                  TRACE("a0002\n");
               });
            if (nRet != 0) {
               LOGI("<Master>Bonder1切换Start状态失败");
               LOGE("<Master>Bonder1切换Start状态失败");
               m_strLastError = "Bonder1切换Start状态失败.";
               goto WAIT;
            }
@@ -448,7 +448,7 @@
                  TRACE("a0003\n");
               });
            if (nRet != 0) {
               LOGI("<Master>Bonder2切换Start状态失败");
               LOGE("<Master>Bonder2切换Start状态失败");
               m_strLastError = "Bonder2切换Start状态失败.";
               goto WAIT;
            }
@@ -461,7 +461,7 @@
                  TRACE("a0004\n");
               });
            if (nRet != 0) {
               LOGI("<Master>BakeCooling切换Start状态失败");
               LOGE("<Master>BakeCooling切换Start状态失败");
               m_strLastError = "BakeCooling切换Start状态失败.";
               goto WAIT;
            }
@@ -474,7 +474,7 @@
                  TRACE("a0005\n");
               });
            if (nRet != 0) {
               LOGI("<Master>VacuumBake切换Start状态失败");
               LOGE("<Master>VacuumBake切换Start状态失败");
               m_strLastError = "VacuumBake切换Start状态失败.";
               goto WAIT;
            }
@@ -487,7 +487,7 @@
                  TRACE("a0006\n");
               });
            if (nRet != 0) {
               LOGI("<Master>Measurement切换Start状态失败");
               LOGE("<Master>Measurement切换Start状态失败");
               m_strLastError = "Measurement切换Start状态失败.";
               goto WAIT;
            }
@@ -501,7 +501,7 @@
            for (int i = 0; i < 6; i++) {
               if (!bIomcOk[i]) {
                  bIomcOk[6] = FALSE;
                  LOGI("<Master>%s切换Start状态失败", pEq[i]->getName().c_str());
                  LOGE("<Master>%s切换Start状态失败", pEq[i]->getName().c_str());
               }
            }
            
@@ -545,7 +545,7 @@
                     TRACE("s000%d: ret=%d\n", i + 1, retCode);
                  });
               if (nRet != 0) {
                  LOGI("<Master>%s切换Stop状态发送失败", pEq[i]->getName().c_str());
                  LOGE("<Master>%s切换Stop状态发送失败", pEq[i]->getName().c_str());
                  m_strLastError = pEq[i]->getName() + "切换Stop状态发送失败.";
                  bIomcOk[i] = FALSE;
                  promises[i].set_value(); // 避免 wait 阻塞
@@ -560,7 +560,7 @@
            for (int i = 0; i < 6; ++i) {
               if (!bIomcOk[i]) {
                  bIomcOk[6] = FALSE;
                  LOGI("<Master>%s切换Stop状态失败", pEq[i]->getName().c_str());
                  LOGE("<Master>%s切换Stop状态失败", pEq[i]->getName().c_str());
               }
            }

@@ -734,7 +734,7 @@

            if (!rmd.armState[0]) {
               // m_nTestFlag = 1;
               if (m_nTestFlag == 1) LOGI("createTransferTask 004df %d, %d", MaterialsType::G1, secondaryType);
               if (m_nTestFlag == 1) LOGD("createTransferTask 004df %d, %d", MaterialsType::G1, secondaryType);
               m_pActiveRobotTask = createTransferTask(pAligner, pVacuumBake, MaterialsType::G1, secondaryType);
               CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
               m_nTestFlag = 0;
@@ -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;
                  }
@@ -791,7 +798,7 @@
            CJState state = m_pControlJob->state();
            if (state == CJState::Completed || state == CJState::Aborted || state == CJState::Failed) {
               // ConrolJpb已完成
               LOGI("<Master>ControlJob已经完成或失败中断");
               LOGE("<Master>ControlJob已经完成或失败中断");
               unlock();
               continue;
            }
@@ -828,7 +835,7 @@
               }
            }
            if (m_inProcesJobs.empty()) {
               LOGI("<Master>选择当前ProcessJob失败！");
               LOGE("<Master>选择当前ProcessJob失败！");
               unlock();
               continue;
            }
@@ -880,7 +887,7 @@

            // Measurement -> LoadPort
            if (rmd.armState[0] || rmd.armState[1]) {
               LOGI("Arm1 %s, Arm2 %s.", rmd.armState[0] ? _T("不可用") : _T("可用"),
               LOGD("Arm1 %s, Arm2 %s.", rmd.armState[0] ? _T("不可用") : _T("可用"),
                  rmd.armState[1] ? _T("不可用") : _T("可用"));
            }
            for (int s = 0; s < 4; s++) {
@@ -1305,22 +1312,22 @@
         BOOL bOk = FALSE;
         lock();
         if (m_pActiveRobotTask != nullptr) {
            LOGI("<CMaster>onPreFethedOutJob 0001.");
            LOGD("<CMaster>onPreFethedOutJob 0001.");
            if (m_pActiveRobotTask->getSrcPosition() == p->getID()) {
               LOGI("<CMaster>onPreFethedOutJob 0002.");
               LOGD("<CMaster>onPreFethedOutJob 0002.");
               CGlass* pGlass = p->getGlassFromSlot(m_pActiveRobotTask->getSrcSlot());
               if (pGlass != nullptr) {
                  LOGI("<CMaster>onPreFethedOutJob 0003.");
                  LOGD("<CMaster>onPreFethedOutJob 0003.");
                  CJobDataS* pJobDataS = pGlass->getJobDataS();
                  if (pJobDataS != nullptr
                     && pJobDataS->getCassetteSequenceNo() == pJobDataB->getCassetteSequenceNo()
                     && pJobDataS->getJobSequenceNo() == pJobDataB->getJobSequenceNo()) {
                     bOk = TRUE;
                     LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
                     LOGD("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
                  }
                  LOGI("<CMaster>onPreFethedOutJob 0004.");
                  LOGD("<CMaster>onPreFethedOutJob 0004.");
                  if (pJobDataS != nullptr) {
                     LOGI("<CMaster>onPreFethedOutJob 0005. %d,%d,%d,%d", 
                     LOGD("<CMaster>onPreFethedOutJob 0005. %d,%d,%d,%d", 
                        pJobDataS->getCassetteSequenceNo(),
                        pJobDataB->getCassetteSequenceNo(),
                        pJobDataS->getJobSequenceNo(),
@@ -1544,6 +1551,26 @@
         if (m_listener.onLoadPortStatusChanged != nullptr) {
            m_listener.onLoadPortStatusChanged(this, (CEquipment*)pEquipment, status, data);
         }
      };
      listener.onSVDataReport = [&](void* pEquipment, void* pData) {
         CSVData* pSVData = (CSVData*)pData;
         auto rawData = pSVData->getSVRawData();
         std::vector<CParam> params;
         ((CEquipment*)pEquipment)->parsingSVData((const char*)rawData.data(), rawData.size(), params);
		
         std::string strOut;
         char szBuffer[256];
         for (auto p : params) {
            if (!strOut.empty()) strOut.append(",");
            if (p.getValueType() == PVT_INT) {
               sprintf_s(szBuffer, 256, "%s:%d", p.getName().c_str(), p.getIntValue());
            }
            else if (p.getValueType() == PVT_DOUBLE) {
               sprintf_s(szBuffer, 256, "%s:%f", p.getName().c_str(), p.getDoubleValue());
            }
            strOut.append(szBuffer);
         }
         LOGD("<CMaster-%s>SVDataReport:%s", ((CEquipment*)pEquipment)->getName().c_str(), strOut.c_str());
      };
      pEquipment->setListener(listener);
      pEquipment->setCcLink(&m_cclink);
@@ -2011,12 +2038,12 @@
      pSrcEq->m_nTestFlag = m_nTestFlag;
      pTarSlot = pTarEq->getAvailableSlotForGlass(primaryType);
      pSrcSlot = pSrcEq->getProcessedSlot(primaryType, bJobMode);
      if (m_nTestFlag == 1) LOGI("createTransferTask 003 %x, %x", pTarSlot, pSrcSlot);
      if (m_nTestFlag == 1) LOGD("createTransferTask 003 %x, %x", pTarSlot, pSrcSlot);
      if (pSrcSlot == nullptr || nullptr == pTarSlot && secondaryType != SERVO::MaterialsType::G0) {
         pTarSlot = pTarEq->getAvailableSlotForGlass(secondaryType);
         pSrcSlot = pSrcEq->getProcessedSlot(secondaryType, bJobMode);
      }
      if (m_nTestFlag == 1) LOGI("createTransferTask 004 %x, %x", pTarSlot, pSrcSlot);
      if (m_nTestFlag == 1) LOGD("createTransferTask 004 %x, %x", pTarSlot, pSrcSlot);

      if (pSrcSlot != nullptr && nullptr != pTarSlot) {
         pTask = new CRobotTask();
@@ -2671,4 +2698,17 @@

      return nullptr;
   }

   int CMaster::getWipGlasses(std::vector<CGlass*>& glasses)
   {
      for (auto eq : m_listEquipment) {
         auto p = dynamic_cast<CLoadPort*>(eq);
         if (p == nullptr) {
            eq->getAllGlass(glasses);
         }

      }

      return (int)glasses.size();
   }
}