From 90ae1c3db92833354814484e65f8cd2eef1f5f3e Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期三, 30 七月 2025 15:14:20 +0800 Subject: [PATCH] 1.配方列表获取完善； --- SourceCode/Bond/Servo/CEquipment.cpp | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp index 26b20d3..0d99db6 100644 --- a/SourceCode/Bond/Servo/CEquipment.cpp +++ b/SourceCode/Bond/Servo/CEquipment.cpp @@ -525,8 +525,12 @@ // EQ Job Event CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS1, pszData, size); CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS2, pszData, size); + CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS3, pszData, size); + CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS4, pszData, size); CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS1, pszData, size); CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS2, pszData, size); + CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS3, pszData, size); + CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS4, pszData, size); // Store Job Report #1~15 CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT1, pszData, size); @@ -1270,6 +1274,12 @@ if (m_slot[i].isLock()) continue; if (!m_slot[i].isEmpty()) continue; + int lsPath = m_slot[i].getLinkSignalPath(); + if (!m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_INLINE] + || m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_TROUBLE] + || !m_bLinkSignalToDownstream[lsPath][SIGNAL_INTERLOCK] + || !m_bLinkSignalToDownstream[lsPath][SIGNAL_RECEIVE_ABLE]) continue; + MaterialsType slotType = m_slot[i].getType(); if (type == MaterialsType::G1 && slotType == MaterialsType::G2) continue; if (type == MaterialsType::G2 && slotType == MaterialsType::G1) continue; @@ -1308,6 +1318,7 @@ CGlass* pGlass = (CGlass*)m_slot[i].getContext(); if (!isSlotProcessed(i)) continue; if (pGlass == nullptr) continue; + if (!pGlass->isScheduledForProcessing()) continue; if(pGlass->getInspResult(m_nID, 0) == InspResult::Fail) continue; int lsPath = m_slot[i].getLinkSignalPath(); if(!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE] @@ -1360,6 +1371,7 @@ if (m_slot[i].isLock()) continue; CGlass* pGlass = (CGlass*)m_slot[i].getContext(); if (pGlass == nullptr) continue; + if (!pGlass->isScheduledForProcessing()) continue; if (pGlass->getInspResult(m_nID, 0) != InspResult::Fail) continue; int lsPath = m_slot[i].getLinkSignalPath(); if (!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE] -- Gitblit v1.9.3