1.完善CJ/PJ事件上报；

chenluhua1980

7 天以前 238f41fd4edac2febc03d2e428bce7206f609e99

 SourceCode/Bond/Servo/Model.cpp

@@ -41,8 +41,118 @@
{
   // 1) 刷新派生 SV
   refreshDerivedSVs();
   // 2) 上报 CJ 状态事件（同一 CJID，RPTID=31000）
   static SERVO::CJState s_prevState = SERVO::CJState::NoState;
   static std::string s_prevCjId;
   SERVO::CControlJob* pCj = m_master.getControlJob();
   if (pCj == nullptr) {
      if (!s_prevCjId.empty()) {
         m_hsmsPassive.withVariableLock([&] {
            m_hsmsPassive.setVariableValue("CJID", s_prevCjId.c_str());
            m_hsmsPassive.requestEventReportSend("CJobDeleted");
         });
         s_prevCjId.clear();
         s_prevState = SERVO::CJState::NoState;
      }
   }
   else {
      const std::string& cjId = pCj->id();
      const SERVO::CJState state = pCj->state();
      if (s_prevCjId != cjId) {
         s_prevCjId = cjId;
         s_prevState = SERVO::CJState::NoState;
      }
      if (state != s_prevState) {
         m_hsmsPassive.withVariableLock([&] {
            m_hsmsPassive.setVariableValue("CJID", cjId.c_str());
            if (state == SERVO::CJState::Queued) {
               m_hsmsPassive.requestEventReportSend("CJobQueued");
            }
            else if (state == SERVO::CJState::Executing) {
               if (s_prevState == SERVO::CJState::Paused) {
                  m_hsmsPassive.requestEventReportSend("CJobResume");
               }
               else {
                  m_hsmsPassive.requestEventReportSend("CJobExecuting");
               }
            }
            else if (state == SERVO::CJState::Paused) {
               m_hsmsPassive.requestEventReportSend("CJobPaused");
            }
            else if (state == SERVO::CJState::Completed) {
               m_hsmsPassive.requestEventReportSend("CJobCompleted");
            }
            else if (state == SERVO::CJState::Aborted || state == SERVO::CJState::Failed) {
               m_hsmsPassive.requestEventReportSend("CJobAbort");
            }
         });
         s_prevState = state;
      }
   }
   // 3) 上报 PJ 状态事件（PrJob*）
   emitPjStateEvents();
   // 2) 通知上层 UI（RX_CODE_CONTROLJOB_CHANGED）
   notify(RX_CODE_CONTROLJOB_CHANGED);
}

void CModel::emitPjStateEvents()
{
   // 当前 PJ 列表
   std::map<std::string, SERVO::PJState> current;
   for (auto pj : m_master.getProcessJobs()) {
      if (pj == nullptr) continue;
      current[pj->id()] = pj->state();
   }

   // 已删除的 PJ
   for (auto it = m_prevPjStates.begin(); it != m_prevPjStates.end(); ) {
      if (current.find(it->first) == current.end()) {
         const std::string pjId = it->first;
         m_hsmsPassive.withVariableLock([&] {
            m_hsmsPassive.setVariableValue("PJID", pjId.c_str());
            m_hsmsPassive.requestEventReportSend("PrJobDeleted");
         });
         it = m_prevPjStates.erase(it);
         continue;
      }
      ++it;
   }

   // 状态变更事件
   for (const auto& kv : current) {
      const std::string& pjId = kv.first;
      const SERVO::PJState state = kv.second;
      auto prevIt = m_prevPjStates.find(pjId);
      if (prevIt == m_prevPjStates.end()) {
         // 新 PJ：由 onPRJobMultiCreate 负责上报 PrJobPooled，这里只缓存
         m_prevPjStates[pjId] = state;
         continue;
      }
      const SERVO::PJState prevState = prevIt->second;
      if (state == prevState) continue;

      m_hsmsPassive.withVariableLock([&] {
         m_hsmsPassive.setVariableValue("PJID", pjId.c_str());
         if (state == SERVO::PJState::InProcess) {
            if (prevState == SERVO::PJState::Paused) {
               m_hsmsPassive.requestEventReportSend("PrJobResume");
            }
            else {
               m_hsmsPassive.requestEventReportSend("PrJobProcessing");
            }
         }
         else if (state == SERVO::PJState::Paused) {
            m_hsmsPassive.requestEventReportSend("PrJobPaused");
         }
         else if (state == SERVO::PJState::Completed) {
            m_hsmsPassive.requestEventReportSend("PrJobCompleted");
         }
         else if (state == SERVO::PJState::Aborted || state == SERVO::PJState::Failed || state == SERVO::PJState::Aborting) {
            m_hsmsPassive.requestEventReportSend("PrJobAbort");
         }
      });
      m_prevPjStates[pjId] = state;
   }
}

bool CModel::raiseSoftAlarm(int alarmId,
@@ -184,6 +294,7 @@

int CModel::init()
{
   const ULONGLONG boot_model_begin = GetTickCount64();
   CString strIniFile;
   CString strUnitId;
   strIniFile.Format(_T("%s\\ServoConfiguration.ini"), (LPTSTR)(LPCTSTR)m_strWorkDir);
@@ -214,6 +325,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;
@@ -331,11 +443,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);
@@ -354,6 +479,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;
@@ -366,6 +508,12 @@
      m_hsmsPassive.withVariableLock([&] {
         m_hsmsPassive.setVariableValue("PJQueued", vars);
         m_hsmsPassive.requestEventReportSend_PJ_Queued();
         for (auto pj : processJobs) {
            if (pj == nullptr) continue;
            m_hsmsPassive.setVariableValue("PJID", pj->id().c_str());
            m_hsmsPassive.requestEventReportSend("PrJobPooled");
            m_prevPjStates[pj->id()] = pj->state();
         }
      });
      return nRet;
   };
@@ -402,6 +550,8 @@
   }
   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;
@@ -491,9 +641,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);
            }
         });
      }
@@ -597,6 +747,37 @@
      (void)pMaster;
      (void)port;
      if (pEquipment == nullptr || pJobDataS == nullptr) return;
      {
         const std::string& g1 = pJobDataS->getGlass1Id();
         const std::string& g2 = pJobDataS->getGlass2Id();
         std::string glassId;
         if (!g1.empty() && !g2.empty()) {
            glassId = g1 + "+" + g2;
         }
         else if (!g1.empty()) {
            glassId = g1;
         }
         else {
            glassId = g2;
         }
         const int slotNo = pJobDataS->getTargetSlotNo();
         const int sourceSlotNo = pJobDataS->getSourceSlotNo();
         const int sourcePortNo = pJobDataS->getSourcePortNo();
         std::string sourceCarrier;
         if (sourcePortNo > 0) {
            if (auto* pLoadPort = (SERVO::CLoadPort*)m_master.getEquipment(EQ_ID_LOADPORT1 + sourcePortNo - 1)) {
               sourceCarrier = pLoadPort->getCassetteId();
            }
         }
         m_hsmsPassive.withVariableLock([&] {
            m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
            m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
            m_hsmsPassive.setVariableValue("SourceCarrier", sourceCarrier.c_str());
            m_hsmsPassive.setVariableValue("SourceSlot", (__int64)sourceSlotNo);
            m_hsmsPassive.setVariableValue("SourcePanelID", glassId.c_str());
            m_hsmsPassive.requestEventReportSend("GlassReceivedJob");
         });
      }
      const int eqId = pEquipment->getID();
      const int recipeId = pJobDataS->getMasterRecipe();
      std::string recipe = RecipeManager::getInstance().getPPIDById(recipeId);
@@ -629,6 +810,40 @@
         m_hsmsPassive.requestEventReportSend("RecipeChanged");
      });
   };
   masterListener.onJobSentOut = [&](void* pMaster, SERVO::CEquipment* pEquipment, int port, SERVO::CJobDataS* pJobDataS) {
      (void)pMaster;
      (void)port;
      if (pEquipment == nullptr || pJobDataS == nullptr) return;
      const std::string& g1 = pJobDataS->getGlass1Id();
      const std::string& g2 = pJobDataS->getGlass2Id();
      std::string glassId;
      if (!g1.empty() && !g2.empty()) {
         glassId = g1 + "+" + g2;
      }
      else if (!g1.empty()) {
         glassId = g1;
      }
      else {
         glassId = g2;
      }
      const int slotNo = pJobDataS->getSourceSlotNo();
      const int targetSlotNo = pJobDataS->getTargetSlotNo();
      const int targetPortNo = pJobDataS->getTargetPortNo();
      std::string targetCarrier;
      if (targetPortNo > 0) {
         if (auto* pLoadPort = (SERVO::CLoadPort*)m_master.getEquipment(EQ_ID_LOADPORT1 + targetPortNo - 1)) {
            targetCarrier = pLoadPort->getCassetteId();
         }
      }
      m_hsmsPassive.withVariableLock([&] {
         m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
         m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
         m_hsmsPassive.setVariableValue("TargetCarrier", targetCarrier.c_str());
         m_hsmsPassive.setVariableValue("TargetSlot", (__int64)targetSlotNo);
         m_hsmsPassive.setVariableValue("TargetPanelID", glassId.c_str());
         m_hsmsPassive.requestEventReportSend("GlassSentOutJob");
      });
   };
   masterListener.onLoadPortStatusChanged = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short status, __int64 data) {
      LOGE("<CModel>onLoadPortStatusChanged. status = %d", status);
      static std::map<int, short> s_prevPortStatus;
@@ -639,9 +854,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");
         });
@@ -650,7 +871,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上传 
@@ -665,7 +889,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();
         });
@@ -674,7 +898,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();
         });
@@ -683,9 +907,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();
               }
            }
@@ -696,7 +920,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();
         });
@@ -723,34 +947,37 @@
         m_hsmsPassive.setVariableValue("CurrentProcessState", (__int64)state);
         m_hsmsPassive.requestEventReportSend("ProcessStateChanged");

         // SubEqp events (per equipment, ignore slot distinction except payload)
         static std::map<int, SERVO::PROCESS_STATE> s_prevSubEqpState;
         const auto prevEqState = s_prevSubEqpState[eqId];
         if (prevEqState != state) {
            // state change
            m_hsmsPassive.requestEventReportSend("SubEqpStateChange");
         }
         if (state == SERVO::PROCESS_STATE::Processing) {
            m_hsmsPassive.requestEventReportSend_SubEqpStart();
         }
         else if (state == SERVO::PROCESS_STATE::Complete) {
            m_hsmsPassive.requestEventReportSend_SubEqpEnd();
         }
         s_prevSubEqpState[eqId] = state;

         // Unit events (per equipment slot)
         static std::map<int, std::map<int, SERVO::PROCESS_STATE>> s_prevUnitState;
         const auto prevUnitState = s_prevUnitState[eqId][slotNo];
         if (prevUnitState != state) {
            m_hsmsPassive.requestEventReportSend("UnitStateChange");
            std::string panelId;
            if (pEquipment != nullptr && slotNo > 0) {
               if (auto* pGlass = pEquipment->getGlassFromSlot(slotNo)) {
                  panelId = pGlass->getID();
               }
            }
            if (state == SERVO::PROCESS_STATE::Processing) {
               m_hsmsPassive.setVariableValue("PanelStartID", panelId.c_str());
               m_hsmsPassive.requestEventReportSend("UnitStart");
            }
            else if (state == SERVO::PROCESS_STATE::Complete) {
               m_hsmsPassive.setVariableValue("PanelEndID", panelId.c_str());
               m_hsmsPassive.requestEventReportSend("UnitEnd");
            }
            s_prevUnitState[eqId][slotNo] = state;
         }
      });
   };
   masterListener.onEqStatusChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, int unitId, int status, int reason) {
      (void)pMaster;
      if (pEquipment == nullptr) return;
      m_hsmsPassive.withVariableLock([&] {
         m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
         m_hsmsPassive.setVariableValue("SubEqpSlot", unitId);
         m_hsmsPassive.setVariableValue("EquipmentStatus", (__int64)status);
         m_hsmsPassive.requestEventReportSend("SubEqpStateChange");
      });
   };
   masterListener.onSVDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
@@ -760,6 +987,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]);
@@ -802,6 +1033,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]);
@@ -836,13 +1071,13 @@
   };
   masterListener.onCjStart = [&](void* pMaster, void* pj) {
      m_hsmsPassive.withVariableLock([&] {
         m_hsmsPassive.setVariableValue("CJStartID", ((SERVO::CControlJob*)pj)->id().c_str());
         m_hsmsPassive.setVariableValue("CJID", ((SERVO::CControlJob*)pj)->id().c_str());
         m_hsmsPassive.requestEventReportSend_CJ_Start();
      });
   };
   masterListener.onCjEnd = [&](void* pMaster, void* pj) {
      m_hsmsPassive.withVariableLock([&] {
         m_hsmsPassive.setVariableValue("CJEndID", ((SERVO::CControlJob*)pj)->id().c_str());
         m_hsmsPassive.setVariableValue("CJID", ((SERVO::CControlJob*)pj)->id().c_str());
         m_hsmsPassive.requestEventReportSend_CJ_End();
      });

@@ -851,15 +1086,17 @@
   };
   masterListener.onPjStart = [&](void* pMaster, void* pj) {
      m_hsmsPassive.withVariableLock([&] {
         m_hsmsPassive.setVariableValue("PJStartID", ((SERVO::CProcessJob*)pj)->id().c_str());
         m_hsmsPassive.setVariableValue("PJID", ((SERVO::CProcessJob*)pj)->id().c_str());
         m_hsmsPassive.requestEventReportSend_PJ_Start();
      });
      emitPjStateEvents();
   };
   masterListener.onPjEnd = [&](void* pMaster, void* pj) {
      m_hsmsPassive.withVariableLock([&] {
         m_hsmsPassive.setVariableValue("PJEndID", ((SERVO::CProcessJob*)pj)->id().c_str());
         m_hsmsPassive.setVariableValue("PJID", ((SERVO::CProcessJob*)pj)->id().c_str());
         m_hsmsPassive.requestEventReportSend_PJ_End();
      });
      emitPjStateEvents();
   };
   masterListener.onPanelStart = [&](void* pMaster, void* pPanel) {
      m_hsmsPassive.withVariableLock([&] {
@@ -905,6 +1142,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数据库
@@ -913,6 +1152,8 @@
   GlassLogDb::Init(path);


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