1.修复一个回复错误的问题；

chenluhua1980

2026-01-06 4d9d8d22e3666076988c30afb4e7c6fe365c19aa

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -5,6 +5,7 @@
#include "CArm.h"
#include "CGlassPool.h"
#include "Servo.h"
#include "GlassJson.h"


namespace SERVO {
@@ -25,7 +26,6 @@
      m_pCclink = nullptr;
      m_nBaseAlarmId = 0;
      m_pArm = nullptr;
      m_processState = PROCESS_STATE::Ready;
      m_blockReadBit = { 0 };
      m_nTestFlag = 0;
      InitializeCriticalSection(&m_criticalSection);
@@ -143,13 +143,15 @@
      return 0;
   }

   void CEquipment::setProcessState(PROCESS_STATE state)
   void CEquipment::setProcessState(int nSlotNo, PROCESS_STATE state)
   {
      m_processState = state;
      onProcessStateChanged(m_processState);
      if (nSlotNo <= 0 || nSlotNo > 8) return;

      m_processState[nSlotNo - 1] = state;
      onProcessStateChanged(nSlotNo, m_processState[nSlotNo - 1]);

      if (m_listener.onProcessStateChanged != nullptr) {
         m_listener.onProcessStateChanged(this, m_processState);
         m_listener.onProcessStateChanged(this, nSlotNo, m_processState[nSlotNo - 1]);
      }
   }

@@ -335,11 +337,16 @@
         for (int i = 0; i < SLOT_MAX; i++) {
            m_slot[i].serialize(ar);
            CGlass* pGlass = (CGlass *)m_slot[i].getContext();
            if (pGlass != nullptr) {					
               pGlass->serialize(ar);
            if (pGlass != nullptr) {
               const std::string pretty = GlassJson::ToPrettyString(*pGlass);
               CString strPretty = CString(pretty.c_str());
               ar << strPretty;

               CGlass* pBuddy = pGlass->getBuddy();
               if (pBuddy != nullptr) {
                  pBuddy->serialize(ar);
                  const std::string prettyBuddy = GlassJson::ToPrettyString(*pBuddy);
                  CString strPrettyBuddy = CString(prettyBuddy.c_str());
                  ar << strPrettyBuddy;
               }
            }
         }
@@ -349,17 +356,29 @@
         for (int i = 0; i < SLOT_MAX; i++) {
            m_slot[i].serialize(ar);
            if (m_slot[i].getTempContext() != nullptr) {
               CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
               pGlass->serialize(ar);
               m_slot[i].setContext(pGlass);
               if (pGlass->getBuddy() != nullptr) {
                  CGlass* pBuddy = theApp.m_model.m_glassPool.allocaGlass();
                  pBuddy->serialize(ar);
                  pGlass->forceSetBuddy(pBuddy);
               CString strPretty;
               std::string pretty;
               ar >> strPretty;
               pretty = (LPTSTR)(LPCTSTR)strPretty;
               if (!pretty.empty()) {
                  CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
                  GlassJson::FromString(pretty, *pGlass);
                  m_slot[i].setContext(pGlass);

                  if (!pGlass->getBuddyId().empty()) {
                     CGlass* pBuddy = theApp.m_model.m_glassPool.allocaGlass();
                     CString strPrettyBuddy;
                     std::string prettyBuddy;
                     ar >> strPrettyBuddy;
                     prettyBuddy = (LPTSTR)(LPCTSTR)strPrettyBuddy;
                     GlassJson::FromString(prettyBuddy, *pBuddy);
                     pGlass->forceSetBuddy(pBuddy);
                  }
               }

            }
         }
			

         // 梳理各玻璃之间的绑定关系
         /*
         Lock();
@@ -491,7 +510,14 @@
      CHECK_READ_STEP_SIGNAL(STEP_ID_PROCESS_DATA_REPORT, pszData, size);

      // FAC Data report
      CHECK_READ_STEP_SIGNAL(STEP_ID_FAC_DATA_REPORT, pszData, size);
      // CHECK_READ_STEP_SIGNAL(STEP_ID_FAC_DATA_REPORT, pszData, size);
      {
         SERVO::CStep* pStep = getStep(STEP_ID_FAC_DATA_REPORT);
         if (pStep != nullptr) {
               ((CReadStep*)pStep)->onReadSignal(TRUE);
         }
      }


      // 配方改变
      CHECK_READ_STEP_SIGNAL(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pszData, size);
@@ -891,8 +917,8 @@
      Unlock();


      if (m_processState != PROCESS_STATE::Ready) {
         setProcessState(PROCESS_STATE::Ready);
      if (m_processState[port] != PROCESS_STATE::Ready) {
         setProcessState(port, PROCESS_STATE::Ready);
      }

      if (m_listener.onDataChanged != nullptr) {
@@ -917,13 +943,17 @@
      ASSERT(pGlass);
      Lock();
      pGlass->addPath(m_nID, getSlotUnit(putSlot), putSlot);
      CGlass* pBuddy = pGlass->getBuddy();
      if (pBuddy != nullptr) pBuddy->addPath(m_nID, getSlotUnit(putSlot), putSlot);
      m_slot[putSlot - 1].setContext(pGlass);
      pGlass->release();            // tempFetchOut需要调用一次release
      Unlock();

      /*
      if (m_processState != PROCESS_STATE::Processing) {
         setProcessState(PROCESS_STATE::Processing);
      }
      */

      if (m_listener.onDataChanged != nullptr) {
         m_listener.onDataChanged(this, EDCC_STORED_JOB);
@@ -1477,6 +1507,19 @@
      return &m_slot[index];
   }

   CSlot* CEquipment::getSlotWithNo(int slotNo)
   {
      CSlot* pSlot = nullptr;
      for (int i = 0; i < SLOT_MAX; i++) {
         if (!m_slot[i].isEnable()) continue;
         if (m_slot[i].getNo() != slotNo) continue;
         pSlot = &m_slot[i];
         break;
      }

      return pSlot;
   }

   CGlass* CEquipment::getAnyGlass()
   {
      CSlot* pSlot = nullptr;
@@ -1553,17 +1596,27 @@
      CGlass* pGlass = this->getGlassWithCassette(processData.getCassetteSequenceNo(),
         processData.getJobSequenceNo());
      if (pGlass == nullptr) {
         LOGE("<CEquipment-%s>找不到对应Glass, 关联工艺参数失败。", this->getName().c_str(),
         LOGE("<CEquipment-%s>找不到对应Glass, 关联工艺参数失败。CassetteSequenceNo:%d/%d",
            this->getName().c_str(),
            processData.getCassetteSequenceNo(),
            processData.getJobSequenceNo());
         return -1;
      }

      auto rawData = processData.getParamsRawData();
      std::vector<CParam> params;
      this->parsingParams((const char*)rawData.data(), rawData.size(), params);
      std::vector<CParam> tempParams;
      this->parsingProcessData((const char*)rawData.data(), rawData.size(), tempParams);
      int n = processData.getTotalParameter();
      std::vector<CParam> params(tempParams.begin(), tempParams.begin() + min(n, (int)tempParams.size()));
      pGlass->addParams(params);

		
      // 关联的Glass也要更新
      CGlass* pBuddy = pGlass->getBuddy();
      LOGI("<Equipment-%s>decodeProcessDataReport pBuddy=%x %s", getName().c_str(), pBuddy, pGlass->getID().c_str());
      if (pBuddy != nullptr) {
         LOGI("<Equipment-%s>decodeProcessDataReport addParams pBuddy=%x %s", getName().c_str(), pBuddy, pGlass->getID().c_str());
         pBuddy->addParams(params);
      }

      return nRet;
   }
@@ -1795,7 +1848,12 @@
            getName().c_str(), cassetteNo, jobSequenceNo);
         return -1;
      }
      pGlass->setInspResult(m_nID, 0, judgeStringToInspResult(strPanelJudgeData));
      auto result = judgeStringToInspResult(strPanelJudgeData);
      pGlass->setInspResult(m_nID, 0, result);

      if (m_listener.onPanelDataReport != nullptr) {
         m_listener.onPanelDataReport(this, pGlass);
      }

      return 0;
   }
@@ -1881,12 +1939,17 @@
         year, month, day, hour, minute, second
         );

      CGlass* pGlass = getGlassFromSlot(slotNo);
      if (pGlass == nullptr) {
         LOGE("<CEquipment-%s>decodeJobProcessStartReport, 找不到对应glass", getName().c_str());
      }
      if (slotNo <= 0 || slotNo > 8) return -1;

      if (m_processState != PROCESS_STATE::Processing) {
      if (m_processState[slotNo -1] != PROCESS_STATE::Processing) {
         Lock();
         m_svDatas.clear();
         Unlock();
         setProcessState(PROCESS_STATE::Processing);
         setProcessState(slotNo, PROCESS_STATE::Processing);
      }


@@ -1954,11 +2017,11 @@
      );


      if (m_processState != PROCESS_STATE::Complete) {
         setProcessState(PROCESS_STATE::Complete);
      }
		
      CGlass* pGlass = getGlassFromSlot(slotNo);
      if (m_processState[slotNo - 1] != PROCESS_STATE::Complete) {
         setProcessState(slotNo, PROCESS_STATE::Complete);
      }
	
      if (pGlass == nullptr) {
         LOGE("<CEquipment-%s>decodeJobProcessEndReport, 找不到对应glass", getName().c_str());
      }
@@ -1967,9 +2030,6 @@
         if (pJs->getCassetteSequenceNo() == cassetteNo
            && pJs->getJobSequenceNo() == jobSequenceNo) {
            pGlass->processEnd(m_nID, getSlotUnit(slotNo));
            if (m_processState != PROCESS_STATE::Complete) {
               setProcessState(PROCESS_STATE::Complete);
            }
         }
         else {
            LOGE("<CEquipment-%s>decodeJobProcessEndReport, jobSequenceNo或jobSequenceNo不匹配",
@@ -2088,7 +2148,7 @@
      return 0;
   }

   int CEquipment::onProcessStateChanged(PROCESS_STATE state)
   int CEquipment::onProcessStateChanged(int nSlotNo, PROCESS_STATE state)
   {
      return 0;
   }
@@ -2189,7 +2249,8 @@
            return -1;
         });
      pStep->setName(STEP_EQ_FAC_DATA_REPORT);
      pStep->setProp("Port", (void*)port);
      pStep->setProp("Port", (void*)(__int64)port);
      pStep->setReadContinue(TRUE);
      pStep->setWriteSignalDev(writeSignalDev);
      if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
         delete pStep;