chenluhua1980
10 天以前 517c0e8eba29ff41afbbc0abb0f913914b37e4e1
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);
@@ -660,8 +673,14 @@
      // 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(stateVid, (__int64)status);
            m_hsmsPassive.setVariableValue(modeVid, (__int64)pLoadPort->getPortMode());
            m_hsmsPassive.setVariableValue("PortStateChangePortId", pLoadPort->getID());
            m_hsmsPassive.setVariableValue("PortState", (__int64)status);
            m_hsmsPassive.requestEventReportSend("PortStateChange");
@@ -671,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上传