1.增加机台事件的上报时关联机器名，slot

chenluhua1980

9 天以前 bca7e5d43c28757b3de88050e585eb40aa202bce

 SourceCode/Bond/Servo/Model.cpp

@@ -37,6 +37,79 @@
   m_hsmsPassive.setVariableValue("PJobSpace", (__int64)(m_master.isProcessJobsEmpty() ? 1 : 0));
}

void CModel::notifyControlJobChanged()
{
   // 1) 刷新派生 SV
   refreshDerivedSVs();
   // 2) 通知上层 UI（RX_CODE_CONTROLJOB_CHANGED）
   notify(RX_CODE_CONTROLJOB_CHANGED);
}

bool CModel::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;

   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;
   // 若未显式提供设备/单元名称，尝试通过 deviceId/unitId 解析（soft alarm 默认均为 0）
   if (alarmData.strDeviceName.empty()) {
      alarmData.strDeviceName = alarmManager.getDeviceNameById(deviceId);
   }
   if (alarmData.strUnitName.empty()) {
      alarmData.strUnitName = alarmManager.getUnitNameById(deviceId, unitId);
   }
   alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
   alarmData.strEndTime = "";
   alarmData.strDescription = descText;

   int nAlarmEventId = 0;
   bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
   if (result) {
      notify(RX_CODE_ALARM_SET);
      if (m_master.isAlarmReportEnable()) {
         m_hsmsPassive.requestAlarmReport(1, alarmId, descText.c_str());
      }
   }
   return result;
}

void CModel::clearSoftAlarm(int alarmId, int deviceId, int unitId)
{
   AlarmManager& alarmManager = AlarmManager::getInstance();
   alarmManager.clearAlarmByAttributes(alarmId, deviceId, unitId, CToolUnits::getCurrentTimeString());
   notify(RX_CODE_ALARM_CLEAR);
   if (m_master.isAlarmReportEnable()) {
      const AlarmInfo* info = alarmManager.getAlarmInfoByID(alarmId);
      std::string descText;
      if (info != nullptr) descText = info->strAlarmText;
      m_hsmsPassive.requestAlarmReport(0, alarmId, descText.c_str());
   }
}

void CModel::setControlState(ControlState newState)
{
   const auto prev = m_currentControlState;
@@ -111,6 +184,7 @@

int CModel::init()
{
   const ULONGLONG boot_model_begin = GetTickCount64();
   CString strIniFile;
   CString strUnitId;
   strIniFile.Format(_T("%s\\ServoConfiguration.ini"), (LPTSTR)(LPCTSTR)m_strWorkDir);
@@ -125,6 +199,9 @@
   // CGlassPool
   m_glassPool.initPool();

   // 将 Model 上下文传递给 Master，便于 Master 触发软件级报警等跨层操作
   m_master.setModelCtx(this);


   // Log
   CString strLogDir;
@@ -138,6 +215,7 @@
   CLog::GetLog()->SetLogsDir(strLogDir);
   CLog::GetLog()->SetEquipmentId((LPTSTR)(LPCTSTR)strUnitId);
   LOGI("\r\n\r\n~~~ Prog Start! ~~~");
   LOGI("[BOOT][MODEL] init begin");


   SECSListener listener;
@@ -255,11 +333,24 @@
               return CAACK_5;
            }

            const short scanMap = pLoadPort->getScanCassetteMap();
            const short downloadMap = pLoadPort->getDownloadCassetteMap();
            m_hsmsPassive.withVariableLock([&] {
               m_hsmsPassive.setVariableValue("SlotMapScan", pLoadPort->getScanCassetteMap());
               m_hsmsPassive.setVariableValue("SlotMapDownload", pLoadPort->getDownloadCassetteMap());
               m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
               m_hsmsPassive.setVariableValue("SlotMapScan", scanMap);
               m_hsmsPassive.setVariableValue("SlotMapDownload", downloadMap);
               if (scanMap != downloadMap) {
                  m_hsmsPassive.requestEventReportSend_SlotMapVerificationNG();
                  m_hsmsPassive.requestEventReportSend("SlotMapMismatch");
               }
               else {
                  m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
               }
            });

            if (scanMap != downloadMap) {
               strErrorTxt = "rejected - SlotMap mismatch";
               return CAACK_5;
            }

            // Host 确认 SlotMap 后再开始加工/流程
            m_master.proceedWithCarrier(portIndex);
@@ -278,6 +369,23 @@
      for (auto p : pjs) {
         LOGI("<Model>onPRJobMultiCreate %s %s", p->id().c_str(), p->recipeSpec().c_str());
      }

      auto rejectAll = [&](uint32_t code, const std::string& msg) -> int {
         LOGW("<Model>onPRJobMultiCreate rejected: %s", msg.c_str());
         for (auto p : pjs) {
            if (p != nullptr) p->addIssue(code, msg);
         }
         return -1;
      };

      // 单 PJ 模式：只接受 1 条且当前无在制 PJ
      if (pjs.size() != 1) {
         return rejectAll(1200, "Only 1 ProcessJob supported (single-PJ mode)");
      }
      if (!m_master.isProcessJobsEmpty()) {
         return rejectAll(1201, "ProcessJob exists, cannot create new in single-PJ mode");
      }

      int nRet = m_master.setProcessJobs(pjs);
      auto processJobs = m_master.getProcessJobs();
      std::vector<SERVO::CVariable> vars;
@@ -315,8 +423,19 @@
   m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
   strVarialbleFile.Format(_T("%s\\CollectionEventList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
   m_hsmsPassive.loadCollectionEvents((LPTSTR)(LPCTSTR)strVarialbleFile);
   {
      auto events = m_hsmsPassive.getCollectionEvents();
      std::vector<unsigned int> ceids;
      ceids.reserve(events.size());
      for (auto e : events) {
         if (e != nullptr) ceids.push_back(e->getEventId());
      }
      m_master.setAllowedCeids(ceids);
   }
   strVarialbleFile.Format(_T("%s\\HsmsPassive.cache"), (LPTSTR)(LPCTSTR)m_strWorkDir);
   m_hsmsPassive.loadCacheFromFile(strVarialbleFile);
   LOGI("[BOOT][MODEL] HSMS config loaded, cost=%llu ms",
      (unsigned long long)(GetTickCount64() - boot_model_begin));


   SERVO::MasterListener masterListener;
@@ -332,7 +451,7 @@
   };
   masterListener.onControlJobChanged = [this](void* pMaster) {
      (void)pMaster;
      this->refreshDerivedSVs();
      this->notifyControlJobChanged();
      };
   masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
      LOGI("<CModel>Equipment onAlive:%s(%s).", pEquipment->getName().c_str(),
@@ -406,9 +525,9 @@
      if (pReport != nullptr) {
         m_hsmsPassive.withVariableLock([&] {
            m_hsmsPassive.setVariableValue("VCRPanelID", pReport->getGlassId().c_str());
            int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read_OK();
            int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read(pReport->getVcrResult());
            if (nRet != ER_NOERROR) {
               LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read_OK failed, ret=%d", nRet);
               LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read failed, ret=%d", nRet);
            }
         });
      }
@@ -554,9 +673,15 @@

      // Unified PortStateChange event + SV maintenance
      if (pLoadPort != nullptr) {
         const unsigned int portIndex = pLoadPort->getIndex() + 1;
         char stateVid[64] = {0};
         char modeVid[64] = {0};
         sprintf_s(stateVid, "PortTransferState_P%u", portIndex);
         sprintf_s(modeVid, "AccessMode_P%u", portIndex);
         m_hsmsPassive.withVariableLock([&] {
            m_hsmsPassive.setVariableValue("PortTransferState", (__int64)status); // maintain SVID=100
            m_hsmsPassive.setVariableValue("PortStateChangePortId", pLoadPort->getID());
            m_hsmsPassive.setVariableValue(stateVid, (__int64)status);
            m_hsmsPassive.setVariableValue(modeVid, (__int64)pLoadPort->getPortMode());
            m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
            m_hsmsPassive.setVariableValue("PortState", (__int64)status);
            m_hsmsPassive.requestEventReportSend("PortStateChange");
         });
@@ -565,7 +690,10 @@
      if (status == PORT_INUSE) {
         m_hsmsPassive.withVariableLock([&] {
            if (pLoadPort != nullptr) {
               m_hsmsPassive.setVariableValue("CarrierID", pLoadPort->getCassetteId().c_str());
               const unsigned int portIndex = pLoadPort->getIndex() + 1;
               char carrierVid[64] = {0};
               sprintf_s(carrierVid, "CarrierID_P%u", portIndex);
               m_hsmsPassive.setVariableValue(carrierVid, pLoadPort->getCassetteId().c_str());
               if (prevStatus != PORT_INUSE && pLoadPort->isCompareMapsBeforeProceeding()) {
                  // TODO(Host协商):
                  // 文档中标明：1-Empty，3-Exist，因此我们可能需要将uint的map转换为list上传 
@@ -580,7 +708,7 @@
         SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
         m_hsmsPassive.withVariableLock([&] {
            if (pLoadPort != nullptr) {
               m_hsmsPassive.setVariableValue("BlockedPortId", pLoadPort->getID());
               m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
            }
            m_hsmsPassive.requestEventReportSend_Port_Blocked();
         });
@@ -589,7 +717,7 @@
         SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
         m_hsmsPassive.withVariableLock([&] {
            if (pLoadPort != nullptr) {
               m_hsmsPassive.setVariableValue("LoadReadyPortId", pLoadPort->getID());
               m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
            }
            m_hsmsPassive.requestEventReportSend_Port_Load_Ready();
         });
@@ -598,9 +726,9 @@
         SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
         m_hsmsPassive.withVariableLock([&] {
            if (pLoadPort != nullptr) {
               m_hsmsPassive.setVariableValue("UnloadReadyPortId", pLoadPort->getID());
               m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
               if (prevStatus == PORT_INUSE) {
                  m_hsmsPassive.setVariableValue("ReadyToReleasePortId", pLoadPort->getID());
                  m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
                  m_hsmsPassive.requestEventReportSend_Port_Ready_To_Release();
               }
            }
@@ -611,7 +739,7 @@
         SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
         m_hsmsPassive.withVariableLock([&] {
            if (pLoadPort != nullptr) {
               m_hsmsPassive.setVariableValue("LoadPortNotAssocPortId", pLoadPort->getID());
               m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
            }
            m_hsmsPassive.requestEventReportSend_LoadPortNotAssoc();
         });
@@ -675,6 +803,10 @@
      auto sendSv = [&](const auto& vidMap, const char* evName) {
         const size_t count = (std::min)(params.size(), vidMap.size());
         m_hsmsPassive.withVariableLock([&] {
            if (pEquipment != nullptr) {
               m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
            }
            m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
            m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
            for (size_t idx = 0; idx < count; ++idx) {
               const std::string val = formatParamValue(params[idx]);
@@ -717,6 +849,10 @@
      auto sendProcess = [&](const auto& vidMap, const char* evName) {
         const size_t count = (std::min)(params.size(), vidMap.size());
         m_hsmsPassive.withVariableLock([&] {
            if (pEquipment != nullptr) {
               m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
            }
            m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
            m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
            for (size_t idx = 0; idx < count; ++idx) {
               const std::string val = formatParamValue(params[idx]);
@@ -820,6 +956,8 @@
   char szBuffer[MAX_PATH];
   sprintf_s(szBuffer, MAX_PATH, "%s\\AlarmList.csv", (LPTSTR)(LPCTSTR)m_strWorkDir);
   alarmManager.readAlarmFile(szBuffer);
   LOGI("[BOOT][MODEL] Alarm list loaded, cost=%llu ms",
      (unsigned long long)(GetTickCount64() - boot_model_begin));


   // Glass数据库
@@ -828,6 +966,8 @@
   GlassLogDb::Init(path);


   LOGI("[BOOT][MODEL] init finished, total cost=%llu ms",
      (unsigned long long)(GetTickCount64() - boot_model_begin));
   return 0;
}