1.PageGlassList，修改字段名，简化显示内容；

LAPTOP-SNT8I5JK\Boounion

2025-09-12 3ad367bfccc773620a8fae926689355bada16db5

 SourceCode/Bond/Servo/CMaster.cpp

@@ -53,7 +53,7 @@
      m_ullRunTime = 0;
      m_state = MASTERSTATE::READY;
      m_pActiveRobotTask = nullptr;
      m_nLastError = 0;
      m_nLastError = ER_CODE_NOERROR;
      m_isCompareMapsBeforeProceeding = FALSE;
      m_bJobMode = FALSE;
      m_bEnableEventReport = true;
@@ -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状态失败.");
@@ -307,7 +307,7 @@
      return 0;
   }

   int CMaster::stop()
   int CMaster::stop(int nErCode/* = ER_CODE_NOERROR*/)
   {
      // 运行时间为累加结果，本次停止时刷新；
      lock();
@@ -321,6 +321,7 @@


      // 更新状态
      m_nLastError = nErCode;
      setState(MASTERSTATE::STOPPING);


@@ -422,7 +423,8 @@
                  TRACE("a0001\n", writeCode, retCode);
               });
            if (nRet != 0) {
               LOGI("<Master>EFEM切换Start状态失败");
               LOGE("<Master>EFEM切换Start状态失败");
               m_nLastError = ER_CODE_OPERATION_MODE_FAIL;
               m_strLastError = "EFEM切换Start状态失败.";
               goto WAIT;
            }
@@ -435,7 +437,8 @@
                  TRACE("a0002\n");
               });
            if (nRet != 0) {
               LOGI("<Master>Bonder1切换Start状态失败");
               LOGE("<Master>Bonder1切换Start状态失败");
               m_nLastError = ER_CODE_BONDER_OPERATION_MODE_FAIL;
               m_strLastError = "Bonder1切换Start状态失败.";
               goto WAIT;
            }
@@ -448,7 +451,8 @@
                  TRACE("a0003\n");
               });
            if (nRet != 0) {
               LOGI("<Master>Bonder2切换Start状态失败");
               LOGE("<Master>Bonder2切换Start状态失败");
               m_nLastError = ER_CODE_BONDER_OPERATION_MODE_FAIL;
               m_strLastError = "Bonder2切换Start状态失败.";
               goto WAIT;
            }
@@ -461,7 +465,8 @@
                  TRACE("a0004\n");
               });
            if (nRet != 0) {
               LOGI("<Master>BakeCooling切换Start状态失败");
               LOGE("<Master>BakeCooling切换Start状态失败");
               m_nLastError = ER_CODE_OPERATION_MODE_FAIL;
               m_strLastError = "BakeCooling切换Start状态失败.";
               goto WAIT;
            }
@@ -474,7 +479,8 @@
                  TRACE("a0005\n");
               });
            if (nRet != 0) {
               LOGI("<Master>VacuumBake切换Start状态失败");
               LOGE("<Master>VacuumBake切换Start状态失败");
               m_nLastError = ER_CODE_OPERATION_MODE_FAIL;
               m_strLastError = "VacuumBake切换Start状态失败.";
               goto WAIT;
            }
@@ -487,7 +493,8 @@
                  TRACE("a0006\n");
               });
            if (nRet != 0) {
               LOGI("<Master>Measurement切换Start状态失败");
               LOGE("<Master>Measurement切换Start状态失败");
               m_nLastError = ER_CODE_OPERATION_MODE_FAIL;
               m_strLastError = "Measurement切换Start状态失败.";
               goto WAIT;
            }
@@ -501,7 +508,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 +552,8 @@
                     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_nLastError = ER_CODE_OPERATION_MODE_FAIL;
                  m_strLastError = pEq[i]->getName() + "切换Stop状态发送失败.";
                  bIomcOk[i] = FALSE;
                  promises[i].set_value(); // 避免 wait 阻塞
@@ -560,7 +568,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());
               }
            }

@@ -570,7 +578,11 @@
            }

            LOGI("<Master>所有设备成功切换到 Stop 模式");
            setState(MASTERSTATE::READY);
            if(m_nLastError == ER_CODE_NOERROR)
               setState(MASTERSTATE::READY);
            else
               setState(MASTERSTATE::ATHERERROR);

            continue;
         }

@@ -734,7 +746,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;
@@ -774,6 +786,8 @@
                        continue;
                     }

                     pGlass->queue();
                     pGlass->start();
                     pEFEM->setContext(m_pActiveRobotTask->getContext());
                     goto PORT_GET;
                  }
@@ -798,7 +812,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;
            }
@@ -835,7 +849,7 @@
               }
            }
            if (m_inProcesJobs.empty()) {
               LOGI("<Master>选择当前ProcessJob失败！");
               LOGE("<Master>选择当前ProcessJob失败！");
               unlock();
               continue;
            }
@@ -887,7 +901,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++) {
@@ -1312,22 +1326,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(),
@@ -1449,6 +1463,8 @@
               if (m_pActiveRobotTask->getSrcPosition() == EQ_ID_MEASUREMENT) {
                  CGlass* pGlass = (CGlass*)m_pActiveRobotTask->getContext();
                  pGlass->complete();
                  CGlass* pBuddy = pGlass->getBuddy();
                  if (pBuddy != nullptr) pBuddy->complete();
                  this->saveState();
                  bool bMoved = glassFromInPorcessToComplete(pGlass);
                  if (bMoved) {
@@ -1570,7 +1586,26 @@
            }
            strOut.append(szBuffer);
         }
         LOGI("<CMaster-%s>SVDataReport:%s", ((CEquipment*)pEquipment)->getName().c_str(), strOut.c_str());
         LOGD("<CMaster-%s>SVDataReport:%s", ((CEquipment*)pEquipment)->getName().c_str(), strOut.c_str());
      };
      listener.onPanelDataReport = [&](void* pEquipment, void* pContext) {
         LOGD("<CMaster-%s>onPanelDataReport", ((CEquipment*)pEquipment)->getName().c_str());

         CEquipment* pEq = (CEquipment*)pEquipment;
         CGlass* pGlass = (CGlass*)pContext;

         // 如果AOI检测失败，要停机
         if (pEq->getID() == EQ_ID_MEASUREMENT) {
            LOGD("<CMaster-%s>onPanelDataReport 01", ((CEquipment*)pEquipment)->getName().c_str());
            if (pGlass->getAOIInspResult() == InspResult::Fail) {
               LOGD("<CMaster-%s>onPanelDataReport 02", ((CEquipment*)pEquipment)->getName().c_str());
               if (stop() == 0) {
                  m_nLastError = ER_CODE_AOI_NG;
                  m_strLastError = "AOI检测未通过.";
               }
            }
         }

      };
      pEquipment->setListener(listener);
      pEquipment->setCcLink(&m_cclink);
@@ -1832,6 +1867,8 @@
         if (!m_inProcesGlasses.empty()) {
            CGlass* pGlass = m_inProcesGlasses.front();
            pGlass->complete();
            CGlass* pBuddy = pGlass->getBuddy();
            if (pBuddy != nullptr) pBuddy->complete();
            glassFromInPorcessToComplete(pGlass);
            this->saveState();

@@ -2038,12 +2075,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();
@@ -2276,6 +2313,22 @@
      int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
      CLoadPort* pPort = (CLoadPort*)getEquipment(eqid[index]);
      pPort->localEanblePort(bEnable);
   }

   int CMaster::getPortCassetteSnSeed(int port)
   {
      ASSERT(1 <= port && port <= 4);
      int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
      CLoadPort* pPort = (CLoadPort*)getEquipment(eqid[port - 1]);
      return pPort->getPortCassetteSnSeed();
   }

   void CMaster::setPortCassetteSnSeed(int port, int seed)
   {
      ASSERT(1 <= port && port <= 4);
      int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
      CLoadPort* pPort = (CLoadPort*)getEquipment(eqid[port - 1]);
      return pPort->setPortCassetteSnSeed(seed);
   }

   void CMaster::setCompareMapsBeforeProceeding(BOOL bCompare)
@@ -2698,4 +2751,35 @@

      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();
   }

   int CMaster::getLastError()
   {
      return m_nLastError;
   }

   std::string& CMaster::getLastErrorText()
   {
      return m_strLastError;
   }

   void CMaster::test()
   {
      if (stop() == 0) {
         m_nLastError = ER_CODE_AOI_NG;
         m_strLastError = "AOI检测未通过.";
      }
   }
}