From 3cb4638bcb93a8fdf4cfea140025bbc299d35d47 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 18 十一月 2025 17:02:07 +0800
Subject: [PATCH] 1.权限完善。操作日志等

---
 SourceCode/Bond/Servo/CMaster.cpp | 2381 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 2,056 insertions(+), 325 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 6498901..cf85b05 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -1,11 +1,20 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
 #include "Common.h"
 #include "CMaster.h"
 #include <future>
 #include <vector>
+#include "RecipeManager.h"
+#include <fstream>
+#include "SerializeUtil.h"
+#include "CServoUtilsTool.h"
 
 
 namespace SERVO {
+	static inline int64_t now_ms_epoch() {
+		using namespace std::chrono;
+		return duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
+	}
+
 	CMaster* g_pMaster = NULL;
 
 	unsigned __stdcall DispatchThreadFunction(LPVOID lpParam)
@@ -50,12 +59,34 @@
 		m_ullRunTime = 0;
 		m_state = MASTERSTATE::READY;
 		m_pActiveRobotTask = nullptr;
-		m_nLastError = 0;
+		m_nLastError = ER_CODE_NOERROR;
+		m_isCompareMapsBeforeProceeding = FALSE;
+		m_bJobMode = FALSE;
+		m_bEnableEventReport = true;
+		m_bEnableAlarmReport = true;
+		m_bContinuousTransfer = false;
+		m_bBatch = false;
+		m_nContinuousTransferCount = 0;
+		m_nContinuousTransferStep = CTStep_Unknow;
+		m_nContinuousWorkingPort = 0;
+		m_nContinuousWorkingSlot = 0;
+		m_pControlJob = nullptr;
+		m_nTestFlag = 0;
 		InitializeCriticalSection(&m_criticalSection);
 	}
 
 	CMaster::~CMaster()
 	{
+		// 閲婃斁Job鐩稿叧
+		for (auto item : m_processJobs) {
+			delete item;
+		}
+		m_processJobs.clear();
+		if (m_pControlJob != nullptr) {
+			delete m_pControlJob;
+			m_pControlJob = nullptr;
+		}
+
 		if (m_hEventReadBitsThreadExit[0] != nullptr) {
 			::CloseHandle(m_hEventReadBitsThreadExit[0]);
 			m_hEventReadBitsThreadExit[0] = nullptr;
@@ -96,36 +127,36 @@
 
 	int CMaster::init()
 	{
-		LOGI("<Master>正在初始化...");
+		LOGI("<Master>姝e湪鍒濆鍖�...");
 
 
 		// 	cclink
 		if (m_cclink.Connect(CC_LINK_IE_CONTROL_CHANNEL(1)) != 0) {
-			LOGE("连接CC-Link失败.");
+			LOGE("杩炴帴CC-Link澶辫触.");
 		}
 		else {
-			LOGI("连接CC-Link成功.");
+			LOGI("杩炴帴CC-Link鎴愬姛.");
 			BoardVersion version{};
 			int nRet = m_cclink.GetBoardVersion(version);
 			if (nRet == 0) {
-				LOGI("版本信息:%s.", version.toString().c_str());
+				LOGD("鐗堟湰淇℃伅锛�%s.", version.toString().c_str());
 			}
 			else {
-				LOGE("获取CC-Link版本信息失败.");
+				LOGE("鑾峰彇CC-Link鐗堟湰淇℃伅澶辫触.");
 			}
 
 			BoardStatus status;
 			nRet = m_cclink.GetBoardStatus(status);
 			if (nRet == 0) {
-				LOGI("状态:%s.", status.toString().c_str());
+				LOGD("鐘舵�侊細%s.", status.toString().c_str());
 			}
 			else {
-				LOGE("获取CC-Link状态失败.");
+				LOGE("鑾峰彇CC-Link鐘舵�佸け璐�.");
 			}
 		}
 
 
-		// 初始化添加各子设备
+		// 鍒濆鍖栨坊鍔犲悇瀛愯澶�
 		CLoadPort* pPort1, * pPort2, * pPort3, * pPort4;
 		CBonder* pBonder1, * pBonder2;
 		CEFEM* pEfem;
@@ -188,28 +219,31 @@
 
 
 
-
-		
-		// 读缓存数据
+		// 璇荤紦瀛樻暟鎹�
 		readCache();
+		loadState();
 
 
-		// 定时器
+		// 瀹氭椂鍣�
 		g_pMaster = this;
 		SetTimer(NULL, 1, 250, (TIMERPROC)MasterTimerProc);
 
 
-		// 调度线程
+		// 璋冨害绾跨▼
 		m_hDispatchThreadHandle = (HANDLE)_beginthreadex(NULL, 0, SERVO::DispatchThreadFunction, this,
 			0, &m_nDispatchThreadAddr);
 
 
-		// 监控bit线程
+		// 鐩戞帶bit绾跨▼
 		m_hReadBitsThreadHandle = (HANDLE)_beginthreadex(NULL, 0, SERVO::ReadBitsThreadFunction, this,
 			0, &m_nReadBitsThreadAddr);
 
 
-		LOGI("<Master>初始化完成.");
+		// 鏇茬嚎鏈嶅姟
+		CreateDAQBridgeServer();
+
+
+		LOGI("<Master>鍒濆鍖栧畬鎴�.");
 		return 0;
 	}
 
@@ -220,7 +254,7 @@
 		::WaitForSingleObject(m_hEventReadBitsThreadExit[1], INFINITE);
 		::WaitForSingleObject(m_hEventDispatchThreadExit[1], INFINITE);
 
-		LOGI("<Master>正在结束程序.");
+		LOGI("<Master>姝e湪缁撴潫绋嬪簭.");
 		for (auto item : m_listEquipment) {
 			item->term();
 		}
@@ -239,6 +273,12 @@
 		m_listEquipment.clear();
 
 
+		if (m_pCollector != nullptr) {
+			m_pCollector->stopLoop();
+			delete m_pCollector;
+			m_pCollector = nullptr;
+		}
+
 		return 0;
 	}
 
@@ -248,21 +288,68 @@
 			return -1;
 		}
 
+		m_bContinuousTransfer = false;
+		m_bBatch = false;
 		setState(MASTERSTATE::STARTING);
 		m_ullStartTime = GetTickCount64();
 
 		return 0;
 	}
 
-	int CMaster::stop()
+	int CMaster::startContinuousTransfer()
 	{
-		// 运行时间为累加结果,本次停止时刷新;
-		if (m_state != MASTERSTATE::RUNNING) {
+		if (m_state != MASTERSTATE::READY) {
 			return -1;
 		}
 
+		m_bContinuousTransfer = true;
+		m_bBatch = false;
+		setState(MASTERSTATE::STARTING);
+		m_ullStartTime = GetTickCount64();
+
+		return 0;
+	}
+
+	int CMaster::startBatch()
+	{
+		if (m_state != MASTERSTATE::READY) {
+			return -1;
+		}
+
+		m_bContinuousTransfer = false;
+		m_bBatch = true;
+		setState(MASTERSTATE::STARTING);
+		m_ullStartTime = GetTickCount64();
+
+		return 0;
+	}
+
+	int CMaster::stop(int nErCode/* = ER_CODE_NOERROR*/)
+	{
+		// 杩愯鏃堕棿涓虹疮鍔犵粨鏋滐紝鏈鍋滄鏃跺埛鏂帮紱
+		lock();
+		if (m_state != MASTERSTATE::RUNNING && m_state != MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER
+			&& m_state != MASTERSTATE::RUNNING_BATCH) {
+			unlock();
+			return -1;
+		}
 		m_ullRunTime += (GetTickCount64() - m_ullStartTime);
+		unlock();
+
+
+		// 鏇存柊鐘舵��
+		m_nLastError = nErCode;
 		setState(MASTERSTATE::STOPPING);
+
+
+		// ControlJob鏆傚仠
+		lock();
+		if (m_pControlJob != nullptr) {
+			m_pControlJob->pause();
+			saveState();
+		}
+		unlock();
+
 
 		return 0;
 	}
@@ -276,7 +363,8 @@
 
 	ULONGLONG CMaster::getRunTime()
 	{
-		if (m_state == MASTERSTATE::RUNNING)
+		if (m_state == MASTERSTATE::RUNNING || m_state == MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER
+			|| m_state == MASTERSTATE::RUNNING_BATCH)
 			return m_ullRunTime + (GetTickCount64() - m_ullStartTime);
 		else
 			return m_ullRunTime;
@@ -289,19 +377,20 @@
 
 	unsigned CMaster::DispatchProc()
 	{
-		// 优先考虑的类型和次要类型
-		// 一种情况,如果不分主次,一直搬G1, 等到Bonder1和Bonder2都放了G1, Aligner也放了G1,
-		// Bonder1和Bonder2需要的G2就过不来了
-		// 最基本的实现,可以G2和G2轮流搬送,但最好根据Bonder的需求来决定
+		// 浼樺厛鑰冭檻鐨勭被鍨嬪拰娆¤绫诲瀷
+		// 涓�绉嶆儏鍐碉紝濡傛灉涓嶅垎涓绘锛屼竴鐩存惉G1, 绛夊埌Bonder1鍜孊onder2閮芥斁浜咷1, Aligner涔熸斁浜咷1,
+		// Bonder1鍜孊onder2闇�瑕佺殑G2灏辫繃涓嶆潵浜�
+		// 鏈�鍩烘湰鐨勫疄鐜帮紝鍙互G2鍜孏2杞祦鎼�侊紝浣嗘渶濂芥牴鎹瓸onder鐨勯渶姹傛潵鍐冲畾
 		MaterialsType primaryType, secondaryType;
 
 
-		// 各种机器
+		// 鍚勭鏈哄櫒
+		CLoadPort* pLoadPorts[4];
 		CEFEM* pEFEM = (CEFEM*)getEquipment(EQ_ID_EFEM);
-		CLoadPort* pLoadPort1 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT1);
-		CLoadPort* pLoadPort2 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT2);
-		CLoadPort* pLoadPort3 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT3);
-		CLoadPort* pLoadPort4 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT4);
+		pLoadPorts[0] = (CLoadPort*)getEquipment(EQ_ID_LOADPORT1);
+		pLoadPorts[1] = (CLoadPort*)getEquipment(EQ_ID_LOADPORT2);
+		pLoadPorts[2] = (CLoadPort*)getEquipment(EQ_ID_LOADPORT3);
+		pLoadPorts[3] = (CLoadPort*)getEquipment(EQ_ID_LOADPORT4);
 		CFliper* pFliper = (CFliper*)getEquipment(EQ_ID_FLIPER);
 		CVacuumBake* pVacuumBake = (CVacuumBake*)getEquipment(EQ_ID_VACUUMBAKE);
 		CAligner* pAligner = (CAligner*)getEquipment(EQ_ID_ALIGNER);
@@ -311,10 +400,10 @@
 		CMeasurement* pMeasurement = (CMeasurement*)getEquipment(EQ_ID_MEASUREMENT);
 
 		ASSERT(pEFEM);
-		ASSERT(pLoadPort1);
-		ASSERT(pLoadPort2);
-		ASSERT(pLoadPort3);
-		ASSERT(pLoadPort4);
+		ASSERT(pLoadPorts[0]);
+		ASSERT(pLoadPorts[1]);
+		ASSERT(pLoadPorts[2]);
+		ASSERT(pLoadPorts[3]);
 		ASSERT(pFliper);
 		ASSERT(pVacuumBake);
 		ASSERT(pAligner);
@@ -324,19 +413,19 @@
 		ASSERT(pMeasurement);
 
 		while (1) {
-			// 待退出信号或时间到
+			// 寰呴��鍑轰俊鍙锋垨鏃堕棿鍒�
 			HANDLE hEvents[] = { m_hEventDispatchThreadExit[0], m_hDispatchEvent };
-			int nRet = WaitForMultipleObjects(2, hEvents, FALSE, 1000);
+			int nRet = WaitForMultipleObjects(2, hEvents, FALSE, 500);
 			if (nRet == WAIT_OBJECT_0) {
 				break;
 			}
 			
 
-			// 如果状态为STARTING,开始工作并切换到RUNNING状态
+			// 濡傛灉鐘舵�佷负STARTING锛屽紑濮嬪伐浣滃苟鍒囨崲鍒癛UNNING鐘舵��
 			lock();
 			if (m_state == MASTERSTATE::STARTING) {
-				// 发送indexerOperationModeChange到各个机台,成功后切换到RUNNING状态
-				// 否则切换到MSERROR状态
+				// 鍙戦�乮ndexerOperationModeChange鍒板悇涓満鍙帮紝鎴愬姛鍚庡垏鎹㈠埌RUNNING鐘舵��
+				// 鍚﹀垯鍒囨崲鍒癕SERROR鐘舵��
 				int nRet;
 				CEquipment* pEq[6] = { pEFEM, pBonder1, pBonder2, pBakeCooling, 
 					pVacuumBake, pMeasurement};
@@ -351,8 +440,9 @@
 						TRACE("a0001\n", writeCode, retCode);
 					});
 				if (nRet != 0) {
-					LOGI("<Master>EFEM切换Start状态失败");
-					m_strLastError = "EFEM切换Start状态失败.";
+					LOGE("<Master>EFEM鍒囨崲Start鐘舵�佸け璐�");
+					m_nLastError = ER_CODE_OPERATION_MODE_FAIL;
+					m_strLastError = "EFEM鍒囨崲Start鐘舵�佸け璐�.";
 					goto WAIT;
 				}
 				futures.push_back(promises[0].get_future());
@@ -364,8 +454,9 @@
 						TRACE("a0002\n");
 					});
 				if (nRet != 0) {
-					LOGI("<Master>Bonder1切换Start状态失败");
-					m_strLastError = "Bonder1切换Start状态失败.";
+					LOGE("<Master>Bonder1鍒囨崲Start鐘舵�佸け璐�");
+					m_nLastError = ER_CODE_BONDER_OPERATION_MODE_FAIL;
+					m_strLastError = "Bonder1鍒囨崲Start鐘舵�佸け璐�.";
 					goto WAIT;
 				}
 				futures.push_back(promises[1].get_future());
@@ -377,8 +468,9 @@
 						TRACE("a0003\n");
 					});
 				if (nRet != 0) {
-					LOGI("<Master>Bonder2切换Start状态失败");
-					m_strLastError = "Bonder2切换Start状态失败.";
+					LOGE("<Master>Bonder2鍒囨崲Start鐘舵�佸け璐�");
+					m_nLastError = ER_CODE_BONDER_OPERATION_MODE_FAIL;
+					m_strLastError = "Bonder2鍒囨崲Start鐘舵�佸け璐�.";
 					goto WAIT;
 				}
 				futures.push_back(promises[2].get_future());
@@ -390,8 +482,9 @@
 						TRACE("a0004\n");
 					});
 				if (nRet != 0) {
-					LOGI("<Master>BakeCooling切换Start状态失败");
-					m_strLastError = "BakeCooling切换Start状态失败.";
+					LOGE("<Master>BakeCooling鍒囨崲Start鐘舵�佸け璐�");
+					m_nLastError = ER_CODE_OPERATION_MODE_FAIL;
+					m_strLastError = "BakeCooling鍒囨崲Start鐘舵�佸け璐�.";
 					goto WAIT;
 				}
 				futures.push_back(promises[3].get_future());
@@ -403,8 +496,9 @@
 						TRACE("a0005\n");
 					});
 				if (nRet != 0) {
-					LOGI("<Master>VacuumBake切换Start状态失败");
-					m_strLastError = "VacuumBake切换Start状态失败.";
+					LOGE("<Master>VacuumBake鍒囨崲Start鐘舵�佸け璐�");
+					m_nLastError = ER_CODE_OPERATION_MODE_FAIL;
+					m_strLastError = "VacuumBake鍒囨崲Start鐘舵�佸け璐�.";
 					goto WAIT;
 				}
 				futures.push_back(promises[4].get_future());
@@ -416,8 +510,9 @@
 						TRACE("a0006\n");
 					});
 				if (nRet != 0) {
-					LOGI("<Master>Measurement切换Start状态失败");
-					m_strLastError = "Measurement切换Start状态失败.";
+					LOGE("<Master>Measurement鍒囨崲Start鐘舵�佸け璐�");
+					m_nLastError = ER_CODE_OPERATION_MODE_FAIL;
+					m_strLastError = "Measurement鍒囨崲Start鐘舵�佸け璐�.";
 					goto WAIT;
 				}
 				futures.push_back(promises[5].get_future());
@@ -425,33 +520,38 @@
 
 WAIT:
 				for (auto& f : futures) {
-					f.wait();  // 阻塞等待对应设备完成
+					f.wait();  // 闃诲绛夊緟瀵瑰簲璁惧瀹屾垚
 				}
 				for (int i = 0; i < 6; i++) {
 					if (!bIomcOk[i]) {
 						bIomcOk[6] = FALSE;
-						LOGI("<Master>%s切换Start状态失败", pEq[i]->getName().c_str());
+						LOGE("<Master>%s鍒囨崲Start鐘舵�佸け璐�", pEq[i]->getName().c_str());
 					}
 				}
 				
-				// 检查看是否都已经切换到START状态
+				// 妫�鏌ョ湅鏄惁閮藉凡缁忓垏鎹㈠埌START鐘舵��
 				if (!bIomcOk[6]) {
 					unlock();
 					setState(MASTERSTATE::MSERROR);
 					continue;
 				}
 
-
 				unlock();
-				setState(MASTERSTATE::RUNNING);
+				if(m_bContinuousTransfer)
+					setState(MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER);
+				else if (m_bBatch)
+					setState(MASTERSTATE::RUNNING_BATCH);
+				else
+					setState(MASTERSTATE::RUNNING);
+
 				continue;
 			}
 
 
-			// 处理完成当前事务后,切换到停止或就绪状态
+			// 澶勭悊瀹屾垚褰撳墠浜嬪姟鍚庯紝鍒囨崲鍒板仠姝㈡垨灏辩华鐘舵��
 			else if (m_state == MASTERSTATE::STOPPING) {
 				unlock();
-				LOGI("<Master>开始切换各设备到 Stop 模式...");
+				LOGI("<Master>寮�濮嬪垏鎹㈠悇璁惧鍒� Stop 妯″紡...");
 
 				std::vector<std::promise<void>> promises(6);
 				std::vector<std::future<void>> futures;
@@ -469,22 +569,23 @@
 							TRACE("s000%d: ret=%d\n", i + 1, retCode);
 						});
 					if (nRet != 0) {
-						LOGI("<Master>%s切换Stop状态发送失败", pEq[i]->getName().c_str());
-						m_strLastError = pEq[i]->getName() + "切换Stop状态发送失败.";
+						LOGE("<Master>%s鍒囨崲Stop鐘舵�佸彂閫佸け璐�", pEq[i]->getName().c_str());
+						m_nLastError = ER_CODE_OPERATION_MODE_FAIL;
+						m_strLastError = pEq[i]->getName() + "鍒囨崲Stop鐘舵�佸彂閫佸け璐�.";
 						bIomcOk[i] = FALSE;
-						promises[i].set_value(); // 避免 wait 阻塞
+						promises[i].set_value(); // 閬垮厤 wait 闃诲
 					}
 					futures.push_back(promises[i].get_future());
 				}
 
 				for (auto& f : futures) {
-					f.wait();  // 等待所有完成
+					f.wait();  // 绛夊緟鎵�鏈夊畬鎴�
 				}
 
 				for (int i = 0; i < 6; ++i) {
 					if (!bIomcOk[i]) {
 						bIomcOk[6] = FALSE;
-						LOGI("<Master>%s切换Stop状态失败", pEq[i]->getName().c_str());
+						LOGE("<Master>%s鍒囨崲Stop鐘舵�佸け璐�", pEq[i]->getName().c_str());
 					}
 				}
 
@@ -493,15 +594,19 @@
 					continue;
 				}
 
-				LOGI("<Master>所有设备成功切换到 Stop 模式");
-				setState(MASTERSTATE::READY);
+				LOGI("<Master>鎵�鏈夎澶囨垚鍔熷垏鎹㈠埌 Stop 妯″紡");
+				if(m_nLastError == ER_CODE_NOERROR)
+					setState(MASTERSTATE::READY);
+				else
+					setState(MASTERSTATE::ATHERERROR);
+
 				continue;
 			}
 
 
-			// 调度逻辑处理
+			// 璋冨害閫昏緫澶勭悊
 			else if (m_state == MASTERSTATE::RUNNING) {
-				// 检测判断robot状态
+				// 妫�娴嬪垽鏂璻obot鐘舵��
 				RMDATA& rmd = pEFEM->getRobotMonitoringData();
 				if (rmd.status != ROBOT_STATUS::Idle && rmd.status != ROBOT_STATUS::Run) {
 					unlock();
@@ -513,46 +618,68 @@
 						m_pActiveRobotTask->place();
 					}
 					unlock();
-					// 检测到当前有正在下午的任务,确保当前任务完成或中止后继续
-					// LOGI("检测到当前有正在下午的任务,确保当前任务完成或中止后继续...");
+					// 妫�娴嬪埌褰撳墠鏈夋鍦ㄤ笅鍗堢殑浠诲姟锛岀‘淇濆綋鍓嶄换鍔″畬鎴愭垨涓鍚庣户缁�
+					// LOGI("妫�娴嬪埌褰撳墠鏈夋鍦ㄤ笅鍗堢殑浠诲姟锛岀‘淇濆綋鍓嶄换鍔″畬鎴愭垨涓鍚庣户缁�...");
 					continue;
 				}
 
 
-				// 此处检测优先类型和次要类型(G1或G2)
-				// 如果其中一Bonder有单个玻璃,优先取它的配对类型,否则无所谓了
-				primaryType = MaterialsType::G1;
-				secondaryType = MaterialsType::G2;
-				if ((!pBonder1->canPlaceGlassInSlot(0) && !pBonder1->canPlaceGlassInSlot(1))
-					&& (!pBonder2->canPlaceGlassInSlot(0) && !pBonder2->canPlaceGlassInSlot(1))) {
-					// 如果G1和G2都满了,那就看Aligner, 如果Aligner有玻璃为G1, 则取G2
-					CGlass* pGlass = pAligner->getGlassFromSlot(1);
-					if (pGlass != nullptr && pGlass->getType() == MaterialsType::G1) {
-						primaryType = MaterialsType::G2;
-						secondaryType = MaterialsType::G1;
-					}
+				// Bonder1銆丅onder2銆丗liper銆乂acuumBake銆丄ligner锛岀粺璁2鍜孏1鐨勬暟閲�, 閰嶅缁勬暟, 澶氬嚭鐨勭被鍨�
+				int nG2Count = 0, nG1Count = 0, nGlassGroup, nExtraType;
+				if (pBonder1->slotHasGlass(0)) {
+					nG2Count++;
 				}
-				else if ((pBonder1->canPlaceGlassInSlot(0) && !pBonder1->canPlaceGlassInSlot(1))
-					|| (pBonder2->canPlaceGlassInSlot(0) && !pBonder2->canPlaceGlassInSlot(1))) {
-					primaryType = MaterialsType::G2;
-					secondaryType = MaterialsType::G1;
+				if (pBonder1->slotHasGlass(1)) {
+					nG1Count++;
 				}
+
+				if (pBonder2->slotHasGlass(0)) {
+					nG2Count++;
+				}
+				if (pBonder2->slotHasGlass(1)) {
+					nG1Count++;
+				}
+
+				if (pFliper->slotHasGlass(0)) {
+					nG2Count++;
+				}
+
+				if (pVacuumBake->slotHasGlass(0)) {
+					nG1Count++;
+				}
+				if (pVacuumBake->slotHasGlass(1)) {
+					nG1Count++;
+				}
+
+				CGlass* pTempGlass = pAligner->getGlassFromSlot(0);
+				if (pTempGlass != nullptr) {
+					MaterialsType type = pTempGlass->getType();
+					if(type == MaterialsType::G1)
+						nG1Count++;
+					else if (type == MaterialsType::G2)
+						nG2Count++;
+				}
+				nGlassGroup = min(nG1Count, nG2Count);
+				
+				if (nG1Count == nG2Count) {
+					nExtraType = 0;
+				}
+				else if (nG1Count > nG2Count) {
+					nExtraType = 1;
+				}
+				else {
+					nExtraType = 2;
+				}
+				secondaryType = MaterialsType::G0;
 
 
 				// Measurement -> LoadPort
-				LOGI("Arm1 %s, Arm2 %s.", rmd.armState[0] ? _T("不可用") : _T("可用"), 
-					rmd.armState[1] ? _T("不可用") : _T("可用"));
-				CLoadPort* pEqLoadPort[] = { pLoadPort1, pLoadPort2, pLoadPort3, pLoadPort4 };
-				CEquipment* pEqTar[] = { pVacuumBake, pFliper };
-				if (primaryType == MaterialsType::G2) {
-					pEqTar[0] = pFliper;
-					pEqTar[1] = pVacuumBake;
-				}
 				for (int s = 0; s < 4; s++) {
-					if (!rmd.armState[0] && pEqLoadPort[s]->isEnable()
-						&& pEqLoadPort[s]->getPortType() == PortType::Unloading
-						&& pEqLoadPort[s]->getPortMode() == PortMode::ReadyToUnload) {
-						m_pActiveRobotTask = createTransferTask(pMeasurement, pEqLoadPort[s], primaryType, secondaryType);
+					PortType pt = pLoadPorts[s]->getPortType();
+					if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
+						&& (pt == PortType::Unloading || pt == PortType::Both)
+						&& pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+						m_pActiveRobotTask = createTransferTask(pMeasurement, pLoadPorts[s], MaterialsType::G1, secondaryType);
 						if (m_pActiveRobotTask != nullptr) {
 							goto PORT_PUT;
 						}
@@ -560,178 +687,124 @@
 				}
 
 			PORT_PUT:
-				if (m_pActiveRobotTask != nullptr) {
-					m_pActiveRobotTask->pick();
-					std::string strDescription = m_pActiveRobotTask->getDescription();
-					unlock();
-					if (m_listener.onRobotTaskEvent != nullptr) {
-						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-					}
-					LOGI("创建新任务<%s>...", strDescription.c_str());
-					continue;
+				CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+
+
+				// Measurement NG -> LoadPort
+				// NG鍥炲師浣�
+				if (!rmd.armState[1]) {
+					m_pActiveRobotTask = createTransferTask_restore(pMeasurement, pLoadPorts);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
 				}
 
 
 				// BakeCooling ->Measurement
 				if (!rmd.armState[0]) {
 					m_pActiveRobotTask = createTransferTask_bakecooling_to_measurement(pBakeCooling, pMeasurement);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
 				}
 
-
 				
-				// BakeCooling内部
+				// BakeCooling鍐呴儴
 				// Bake -> Cooling
 				if (!rmd.armState[0]) {
 					m_pActiveRobotTask = createTransferTask_bake_to_cooling(pBakeCooling);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
 				}
 
 
 				// Bonder -> BakeCooling
 				if (!rmd.armState[0]) {
 					m_pActiveRobotTask = createTransferTask_bonder_to_bakecooling(pBonder1, pBakeCooling);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
 				}
 
 				if (!rmd.armState[0]) {
 					m_pActiveRobotTask = createTransferTask_bonder_to_bakecooling(pBonder2, pBakeCooling);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
 				}
 
 
 				// Fliper(G2) -> Bonder
+				//m_nTestFlag = 1;
+				//pVacuumBake->m_nTestFlag = 1;
+				auto pSrcSlot = pVacuumBake->getProcessedSlot(MaterialsType::G1);
+				//LOGI("<Master>pSrcSlot = %x", pSrcSlot,);
+				if (pSrcSlot != nullptr && !rmd.armState[1]
+					&& pBonder1->canPlaceGlassInSlot(0)) {
+					m_pActiveRobotTask = createTransferTask(pFliper, pBonder1, MaterialsType::G2, MaterialsType::G0, 2);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+				if (pSrcSlot != nullptr && !rmd.armState[1] 
+					&& pBonder2->canPlaceGlassInSlot(0)) {
+					m_pActiveRobotTask = createTransferTask(pFliper, pBonder2, MaterialsType::G2, MaterialsType::G0, 2);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+				//m_nTestFlag = 0
+					;
 				// VacuumBake(G1) -> Bonder
-				if (!rmd.armState[1] && !pBonder1->hasBondClass()) {
-					m_pActiveRobotTask = createTransferTask(pFliper, pBonder1, primaryType, secondaryType, 2);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
+				if (!rmd.armState[0] && pBonder1->slotHasGlass(0) && !pBonder1->slotHasGlass(1)) {
+					m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder1, MaterialsType::G1, MaterialsType::G0);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
 				}
 
-				if (!rmd.armState[1] && !pBonder2->hasBondClass()) {
-					m_pActiveRobotTask = createTransferTask(pFliper, pBonder2, primaryType, secondaryType, 2);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
-				}
-
-				if (!rmd.armState[0] && !pBonder1->hasBondClass()) {
-					m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder1, primaryType, secondaryType);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
-				}
-
-				if (!rmd.armState[0] && !pBonder2->hasBondClass()) {
-					m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder2, primaryType, secondaryType);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
+				if (!rmd.armState[0] && pBonder2->slotHasGlass(0) && !pBonder2->slotHasGlass(1)) {
+					m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder2, MaterialsType::G1, MaterialsType::G0);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
 				}
 
 
 				// Aligner -> Fliper(G2)
 				// Aligner -> VacuumBake(G1)
 				if (!rmd.armState[1]) {
-					m_pActiveRobotTask = createTransferTask(pAligner, pFliper, primaryType, secondaryType);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
+					m_pActiveRobotTask = createTransferTask(pAligner, pFliper, MaterialsType::G2, secondaryType);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
 				}
 
 				if (!rmd.armState[0]) {
-					m_pActiveRobotTask = createTransferTask(pAligner, pVacuumBake, primaryType, secondaryType);
-					if (m_pActiveRobotTask != nullptr) {
-						m_pActiveRobotTask->pick();
-						std::string strDescription = m_pActiveRobotTask->getDescription();
-						unlock();
-						if (m_listener.onRobotTaskEvent != nullptr) {
-							m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
-						}
-						LOGI("创建新任务<%s>...", strDescription.c_str());
-						continue;
-					}
+					// m_nTestFlag = 1;
+					if (m_nTestFlag == 1) LOGD("createTransferTask 004df %d, %d", MaterialsType::G1, secondaryType);
+					m_pActiveRobotTask = createTransferTask(pAligner, pVacuumBake, MaterialsType::G1, secondaryType);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+					m_nTestFlag = 0;
 				}
 
+
+				// Aligner -> LoadPort
+				if (!rmd.armState[1]) {
+					m_pActiveRobotTask = createTransferTask_restore(pAligner, pLoadPorts);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+
 				// LoadPort -> Aligner
+				if (nGlassGroup >= 2) {
+					unlock();
+					continue;
+				}
+
+				if(nExtraType == 0)
+					primaryType = MaterialsType::G2;
+				else {
+					primaryType = MaterialsType::G1;
+				}
+
 				for (int s = 0; s < 4; s++) {
-					if (!rmd.armState[0] && pEqLoadPort[s]->isEnable()
-						&& pEqLoadPort[s]->getPortType() == PortType::Loading
-						&& pEqLoadPort[s]->getPortMode() == PortMode::ReadyToLoad) {
-						m_pActiveRobotTask = createTransferTask(pEqLoadPort[s], pAligner, primaryType, secondaryType);
+					PortType pt = pLoadPorts[s]->getPortType();
+					if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
+						&& (pt == PortType::Loading || pt == PortType::Both)
+						&& pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+						m_pActiveRobotTask = createTransferTask(pLoadPorts[s], pAligner, primaryType, secondaryType, 1, m_bJobMode);
 						if (m_pActiveRobotTask != nullptr) {
+							CGlass* pGlass = (CGlass*)m_pActiveRobotTask->getContext();
+							if (pGlass->getBuddy() != nullptr) {
+								delete m_pActiveRobotTask;
+								m_pActiveRobotTask = nullptr;
+								continue;
+							}
+
+							pGlass->queue();
+							pGlass->start();
 							pEFEM->setContext(m_pActiveRobotTask->getContext());
 							goto PORT_GET;
 						}
@@ -739,20 +812,428 @@
 				}
 
 PORT_GET:
-				if (m_pActiveRobotTask != nullptr) {
-					m_pActiveRobotTask->pick();
-					std::string strDescription = m_pActiveRobotTask->getDescription();
+				CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+
+
+				unlock();
+				continue;
+			}
+
+			// 鎵瑰鐞嗘ā寮忥紝鏈�缁堜互姝や负鍑嗭紝浣嗗厛淇濈暀涔嬪墠鐨勫崟鐗囨ā寮�
+			else if (m_state == MASTERSTATE::RUNNING_BATCH) {
+				// 1) 鎺у埗浣滀笟鐢熷懡鍛ㄦ湡淇濋殰
+				if (m_pControlJob == nullptr) { unlock(); continue; }
+				CJState cjst = m_pControlJob->state();
+				if (cjst == CJState::Completed || cjst == CJState::Aborted || cjst == CJState::Failed) {
 					unlock();
-					if (m_listener.onRobotTaskEvent != nullptr) {
-						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					continue;
+				}
+				if (cjst == CJState::NoState) {
+					LOGI("<Master>ControlJob宸茬粡杩涘叆鍒楅槦");
+					m_pControlJob->queue();
+				}
+				if (m_pControlJob->state() == CJState::Queued) {
+					LOGI("<Master>ControlJob宸茬粡鍚姩");
+					m_pControlJob->start();
+					if (m_listener.onCjStart) m_listener.onCjStart(this, m_pControlJob);
+				}
+				if (m_pControlJob->state() == CJState::Paused) {
+					LOGI("<Master>ControlJob宸茬粡鎭㈠杩愯");
+					m_pControlJob->resume();
+				}
+
+				// 2) 鑻ュ綋鍓嶆棤 PJ锛屽垯閫夋嫨涓�涓苟涓婃姤
+				if (m_inProcesJobs.empty()) {
+					if (auto pj = acquireNextProcessJob()) {
+						m_inProcesJobs.push_back(pj);
+						if (m_listener.onPjStart) m_listener.onPjStart(this, pj);
 					}
-					LOGI("创建新任务<%s>...", strDescription.c_str());
+				}
+				if (m_inProcesJobs.empty()) {
+					LOGE("<Master>閫夋嫨褰撳墠ProcessJob澶辫触锛�");
+					unlock();
 					continue;
 				}
 
-				unlock();
+				// 3) 鑻ラ槦鍒楁棤 Glass锛屾媺鍙栧埌绛夊緟闃熷垪
+				if (m_queueGlasses.empty()) {
+					int nCount = acquireGlassToQueue();
+					if (nCount > 0) {
+						LOGI("<Master>宸插姞鍏� %d 鍧桮lass鍒板伐鑹哄垪闃燂紒", nCount);
+					}
+				}
 
+				// 4) 鏈哄櫒浜虹姸鎬�
+				RMDATA& rmd = pEFEM->getRobotMonitoringData();
+				if (rmd.status != ROBOT_STATUS::Idle && rmd.status != ROBOT_STATUS::Run) {
+					unlock(); continue;
+				}
+
+				// 5) 姝e湪鎵ц鐨� RobotTask 鍏堣瀹冭窇瀹屼竴鎷�
+				if (m_pActiveRobotTask != nullptr) {
+					if (m_pActiveRobotTask->isPicked()) {
+						m_pActiveRobotTask->place();
+					}
+					unlock(); // 绛夊綋鍓嶄换鍔″畬鎴愭垨涓鍚庣户缁�
+					continue;
+				}
+
+				// 6) 鈥斺�斿叧閿細鍏ㄥ眬缁熻 G1/G2 涓庣粍鏁伴棬闄愶紙涓庡崟鐗囧垎鏀榻愶級鈥斺��
+				auto countG1G2 = [&]() {
+					int g1 = 0, g2 = 0;
+					if (pBonder1->slotHasGlass(0)) g2++;
+					if (pBonder1->slotHasGlass(1)) g1++;
+					if (pBonder2->slotHasGlass(0)) g2++;
+					if (pBonder2->slotHasGlass(1)) g1++;
+					if (pFliper->slotHasGlass(0))  g2++;
+					if (pVacuumBake->slotHasGlass(0)) g1++;
+					if (pVacuumBake->slotHasGlass(1)) g1++;
+					if (auto g = pAligner->getGlassFromSlot(0)) {
+						auto t = g->getType();
+						if (t == MaterialsType::G1) g1++; else if (t == MaterialsType::G2) g2++;
+					}
+					return std::pair<int, int>(g1, g2);
+				};
+
+				int g1Count = 0, g2Count = 0;
+				std::tie(g1Count, g2Count) = countG1G2();
+				int nGlassGroup = min(g1Count, g2Count);
+				int nExtraType = (g1Count == g2Count ? 0 : (g1Count > g2Count ? 1 : 2));
+
+				// primary/secondary 缁熶竴瀹氫箟锛坰econdary 榛樿 G0锛�
+				MaterialsType primaryType = MaterialsType::G1;
+				MaterialsType secondaryType = MaterialsType::G0;
+				if (nExtraType == 0) primaryType = MaterialsType::G2; // 涓庡崟鐗囧垎鏀竴鑷�
+				else                 primaryType = MaterialsType::G1;
+
+				// 缁勬暟闂ㄩ檺锛氣墺2 缁勬椂涓嶅啀浠� LP 涓婄墖锛岄伩鍏嶅爢绉紙涓庡崟鐗囦竴鑷达級
+				bool blockLoadFromLP = (nGlassGroup >= 2);
+
+				// 7) Measurement -> LoadPort锛堝浐瀹氾細G1 浼樺厛鍥� LP锛�
+				if (rmd.armState[0] || rmd.armState[1]) {
+					LOGD("Arm1 %s, Arm2 %s.",
+						rmd.armState[0] ? _T("涓嶅彲鐢�") : _T("鍙敤"),
+						rmd.armState[1] ? _T("涓嶅彲鐢�") : _T("鍙敤"));
+				}
+				for (int s = 0; s < 4; s++) {
+					PortType pt = pLoadPorts[s]->getPortType();
+					if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
+						&& (pt == PortType::Unloading || pt == PortType::Both)
+						&& pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+						m_pActiveRobotTask = createTransferTask(pMeasurement, pLoadPorts[s], MaterialsType::G1, secondaryType);
+						if (m_pActiveRobotTask != nullptr) { goto BATCH_PORT_PUT; }
+					}
+				}
+
+				BATCH_PORT_PUT:
+				CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+
+				// 8) Measurement NG -> LoadPort锛堝師浣嶅洖閫�锛�
+				if (!rmd.armState[1]) {
+					m_pActiveRobotTask = createTransferTask_restore(pMeasurement, pLoadPorts);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// 9) BakeCooling -> Measurement
+				if (!rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_bakecooling_to_measurement(pBakeCooling, pMeasurement);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// 10) BakeCooling 鍐呴儴锛圔ake -> Cooling锛�
+				if (!rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_bake_to_cooling(pBakeCooling);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// 11) Bonder -> BakeCooling
+				if (!rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_bonder_to_bakecooling(pBonder1, pBakeCooling);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+				if (!rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_bonder_to_bakecooling(pBonder2, pBakeCooling);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// 12) Fliper(G2) -> Bonder锛堝墠缃細VacuumBake 鏈� processed G1锛涜緭鍑� G2 鍒� Bonder slot0锛�
+				if (auto pSrcSlot = pVacuumBake->getProcessedSlot(MaterialsType::G1)) {
+					if (!rmd.armState[1] && pBonder1->canPlaceGlassInSlot(0)) {
+						m_pActiveRobotTask = createTransferTask(pFliper, pBonder1, MaterialsType::G2, MaterialsType::G0, 2);
+						CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+					}
+					if (!rmd.armState[1] && pBonder2->canPlaceGlassInSlot(0)) {
+						m_pActiveRobotTask = createTransferTask(pFliper, pBonder2, MaterialsType::G2, MaterialsType::G0, 2);
+						CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+					}
+				}
+
+				// 13) VacuumBake(G1) -> Bonder锛堟Ы绾у垽瀹氾細slot0(G2) 宸叉湁涓� slot1(G1) 涓虹┖锛�
+				if (!rmd.armState[0] && pBonder1->slotHasGlass(0) && !pBonder1->slotHasGlass(1)) {
+					m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder1, MaterialsType::G1, MaterialsType::G0);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+				if (!rmd.armState[0] && pBonder2->slotHasGlass(0) && !pBonder2->slotHasGlass(1)) {
+					m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder2, MaterialsType::G1, MaterialsType::G0);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// 14) Aligner -> Fliper(G2) 浠ュ強 -> VacuumBake(G1)锛堝浐瀹氭槧灏勶級
+				if (!rmd.armState[1]) {
+					m_pActiveRobotTask = createTransferTask(pAligner, pFliper, MaterialsType::G2, MaterialsType::G0);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+				if (!rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask(pAligner, pVacuumBake, MaterialsType::G1, MaterialsType::G0);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// 15) Aligner -> LoadPort锛坮estore锛�
+				if (!rmd.armState[1]) {
+					m_pActiveRobotTask = createTransferTask_restore(pAligner, pLoadPorts);
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// 16) LoadPort -> Aligner锛堝彈缁勬暟闂ㄩ檺鎺у埗锛涚粺涓� buddy/鐘舵�佹椂搴忥級
+				if (blockLoadFromLP) { unlock(); continue; }
+
+				for (int s = 0; s < 4; s++) {
+					PortType pt = pLoadPorts[s]->getPortType();
+					if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
+						&& (pt == PortType::Loading || pt == PortType::Both)
+						&& pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+
+						m_pActiveRobotTask = createTransferTask(pLoadPorts[s], pAligner, primaryType, secondaryType, 1, m_bJobMode);
+						if (m_pActiveRobotTask != nullptr) {
+							auto* pGlass = static_cast<CGlass*>(m_pActiveRobotTask->getContext());
+							if (pGlass->getBuddy() != nullptr) {
+								delete m_pActiveRobotTask; m_pActiveRobotTask = nullptr;
+								continue;
+							}
+
+							// 缁熶竴锛歲ueue -> start -> setContext -> move queue鈫抜nProcess -> onPanelStart
+							pGlass->queue();
+							pGlass->start();
+							pEFEM->setContext(pGlass);
+
+							bool bMoved = glassFromQueueToInPorcess(pGlass);
+							if (bMoved) {
+								LOGI("<Master>Glass(%s)浠庣瓑寰呭垪闃熷埌宸ヨ壓鍒楅槦杞Щ鎴愬姛.", pGlass->getID().c_str());
+							}
+							else {
+								LOGE("<Master>Glass(%s)浠庣瓑寰呭垪闃熷埌宸ヨ壓鍒楅槦杞Щ澶辫触.", pGlass->getID().c_str());
+							}
+
+							if (m_listener.onPanelStart) m_listener.onPanelStart(this, pGlass);
+							goto BATCH_PORT_GET;
+						}
+					}
+				}
+
+				BATCH_PORT_GET:
+				CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+
+				unlock();
+				continue;
 			}
+
+
+			// 鍗冧紶妯″紡璋冨害閫昏緫
+			else if (m_state == MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER) {
+				// 妫�娴嬪垽鏂璻obot鐘舵��
+				RMDATA& rmd = pEFEM->getRobotMonitoringData();
+				if (rmd.status != ROBOT_STATUS::Idle && rmd.status != ROBOT_STATUS::Run) {
+					unlock();
+					continue;
+				}
+
+				if (m_pActiveRobotTask != nullptr) {
+					if (m_pActiveRobotTask->isPicked()) {
+						m_pActiveRobotTask->place();
+					}
+					unlock();
+					// 妫�娴嬪埌褰撳墠鏈夋鍦ㄤ笅鍗堢殑浠诲姟锛岀‘淇濆綋鍓嶄换鍔″畬鎴愭垨涓鍚庣户缁�
+					// LOGI("妫�娴嬪埌褰撳墠鏈夋鍦ㄤ笅鍗堢殑浠诲姟锛岀‘淇濆綋鍓嶄换鍔″畬鎴愭垨涓鍚庣户缁�...");
+					continue;
+				}
+
+				// Measurement -> LoadPort
+				for (int p = 0; p < 4; p++) {
+					if (p != m_nContinuousWorkingPort) continue;
+					PortType pt = pLoadPorts[p]->getPortType();
+					if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_BakeCooling_Measurement)
+						&& !rmd.armState[0] && pLoadPorts[p]->isEnable()
+						&& (pt == PortType::Unloading || pt == PortType::Both)
+						&& pLoadPorts[p]->getPortStatus() == PORT_INUSE) {
+						for (int slot = 0; slot < SLOT_MAX; slot++) {
+							if (slot != m_nContinuousWorkingSlot) continue;
+							m_pActiveRobotTask = createTransferTask_continuous_transfer(pMeasurement,
+								0, pLoadPorts[p], slot);
+							if (m_pActiveRobotTask != nullptr) {
+								m_nContinuousTransferStep = CTStep_Measurement_LoadPort;
+								m_nContinuousTransferStep = CTStep_end;
+								goto CT_PORT_PUT;
+							}
+						}
+					}
+				}
+
+			CT_PORT_PUT:
+				CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+
+
+				// BakeCooling ->Measurement
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_BakeCooling_BakeCooling3)
+					&& !rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pBakeCooling,
+						3, pMeasurement, 0);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_BakeCooling_Measurement;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(BakeCooling -> Measurement)...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				
+				// BakeCooling鍐呴儴
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_BakeCooling_BakeCooling2)
+					&& !rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pBakeCooling,
+						2, pBakeCooling, 3);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_BakeCooling_BakeCooling3;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(BakeCooling-2 -> BakeCooling-3)...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_BakeCooling_BakeCooling1)
+					&& !rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pBakeCooling,
+						1, pBakeCooling, 2);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_BakeCooling_BakeCooling2;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(BakeCooling-1 -> BakeCooling-2)...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_VacuumBake_BakeCooling)
+					&& !rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pBakeCooling,
+						0, pBakeCooling, 1);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_BakeCooling_BakeCooling1;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(BakeCooling-0 -> BakeCooling-1)...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// VacuumBake(G1) -> BakeCooling
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_VacuumBake_VacuumBake)
+					&& !rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pVacuumBake,
+						1, pBakeCooling, 0);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_VacuumBake_BakeCooling;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(VacuumBake(G1) -> BakeCooling)...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// VacuumBake(G1) -> VacuumBake(G1)
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_Bonder2_VacuumBake)
+					&& !rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pVacuumBake,
+						0, pVacuumBake, 1);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_VacuumBake_VacuumBake;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(VacuumBake(G1-0) -> VacuumBake(G1-1))...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// Bonder2 -> VacuumBake(G1)
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_Bonder1_Bonder2)
+					&& !rmd.armState[0]) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pBonder2,
+						1, pVacuumBake, 0);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_Bonder2_VacuumBake;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(Bonder2 -> VacuumBake(G1))...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+				
+				// Bonder1 -> Bonder2
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_Fliper_Bonder1)
+					&& !rmd.armState[0] && !pBonder2->hasBondGlass()) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pBonder1,
+						1, pBonder2, 1);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_Bonder1_Bonder2;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(Bonder1 -> Bonder2)...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// Fliper(G2) -> Bonder1
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_Aligner_Fliper)
+					&&!rmd.armState[0] && !pBonder1->hasBondGlass()) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pFliper,
+						0, pBonder1, 1);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_Fliper_Bonder1;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(Fliper(G2) -> Bonder1)...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// Aligner -> Fliper(G2)
+				if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_LoadPort_Aligner)
+					&& !rmd.armState[1]) {
+					m_pActiveRobotTask = createTransferTask_continuous_transfer(pAligner,
+						0, pFliper, 0);
+					if (m_pActiveRobotTask != nullptr) {
+						m_nContinuousTransferStep = CTStep_Aligner_Fliper;
+						LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(Aligner -> Fliper(G2))...");
+					}
+					CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+				}
+
+				// LoadPort -> Aligner
+				for (int p = 0; p < 4; p++) {
+					PortType pt = pLoadPorts[p]->getPortType();
+					if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_end)
+						&& !rmd.armState[0] && pLoadPorts[p]->isEnable()
+						&& (pt == PortType::Loading || pt == PortType::Both)
+						&& pLoadPorts[p]->getPortStatus() == PORT_INUSE) {
+						for (int slot = 0; slot < SLOT_MAX; slot++) {
+							m_pActiveRobotTask = createTransferTask_continuous_transfer(pLoadPorts[p], 
+								slot, pAligner, 0);
+							if (m_pActiveRobotTask != nullptr) {
+								m_nContinuousTransferStep = CTStep_LoadPort_Aligner;
+								m_nContinuousWorkingPort = p;
+								m_nContinuousWorkingSlot = slot;
+								LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬫惉閫佷换鍔�(LoadPort -> Aligner)...");
+								pEFEM->setContext(m_pActiveRobotTask->getContext());
+								goto CT_PORT_GET;
+							}
+						}
+					}
+				}
+
+			CT_PORT_GET:
+				if (m_pActiveRobotTask != nullptr) {
+					m_nContinuousTransferStep = CTStep_begin;
+					LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛屽紑濮嬬 %d 杞�", m_nContinuousTransferCount + 1);
+				}
+				CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+
+
+				unlock();
+				continue;
+			}
+
+
 			unlock();
 		}
 
@@ -760,28 +1241,39 @@
 
 
 		// _endthreadex(0);
-		TRACE("CMaster::DispatchProc 线程退出\n");
+		TRACE("CMaster::DispatchProc 绾跨▼閫�鍑篭n");
 		return 0;
 	}
 
 	unsigned CMaster::ReadBitsProc()
 	{
+		// 鏍囧織浣嶆竻0澶嶄綅		
+		{
+			StationIdentifier station;
+			station.nNetNo = 0;
+			station.nStNo = 255;
+			char szBuffer[528] = { 0 };	// 0x0, 0x1087
+			m_cclink.WriteData(station, (long)DeviceType::B, 0, 528, (short*)szBuffer);
+		}
+
+
 		while (1) {
-			// 待退出信号或时间到
+			// 寰呴��鍑轰俊鍙锋垨鏃堕棿鍒�
 			int nRet = ::WaitForSingleObject(m_hEventReadBitsThreadExit[0], 1000);
 			if (nRet == WAIT_OBJECT_0) {
 				break;
 			}
 
-			// 读标志位
+			// 璇绘爣蹇椾綅
 			for (auto item : m_listEquipment) {
 				const StationIdentifier& station = item->getStation();
 				MemoryBlock& block = item->getReadBitBlock();
-
-				int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
-					block.start, block.size, block.buffer);
-				if (0 == nRet) {
-					item->onReceiveLBData(block.buffer, block.size);
+				if (block.end > block.start) {
+					int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
+						block.start, block.size, block.buffer);
+					if (0 == nRet) {
+						item->onReceiveLBData(block.buffer, block.size);
+					}
 				}
 			}
 		}
@@ -790,7 +1282,7 @@
 
 
 		// _endthreadex(0);
-		TRACE("CMaster::ReadBitsProc 线程退出\n");
+		TRACE("CMaster::ReadBitsProc 绾跨▼閫�鍑篭n");
 		return 0;
 	}
 
@@ -822,23 +1314,37 @@
 				m_listener.onEqVcrEventReport(this, p, p2);
 			}
 		};
-		listener.onPreFethedOutJob = [&](void* pEquipment, CJobDataB* pJobDataB) -> BOOL {
+		listener.onPreFethedOutJob = [&](void* pEquipment, int port, CJobDataB* pJobDataB) -> BOOL {
 			CEquipment* p = (CEquipment*)pEquipment;
 
+			// 鍙兘瑕佸姞杩欎竴鍙�
+			Sleep(750);
 
-			// 取片,更新当前搬送任务
+			// 鍙栫墖锛屾洿鏂板綋鍓嶆惉閫佷换鍔�
 			BOOL bOk = FALSE;
 			lock();
 			if (m_pActiveRobotTask != nullptr) {
+				LOGD("<CMaster>onPreFethedOutJob 0001.");
 				if (m_pActiveRobotTask->getSrcPosition() == p->getID()) {
+					LOGD("<CMaster>onPreFethedOutJob 0002.");
 					CGlass* pGlass = p->getGlassFromSlot(m_pActiveRobotTask->getSrcSlot());
 					if (pGlass != nullptr) {
+						LOGD("<CMaster>onPreFethedOutJob 0003.");
 						CJobDataS* pJobDataS = pGlass->getJobDataS();
 						if (pJobDataS != nullptr
 							&& pJobDataS->getCassetteSequenceNo() == pJobDataB->getCassetteSequenceNo()
 							&& pJobDataS->getJobSequenceNo() == pJobDataB->getJobSequenceNo()) {
 							bOk = TRUE;
-							LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
+							LOGD("<CMaster>onPreFethedOutJob, 宸叉牎楠屾暟鎹竴鑷存��.");
+						}
+						LOGD("<CMaster>onPreFethedOutJob 0004.");
+						if (pJobDataS != nullptr) {
+							LOGD("<CMaster>onPreFethedOutJob 0005. %d,%d,%d,%d", 
+								pJobDataS->getCassetteSequenceNo(),
+								pJobDataB->getCassetteSequenceNo(),
+								pJobDataS->getJobSequenceNo(),
+								pJobDataB->getJobSequenceNo()
+								);
 						}
 					}
 				}
@@ -849,21 +1355,23 @@
 			unlock();
 
 			if (!bOk) {
-				LOGE("<CMaster>onPreFethedOutJob, 数据校验失败.");
+				LOGE("<CMaster>onPreFethedOutJob, 鏁版嵁鏍¢獙澶辫触.");
 			}
 
 			return bOk;
 
 		};
-		listener.onPreStoredJob = [&](void* pEquipment, CJobDataB* pJobDataB, short& slot) -> BOOL {
+		listener.onPreStoredJob = [&](void* pEquipment, int port, CJobDataB* pJobDataB, short& slot) -> BOOL {
 			CEquipment* p = (CEquipment*)pEquipment;
 
+			// 鍙兘瑕佸姞杩欎竴鍙�
+			Sleep(750);
 
-			// 放片,更新当前搬送任务
+			// 鏀剧墖锛屾洿鏂板綋鍓嶆惉閫佷换鍔�
 			BOOL bOk = FALSE;
 			lock();
 			if (m_pActiveRobotTask != nullptr) {
-				// 是否已经进入手臂(即取片完成),进入下一步,放片
+				// 鏄惁宸茬粡杩涘叆鎵嬭噦(鍗冲彇鐗囧畬鎴�),杩涘叆涓嬩竴姝ワ紝鏀剧墖
 				if (m_pActiveRobotTask->isPicking() && 
 					((m_pActiveRobotTask->getArmNo() == 1 && p->getID() == EQ_ID_ARM_TRAY1)
 					|| (m_pActiveRobotTask->getArmNo() == 2 && p->getID() == EQ_ID_ARM_TRAY2))
@@ -872,32 +1380,32 @@
 					bOk = TRUE;
 				}
 
-				// 是否放片完成
+				// 鏄惁鏀剧墖瀹屾垚
 				else if (m_pActiveRobotTask->isPlacing() &&
 					m_pActiveRobotTask->getTarPosition() == p->getID()) {
 					CGlass* pGlass = p->getGlassFromSlot(m_pActiveRobotTask->getTarSlot());
 					if (pGlass == nullptr) {
 						bOk = TRUE;
 						slot = m_pActiveRobotTask->getTarSlot();
-						LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
+						LOGI("<CMaster>onPreStoredJob, 宸叉牎楠屾暟鎹竴鑷存��.");
 					}
 				}
 
-				// 是否回撤
+				// 鏄惁鍥炴挙
 				else if (m_pActiveRobotTask->isRestoring() &&
 					m_pActiveRobotTask->getSrcPosition() == p->getID()) {
 					CGlass* pGlass = p->getGlassFromSlot(m_pActiveRobotTask->getSrcSlot());
-					if (pGlass == nullptr) {
+					if (pGlass == nullptr && m_pActiveRobotTask->getSrcSlot() == port) {
 						bOk = TRUE;
 						slot = m_pActiveRobotTask->getSrcSlot();
-						LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
+						LOGI("<CMaster>onPreStoredJob, 宸叉牎楠屾暟鎹竴鑷存��.");
 					}
 				}
 			}
 			unlock();
 
 			if (!bOk) {
-				LOGE("<CMaster>onPreStoredJob, 数据校验失败.");
+				LOGE("<CMaster>onPreStoredJob, 鏁版嵁鏍¢獙澶辫触.");
 			}
 
 			return bOk;
@@ -910,11 +1418,11 @@
 				m_listener.onEqDataChanged(this, p, 0);
 			}
 
-			// 取放片,更新当前搬送任务
+			// 鍙栨斁鐗囷紝鏇存柊褰撳墠鎼�佷换鍔�
 			if (code == EDCC_FETCHOUT_JOB) {
 				lock();
 				if (m_pActiveRobotTask != nullptr && m_pActiveRobotTask->getSrcPosition() == p->getID()) {
-					LOGI("开始取片...");
+					LOGI("寮�濮嬪彇鐗�...");
 				}
 				unlock();
 			}
@@ -925,7 +1433,7 @@
 					&& ((m_pActiveRobotTask->getArmNo() == 1 && p->getID() == EQ_ID_ARM_TRAY1)
 						|| (m_pActiveRobotTask->getArmNo() == 2 && p->getID() == EQ_ID_ARM_TRAY2))
 					) {
-					LOGI("取片完成.");
+					LOGI("鍙栫墖瀹屾垚.");
 					m_pActiveRobotTask->fetchOut();
 					m_pActiveRobotTask->picked();
 				}
@@ -935,8 +1443,68 @@
 					&& m_pActiveRobotTask->getTarPosition() == p->getID()) {
 					m_pActiveRobotTask->stored();
 					m_pActiveRobotTask->completed();
-					LOGI("放片完成...");
-					// 完成此条搬送任务,但要把数据和消息上抛应用层
+
+					if (m_state == MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER) {
+						if (m_nContinuousTransferStep == CTStep_end) {
+							m_nContinuousTransferCount++;
+							LOGI("<ContinuousTransfer>鍗冧紶娴嬭瘯锛岀 %d 杞粨鏉�", m_nContinuousTransferCount);
+							if (m_listener.onCTRoundEnd != nullptr) {
+								m_listener.onCTRoundEnd(this, m_nContinuousTransferCount);
+							}
+						}
+					}
+
+					LOGI("鏀剧墖瀹屾垚...");
+					// 瀹屾垚姝ゆ潯鎼�佷换鍔★紝浣嗚鎶婃暟鎹拰娑堟伅涓婃姏搴旂敤灞�
+
+					// 濡傛灉鏄惉閫佸洖浠嶢OI鎼�佸洖Port, 鍒檊lass宸ヨ壓瀹屾垚
+					if (m_pActiveRobotTask->getSrcPosition() == EQ_ID_MEASUREMENT) {
+						CGlass* pGlass = (CGlass*)m_pActiveRobotTask->getContext();
+						pGlass->complete();
+						CGlass* pBuddy = pGlass->getBuddy();
+						if (pBuddy != nullptr) pBuddy->complete();
+						this->saveState();
+						bool bMoved = glassFromInPorcessToComplete(pGlass);
+						if (bMoved) {
+							LOGI("<Master>Glass(%s)浠庡伐鑹哄垪闃熷埌瀹屾垚鍒楅槦杞Щ鎴愬姛.",
+								pGlass->getID().c_str());
+						}
+						else {
+							LOGE("<Master>Glass(%s)浠庡伐鑹哄垪闃熷埌瀹屾垚鍒楅槦杞Щ澶辫触.",
+								pGlass->getID().c_str());
+						}
+						if (m_listener.onPanelEnd != nullptr) {
+							m_listener.onPanelEnd(this, pGlass);
+						}
+
+						// 妫�鏌J鏄惁宸茬粡瀹屾垚
+						CProcessJob* pJob = getGlassProcessJob((CGlass*)m_pActiveRobotTask->getContext());
+						if (pJob != nullptr && checkAndUpdatePjComplete(pJob)) {
+							this->saveState();
+							LOGE("<Master>ProcessJob(%s)瀹屾垚.",
+								pJob->id().c_str());
+							processJobFromInPorcessToComplete(pJob);
+							if (m_listener.onPjEnd != nullptr) {
+								m_listener.onPjEnd(this, pJob);
+							}
+
+							// 妫�鏌J鏄惁宸茬粡瀹屾垚
+							ASSERT(m_pControlJob);
+							if (checkAndUpdateCjComplete(m_pControlJob)) {
+								this->saveState();
+								LOGE("<Master>ControlJob(%s)瀹屾垚.",
+									m_pControlJob->id().c_str());
+								if (m_listener.onCjEnd != nullptr) {
+									m_listener.onCjEnd(this, pJob);
+								}
+
+								completeControlJob();
+							}
+						}
+					}
+
+
+
 					unlock();
 
 
@@ -953,8 +1521,8 @@
 					&& m_pActiveRobotTask->getSrcPosition() == p->getID()) {
 					m_pActiveRobotTask->stored();
 					m_pActiveRobotTask->restored();
-					LOGI("回撤完成...");
-					// 完成此条搬送任务,但要把数据和消息上抛应用层
+					LOGI("鍥炴挙瀹屾垚...");
+					// 瀹屾垚姝ゆ潯鎼�佷换鍔★紝浣嗚鎶婃暟鎹拰娑堟伅涓婃姏搴旂敤灞�
 					unlock();
 
 
@@ -969,8 +1537,262 @@
 				unlock();
 			}
 		};
-		listener.onProcessStateChanged = [&](void* pEquipment, PROCESS_STATE state) -> void {
+		listener.onProcessStateChanged = [&](void* pEquipment, int slotNo, PROCESS_STATE state) -> void {
+			ASSERT(1 <= slotNo && slotNo <= 8);
+			int eqid = ((CEquipment*)pEquipment)->getID();
+			CGlass* pGlass = ((CEquipment*)pEquipment)->getGlassFromSlot(slotNo);
 			LOGI("<Master>onProcessStateChanged<%d>", (int)state);
+			if (state == PROCESS_STATE::Processing) {
+				if (pGlass != nullptr) {
+					m_pCollector->batchStart(SlotToMid(eqid, slotNo),
+						pGlass->getID().c_str(), 10 * 60 * 1000ULL);
+				}
+			}
+			else if (state == PROCESS_STATE::Complete) {
+				if (pGlass != nullptr) {
+					m_pCollector->batchStop(SlotToMid(eqid, slotNo));
+				}
+			}
+		};
+		listener.onMapMismatch = [&](void* pEquipment, short scanMap, short downMap) {
+			LOGE("<Master-%s>Port InUse, map(%d!=%d)涓嶄竴鑷达紝璇锋鏌ャ��",
+				((CEquipment*)pEquipment)->getName().c_str(), scanMap, downMap);
+		};
+		listener.onPortStatusChanged = [&](void* pEquipment, short status, __int64 data) {
+			LOGE("<Master-%s>onPortStatusChanged銆俿tatus=%d, data=%lld", ((CEquipment*)pEquipment)->getName().c_str(), status);
+			if (status == PORT_INUSE && m_pControlJob != nullptr) {
+				CLoadPort* pPort = (CLoadPort*)pEquipment;
+				auto pjs = m_pControlJob->getPjs();
+				for (auto pj : pjs) {
+					auto carrier = pj->getCarrier(pPort->getCassetteId());
+					if (carrier != nullptr) {
+						carrier->contexts.clear();
+						for (auto slot : carrier->slots) {
+							CGlass* pGlass = pPort->getGlassFromSlot(slot);
+							carrier->contexts.push_back((void*)pGlass);
+							if (pGlass != nullptr) {
+								pGlass->setProcessJob(pj);
+
+								PJWarp& jpWarp = pj->getPjWarp();
+								int nRecipeID = RecipeManager::getInstance().getIdByPPID(pj->recipeSpec());
+								RecipeInfo stRecipeInfo = RecipeManager::getInstance().getRecipeByPPID(pj->recipeSpec());
+								std::vector<DeviceRecipe> vecRecipeInfo = stRecipeInfo.vecDeviceList;
+
+								pGlass->setScheduledForProcessing(jpWarp.checkSlot[slot-1]);
+								pGlass->setType(static_cast<SERVO::MaterialsType>(jpWarp.material[slot-1]));
+
+								SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+								if (pJobDataS != nullptr) {
+									SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+									pJobDataS->setLotId(pj->getLotId().c_str());
+									pJobDataS->setProductId(pj->getProductId().c_str());
+									pJobDataS->setOperationId(pj->getOperationId().c_str());
+									pJobDataS->setMaterialsType(jpWarp.material[slot - 1]);
+									pJobDataS->setMasterRecipe(nRecipeID);
+									for (const auto& info : vecRecipeInfo) {
+										const std::string& name = info.strDeviceName;
+										short nRecipeID = (short)info.nRecipeID;
+
+										if (name == EQ_NAME_EFEM) {
+											pJobDataS->setDeviceRecipeId(0, nRecipeID);
+										}
+										else if (name == EQ_NAME_BONDER1) {
+											pJobDataS->setDeviceRecipeId(1, nRecipeID);
+										}
+										else if (name == EQ_NAME_BONDER2) {
+											pJobDataS->setDeviceRecipeId(2, nRecipeID);
+										}
+										else if (name == EQ_NAME_BAKE_COOLING) {
+											pJobDataS->setDeviceRecipeId(3, nRecipeID);
+										}
+										else if (name == EQ_NAME_VACUUMBAKE) {
+											pJobDataS->setDeviceRecipeId(4, nRecipeID);
+										}
+										else if (name == EQ_NAME_MEASUREMENT) {
+											pJobDataS->setDeviceRecipeId(5, nRecipeID);
+										}
+									}
+
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			if (m_listener.onLoadPortStatusChanged != nullptr) {
+				m_listener.onLoadPortStatusChanged(this, (CEquipment*)pEquipment, status, data);
+			}
+		};
+		listener.onSVDataReport = [&](void* pEquipment, void* pData) {
+			CSVData* pSVData = (CSVData*)pData;
+			auto rawData = pSVData->getSVRawData();
+			std::vector<CParam> params;
+			((CEquipment*)pEquipment)->parsingSVData((const char*)rawData.data(), rawData.size(), params);
+		
+
+			// 浠ヤ笅鍔犲叆鍒版洸绾挎暟鎹腑
+			LOGD("<Master>onSVDataReport 001");
+
+			const int64_t ts = now_ms_epoch();
+			int eqid = ((CEquipment*)pEquipment)->getID();
+			if (eqid == EQ_ID_Bonder1 || eqid == EQ_ID_Bonder2) {
+				LOGD("<Master>onSVDataReport 002A");
+				// 瀹氫箟 Bonder 鐨勭壒瀹氭槧灏�
+				std::vector<std::pair<int, int>> bonderMapping = {
+					{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}, {6, 6}, {7, 7},
+					{8, 8}, {9, 9}, {10, 10}, {11, 11}, {12, 12}, {13, 13}, {14, 14}, {15, 15}, {16, 16}
+				};
+
+				CGlass* pGlass = ((CEquipment*)pEquipment)->getGlassFromSlot(2);
+				auto& dataTypes = CServoUtilsTool::getEqDataTypes();
+				auto& bonderTypes = dataTypes[SlotToMid(eqid, 2)];
+				for (const auto& mapping : bonderMapping) {
+					int paramIndex = mapping.first;
+					int channel = mapping.second;
+
+					if (paramIndex < params.size() && channel - 1 < bonderTypes.size()) {
+						if(m_pCollector != nullptr)
+							m_pCollector->buffersPush(SlotToMid(eqid, 2), channel, ts, params.at(paramIndex).getDoubleValue());
+						if(pGlass != nullptr)
+							pGlass->addSVData(eqid, bonderTypes[channel - 1], ts, params.at(paramIndex).getDoubleValue());
+					}
+				}
+			}
+			else if (eqid == EQ_ID_VACUUMBAKE) {
+				LOGD("<Master>onSVDataReport 002");
+				// 瀹氫箟 VACUUMBAKE 鐨勭壒瀹氭槧灏�
+				std::vector<std::pair<int, int>> vacuumMapping = {
+					{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}, {6, 6}, {7, 7},
+					{10, 8}, {11, 9}, {12, 10}, {13, 11}, {14, 12}, {15, 13}, {16, 14}
+				};
+
+				CGlass* pGlass1 = ((CEquipment*)pEquipment)->getGlassFromSlot(1);
+				CGlass* pGlass2 = ((CEquipment*)pEquipment)->getGlassFromSlot(2);
+				auto& dataTypes = CServoUtilsTool::getEqDataTypes();
+				auto& vacuumbakeTypes = dataTypes[SlotToMid(eqid, 1)];
+				LOGD("<Master>onSVDataReport 003 : %d", vacuumMapping.size());
+				for (const auto& mapping : vacuumMapping) {
+					int paramIndex = mapping.first;
+					int channel = mapping.second;
+
+					if (paramIndex < params.size() && channel - 1 < vacuumbakeTypes.size()) {
+						auto& param = params.at(paramIndex);
+						double value = param.getDoubleValue();
+						const std::string& dataType = vacuumbakeTypes[channel - 1];
+						const std::string& paramName = param.getName();
+						const char slotTag = !paramName.empty() ? paramName[0] : '\0';
+
+						if (m_pCollector != nullptr) {
+							if (slotTag == 'A')
+								m_pCollector->buffersPush(SlotToMid(eqid, 1), channel, ts, value);
+							else if (slotTag == 'B')
+								m_pCollector->buffersPush(SlotToMid(eqid, 2), channel, ts, value);
+						}
+
+						// 鏍规嵁鑵斾綋鍓嶇紑鍐欏叆瀵瑰簲 Slot 鐨勭幓鐠�
+						if (pGlass1 != nullptr && !dataType.empty() && slotTag == 'A')
+							pGlass1->addSVData(eqid, dataType, ts, value);
+						if (pGlass2 != nullptr && !dataType.empty() && slotTag == 'B')
+							pGlass2->addSVData(eqid, dataType, ts, value);
+					}
+				}
+			}
+			else if (eqid == EQ_ID_BAKE_COOLING) {
+				LOGD("<Master>onSVDataReport 002B");
+				// 瀹氫箟 BAKE_COOLING 鐨勭壒瀹氭槧灏�
+				std::vector<std::pair<int, int>> coolingMapping = {
+					{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}, {6, 6},
+					{11, 7}, {12, 8}, {13, 9}, {14, 10}, {15, 11}, {16, 12}
+				};
+
+				CGlass* pGlass1 = ((CEquipment*)pEquipment)->getGlassFromSlot(1); // A Bake
+				CGlass* pGlass2 = ((CEquipment*)pEquipment)->getGlassFromSlot(2); // A Cool
+				CGlass* pGlass3 = ((CEquipment*)pEquipment)->getGlassFromSlot(3); // B Bake
+				CGlass* pGlass4 = ((CEquipment*)pEquipment)->getGlassFromSlot(4); // B Cool
+				auto& dataTypes = CServoUtilsTool::getEqDataTypes();
+				auto& coolingTypes = dataTypes[SlotToMid(eqid, 1)];
+				LOGD("<Master>onSVDataReport 003B : %d", coolingMapping.size());
+				auto addToGlass = [&](CGlass* glass, const std::string& type, double val) {
+					if (glass != nullptr)
+						glass->addSVData(eqid, type, ts, val);
+				};
+				for (const auto& mapping : coolingMapping) {
+					int paramIndex = mapping.first;
+					int channel = mapping.second;
+
+					if (paramIndex < params.size() && channel - 1 < coolingTypes.size()) {
+						auto& param = params.at(paramIndex);
+						double value = param.getDoubleValue();
+						const std::string& dataType = coolingTypes[channel - 1];
+						const std::string& paramName = param.getName();
+						const char slotTag = !paramName.empty() ? paramName[0] : '\0';
+						const bool paramIsBake = paramName.find("鐑樼儰") != std::string::npos;
+						const bool paramIsCooling = paramName.find("鍐峰嵈") != std::string::npos;
+
+						if (m_pCollector != nullptr && paramIsBake) {
+							if (slotTag == 'A')
+								m_pCollector->buffersPush(SlotToMid(eqid, 1), channel, ts, value);
+							else if (slotTag == 'B')
+								m_pCollector->buffersPush(SlotToMid(eqid, 3), channel, ts, value);
+						}
+
+						if (!dataType.empty()) {
+							switch (slotTag) {
+							case 'A':
+								if (paramIsBake)
+									addToGlass(pGlass1, dataType, value);
+								else if (paramIsCooling)
+									addToGlass(pGlass2, dataType, value);
+								break;
+							case 'B':
+								if (paramIsBake)
+									addToGlass(pGlass3, dataType, value);
+								else if (paramIsCooling)
+									addToGlass(pGlass4, dataType, value);
+								break;
+							default:
+								break;
+							}
+						}
+					}
+				}
+			}
+
+
+			// 浠ヤ笅鏄緭鍑烘祴璇�
+			std::string strOut;
+			char szBuffer[256];
+			for (auto p : params) {
+				if (!strOut.empty()) strOut.append(",");
+				if (p.getValueType() == PVT_INT) {
+					sprintf_s(szBuffer, 256, "%s:%d", p.getName().c_str(), p.getIntValue());
+				}
+				else if (p.getValueType() == PVT_DOUBLE) {
+					sprintf_s(szBuffer, 256, "%s:%f", p.getName().c_str(), p.getDoubleValue());
+				}
+				strOut.append(szBuffer);
+			}
+			LOGD("<CMaster-%s>SVDataReport:%s", ((CEquipment*)pEquipment)->getName().c_str(), strOut.c_str());
+		};
+		listener.onPanelDataReport = [&](void* pEquipment, void* pContext) {
+			LOGD("<CMaster-%s>onPanelDataReport", ((CEquipment*)pEquipment)->getName().c_str());
+
+			CEquipment* pEq = (CEquipment*)pEquipment;
+			CGlass* pGlass = (CGlass*)pContext;
+
+			// 濡傛灉AOI妫�娴嬪け璐ワ紝瑕佸仠鏈�
+			if (pEq->getID() == EQ_ID_MEASUREMENT) {
+				LOGD("<CMaster-%s>onPanelDataReport 01", ((CEquipment*)pEquipment)->getName().c_str());
+				if (pGlass->getAOIInspResult() == InspResult::Fail) {
+					LOGD("<CMaster-%s>onPanelDataReport 02", ((CEquipment*)pEquipment)->getName().c_str());
+					if (stop() == 0) {
+						m_nLastError = ER_CODE_AOI_NG;
+						m_strLastError = "AOI妫�娴嬫湭閫氳繃.";
+					}
+				}
+			}
+
 		};
 		pEquipment->setListener(listener);
 		pEquipment->setCcLink(&m_cclink);
@@ -993,8 +1815,17 @@
 		return nullptr;
 	}
 
+	CEquipment* CMaster::getEquipment(int id) const
+	{
+		for (auto item : m_listEquipment) {
+			if (item->getID() == id) return item;
+		}
+
+		return nullptr;
+	}
+
 	/*
-	 * 添加LoadPort1
+	 * 娣诲姞LoadPort1
 	 * index -- 0~3
 	 */
 	CLoadPort* CMaster::addLoadPort(int index)
@@ -1009,11 +1840,12 @@
 		pEquipment->setID(EQ_ID_LOADPORT1 + index);
 		pEquipment->setName(szName);
 		pEquipment->setDescription(szName);
+		pEquipment->setCompareMapsBeforeProceeding(m_isCompareMapsBeforeProceeding);		
 		addToEquipmentList(pEquipment);
 
 
 		pEquipment->init();
-		LOGE("已添加“%s”.", pEquipment->getName().c_str());
+		LOGE("宸叉坊鍔犫��%s鈥�.", pEquipment->getName().c_str());
 
 
 		return pEquipment;
@@ -1026,13 +1858,13 @@
 		pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
 		pEquipment->setName("Fliper(G2)");
 		pEquipment->setDescription("Fliper(G2).");
-		pEquipment->setReadBitBlock(0x4000, 0x45ff);
+		pEquipment->setReadBitBlock(0x0, 0x0);
 		pEquipment->setStation(0, 255);
 		addToEquipmentList(pEquipment);
 
 
 		pEquipment->init();
-		LOGE("已添加“Fliper”.");
+		LOGE("宸叉坊鍔犫�淔liper鈥�.");
 		return pEquipment;
 	}
 
@@ -1049,7 +1881,7 @@
 
 
 		pEquipment->init();
-		LOGE("已添加“VacuumBake”.");
+		LOGE("宸叉坊鍔犫�淰acuumBake鈥�.");
 
 		return pEquipment;
 	}
@@ -1061,13 +1893,13 @@
 		pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
 		pEquipment->setName("Aligner");
 		pEquipment->setDescription("Aligner.");
-		pEquipment->setReadBitBlock(0x4000, 0x45ff);
+		pEquipment->setReadBitBlock(0x0, 0x0);
 		pEquipment->setStation(0, 255);
 		addToEquipmentList(pEquipment);
 
 
 		pEquipment->init();
-		LOGE("已添加“Aligner”.");
+		LOGE("宸叉坊鍔犫�淎ligner鈥�.");
 
 		return pEquipment;
 	}
@@ -1085,7 +1917,7 @@
 
 
 		pEquipment->init();
-		LOGE("已添加“EFEM(ROBOT)”.");
+		LOGE("宸叉坊鍔犫�淓FEM(ROBOT)鈥�.");
 
 		return pEquipment;
 	}
@@ -1101,7 +1933,7 @@
 
 
 		pEquipment->init();
-		LOGE("已添加“ARM”.");
+		LOGE("宸叉坊鍔犫�淎RM鈥�.");
 
 		return pEquipment;
 	}
@@ -1117,12 +1949,12 @@
 
 
 		pEquipment->init();
-		LOGE("已添加“%s”.", pEquipment->getName().c_str());
+		LOGE("宸叉坊鍔犫��%s鈥�.", pEquipment->getName().c_str());
 
 		return pEquipment;
 	}
 
-	/* 添加bonder1 或 bonder2 
+	/* 娣诲姞bonder1 鎴� bonder2 
 	 * index -- 0, bonder1
 	 * index -- 1, bonder2
 	 */
@@ -1141,7 +1973,7 @@
 
 
 		pEquipment->init();
-		LOGE("已添加“%s”.", pEquipment->getName().c_str());
+		LOGE("宸叉坊鍔犫��%s鈥�.", pEquipment->getName().c_str());
 
 
 		return pEquipment;
@@ -1159,7 +1991,7 @@
 		addToEquipmentList(pEquipment);
 
 		pEquipment->init();
-		LOGE("已添加“Aligner”.");
+		LOGE("宸叉坊鍔犫�淎ligner鈥�.");
 
 		return pEquipment;
 	}
@@ -1176,7 +2008,7 @@
 		addToEquipmentList(pEquipment);
 
 		pEquipment->init();
-		LOGE("已添加“Measurement”.");
+		LOGE("宸叉坊鍔犫�淢easurement鈥�.");
 
 		return pEquipment;
 	}
@@ -1188,29 +2020,10 @@
 		}
 
 
-		// 按一定频率扫描LB数据
 		static int i = 0;
 		i++;
-		/*
-		if (i % (4 * 1) == 0) {
 
-			for (auto item : m_listEquipment) {
-				if (item->getID() == EQ_ID_Bonder1) {
-					const StationIdentifier& station = item->getStation();
-					MemoryBlock& block = item->getReadBitBlock();
-
-					int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
-						block.start, block.size, block.buffer);
-					if (0 == nRet) {
-						item->onReceiveLBData(block.buffer, block.size);
-					}
-				}
-			}
-		}
-		*/
-
-
-		// 自动保存缓存
+		// 鑷姩淇濆瓨缂撳瓨
 		if (i % (4 * 2) == 0) {
 			if (m_bDataModify) {
 				saveCacheAndBackups();
@@ -1218,6 +2031,64 @@
 			}
 		}
 
+
+
+		// 妯℃嫙娴嬭瘯
+		/*
+		static int aaa = 0;
+		aaa++;
+		if (aaa % 30 == 0) {
+			if (!m_queueGlasses.empty()) {
+				CGlass* pGlass = m_queueGlasses.front();
+				pGlass->start();
+				glassFromQueueToInPorcess(pGlass);
+				this->saveState();
+
+				// 杩欓噷涓婃姤Panel Start浜嬩欢
+				if (m_listener.onPanelStart != nullptr) {
+					m_listener.onPanelStart(this, pGlass);
+				}
+			}
+		}
+
+		if (aaa % 45 == 0) {
+			if (!m_inProcesGlasses.empty()) {
+				CGlass* pGlass = m_inProcesGlasses.front();
+				pGlass->complete();
+				CGlass* pBuddy = pGlass->getBuddy();
+				if (pBuddy != nullptr) pBuddy->complete();
+				glassFromInPorcessToComplete(pGlass);
+				this->saveState();
+
+				// 杩欓噷涓婃姤Panel End浜嬩欢
+				if (m_listener.onPanelEnd != nullptr) {
+					m_listener.onPanelEnd(this, pGlass);
+				}
+
+				CProcessJob* pJob = getGlassProcessJob(pGlass);
+				if (pJob != nullptr && checkAndUpdatePjComplete(pJob)) {
+					processJobFromInPorcessToComplete(pJob);
+					this->saveState();
+					LOGE("<Master>ProcessJob(%s)瀹屾垚.",
+						pJob->id().c_str());
+					if (m_listener.onPjEnd != nullptr) {
+						m_listener.onPjEnd(this, pJob);
+					}
+
+					// 妫�鏌J鏄惁宸茬粡瀹屾垚
+					ASSERT(m_pControlJob);
+					if (checkAndUpdateCjComplete(m_pControlJob)) {
+						this->saveState();
+						LOGE("<Master>ControlJob(%s)瀹屾垚.",
+							m_pControlJob->id().c_str());
+						if (m_listener.onCjEnd != nullptr) {
+							m_listener.onCjEnd(this, pJob);
+						}
+					}
+				}
+			}
+		}
+		*/
 	}
 
 	void CMaster::connectEquipments()
@@ -1237,63 +2108,63 @@
 
 		nRet = pLoadPort1->getPin("Out")->connectPin(pAligner->getPin("In1"));
 		if (nRet < 0) {
-			LOGE("连接LoadPort1-Fliper失败");
+			LOGE("杩炴帴LoadPort1-Fliper澶辫触");
 		}
 		nRet = pLoadPort2->getPin("Out")->connectPin(pAligner->getPin("In2"));
 		if (nRet < 0) {
-			LOGE("连接LoadPort1-Fliper失败");
+			LOGE("杩炴帴LoadPort1-Fliper澶辫触");
 		}
 
 		nRet = pAligner->getPin("Out1")->connectPin(pFliper->getPin("In"));
 		if (nRet < 0) {
-			LOGE("连接Aligner-Fliper失败");
+			LOGE("杩炴帴Aligner-Fliper澶辫触");
 		}
 		nRet = pAligner->getPin("Out2")->connectPin(pVacuumBake->getPin("In"));
 		if (nRet < 0) {
-			LOGE("连接Aligner-VacuumBake失败");
+			LOGE("杩炴帴Aligner-VacuumBake澶辫触");
 		}
 
 		nRet = pFliper->getPin("Out1")->connectPin(pBonder1->getPin("In1"));
 		if (nRet < 0) {
-			LOGE("连接Fliper-Bonder1失败");
+			LOGE("杩炴帴Fliper-Bonder1澶辫触");
 		}
 		nRet = pFliper->getPin("Out2")->connectPin(pBonder2->getPin("In1"));
 		if (nRet < 0) {
-			LOGE("连接Fliper-Bonder2失败");
+			LOGE("杩炴帴Fliper-Bonder2澶辫触");
 		}
 
 		nRet = pVacuumBake->getPin("Out1")->connectPin(pBonder1->getPin("In2"));
 		if (nRet < 0) {
-			LOGE("连接VacuumBake-Bonder1失败");
+			LOGE("杩炴帴VacuumBake-Bonder1澶辫触");
 		}
 		nRet = pVacuumBake->getPin("Out2")->connectPin(pBonder2->getPin("In2"));
 		if (nRet < 0) {
-			LOGE("连接VacuumBake-Bonder2失败");
+			LOGE("杩炴帴VacuumBake-Bonder2澶辫触");
 		}
 
 		nRet = pBonder1->getPin("Out")->connectPin(pBakeCooling->getPin("In1"));
 		if (nRet < 0) {
-			LOGE("连接Bonder1-BakeCooling失败");
+			LOGE("杩炴帴Bonder1-BakeCooling澶辫触");
 		}
 
 		nRet = pBonder2->getPin("Out")->connectPin(pBakeCooling->getPin("In2"));
 		if (nRet < 0) {
-			LOGE("连接Bonder2-BakeCooling失败");
+			LOGE("杩炴帴Bonder2-BakeCooling澶辫触");
 		}
 
 		nRet = pBakeCooling->getPin("Out")->connectPin(pMeasurement->getPin("In"));
 		if (nRet < 0) {
-			LOGE("连接BakeCooling-LoadPort3失败");
+			LOGE("杩炴帴BakeCooling-LoadPort3澶辫触");
 		}
 
 		nRet = pMeasurement->getPin("Out1")->connectPin(pLoadPort3->getPin("In"));
 		if (nRet < 0) {
-			LOGE("连接BakeCooling-LoadPort3失败");
+			LOGE("杩炴帴BakeCooling-LoadPort3澶辫触");
 		}
 
 		nRet = pMeasurement->getPin("Out2")->connectPin(pLoadPort4->getPin("In"));
 		if (nRet < 0) {
-			LOGE("连接BakeCooling-LoadPort4失败");
+			LOGE("杩炴帴BakeCooling-LoadPort4澶辫触");
 		}
 	}
 
@@ -1317,7 +2188,7 @@
 		saveCache();
 
 
-		// 创建备份目录
+		// 鍒涘缓澶囦唤鐩綍
 		CString strNewFile;
 		CString strFileDir = m_strFilepath.c_str();
 		int index = strFileDir.ReverseFind('\\');
@@ -1382,17 +2253,22 @@
 	static int taskSeqNo = 0;
 	CRobotTask* CMaster::createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
 		MaterialsType primaryType/* = MaterialsType::G1*/, MaterialsType secondaryType/* = MaterialsType::G2*/,
-		int armNo/* = 1*/)
+		int armNo/* = 1*/, BOOL bJobMode/* = FALSE*/)
 	{
+		if (!pSrcEq->IsEnabled()) { 
+			return nullptr;
+		}
 		CRobotTask* pTask = nullptr;
 		CSlot* pSrcSlot, * pTarSlot;
+		pSrcEq->m_nTestFlag = m_nTestFlag;
 		pTarSlot = pTarEq->getAvailableSlotForGlass(primaryType);
-		pSrcSlot = pSrcEq->getProcessedSlot(primaryType);
-		if (pSrcSlot == nullptr || nullptr == pTarSlot) {
+		pSrcSlot = pSrcEq->getProcessedSlot(primaryType, bJobMode);
+		if (m_nTestFlag == 1) LOGD("createTransferTask 003 %x, %x", pTarSlot, pSrcSlot);
+		if ((pSrcSlot == nullptr || nullptr == pTarSlot) && secondaryType != SERVO::MaterialsType::G0) {
 			pTarSlot = pTarEq->getAvailableSlotForGlass(secondaryType);
-			pSrcSlot = pSrcEq->getProcessedSlot(secondaryType);
+			pSrcSlot = pSrcEq->getProcessedSlot(secondaryType, bJobMode);
 		}
-
+		if (m_nTestFlag == 1) LOGD("createTransferTask 004 %x, %x", pTarSlot, pSrcSlot);
 
 		if (pSrcSlot != nullptr && nullptr != pTarSlot) {
 			pTask = new CRobotTask();
@@ -1408,7 +2284,11 @@
 
 	CRobotTask* CMaster::createTransferTask_bonder_to_bakecooling(CEquipment* pSrcEq, CEquipment* pTarEq)
 	{
-		std::vector<int> slots = {1, 2};
+		if (!pSrcEq->IsEnabled()) {
+			return nullptr;
+		}
+
+		std::vector<int> slots = {1, 3};
 
 		CRobotTask* pTask = nullptr;
 		CSlot* pSrcSlot, * pTarSlot;
@@ -1429,8 +2309,12 @@
 
 	CRobotTask* CMaster::createTransferTask_bake_to_cooling(CEquipment* pSrcEq)
 	{
-		std::vector<int> slotsTar = { 3, 4 };
-		std::vector<int> slotsSrc = { 1, 2 };
+		if (!pSrcEq->IsEnabled()) {
+			return nullptr;
+		}
+
+		std::vector<int> slotsTar = { 2, 4 };
+		std::vector<int> slotsSrc = { 1, 3 };
 
 		CRobotTask* pTask = nullptr;
 		CSlot* pSrcSlot, * pTarSlot;
@@ -1451,7 +2335,11 @@
 
 	CRobotTask* CMaster::createTransferTask_bakecooling_to_measurement(CEquipment* pSrcEq, CEquipment* pTarEq)
 	{
-		std::vector<int> slots = { 3, 4 };
+		if (!pSrcEq->IsEnabled()) {
+			return nullptr;
+		}
+
+		std::vector<int> slots = { 2, 4 };
 
 		CRobotTask* pTask = nullptr;
 		CSlot* pSrcSlot, * pTarSlot;
@@ -1463,6 +2351,71 @@
 			pTask->setContext(pSrcSlot->getContext());
 			pTask->setEFEM((CEFEM*)getEquipment(EQ_ID_EFEM));
 			taskSeqNo = pTask->setRobotTransferParam(taskSeqNo, 1, pSrcSlot->getPosition(),
+				pTarSlot->getPosition(), pSrcSlot->getNo(), pTarSlot->getNo());
+		}
+
+
+		return pTask;
+	}
+
+	CRobotTask* CMaster::createTransferTask_restore(CEquipment* pEqSrc, CLoadPort** pPorts)
+	{
+		if (!pEqSrc->IsEnabled()) {
+			return nullptr;
+		}
+
+		CRobotTask* pTask = nullptr;
+		CSlot* pSrcSlot, * pTarSlot = nullptr, * pTempSlot;
+		pSrcSlot = pEqSrc->getInspFailSlot();
+		if (pSrcSlot != nullptr) {
+			CGlass* pGlass = (CGlass*)pSrcSlot->getContext();
+			ASSERT(pGlass);
+			int port, slot;
+			pGlass->getOrginPort(port, slot);
+			pGlass->setInspResult(pPorts[port]->getID(), 0, InspResult::Fail);
+			ASSERT(0 <= port && port < 4);
+			ASSERT(0 <= slot && slot < 8);
+			pTempSlot = pPorts[port]->getSlot(slot);
+			if (pTempSlot->getContext() == nullptr) {
+				pTarSlot = pTempSlot;
+			}
+		}
+
+
+		if (pSrcSlot != nullptr && nullptr != pTarSlot) {
+			pTask = new CRobotTask();
+			pTask->setContext(pSrcSlot->getContext());
+			pTask->setEFEM((CEFEM*)getEquipment(EQ_ID_EFEM));
+			taskSeqNo = pTask->setRobotTransferParam(taskSeqNo, 1, pSrcSlot->getPosition(),
+				pTarSlot->getPosition(), pSrcSlot->getNo(), pTarSlot->getNo());
+		}
+
+
+		return pTask;
+	}
+
+	CRobotTask* CMaster::createTransferTask_continuous_transfer(CEquipment* pSrcEq, int nSrcSlot,
+		CEquipment* pTarEq, int nTarSlot, int armNo/* = 1*/)
+	{
+		if (!pSrcEq->IsEnabled()) {
+			return nullptr;
+		}
+		if (!pTarEq->IsEnabled()) {
+			return nullptr;
+		}
+
+		CRobotTask* pTask = nullptr;
+		CSlot* pSrcSlot = pSrcEq->getProcessedSlotCt(nSrcSlot);
+		if (pSrcSlot != nullptr && pSrcEq->getID() == EQ_ID_MEASUREMENT
+			&& (pTarEq->getID() == EQ_ID_LOADPORT1 || pTarEq->getID() == EQ_ID_LOADPORT2 || pTarEq->getID() == EQ_ID_LOADPORT3 || pTarEq->getID() == EQ_ID_LOADPORT4)) {
+			pTarEq->removeGlass(1);
+		}
+		CSlot* pTarSlot = pTarEq->isSlotAvailable(nTarSlot);
+		if (pSrcSlot != nullptr && nullptr != pTarSlot) {
+			pTask = new CRobotTask();
+			pTask->setContext(pSrcSlot->getContext());
+			pTask->setEFEM((CEFEM*)getEquipment(EQ_ID_EFEM));
+			taskSeqNo = pTask->setRobotTransferParam(taskSeqNo, armNo, pSrcSlot->getPosition(),
 				pTarSlot->getPosition(), pSrcSlot->getNo(), pTarSlot->getNo());
 		}
 
@@ -1489,8 +2442,9 @@
 		}
 		unlock();
 
-		// 当前任务手动中止后,停止调度,需要操作员在解决问题后,重新启动
-		stop();
+		// 褰撳墠浠诲姟鎵嬪姩涓鍚庯紝鍋滄璋冨害锛岄渶瑕佹搷浣滃憳鍦ㄨВ鍐抽棶棰樺悗锛岄噸鏂板惎鍔�
+		// 25骞�7鏈�23鏃ュ悗淇敼涓轰笉鍋滄浠诲姟
+		// stop();
 
 		return 0;
 	}
@@ -1507,11 +2461,31 @@
 		return 0;
 	}
 
-	void CMaster::setPortType(unsigned int index, BOOL enable, int type, int mode,
-		int cassetteType, int transferMode, BOOL autoChangeEnable)
+	int CMaster::resendCurrentTask()
+	{
+		lock();
+		if (m_pActiveRobotTask != nullptr) {
+			m_pActiveRobotTask->resend();
+		}
+		unlock();
+
+
+		return 0;
+	}
+
+	void CMaster::setPortType(unsigned int index, int type)
 	{
 		ASSERT(index < 4);
 		int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4};
+		CLoadPort* pPort = (CLoadPort*)getEquipment(eqid[index]);
+		pPort->localSetPortType((SERVO::PortType)type);
+	}
+
+	void CMaster::setPortTypeEx(unsigned int index, BOOL enable, int type, int mode,
+		int cassetteType, int transferMode, BOOL autoChangeEnable)
+	{
+		ASSERT(index < 4);
+		int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
 		CLoadPort* pPort = (CLoadPort*)getEquipment(eqid[index]);
 		pPort->localEanblePort(enable);
 		pPort->localSetPortType((SERVO::PortType)type);
@@ -1520,4 +2494,761 @@
 		pPort->localSetTransferMode((SERVO::TransferMode)transferMode);
 		pPort->localAutoChangeEnable(autoChangeEnable);
 	}
+
+	void CMaster::setPortCassetteType(unsigned int index, SERVO::CassetteType type)
+	{
+		ASSERT(index < 4);
+		int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
+		CLoadPort* pPort = (CLoadPort*)getEquipment(eqid[index]);
+		pPort->localSetCessetteType(type);
+	}
+
+	void CMaster::setPortEnable(unsigned int index, BOOL bEnable)
+	{
+		ASSERT(index < 4);
+		int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
+		CLoadPort* pPort = (CLoadPort*)getEquipment(eqid[index]);
+		pPort->localEanblePort(bEnable);
+	}
+
+	int CMaster::getPortCassetteSnSeed(int port)
+	{
+		ASSERT(1 <= port && port <= 4);
+		int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
+		CLoadPort* pPort = (CLoadPort*)getEquipment(eqid[port - 1]);
+		return pPort->getPortCassetteSnSeed();
+	}
+
+	void CMaster::setPortCassetteSnSeed(int port, int seed)
+	{
+		ASSERT(1 <= port && port <= 4);
+		int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
+		CLoadPort* pPort = (CLoadPort*)getEquipment(eqid[port - 1]);
+		return pPort->setPortCassetteSnSeed(seed);
+	}
+
+	void CMaster::setCompareMapsBeforeProceeding(BOOL bCompare)
+	{
+		m_isCompareMapsBeforeProceeding = bCompare;
+	}
+
+	void CMaster::setJobMode(BOOL bJobMode)
+	{
+		m_bJobMode = bJobMode;
+	}
+
+	void CMaster::datetimeSync(SYSTEMTIME& time)
+	{
+		for (auto item : m_listEquipment) {
+			item->setDateTime(time.wYear, time.wMonth, time.wDay,
+				time.wHour, time.wMinute, time.wSecond);
+		}
+	}
+
+	void CMaster::enableEventReport(bool bEnable)
+	{
+		m_bEnableEventReport = bEnable;
+	}
+
+	void CMaster::enableAlarmReport(bool bEnable)
+	{
+		m_bEnableAlarmReport = bEnable;
+	}
+
+	bool CMaster::isAlarmReportEnable()
+	{
+		return m_bEnableAlarmReport;
+	}
+
+	int CMaster::proceedWithCarrier(unsigned int port)
+	{
+		if (port >= 4) return -1;
+
+		static int pid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4};
+		CLoadPort* pPort = (CLoadPort*)getEquipment(pid[port]);
+		pPort->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
+		return 0;
+	}
+
+	int CMaster::carrierRelease(unsigned int port)
+	{
+		if (port >= 4) return -1;
+
+		static int pid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
+		CLoadPort* pPort = (CLoadPort*)getEquipment(pid[port]);
+		pPort->sendCassetteCtrlCmd(CCC_PROCESS_CANCEL, nullptr, 0, 0, 0, nullptr, nullptr);
+		return 0;
+	}
+
+	int CMaster::getContinuousTransferCount()
+	{
+		return m_nContinuousTransferCount;
+	}
+
+	void CMaster::setContinuousTransferCount(int round)
+	{
+		m_nContinuousTransferCount = round;
+	}
+
+	int CMaster::setProcessJobs(std::vector<CProcessJob*>& pjs)
+	{
+		std::vector<SERVO::CProcessJob*> temp;
+		for (auto p : pjs) {
+			if (p->validate(*this)) {
+				p->queue();
+				temp.push_back(p);
+			}
+		}
+		m_processJobs = temp;
+
+
+		// 鏇存柊context
+		std::vector<uint8_t> newSlots;
+		std::vector<void*> newContexts;
+		for (auto pj : m_processJobs) {
+			for (auto& c : pj->carriers()) {
+				auto pPort = getPortWithCarrierId(c.carrierId);
+				if (pPort == nullptr) continue;
+
+				for (auto s : c.slots) {
+					auto pGlass = pPort->getGlassFromSlot(s);
+					if (pGlass == nullptr) continue;
+
+					newSlots.push_back(s);
+					newContexts.push_back(pGlass);
+				}
+
+				pj->setCarrierSlotsAndContexts(c.carrierId, newSlots, newContexts);
+			}
+		}
+
+
+
+		this->saveState();
+
+		return (int)m_processJobs.size();
+	}
+
+	std::vector<CProcessJob*>& CMaster::getProcessJobs()
+	{
+		return m_processJobs;
+	}
+
+	CProcessJob* CMaster::getProcessJob(const std::string& id)
+	{
+		for (auto item : m_processJobs) {
+			if (item->id().compare(id) == 0) return item;
+		}
+
+		return nullptr;
+	}
+
+	int CMaster::setControlJob(CControlJob& controlJob)
+	{
+		// 鍥炶皟锛氭槸鍚﹀弬鍒涘缓ControlJob
+		auto canCreateCjFn = [&](uint32_t& cc, std::string& mm) -> bool {
+			if (m_pControlJob != nullptr) {
+				cc = 1100;
+				mm = "褰撳墠ControlJob鏈粨鎵癸紝涓嶈兘鍒涘缓鏂扮殑ControlJob";
+				return false;
+			}
+			return true;
+		};
+
+
+		// 鍥炶皟锛氭槸鍚﹀瓨鍦�
+		auto pjExists = [&](const std::string& id) -> bool {
+			return getProcessJob(id) != nullptr;
+		};
+
+		// 鍥炶皟锛氭槸鍚﹀彲鍔犲叆 CJ锛堣繖閲屽畾涔夛細蹇呴』鏄� Queued锛�
+		auto pjJoinable = [&](const std::string& id) -> bool {
+			auto pj = getProcessJob(id);
+			if (pj == nullptr) return false;
+			return pj->state() == PJState::Queued;
+		};
+
+		bool bRet = controlJob.validateForCreate(canCreateCjFn, pjExists, pjJoinable);
+		if (!bRet) return -1;
+
+		std::vector<CProcessJob*> temps;
+		m_pControlJob = new CControlJob(controlJob);
+		auto pjIds = controlJob.pjIds();
+		for (auto id : pjIds) {
+			auto pj = getProcessJob(id);
+			if (pj != nullptr) {
+				temps.push_back(pj);
+			}
+		}
+		m_pControlJob->setPJs(temps);
+		this->saveState();
+
+
+		return 0;
+	}
+
+	CControlJob* CMaster::getControlJob()
+	{
+		return m_pControlJob;
+	}
+
+	CLoadPort* CMaster::getPortWithCarrierId(const std::string& carrierId) const
+	{
+		CLoadPort* pPort;
+		int eqid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4};
+		for (int i = 0; i < 4; i++) {
+			pPort = (CLoadPort*)getEquipment(eqid[i]);
+			ASSERT(pPort);
+			if (pPort->getCassetteId().compare(carrierId) == 0) return pPort;
+		}
+
+		return nullptr;
+	}
+
+	bool CMaster::isProcessJobsEmpty() const
+	{
+		return m_processJobs.empty();
+	}
+
+	bool CMaster::recipeExists(const std::string& ppid) const
+	{
+		std::vector<std::string> vecRecipe = RecipeManager::getInstance().getAllPPID();
+		bool exists = std::find(vecRecipe.begin(), vecRecipe.end(), ppid) != vecRecipe.end();
+		return exists;
+	}
+
+	bool CMaster::carrierPresent(const std::string& carrierId) const
+	{
+		CLoadPort* pPort = getPortWithCarrierId(carrierId);
+		return pPort != nullptr;
+	}
+
+	bool CMaster::slotUsable(const std::string& carrierId, uint16_t slot) const
+	{
+		CLoadPort* pPort = getPortWithCarrierId(carrierId);
+		if(pPort == nullptr) return false;
+		CSlot* pSlot = pPort->getSlot(slot);
+		if (pSlot == nullptr) return false;
+		return pSlot->isEnable();
+	}
+
+	bool CMaster::ceidDefined(uint32_t ceid) const
+	{
+		return true;
+	}
+
+	bool CMaster::saveState() const
+	{
+		std::ofstream ofs(m_strStatePath, std::ios::binary);
+		if (!ofs) return false;
+
+		// 鏂囦欢澶�
+		uint32_t magic = 0x4D415354; // 'MAST'
+		uint16_t version = 1;
+		ofs.write(reinterpret_cast<const char*>(&magic), sizeof(magic));
+		ofs.write(reinterpret_cast<const char*>(&version), sizeof(version));
+
+		// 淇濆瓨 ControlJob
+		bool hasCJ = (m_pControlJob != nullptr);
+		ofs.write(reinterpret_cast<const char*>(&hasCJ), sizeof(hasCJ));
+		if (hasCJ) {
+			m_pControlJob->serialize(ofs);
+		}
+
+		// 淇濆瓨 ProcessJob 鍒楄〃
+		uint32_t count = static_cast<uint32_t>(m_processJobs.size());
+		ofs.write(reinterpret_cast<const char*>(&count), sizeof(count));
+		for (const auto& job : m_processJobs) {
+			job->serialize(ofs);
+		}
+
+		// 浠ュ悗鍙互鍦ㄨ繖閲岃拷鍔犳柊瀛楁
+		return true;
+	}
+
+	bool CMaster::loadState()
+	{
+		std::ifstream ifs(m_strStatePath, std::ios::binary);
+		if (!ifs) return false;
+
+		// 鏂囦欢澶�
+		uint32_t magic = 0;
+		uint16_t version = 0;
+		ifs.read(reinterpret_cast<char*>(&magic), sizeof(magic));
+		ifs.read(reinterpret_cast<char*>(&version), sizeof(version));
+
+		if (magic != 0x4D415354) {
+			// 鏂囦欢涓嶅悎娉�
+			return false;
+		}
+
+		if (m_pControlJob != nullptr) {
+			delete m_pControlJob;
+			m_pControlJob = nullptr;
+		}
+
+		// 璇诲彇 ControlJob
+		bool hasCJ = false;
+		ifs.read(reinterpret_cast<char*>(&hasCJ), sizeof(hasCJ));
+		if (hasCJ) {
+			m_pControlJob = new CControlJob();
+			if (!CControlJob::deserialize(ifs, *m_pControlJob)) return false;
+		}
+		else {
+			return false;
+		}
+
+		// 璇诲彇 ProcessJob 鍒楄〃
+		uint32_t count = 0;
+		ifs.read(reinterpret_cast<char*>(&count), sizeof(count));
+		m_processJobs.clear();
+		for (uint32_t i = 0; i < count; i++) {
+			CProcessJob* pProcessJob = new CProcessJob();
+			if (!CProcessJob::deserialize(ifs, *pProcessJob)) return false;
+			m_processJobs.push_back(pProcessJob);
+		}
+
+
+		// 鎵惧埌CProcessJob鎸囬拡鍔犲叆鍒楄〃涓�
+		std::vector<CProcessJob*> tempPjs;
+		auto ids = m_pControlJob->pjIds();
+		for (auto id : ids) {
+			auto pj = getProcessJob(id);
+			if (pj != nullptr) {
+				tempPjs.push_back(pj);
+			}
+		}
+		m_pControlJob->setPJs(tempPjs);
+
+
+		// 鏇存柊contexts
+		auto pjs = m_pControlJob->getPjs();
+		for (auto pj : pjs) {
+			for (auto& c : pj->carriers()) {
+				auto p = getPortWithCarrierId(c.carrierId);
+				if (p == nullptr) continue;
+
+				std::vector<void*> contexts;
+				for (auto s : c.slots) {
+					auto g = getGlass(p->getIndex(), s - 1);
+					if (g == nullptr) continue;
+					contexts.push_back(g);
+				}
+				pj->setCarrierContexts(c.carrierId, contexts);
+			}
+		}
+
+
+		// 濡傛灉鐗堟湰鍗囩骇锛屽彲鍦ㄨ繖閲屽垽鏂� version 鏉ュ姞杞芥柊瀛楁
+
+
+		return true;
+	}
+
+	void CMaster::setStateFile(const std::string& path)
+	{
+		m_strStatePath = path;
+	}
+
+	CProcessJob* CMaster::acquireNextProcessJob()
+	{
+		auto& pjs = m_pControlJob->getPjs();
+		for (const auto pj : pjs) {
+			if (pj->state() == PJState::Queued) {
+				pj->start();
+				return pj;
+			}
+		}
+
+
+		return nullptr;
+	}
+
+	CGlass* CMaster::acquireNextGlass()
+	{
+		for (auto* pj : m_inProcesJobs) {
+			// 閬嶅巻 PJ 鐨� carriers 鍜� slots
+			for (auto& cs : pj->carriers()) {
+				for (auto ctx : cs.contexts) {
+					CGlass* pGlass = (CGlass*)ctx;
+					if (pGlass->state() == GlsState::NoState) {
+						pGlass->queue();
+						return pGlass;
+					}
+				}
+			}
+		}
+		return nullptr; // 娌℃湁鍙姞宸ョ殑 Glass
+	}
+
+	int CMaster::acquireGlassToQueue()
+	{
+		int nCount = 0;
+		for (auto* pj : m_inProcesJobs) {
+			// 閬嶅巻 PJ 鐨� carriers 鍜� slots
+			if (pj->carriers().empty()) continue;
+			for (auto& cs : pj->carriers()) {
+				for (auto ctx : cs.contexts) {
+					CGlass* pGlass = (CGlass*)ctx;
+					if (pGlass->state() == GlsState::NoState) {
+						pGlass->queue();
+						if(addGlassToQueue(pGlass)) nCount++;
+					}
+				}
+			}
+		}
+		return nCount;
+	}
+
+	bool CMaster::addGlassToQueue(CGlass* pGlass)
+	{
+		for (auto g : m_queueGlasses) {
+			if (g == pGlass) return false;
+		}
+
+		m_queueGlasses.push_back(pGlass);
+		return true;
+	}
+
+	bool CMaster::glassFromQueueToInPorcess(CGlass* pGlass)
+	{
+		auto it = std::find(m_queueGlasses.begin(), m_queueGlasses.end(), pGlass); 
+		if (it != m_queueGlasses.end()) {
+			m_inProcesGlasses.push_back(*it);
+			m_queueGlasses.erase(it);
+			return true;
+		}
+		return false;
+	}
+
+	bool CMaster::glassFromInPorcessToComplete(CGlass* pGlass)
+	{
+		auto it = std::find(m_inProcesGlasses.begin(), m_inProcesGlasses.end(), pGlass);
+		if (it != m_inProcesGlasses.end()) {
+			m_completeGlasses.push_back(*it);
+			m_inProcesGlasses.erase(it);
+			return true;
+		}
+		return false;
+	}
+
+	bool CMaster::processJobFromInPorcessToComplete(CProcessJob* pProcessJob)
+	{
+		auto it = std::find(m_inProcesJobs.begin(), m_inProcesJobs.end(), pProcessJob);
+		if (it != m_inProcesJobs.end()) {
+			m_completeProcessJobs.push_back(*it);
+			m_inProcesJobs.erase(it);
+			return true;
+		}
+		return false;
+	}
+
+	bool CMaster::checkAndUpdatePjComplete(CProcessJob* pJob)
+	{
+		ASSERT(pJob);
+		auto state = pJob->state();
+		if (state != PJState::InProcess && state != PJState::Paused) return false;
+
+		for (auto c : pJob->carriers()) {
+			for (auto g : c.contexts) {
+				auto state = ((CGlass*)g)->state();
+				if (state != GlsState::Aborted && state != GlsState::Completed
+					&& state != GlsState::Failed) return false;
+			}
+		}
+
+		return pJob->complete();
+	}
+
+	bool CMaster::checkAndUpdateCjComplete(CControlJob* pJob)
+	{
+		ASSERT(pJob);
+		auto state = pJob->state();
+		if (state != CJState::Executing && state != CJState::Paused) return false;
+
+		for (auto pj : pJob->getPjs()) {
+			auto state = pj->state();
+			if (state != PJState::Aborted && state != PJState::Completed
+				&& state != PJState::Failed) {
+				return false;
+			}
+		}
+
+		return pJob->complete();
+	}
+
+	CProcessJob* CMaster::getGlassProcessJob(CGlass* pGlass)
+	{
+		if (m_pControlJob == nullptr) return nullptr;
+		for (auto pj : m_pControlJob->getPjs()) {
+			for (auto c : pj->carriers()) {
+				for (auto g : c.contexts) {
+					if (g == pGlass) return pj;
+				}
+			}
+		}
+
+		return nullptr;
+	}
+
+
+	bool CMaster::completeControlJob()
+	{
+		if (m_pControlJob == nullptr) {
+			return false;
+		}
+		for (auto item : m_processJobs) {
+			if (item->state() != PJState::Completed) return false;
+		}
+		if (m_pControlJob->state() != CJState::Completed)
+			return false;
+
+
+
+		// 閲婃斁Job鐩稿叧
+		for (auto item : m_processJobs) {
+			delete item;
+		}
+		m_processJobs.clear();
+		if (m_pControlJob != nullptr) {
+			delete m_pControlJob;
+			m_pControlJob = nullptr;
+		}
+
+		// 娉ㄦ剰瑕侀噴鏀惧紩鐢�
+		m_inProcesJobs.clear();
+		m_completeProcessJobs.clear();
+		m_queueGlasses.clear();
+		m_inProcesGlasses.clear();
+		m_completeGlasses.clear();
+
+
+		saveState();
+
+		return true;
+	}
+
+	bool CMaster::forceCompleteControlJob(std::string description)
+	{
+		if (m_pControlJob == nullptr || m_state != SERVO::MASTERSTATE::READY) {
+			return false;
+		}
+		for (auto item : m_processJobs) {
+			item->abort(description);
+		}
+		m_pControlJob->abort(description);
+
+
+		// 閲婃斁Job鐩稿叧
+		for (auto item : m_processJobs) {
+			delete item;
+		}
+		m_processJobs.clear();
+		if (m_pControlJob != nullptr) {
+			delete m_pControlJob;
+			m_pControlJob = nullptr;
+		}
+
+		// 娉ㄦ剰瑕侀噴鏀惧紩鐢�
+		m_inProcesJobs.clear();
+		m_completeProcessJobs.clear();
+		m_queueGlasses.clear();
+		m_inProcesGlasses.clear();
+		m_completeGlasses.clear();
+
+
+		saveState();
+
+		return true;
+	}
+
+	bool CMaster::canCreateControlJob()
+	{
+		return m_pControlJob == nullptr;
+	}
+
+	bool CMaster::canCompleteControlJob()
+	{
+		return m_pControlJob != nullptr && m_state == SERVO::MASTERSTATE::READY;
+	}
+
+	bool CMaster::canDeleteControlJob()
+	{
+		return m_pControlJob != nullptr 
+			&& m_pControlJob->state() == CJState::NoState
+			&& m_state == SERVO::MASTERSTATE::READY;
+	}
+
+	int CMaster::getWipGlasses(std::vector<CGlass*>& glasses)
+	{
+		for (auto eq : m_listEquipment) {
+			auto p = dynamic_cast<CLoadPort*>(eq);
+			if (p == nullptr) {
+				eq->getAllGlass(glasses);
+			}
+
+		}
+
+		return (int)glasses.size();
+	}
+
+	int CMaster::getLastError()
+	{
+		return m_nLastError;
+	}
+
+	std::string& CMaster::getLastErrorText()
+	{
+		return m_strLastError;
+	}
+
+	void CMaster::test()
+	{
+		if (stop() == 0) {
+			m_nLastError = ER_CODE_AOI_NG;
+			m_strLastError = "AOI妫�娴嬫湭閫氳繃.";
+		}
+	}
+
+	bool CMaster::moveGlassToBuf(int eqid, int slotNo)
+	{
+		CEquipment* pEquipment = getEquipment(eqid);
+		if (pEquipment == nullptr) return false;
+
+		CSlot* pSlot = pEquipment->getSlotWithNo(slotNo);
+		if (pSlot == nullptr) return false;
+
+		CGlass* pGlass = (CGlass*)pSlot->getContext();
+		m_bufGlass.push_back(pGlass);
+		pGlass->addRef();
+		pSlot->setContext(nullptr);
+
+		m_bDataModify = TRUE;
+		if (m_listener.onEqDataChanged != nullptr) {
+			m_listener.onEqDataChanged(this, pEquipment, 0);
+		}
+
+		return true;
+	}
+
+	bool CMaster::moveGlassToSlot(int eqid, int slotNo)
+	{
+		CEquipment* pEquipment = getEquipment(eqid);
+		if (pEquipment == nullptr) return false;
+
+		CSlot* pSlot = pEquipment->getSlotWithNo(slotNo);
+		if (pSlot == nullptr) return false;
+		if (m_bufGlass.empty()) return false;
+
+		CGlass* pGlass = m_bufGlass.front();
+		m_bufGlass.pop_front();
+		if (pGlass == nullptr) return false;
+		pSlot->setContext(pGlass);
+		pGlass->release();
+
+		m_bDataModify = TRUE;
+		if (m_listener.onEqDataChanged != nullptr) {
+			m_listener.onEqDataChanged(this, pEquipment, 0);
+		}
+
+		return true;
+	}
+
+	CGlass* CMaster::getGlass(int scrPort, int scrSlot)
+	{
+		for (auto eq : m_listEquipment) {
+			std::vector<CGlass*> glasses;
+			eq->getAllGlass(glasses);
+			for (auto g : glasses) {
+				int p, s;
+				g->getOrginPort(p, s);
+				if (p == scrPort && s == scrSlot) {
+					return g;
+				}
+			}
+		}
+
+		return nullptr;
+	}
+
+	void CMaster::CreateDAQBridgeServer()
+	{
+		auto connectionStatusCallback = [&](int code, const std::string& status) {
+			LOGI("<DAQBridge>status:", status.c_str());
+		};
+		auto rawDataCallback = [](const std::vector<uint8_t>& bytes) {
+
+		};
+
+		// 浜嬩欢锛氭湁浜鸿繛鍏�/鏂紑灏变笂鏃ュ織
+		auto clieintEventCallback = [](const std::string& ip, uint16_t port, bool connected) {
+			LOGI("<DAQBridge>[Client %s] %s:%u", connected ? _T("JOIN") : _T("LEAVE"), ip.c_str(), port);
+		};
+
+		if (m_pCollector == nullptr) {
+			m_pCollector = new Collector();
+			m_pCollector->setConnectionStatusCallback(connectionStatusCallback);
+			m_pCollector->setRawDataCallback(rawDataCallback);
+			m_pCollector->setClientEventCallback(clieintEventCallback);
+			m_pCollector->createServer(8081);
+			m_pCollector->startLoop(10);
+
+			// 1) 娉ㄥ唽鏈哄彴锛堟帹鑽愶細鍏堟敞鍐� id + 鏈哄櫒鍚嶇О锛�
+			RetentionPolicy defP; defP.mode = RetainMode::ByCount; defP.maxSamples = 200;
+			m_pCollector->registryAddMachine(MID_Bonder1, "Bonder1", defP);
+			m_pCollector->registryAddMachine(MID_Bonder2, "Bonder2", defP);
+			m_pCollector->registryAddMachine(MID_VacuumBakeA, "鍓嶇儤-A", defP);
+			m_pCollector->registryAddMachine(MID_VacuumBakeB, "鍓嶇儤-B", defP);
+			m_pCollector->registryAddMachine(MID_BakeCoolingA, "鍚庣儤-A", defP);
+			m_pCollector->registryAddMachine(MID_BakeCoolingB, "鍚庣儤-B", defP);
+
+
+			// 2) 涓洪�氶亾璁剧疆鈥滄洸绾垮悕绉扳��
+			auto& dataTypes = CServoUtilsTool::getEqDataTypes();
+			auto& bonderTypes = dataTypes[MID_Bonder1];
+			for (size_t i = 0; i < bonderTypes.size(); ++i) {
+				m_pCollector->buffersSetChannelName(MID_Bonder1, i + 1, bonderTypes[i].c_str());
+				m_pCollector->buffersSetChannelName(MID_Bonder2, i + 1, bonderTypes[i].c_str());
+			}
+
+			auto& vacuumbakeTypes = dataTypes[MID_VacuumBakeA];
+			for (size_t i = 0; i < vacuumbakeTypes.size(); ++i) {
+				m_pCollector->buffersSetChannelName(MID_VacuumBakeA, i + 1, vacuumbakeTypes[i].c_str());
+				m_pCollector->buffersSetChannelName(MID_VacuumBakeB, i + 1, vacuumbakeTypes[i].c_str());
+			}
+
+			auto& coolingTypes = dataTypes[MID_BakeCoolingA];
+			for (size_t i = 0; i < coolingTypes.size(); ++i) {
+				m_pCollector->buffersSetChannelName(MID_BakeCoolingA, i + 1, coolingTypes[i].c_str());
+				m_pCollector->buffersSetChannelName(MID_BakeCoolingB, i + 1, coolingTypes[i].c_str());
+			}
+		}
+	}
+
+	uint32_t CMaster::SlotToMid(int eqid, int slot)
+	{
+		if (eqid == EQ_ID_Bonder1) {
+			return MID_Bonder1;
+		}
+
+		if (eqid == EQ_ID_Bonder2) {
+			return MID_Bonder2;
+		}
+
+		if (eqid == EQ_ID_VACUUMBAKE) {
+			if(slot == 1)
+				return MID_VacuumBakeA;
+			if (slot == 2)
+				return MID_VacuumBakeB;
+		}
+
+		if (eqid == EQ_ID_BAKE_COOLING) {
+			if (slot == 1)
+				return MID_BakeCoolingA;
+			if (slot == 3)
+				return MID_BakeCoolingB;
+		}
+
+		return 0;
+	}
 }

--
Gitblit v1.9.3