1.修复前烘-b, 后烘-b没有进入b分支导致数据没有推送到显示端的问题；

chenluhua1980

2026-01-24 847a34f02bfe00475735fb5bfbefea2db28c8ad6

 SourceCode/Bond/Servo/CMaster.cpp

@@ -8,6 +8,9 @@
#include <fstream>
#include "SerializeUtil.h"
#include "CServoUtilsTool.h"
#include "AlarmManager.h"
#include "ToolUnits.h"
#include "Model.h"


namespace SERVO {
@@ -59,6 +62,7 @@
      m_ullStartTime = 0;
      m_ullRunTime = 0;
      m_state = MASTERSTATE::READY;
      m_curveMode = CurveMode::Production;
      m_pActiveRobotTask = nullptr;
      m_nLastError = ER_CODE_NOERROR;
      m_isCompareMapsBeforeProceeding = FALSE;
@@ -72,6 +76,8 @@
      m_nContinuousWorkingPort = 0;
      m_nContinuousWorkingSlot = 0;
      m_pControlJob = nullptr;
      m_bPauseAlarmRaised = false;
      m_pModelCtx = nullptr;
      m_nTestFlag = 0;
      InitializeCriticalSection(&m_criticalSection);
   }
@@ -113,12 +119,25 @@
         m_hEventDispatchThreadExit[1] = nullptr;
      }

      // 释放人工搬出缓冲区里的玻璃
      for (auto* pGlass : m_bufGlass) {
         if (pGlass != nullptr) {
            pGlass->release();
         }
      }
      m_bufGlass.clear();

      DeleteCriticalSection(&m_criticalSection);
   }

   void CMaster::setListener(MasterListener listener)
   {
      m_listener = listener;
   }

   void CMaster::setModelCtx(CModel* pModel)
   {
      m_pModelCtx = pModel;
   }

   CRobotTask* CMaster::getActiveRobotTask()
@@ -128,11 +147,18 @@

   int CMaster::init()
   {
      const ULONGLONG boot_master_begin = GetTickCount64();
      LOGI("<Master>正在初始化...");
      LOGI("[BOOT][MASTER] init begin");


      //    cclink
      if (m_cclink.Connect(CC_LINK_IE_CONTROL_CHANNEL(1)) != 0) {
      const ULONGLONG boot_cclink_begin = GetTickCount64();
      const int cc_ret = m_cclink.Connect(CC_LINK_IE_CONTROL_CHANNEL(1));
      LOGI("[BOOT][MASTER] CC-Link connect ret=%d, cost=%llu ms",
         cc_ret,
         (unsigned long long)(GetTickCount64() - boot_cclink_begin));
      if (cc_ret != 0) {
         LOGE("连接CC-Link失败.");
      }
      else {
@@ -221,11 +247,21 @@


      // 读缓存数据
      const ULONGLONG boot_cache_begin = GetTickCount64();
      const ULONGLONG boot_read_begin = GetTickCount64();
      readCache();
      LOGI("[BOOT][MASTER] readCache finished, cost=%llu ms", (unsigned long long)(GetTickCount64() - boot_read_begin));

      const ULONGLONG boot_state_begin = GetTickCount64();
      loadState();
      LOGI("[BOOT][MASTER] loadState finished, cost=%llu ms", (unsigned long long)(GetTickCount64() - boot_state_begin));
      if (m_listener.onControlJobChanged) {
         m_listener.onControlJobChanged(this);
         notifyControlJobChanged();
      }

      LOGI("[BOOT][MASTER] cache/state loaded, cost=%llu ms (since init %llu ms)",
         (unsigned long long)(GetTickCount64() - boot_cache_begin),
         (unsigned long long)(GetTickCount64() - boot_master_begin));


      // 定时器
@@ -248,7 +284,39 @@


      LOGI("<Master>初始化完成.");
      LOGI("[BOOT][MASTER] init finished, total cost=%llu ms",
         (unsigned long long)(GetTickCount64() - boot_master_begin));
      return 0;
   }

   void CMaster::setCurveMode(CurveMode mode)
   {
      if (m_curveMode == mode) {
         return;
      }
      m_curveMode = mode;
      if (m_pCollector != nullptr) {
         const uint32_t mids[] = {
            MID_Bonder1, MID_Bonder2,
            MID_VacuumBakeA, MID_VacuumBakeB,
            MID_BakeCoolingA, MID_BakeCoolingB
         };
         for (uint32_t mid : mids) {
            if (mode == CurveMode::EmptyChamber) {
               m_pCollector->batchStart(mid, "EMPTY_CHAMBER", 30 * 60 * 1000ULL); // 空腔模式：启动采样批次
            }
            else {
               m_pCollector->batchStop(mid);
               m_pCollector->buffersClear(mid); // 切回生产模式，清掉空腔数据
            }
         }
      }
      LOGI("<Master>CurveMode=%s", mode == CurveMode::EmptyChamber ? "EmptyChamber" : "Production");
   }

   CurveMode CMaster::getCurveMode() const
   {
      return m_curveMode;
   }

   int CMaster::term()
@@ -879,6 +947,33 @@
                  m_pActiveRobotTask->place();
               }
               unlock(); // 等当前任务完成或中止后继续
               continue;
            }

            // 5.5) 暂停状态检查：若 CJ 或在制 PJ 处于 Paused，暂缓调度新的搬送
            bool pausedByEvent = false;
            if (m_pControlJob != nullptr && m_pControlJob->state() == CJState::Paused) {
               pausedByEvent = true;
            }
            for (auto pj : m_inProcesJobs) {
               if (pj != nullptr && pj->state() == PJState::Paused) {
                  pausedByEvent = true;
                  break;
               }
            }
            if (!pausedByEvent && m_bPauseAlarmRaised) {
               if (m_pModelCtx != nullptr) {
                  m_pModelCtx->clearSoftAlarm(ALID_SOFTWARE_PAUSE_EVENT, 0, 0);
               }
               else {
                  AlarmManager& alarmManager = AlarmManager::getInstance();
                  alarmManager.clearAlarmByAttributes(ALID_SOFTWARE_PAUSE_EVENT, 0, 0, CToolUnits::getCurrentTimeString());
               }
               m_bPauseAlarmRaised = false;
            }
            if (pausedByEvent) {
               LOGI("<Master>调度暂停：ControlJob/ProcessJob 处于 Paused 状态（可能由 PauseEvent 触发）");
               unlock();
               continue;
            }

@@ -1638,6 +1733,15 @@
         }
      };
      listener.onSVDataReport = [&](void* pEquipment, void* pData) {
         const bool allowSvLog =
            (m_state == MASTERSTATE::RUNNING ||
               m_state == MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER ||
               m_state == MASTERSTATE::RUNNING_BATCH ||
               m_state == MASTERSTATE::STARTING);
         const bool allowCurve = allowSvLog || (m_curveMode == CurveMode::EmptyChamber);
         if (!allowCurve) {
            return;
         }
         CSVData* pSVData = (CSVData*)pData;
         auto rawData = pSVData->getSVRawData();
         std::vector<CParam> params;
@@ -1689,18 +1793,23 @@
               int paramIndex = mapping.first;
               int channel = mapping.second;

               if (paramIndex < params.size() && channel - 1 < vacuumbakeTypes.size()) {
               if (paramIndex < params.size()) {
                  auto& param = params.at(paramIndex);
                  double value = param.getDoubleValue();
                  const std::string& dataType = vacuumbakeTypes[channel - 1];
                  const std::string& paramName = param.getName();
                  const char slotTag = !paramName.empty() ? paramName[0] : '\0';
                  const int typeIndex = (slotTag == 'B') ? (channel - 8) : (channel - 1);
                  if (typeIndex < 0 || typeIndex >= (int)vacuumbakeTypes.size()) {
                     continue;
                  }
                  const int pushChannel = typeIndex + 1;
                  const std::string& dataType = vacuumbakeTypes[typeIndex];

                  if (m_pCollector != nullptr) {
                     if (slotTag == 'A')
                        m_pCollector->buffersPush(SlotToMid(eqid, 1), channel, ts, value);
                        m_pCollector->buffersPush(SlotToMid(eqid, 1), pushChannel, ts, value);
                     else if (slotTag == 'B')
                        m_pCollector->buffersPush(SlotToMid(eqid, 2), channel, ts, value);
                        m_pCollector->buffersPush(SlotToMid(eqid, 2), pushChannel, ts, value);
                  }

                  // 根据腔体前缀写入对应 Slot 的玻璃
@@ -1734,20 +1843,25 @@
               int paramIndex = mapping.first;
               int channel = mapping.second;

               if (paramIndex < params.size() && channel - 1 < coolingTypes.size()) {
               if (paramIndex < params.size()) {
                  auto& param = params.at(paramIndex);
                  double value = param.getDoubleValue();
                  const std::string& dataType = coolingTypes[channel - 1];
                  const std::string& paramName = param.getName();
                  const char slotTag = !paramName.empty() ? paramName[0] : '\0';
                  const bool paramIsBake = paramName.find("烘烤") != std::string::npos;
                  const bool paramIsCooling = paramName.find("冷却") != std::string::npos;
                  const int typeIndex = (slotTag == 'B') ? (channel - 7) : (channel - 1);
                  if (typeIndex < 0 || typeIndex >= (int)coolingTypes.size()) {
                     continue;
                  }
                  const int pushChannel = typeIndex + 1;
                  const std::string& dataType = coolingTypes[typeIndex];

                  if (m_pCollector != nullptr && paramIsBake) {
                     if (slotTag == 'A')
                        m_pCollector->buffersPush(SlotToMid(eqid, 1), channel, ts, value);
                        m_pCollector->buffersPush(SlotToMid(eqid, 1), pushChannel, ts, value);
                     else if (slotTag == 'B')
                        m_pCollector->buffersPush(SlotToMid(eqid, 3), channel, ts, value);
                        m_pCollector->buffersPush(SlotToMid(eqid, 3), pushChannel, ts, value);
                  }

                  if (!dataType.empty()) {
@@ -2859,7 +2973,7 @@

      this->saveState();
      if (m_listener.onControlJobChanged) {
         m_listener.onControlJobChanged(this);
         notifyControlJobChanged();
      }

      return (int)m_processJobs.size();
@@ -2919,7 +3033,7 @@
      m_pControlJob->setPJs(temps);
      this->saveState();
      if (m_listener.onControlJobChanged) {
         m_listener.onControlJobChanged(this);
         notifyControlJobChanged();
      }


@@ -2977,15 +3091,83 @@
      return m_allowedCeids.find(ceid) != m_allowedCeids.end();
   }

   bool CMaster::raiseSoftAlarm(int alarmId,
      const std::string& desc,
      int level/* = -1*/,
      int deviceId/* = 0*/,
      int unitId/* = 0*/,
      const char* deviceName/* = "Software"*/,
      const char* unitName/* = "App"*/)
   {
      AlarmManager& alarmManager = AlarmManager::getInstance();
      const AlarmInfo* info = alarmManager.getAlarmInfoByID(alarmId);

      int severity = level;
      if (severity < 0 && info != nullptr) {
         severity = info->nAlarmLevel;
      }
      if (severity < 0) severity = 0; // fallback

      std::string descText = desc;
      if (descText.empty() && info != nullptr) {
         descText = !info->strDescription.empty() ? info->strDescription : info->strAlarmText;
      }
      if (descText.empty()) {
         descText = CToolUnits::formatString("Alarm %d", alarmId);
      }

      AlarmData alarmData;
      alarmData.nId = alarmId;
      alarmData.nSeverityLevel = severity;
      alarmData.nDeviceId = deviceId;
      alarmData.nUnitId = unitId;
      alarmData.strDeviceName = deviceName;
      alarmData.strUnitName = unitName;
      alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
      alarmData.strEndTime = "";
      alarmData.strDescription = descText;

      int nAlarmEventId = 0;
      return alarmManager.addAlarm(alarmData, nAlarmEventId);
   }

   void CMaster::handleCollectionEvent(uint32_t ceid)
   {
      // 遍历当前 PJ，命中 pauseEvents 时可在此扩展暂停动作
      bool pausedAny = false;
      for (auto pj : m_processJobs) {
         if (pj == nullptr) continue;
         const auto& pauseList = pj->pauseEvents();
         if (std::find(pauseList.begin(), pauseList.end(), ceid) != pauseList.end()) {
            LOGW("<Master>PauseEvent hit: CEID=%u, PJ=%s, state=%d", ceid, pj->id().c_str(), (int)pj->state());
            // TODO: 衔接具体暂停策略（如暂停 PJ/CJ、停止调度/搬送），此处仅留桩位
            if (pj->pause()) {
               LOGI("<Master>PJ paused by CEID=%u", ceid);
               pausedAny = true;
            }
            if (m_pControlJob != nullptr && m_pControlJob->state() == CJState::Executing) {
               if (m_pControlJob->pause()) {
                  LOGI("<Master>ControlJob paused by CEID=%u", ceid);
                  pausedAny = true;
               }
            }
         }
      }
      if (pausedAny && m_listener.onControlJobChanged) {
         // 通知应用层刷新 UI/按钮状态
         notifyControlJobChanged();
      }
      if (pausedAny && !m_bPauseAlarmRaised) {
         std::string desc = CToolUnits::formatString("<PauseEvent CEID=%u>", ceid);
         bool raised = false;
         if (m_pModelCtx != nullptr) {
            raised = m_pModelCtx->raiseSoftAlarm(ALID_SOFTWARE_PAUSE_EVENT, desc);
         }
         else {
            raised = raiseSoftAlarm(ALID_SOFTWARE_PAUSE_EVENT, desc);
         }
         if (raised) {
            LOGI("<Master>PauseEvent soft alarm raised, CEID=%u", ceid);
            m_bPauseAlarmRaised = true;
         }
      }
   }
@@ -3287,7 +3469,7 @@

      saveState();
      if (m_listener.onControlJobChanged) {
         m_listener.onControlJobChanged(this);
         notifyControlJobChanged();
      }

      return true;
@@ -3324,7 +3506,7 @@

      saveState();
      if (m_listener.onControlJobChanged) {
         m_listener.onControlJobChanged(this);
         notifyControlJobChanged();
      }

      return true;
@@ -3387,6 +3569,15 @@
      if (pSlot == nullptr) return false;

      CGlass* pGlass = (CGlass*)pSlot->getContext();
      if (pGlass == nullptr) return false;

      // Buffer 上限为 1：新搬出时丢弃旧的
      if (!m_bufGlass.empty()) {
         for (auto* oldGlass : m_bufGlass) {
            if (oldGlass != nullptr) oldGlass->release();
         }
         m_bufGlass.clear();
      }
      m_bufGlass.push_back(pGlass);
      pGlass->addRef();
      pSlot->setContext(nullptr);
@@ -3475,14 +3666,14 @@
         auto& dataTypes = CServoUtilsTool::getEqDataTypes();
         auto& bonderTypes = dataTypes[MID_Bonder1];
         for (size_t i = 0; i < bonderTypes.size(); ++i) {
            m_pCollector->buffersSetChannelName(MID_Bonder1, i + 1, bonderTypes[i].c_str());
            m_pCollector->buffersSetChannelName(MID_Bonder2, i + 1, bonderTypes[i].c_str());
            m_pCollector->buffersSetChannelName(MID_Bonder1, (UINT)i + 1, bonderTypes[(UINT)i].c_str());
            m_pCollector->buffersSetChannelName(MID_Bonder2, (UINT)i + 1, bonderTypes[(UINT)i].c_str());
         }

         auto& vacuumbakeTypes = dataTypes[MID_VacuumBakeA];
         for (size_t i = 0; i < vacuumbakeTypes.size(); ++i) {
            m_pCollector->buffersSetChannelName(MID_VacuumBakeA, i + 1, vacuumbakeTypes[i].c_str());
            m_pCollector->buffersSetChannelName(MID_VacuumBakeB, i + 1, vacuumbakeTypes[i].c_str());
            m_pCollector->buffersSetChannelName(MID_VacuumBakeA, (UINT)i + 1, vacuumbakeTypes[(UINT)i].c_str());
            m_pCollector->buffersSetChannelName(MID_VacuumBakeB, (UINT)i + 1, vacuumbakeTypes[(UINT)i].c_str());
         }

         auto& coolingTypes = dataTypes[MID_BakeCoolingA];
@@ -3490,6 +3681,17 @@
            m_pCollector->buffersSetChannelName(MID_BakeCoolingA, i + 1, coolingTypes[i].c_str());
            m_pCollector->buffersSetChannelName(MID_BakeCoolingB, i + 1, coolingTypes[i].c_str());
         }

         if (m_curveMode == CurveMode::EmptyChamber) {
            const uint32_t mids[] = {
               MID_Bonder1, MID_Bonder2,
               MID_VacuumBakeA, MID_VacuumBakeB,
               MID_BakeCoolingA, MID_BakeCoolingB
            };
            for (uint32_t mid : mids) {
               m_pCollector->batchStart(mid, "EMPTY_CHAMBER", 10 * 60 * 1000ULL);
            }
         }
      }
   }