1.port加料时，暂时修改为混料模式；

LAPTOP-SNT8I5JK\Boounion

2025-08-27 526735d2fe4a3dad2b5ed27759a627a971b98ebc

 SourceCode/Bond/Servo/CMaster.cpp

@@ -761,6 +761,10 @@
            if (m_pControlJob->state() == CJState::Queued) {
               LOGI("<Master>ControlJob已经启动");
               m_pControlJob->start();

               if (m_listener.onCjStart != nullptr) {
                  m_listener.onCjStart(this, m_pControlJob);
               }
            }
            if (m_pControlJob->state() == CJState::Paused) {
               LOGI("<Master>ControlJob已经恢复运行");
@@ -950,6 +954,11 @@
                     else {
                        LOGE("<Master>Glass(%s)从等待列队到工艺列队转移失败.",
                           pGlass->getID().c_str());
                     }

                     // 这里上报Panel Start事件
                     if (m_listener.onPanelStart != nullptr) {
                        m_listener.onPanelStart(this, pGlass);
                     }

                     goto BATCH_PORT_GET;
@@ -1310,7 +1319,7 @@
               if (pGlass == nullptr) {
                  bOk = TRUE;
                  slot = m_pActiveRobotTask->getTarSlot();
                  LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
                  LOGI("<CMaster>onPreStoredJob, 已校验数据一致性.");
               }
            }

@@ -1321,7 +1330,7 @@
               if (pGlass == nullptr && m_pActiveRobotTask->getSrcSlot() == port) {
                  bOk = TRUE;
                  slot = m_pActiveRobotTask->getSrcSlot();
                  LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
                  LOGI("<CMaster>onPreStoredJob, 已校验数据一致性.");
               }
            }
         }
@@ -1392,6 +1401,9 @@
                  else {
                     LOGE("<Master>Glass(%s)从工艺列队到完成列队转移失败.",
                        pGlass->getID().c_str());
                  }
                  if (m_listener.onPanelEnd != nullptr) {
                     m_listener.onPanelEnd(this, pGlass);
                  }

                  // 检查PJ是否已经完成
@@ -1711,7 +1723,6 @@


      // 模拟测试
      /*
      static int aaa = 0;
      aaa++;
      if (aaa % 30 == 0) {
@@ -1719,6 +1730,11 @@
            CGlass* pGlass = m_queueGlasses.front();
            pGlass->start();
            glassFromQueueToInPorcess(pGlass);

            // 这里上报Panel Start事件
            if (m_listener.onPanelStart != nullptr) {
               m_listener.onPanelStart(this, pGlass);
            }
         }
      }

@@ -1728,6 +1744,10 @@
            pGlass->complete();
            glassFromInPorcessToComplete(pGlass);

            // 这里上报Panel End事件
            if (m_listener.onPanelEnd != nullptr) {
               m_listener.onPanelEnd(this, pGlass);
            }

            CProcessJob* pJob = getGlassProcessJob(pGlass);
            if (pJob != nullptr && checkAndUpdatePjComplete(pJob)) {
@@ -1739,7 +1759,7 @@
            }
         }
      }
      */
		
   }

   void CMaster::connectEquipments()