From 2ebccf831b56d30089924f2eefa2d790e2b8f3fc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 07 八月 2025 09:20:21 +0800
Subject: [PATCH] 1.为CVariable增加值的设置和获取 2.当发生Port状态改变为InUse时，此时也刚好获取到CarrierID，上报S6F11_CarrierID_Readed
---
SourceCode/Bond/Servo/CGlass.cpp | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index a9e88eb..6c1b30f 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -8,6 +8,9 @@
m_pPath = nullptr;
m_type = MaterialsType::G1;
m_pBuddy = nullptr;
+ m_nOriginPort = 0;
+ m_nOriginSlot = 0;
+ m_bScheduledForProcessing = FALSE;
}
CGlass::~CGlass()
@@ -66,6 +69,28 @@
return m_strID;
}
+ void CGlass::setOriginPort(int port, int slot)
+ {
+ m_nOriginPort = port;
+ m_nOriginSlot = slot;
+ }
+
+ void CGlass::getOrginPort(int& port, int& slot)
+ {
+ port = m_nOriginPort;
+ slot = m_nOriginSlot;
+ }
+
+ BOOL CGlass::isScheduledForProcessing()
+ {
+ return m_bScheduledForProcessing;
+ }
+
+ void CGlass::setScheduledForProcessing(BOOL bProcessing)
+ {
+ m_bScheduledForProcessing = bProcessing;
+ }
+
CPath* CGlass::getPath()
{
return m_pPath;
@@ -103,6 +128,9 @@
Lock();
ar << (int)m_type;
WriteString(ar, m_strID);
+ ar << m_nOriginPort;
+ ar << m_nOriginSlot;
+ ar << m_bScheduledForProcessing;
ar << (ULONGLONG)m_pPath;
if (m_pPath != nullptr) {
m_pPath->serialize(ar);
@@ -123,6 +151,9 @@
ar >> type;
m_type = (MaterialsType)type;
ReadString(ar, m_strID);
+ ar >> m_nOriginPort;
+ ar >> m_nOriginSlot;
+ ar >> m_bScheduledForProcessing;
ar >> ullPath;
if (ullPath != 0) {
m_pPath = new CPath();
@@ -140,6 +171,11 @@
void CGlass::setJobDataS(CJobDataS* pJobDataS)
{
m_jobDataS.copy(pJobDataS);
+ }
+
+ void CGlass::updateJobDataS(CJobDataS* pJobDataS)
+ {
+ m_jobDataS.update(pJobDataS);
}
CJobDataS* CGlass::getJobDataS()
@@ -177,12 +213,13 @@
return m_strBuddyId;
}
- void CGlass::processEnd(unsigned int nEqId, unsigned int nUnit)
+ int CGlass::processEnd(unsigned int nEqId, unsigned int nUnit)
{
CPath* pPath = getPathWithEq(nEqId, nUnit);
- if (pPath != nullptr) {
- pPath->processEnd();
- }
+ if (pPath == nullptr) return -1;
+
+ pPath->processEnd();
+ return 0;
}
BOOL CGlass::isProcessed(unsigned int nEqId, unsigned int nUnit)
@@ -192,4 +229,21 @@
return pPath->isProcessEnd();
}
+
+ int CGlass::setInspResult(unsigned int nEqId, unsigned int nUnit, InspResult result)
+ {
+ CPath* pPath = getPathWithEq(nEqId, nUnit);
+ if (pPath == nullptr) return -1;
+
+ pPath->setInspResult(result);
+ return 0;
+ }
+
+ InspResult CGlass::getInspResult(unsigned int nEqId, unsigned int nUnit)
+ {
+ CPath* pPath = getPathWithEq(nEqId, nUnit);
+ if (pPath == nullptr) return InspResult::NotInspected;
+
+ return pPath->getInspResult();
+ }
}
--
Gitblit v1.9.3