1.Port编码错位问题修复； 2.调度时的判断条件优化。 3.支持上料下料混合；

LAPTOP-SNT8I5JK\Boounion

2025-07-29 1e0e0a4401a783651398c2545e152013d6003939

 SourceCode/Bond/Servo/CPageGraph2.cpp

@@ -212,93 +212,14 @@

      // 测试
      else if (nCmd == ID_EQSGRAPHITEM_TEST1) {
         BOOL bTestGenerate = FALSE;
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
         if (pEquipment->getID() == EQ_ID_LOADPORT4 && !pEquipment->hasGlass()) {
            ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1);
            bTestGenerate = TRUE;
         }
         /*
         else if (pEquipment->getID() == EQ_ID_LOADPORT1 && !pEquipment->hasGlass()) {
            ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G2);
            bTestGenerate = TRUE;
         }
         */
         if (!bTestGenerate) {
            SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
            if (pTask != nullptr) {
               SERVO::CGlass* pGlass = (SERVO::CGlass*)pTask->getContext();
               SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
               if (pJobDataS != nullptr) {
                  SERVO::CJobDataB jobDataB;
                  pEquipment->onFetchedOutJob(0, &pJobDataS->getJobDataB(jobDataB));
                  pEquipment->onSentOutJob(0, pJobDataS);
               }
            }
         }
      }
      else if (nCmd == ID_EQSGRAPHITEM_TEST2) {
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
         SERVO::CArm* pArm = (SERVO::CArm*)pEquipment->getArm();
         if (pArm != nullptr) {
            SERVO::CGlass* pGlass = pArm->getAnyGlass();
            if (pGlass != nullptr) {
               SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
               if (pJobDataS != nullptr) {
                  pEquipment->onReceivedJob(0, pJobDataS);
                  Sleep(600);
                  SERVO::CJobDataB jobDataB;
                  pEquipment->onStoredJob(0, &pJobDataS->getJobDataB(jobDataB));
               }
            }
         }
      }
      else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
         if (pEquipment != nullptr) {
            SERVO::CGlass* pGlass = pEquipment->getAnyGlass();
            if (pGlass != nullptr) {
               SERVO::CProcessData pd;
               pd.setGlassId(pGlass->getID().c_str());
               pEquipment->onProcessData(&pd);
            }
         }
      }
      else if (nCmd == ID_EQSGRAPHITEM_TEST4) {
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
         if (pEquipment != nullptr) {
            pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_TROUBLE, FALSE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_SEND_ABLE, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_TROUBLE, FALSE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_SEND_ABLE, TRUE);
         }

         if (pEquipment != nullptr && (pEquipment->getID() == EQ_ID_Bonder1
            || pEquipment->getID() == EQ_ID_Bonder2)) {
            SERVO::CGlass* pGlass = pEquipment->getAnyGlass();
            if (pGlass != nullptr) {
               SERVO::CProcessData pd;
               pd.setGlassId(pGlass->getID().c_str());
               pEquipment->onProcessData(&pd);
            }
         }
      }
      else if (nCmd == ID_EQSGRAPHITEM_TEST5) {
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
         if (pEquipment != nullptr) {
            pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_TROUBLE, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_SEND_ABLE, FALSE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_TROUBLE, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_SEND_ABLE, FALSE);
         }
      }
      else if (nCmd == ID_EQSGRAPHITEM_TEST6) {
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
@@ -334,9 +255,7 @@
         */

         // 测试设置时间
         /*
         if (pEquipment->getID() == EQ_ID_Bonder1
            || pEquipment->getID() == EQ_ID_Bonder2) {
         if (pEquipment->getID() == EQ_ID_EFEM) {
            CTime time = CTime::GetCurrentTime();
            pEquipment->setDateTime((short)time.GetYear(),
               (short)time.GetMonth(),
@@ -345,7 +264,6 @@
               (short)time.GetMinute(),
               (short)time.GetSecond());
         }
         */

         
         // 测试设置cim mode
@@ -357,32 +275,13 @@
         }
         */
         
			
         /*
         if (pEquipment->getID() == EQ_ID_Bonder1
            || pEquipment->getID() == EQ_ID_Bonder2) {
            static int ii = 0; ii++;
            pEquipment->setEqMode((ii % 5) + 1);
         }
			

         /*
         SERVO::CGlass* pGlass = pEquipment->getAnyGlass();
         if (pGlass != nullptr) {
            std::string strDescription;
            SERVO::CPath* pPath = pGlass->getPath();
            while (pPath != nullptr) {
               pPath->getDescription(strDescription);
               AfxMessageBox(strDescription.c_str());
               pPath = pPath->getNext();
            }
         }
         */


         // 请求主配方列表
         if (pEquipment != nullptr) {
            pEquipment->masterRecipeListRequest(0, nullptr);
         }			
      }