1.扫码事件上报，之前只上报OK一种情况，现在有事种状态。 2.Port事件上报关联PortID, 统一修改为VID：PortID，之前分开很多种。

chenluhua1980

9 天以前 944e8f3dea723404e21168e97116cca2c09c70cb

 SourceCode/Bond/Servo/Model.cpp

@@ -333,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);
@@ -512,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);
            }
         });
      }
@@ -668,7 +681,7 @@
         m_hsmsPassive.withVariableLock([&] {
            m_hsmsPassive.setVariableValue(stateVid, (__int64)status);
            m_hsmsPassive.setVariableValue(modeVid, (__int64)pLoadPort->getPortMode());
            m_hsmsPassive.setVariableValue("PortStateChangePortId", pLoadPort->getID());
            m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
            m_hsmsPassive.setVariableValue("PortState", (__int64)status);
            m_hsmsPassive.requestEventReportSend("PortStateChange");
         });
@@ -695,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();
         });
@@ -704,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();
         });
@@ -713,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();
               }
            }
@@ -726,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();
         });