1.两片玻璃贴合后一起搬运的逻辑问题再优化，同时修改Slot信息，贴合后的玻璃应该放置在同一Slot.

LAPTOP-SNT8I5JK\Boounion

2025-06-17 963e6bffaaf6a62a1f764c6633cf6accbb1608c9

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -255,13 +255,21 @@
         if (!m_slot[i].isEnable()) continue;

         CGlass* pGlass = (CGlass*)m_slot[i].getContext();
         CGlass* pBuddy = nullptr;
         if (pGlass == nullptr) {
            attrubutes.addAttribute(new CAttribute(m_slot[i].getName().c_str(),
               "", "", weight++));
         }
         else {
            attrubutes.addAttribute(new CAttribute(m_slot[i].getName().c_str(),
               pGlass->getID().c_str(), "", weight++));
            pBuddy = pGlass->getBuddy();
            if (pBuddy == nullptr) {
               attrubutes.addAttribute(new CAttribute(m_slot[i].getName().c_str(),
                  pGlass->getID().c_str(), "", weight++));
            }
            else {
               attrubutes.addAttribute(new CAttribute(m_slot[i].getName().c_str(),
                  (pGlass->getID() + " -> " + pBuddy->getID()).c_str(), "", weight++));
            }
         }

      }
@@ -317,8 +325,13 @@
         Lock();
         for (int i = 0; i < SLOT_MAX; i++) {
            m_slot[i].serialize(ar);
            if (m_slot[i].getContext() != nullptr) {
               ((CGlass*)m_slot[i].getContext())->serialize(ar);
            CGlass* pGlass = (CGlass *)m_slot[i].getContext();
            if (pGlass != nullptr) {					
               pGlass->serialize(ar);
               CGlass* pBuddy = pGlass->getBuddy();
               if (pBuddy != nullptr) {
                  pBuddy->serialize(ar);
               }
            }
         }
         Unlock();
@@ -330,10 +343,16 @@
               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);
               }
            }
         }
         
         // 梳理各玻璃之间的绑定关系
         /*
         Lock();
         for (int i = 0; i < SLOT_MAX; i++) {
            CGlass* pGlass = (CGlass*)m_slot[i].getContext();
@@ -351,6 +370,7 @@
            }
         }
         Unlock();
         */
      }
   }

@@ -766,18 +786,6 @@
         return -3;
      }

      // 如果此玻璃已经贴合，贴合的玻璃也要从列表中移除
      CGlass* pBuddy = pContext->getBuddy();
      if (pBuddy != nullptr) {
         for (int i = 0; i < SLOT_MAX; i++) {
            CGlass* pGlass = (CGlass*)m_slot[i].getContext();
            if (pGlass != nullptr && compareJobDataB(pBuddy->getJobDataB(), pGlass->getJobDataB())) {
               m_slot[i].setContext(nullptr);
               break;
            }
         }
      }


      ((CArm*)m_pArm)->tempStore(pContext);
      pContext->release();
@@ -811,6 +819,7 @@


      // 如果此玻璃已经贴合，贴合的玻璃也要从加入到列表中
      /*
      CGlass* pBuddy = pGlass->getBuddy();
      if (pBuddy != nullptr) {
         Lock();
@@ -823,7 +832,7 @@
         }
         Unlock();
      }

      */

      if (m_listener.onDataChanged != nullptr) {
         m_listener.onDataChanged(this, EDCC_STORED_JOB);
@@ -1470,6 +1479,57 @@
      return 0;
   }

   int CEquipment::decodePanelDataReport(CStep* pStep, const char* pszData, size_t size)
   {
      short cassetteNo, jobSequenceNo;
      int index = 0;
      std::string strPanelJudgeData, strPanelGradeData;
      memcpy(&cassetteNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      CToolUnits::convertString(&pszData[index], 128 * 2, strPanelJudgeData);
      index += 128 * 2;
      CToolUnits::convertString(&pszData[index], 256 * 2, strPanelJudgeData);
      index += 256 * 2;


      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      pStep->addAttribute(new CAttribute("CassetteNo",
         std::to_string(cassetteNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("JobSequenceNo",
         std::to_string(jobSequenceNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("PanelJudgeData",
         strPanelJudgeData.c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("PanelGradeData",
         strPanelGradeData.c_str(), "", weight++));


      return 0;
   }

   int CEquipment::decodeFacDataReport(CStep* pStep, const char* pszData, size_t size)
   {
      int index = 0;
      std::string strSvTimeRecord, strSvData;
      CToolUnits::convertString(&pszData[index], 8 * 2, strSvTimeRecord);
      index += 128 * 2;
      CToolUnits::convertString(&pszData[index], 640 * 2, strSvData);
      index += 256 * 2;


      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      pStep->addAttribute(new CAttribute("SV Time Record",
         strSvTimeRecord.c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("SV Data",
         strSvData.c_str(), "", weight++));


      return 0;
   }

   int CEquipment::onPreStoredJob(int port, CJobDataB* pJobDataB, short& putSlot)
   {
      LOGI("<CEquipment-%s>onPreStoredJob:port:%d|GlassId:%s",