From 48d848201d91187c21d015ed54c0e5e81ceb2c66 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 15 五月 2025 08:45:35 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/Servo/CEFEM.cpp |   64 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 32e9233..99e9b0c 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -426,61 +426,89 @@
 		}
 	}
 
-	int CEFEM::onFetchedOut(int port, const char* pszGlassId)
+	int CEFEM::onReceivedJob(int port, CJobDataS* pJobDataS)
+	{
+		m_pPort[0]->onReceivedJob(port, pJobDataS);
+		m_pPort[1]->onReceivedJob(port, pJobDataS);
+		m_pPort[2]->onReceivedJob(port, pJobDataS);
+		m_pPort[3]->onReceivedJob(port, pJobDataS);
+		m_pArmTray[0]->onReceivedJob(port, pJobDataS);
+		m_pArmTray[1]->onReceivedJob(port, pJobDataS);
+		m_pAligner->onReceivedJob(port, pJobDataS);
+		m_pFliper->onReceivedJob(port, pJobDataS);
+
+		return 0;
+	}
+
+	int CEFEM::onSentOutJob(int port, CJobDataS* pJobDataS)
+	{
+		m_pPort[0]->onSentOutJob(port, pJobDataS);
+		m_pPort[1]->onSentOutJob(port, pJobDataS);
+		m_pPort[2]->onSentOutJob(port, pJobDataS);
+		m_pPort[3]->onSentOutJob(port, pJobDataS);
+		m_pArmTray[0]->onSentOutJob(port, pJobDataS);
+		m_pArmTray[1]->onSentOutJob(port, pJobDataS);
+		m_pAligner->onSentOutJob(port, pJobDataS);
+		m_pFliper->onSentOutJob(port, pJobDataS);
+
+		return 0;
+	}
+
+	int CEFEM::onFetchedOutJob(int port, CJobDataB* pJobDataB)
 	{
 		if (port == 1) {
-			return m_pPort[0]->fetchedOut(pszGlassId);
+			return m_pPort[0]->onFetchedOutJob(port, pJobDataB);
 		}
 		if (port == 2) {
-			return m_pPort[1]->fetchedOut(pszGlassId);
+			return m_pPort[1]->onFetchedOutJob(port, pJobDataB);
 		}
 		if (port == 3) {
-			return m_pPort[2]->fetchedOut(pszGlassId);
+			return m_pPort[2]->onFetchedOutJob(port, pJobDataB);
 		}
 		if (port == 4) {
-			return m_pPort[3]->fetchedOut(pszGlassId);
+			return m_pPort[3]->onFetchedOutJob(port, pJobDataB);
 		}
 		if (port == 5) {
-			return m_pArmTray[0]->fetchedOut(pszGlassId);
+			return m_pArmTray[0]->onFetchedOutJob(port, pJobDataB);
 		}
 		if (port == 6) {
-			return m_pArmTray[1]->fetchedOut(pszGlassId);
+			return m_pArmTray[1]->onFetchedOutJob(port, pJobDataB);
 		}
 		if (port == 7) {
-			return m_pAligner->fetchedOut(pszGlassId);
+			return m_pAligner->onFetchedOutJob(port, pJobDataB);
 		}
 		if (port == 8) {
-			return m_pFliper->fetchedOut(pszGlassId);
+			return m_pFliper->onFetchedOutJob(port, pJobDataB);
 		}
 
 		return -1;
 	}
 
-	int CEFEM::onStore(int port, const char* pszGlassId)
+	int CEFEM::onStoredJob(int port, CJobDataB* pJobDataB)
 	{
 		if (port == 1) {
-			return m_pPort[0]->storedJob(pszGlassId);
+			return m_pPort[0]->onStoredJob(port, pJobDataB);
 		}
 		if (port == 2) {
-			return m_pPort[1]->storedJob(pszGlassId);
+			return m_pPort[1]->onStoredJob(port, pJobDataB);
 		}
 		if (port == 3) {
-			return m_pPort[2]->storedJob(pszGlassId);
+			return m_pPort[2]->onStoredJob(port, pJobDataB);
 		}
 		if (port == 4) {
-			return m_pPort[3]->storedJob(pszGlassId);
+			return m_pPort[3]->onStoredJob(port, pJobDataB);
 		}
 		if (port == 5) {
-			return m_pArmTray[0]->storedJob(pszGlassId);
+			return m_pArmTray[0]->onStoredJob(port, pJobDataB);
 		}
 		if (port == 6) {
-			return m_pArmTray[1]->storedJob(pszGlassId);
+			return m_pArmTray[1]->onStoredJob(port, pJobDataB);
 		}
 		if (port == 7) {
-			return m_pAligner->storedJob(pszGlassId);
+			return m_pAligner->onStoredJob(port, pJobDataB);
 		}
 		if (port == 8) {
-			return m_pFliper->storedJob(pszGlassId);
+			return m_pFliper->onStoredJob(port, pJobDataB);
 		}
 
 		return -1;

--
Gitblit v1.9.3