From 4897210a25e7c98ddacb1fa4ecee3e8bdd1ae98e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 12 六月 2025 14:18:16 +0800
Subject: [PATCH] 1.手臂选择匹配问题,

---
 SourceCode/Bond/Servo/CLoadPort.cpp |  506 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 457 insertions(+), 49 deletions(-)

diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index c7c6040..75353d3 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -16,10 +16,10 @@
 	CLoadPort::CLoadPort() : CEquipment()
 	{
 		m_nIndex = 0;
-		m_nType = 1;
-		m_nMode = 1;
-		m_nCassetteType = 1;
-		m_nTransferMode = 1;
+		m_portType = PortType::Loading;
+		m_portMode = PortMode::ReadyToLoad;
+		m_cassetteType = CassetteType::G1;
+		m_transferMode = TransferMode::AGVMode;
 		m_bEnable = FALSE;
 		m_bAutoChangeEnable = FALSE;
 	}
@@ -51,8 +51,36 @@
 		// 加入Pin初始化代码
 		LOGI("<CLoadPort>initPins");
 		addPin(SERVO::PinType::INPUT, _T("In"));
-		addPin(SERVO::PinType::OUTPUT, _T("Out1"));
-		addPin(SERVO::PinType::OUTPUT, _T("Out2"));
+		addPin(SERVO::PinType::OUTPUT, _T("Out"));
+	}
+
+	// 必须要实现的虚函数,在此初始化Slot信息
+	void CLoadPort::initSlots()
+	{
+		m_slot[0].enable();
+		m_slot[0].setPosition(m_nID);
+		m_slot[0].setNo(1);
+		m_slot[0].setName("Slot 1");
+		m_slot[1].enable();
+		m_slot[1].setPosition(m_nID);
+		m_slot[1].setNo(2);
+		m_slot[1].setName("Slot 2");
+		m_slot[2].setPosition(m_nID);
+		m_slot[2].enable();
+		m_slot[2].setNo(3);
+		m_slot[2].setName("Slot 3");
+		m_slot[3].setPosition(m_nID);
+		m_slot[3].enable();
+		m_slot[3].setNo(4);
+		m_slot[3].setName("Slot 4");
+		m_slot[4].setPosition(m_nID);
+		m_slot[4].enable();
+		m_slot[4].setNo(5);
+		m_slot[4].setName("Slot 5");
+		m_slot[5].setPosition(m_nID);
+		m_slot[5].enable();
+		m_slot[5].setNo(6);
+		m_slot[5].setName("Slot 6");
 	}
 
 	void CLoadPort::initSteps()
@@ -88,7 +116,7 @@
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
 				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 					if (code == ROK && pszData != nullptr && size > 0) {
-						m_nType = (unsigned int)CToolUnits::toInt16(pszData);
+						m_portType = (PortType)CToolUnits::toInt16(pszData);
 					}
 					return 0;
 				});
@@ -109,7 +137,7 @@
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
 				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 					if (code == ROK && pszData != nullptr && size > 0) {
-						m_nMode = (unsigned int)CToolUnits::toInt16(pszData);
+						m_portMode = (PortMode)CToolUnits::toInt16(pszData);
 					}
 					return 0;
 				});
@@ -130,7 +158,7 @@
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
 				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 					if (code == ROK && pszData != nullptr && size > 0) {
-						m_nCassetteType = (unsigned int)CToolUnits::toInt16(pszData);
+						m_cassetteType = (CassetteType)CToolUnits::toInt16(pszData);
 					}
 					return 0;
 				});
@@ -151,7 +179,7 @@
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
 				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 					if (code == ROK && pszData != nullptr && size > 0) {
-						m_nTransferMode = (unsigned int)CToolUnits::toInt16(pszData);
+						m_transferMode = (TransferMode)CToolUnits::toInt16(pszData);
 					}
 					return 0;
 				});
@@ -347,6 +375,28 @@
 	void CLoadPort::serialize(CArchive& ar)
 	{
 		CEquipment::serialize(ar);
+
+		if (ar.IsStoring()) {
+			ar << m_nIndex;
+			ar << (int)m_portType;
+			ar << (int)m_portMode;
+			ar << (int)m_cassetteType;
+			ar << (int)m_transferMode;
+			ar << m_bEnable;
+			ar << m_bAutoChangeEnable;
+			m_portStatusReport.serialize(ar);
+		}
+		else {
+			int temp;
+			ar >> m_nIndex;
+			ar >> temp; m_portType = (PortType)temp;
+			ar >> temp; m_portMode = (PortMode)temp;
+			ar >> temp; m_cassetteType = (CassetteType)temp;
+			ar >> temp; m_transferMode = (TransferMode)temp;
+			ar >> m_bEnable;
+			ar >> m_bAutoChangeEnable;
+			m_portStatusReport.serialize(ar);
+		}
 	}
 
 	void CLoadPort::getAttributeVector(CAttributeVector& attrubutes)
@@ -358,13 +408,13 @@
 		attrubutes.addAttribute(new CAttribute("Index",
 			std::to_string(m_nIndex).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Type",
-			getPortTypeDescription(m_nType, strTemp).c_str(), "", weight++));
+			getPortTypeDescription(m_portType, strTemp).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Mode",
-			getPortModeDescription(m_nMode, strTemp).c_str(), "", weight++));
+			getPortModeDescription(m_portMode, strTemp).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("CassetteType",
-			getPortCassetteTypeDescription(m_nCassetteType, strTemp).c_str(), "", weight++));
+			getPortCassetteTypeDescription(m_cassetteType, strTemp).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("TransferMode",
-			getPortTransferModeDescription(m_nTransferMode, strTemp).c_str(), "", weight++));
+			getPortTransferModeDescription(m_transferMode, strTemp).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Enable",
 			m_bEnable ? "Eanble" : "Disable", "", weight++));
 		attrubutes.addAttribute(new CAttribute("Auto Change",
@@ -374,21 +424,6 @@
 	int CLoadPort::recvIntent(CPin* pPin, CIntent* pIntent)
 	{
 		return __super::recvIntent(pPin, pIntent);
-	}
-
-	int CLoadPort::outputGlass(int port)
-	{
-		return __super::outputGlass(port);
-	}
-
-	BOOL CLoadPort::glassWillArrive(CGlass* pGlass)
-	{
-		BOOL bRet = __super::glassWillArrive(pGlass);
-		if (!bRet) {
-			return FALSE;
-		}
-
-		return (m_glassList.size() < 8);
 	}
 
 	int CLoadPort::sendCassetteCtrlCmd(short cmd,
@@ -441,29 +476,64 @@
 		return m_bEnable;
 	}
 
-	int CLoadPort::getPortType()
+	PortType CLoadPort::getPortType()
 	{
-		return m_nType;
+		return m_portType;
 	}
 
-	int CLoadPort::getPortMode()
+	PortMode CLoadPort::getPortMode()
 	{
-		return m_nMode;
+		return m_portMode;
 	}
 
-	int CLoadPort::getCessetteType()
+	CassetteType CLoadPort::getCessetteType()
 	{
-		return m_nCassetteType;
+		return m_cassetteType;
 	}
 
-	int CLoadPort::getTransferMode()
+	TransferMode CLoadPort::getTransferMode()
 	{
-		return m_nTransferMode;
+		return m_transferMode;
 	}
 
 	BOOL CLoadPort::isAutoChange()
 	{
 		return m_bAutoChangeEnable;
+	}
+
+	int CLoadPort::getPortStatus()
+	{
+		return m_portStatusReport.getPortStatus();
+	}
+
+	int CLoadPort::getCassetteSequenceNo()
+	{
+		return m_portStatusReport.getCassetteSequenceNo();
+	}
+
+	std::string& CLoadPort::getCassetteId()
+	{
+		return m_portStatusReport.getCassetteId();
+	}
+
+	int CLoadPort::getLoadingCassetteType()
+	{
+		return m_portStatusReport.getLoadingCassetteType();
+	}
+
+	int CLoadPort::getQTimeFlag()
+	{
+		return m_portStatusReport.getQTimeFlag();
+	}
+
+	int CLoadPort::getCassetteMappingState()
+	{
+		return m_portStatusReport.getCassetteMappingState();
+	}
+
+	int CLoadPort::getCassetteStatus()
+	{
+		return m_portStatusReport.getCassetteStatus();
 	}
 
 	/*
@@ -475,9 +545,9 @@
 	 6: Buffer Port-Un-loader in Buffer Type
 	 7: Unloading Partial Port
 	 */
-	std::string& CLoadPort::getPortTypeDescription(int portType, std::string& strDescription)
+	std::string& CLoadPort::getPortTypeDescription(PortType portType, std::string& strDescription)
 	{
-		switch (portType) {
+		switch ((int)portType) {
 		case 1:
 			strDescription = _T("Loading Port");
 			break;
@@ -515,9 +585,9 @@
 	 4: InService
 	 5: TransferReady
 	 */
-	std::string& CLoadPort::getPortModeDescription(int portMode, std::string& strDescription)
+	std::string& CLoadPort::getPortModeDescription(PortMode portMode, std::string& strDescription)
 	{
-		switch (portMode) {
+		switch ((int)portMode) {
 		case 0:
 			strDescription = _T("OutOfService");
 			break;
@@ -549,9 +619,9 @@
 	 2: G2
 	 3: G1&G2
 	 */
-	std::string& CLoadPort::getPortCassetteTypeDescription(int casseteType, std::string& strDescription)
+	std::string& CLoadPort::getPortCassetteTypeDescription(CassetteType casseteType, std::string& strDescription)
 	{
-		switch (casseteType) {
+		switch ((int)casseteType) {
 		case 1:
 			strDescription = _T("G1");
 			break;
@@ -574,9 +644,9 @@
 	 2: AGV Mode
 	 3: Stocker Inline Mode
 	 */
-	std::string& CLoadPort::getPortTransferModeDescription(int mode, std::string& strDescription)
+	std::string& CLoadPort::getPortTransferModeDescription(TransferMode mode, std::string& strDescription)
 	{
-		switch (mode) {
+		switch ((int)mode) {
 		case 1:
 			strDescription = _T("MGV Mode");
 			break;
@@ -607,6 +677,156 @@
 			break;
 		case 2:
 			strDescription = _T("Disable");
+			break;
+		default:
+			strDescription = _T("");
+			break;
+		}
+
+		return strDescription;
+	}
+
+	/*
+	 1: Load Ready(Load Request)
+	 2: Loaded
+	 3: In Use (Load Complete)
+	 4: Unload Ready (Unload Request)
+	 5: Empty (Unload Complete)
+	 6: Blocked
+ */
+	std::string& CLoadPort::getPortStatusDescription(int portStatus, std::string& strDescription)
+	{
+		switch (portStatus) {
+		case 1:
+			strDescription = _T("Load Ready(Load Request)");
+			break;
+		case 2:
+			strDescription = _T("Loaded");
+			break;
+		case 3:
+			strDescription = _T("In Use(Load Complete)");
+			break;
+		case 4:
+			strDescription = _T("Unload Ready(Unload Request)");
+			break;
+		case 5:
+			strDescription = _T("Empty(Unload Complete)");
+			break;
+		case 6:
+			strDescription = _T("Blocked");
+			break;
+		default:
+			strDescription = _T("");
+			break;
+		}
+
+		return strDescription;
+	}
+
+	/*
+	 1: G1 Cassette
+	 2: G2 Cassette
+	 3: G1 + G2 Cassette
+	 4: Empty Cassette
+	 *  Include this item only when cassette exists"
+	*/
+	std::string& CLoadPort::getLoadingCassetteTypeDescription(int type, std::string& strDescription)
+	{
+		switch (type) {
+		case 1:
+			strDescription = _T("G1 Cassette)");
+			break;
+		case 2:
+			strDescription = _T("G2 Cassette");
+			break;
+		case 3:
+			strDescription = _T("G1+G2 Cassette)");
+			break;
+		case 4:
+			strDescription = _T("Empty Cassette)");
+			break;
+		default:
+			strDescription = _T("");
+			break;
+		}
+
+		return strDescription;
+	}
+
+	/*
+	 1: Normal Un-loading
+	 2: Q-Time Over & Un-loading
+	*/
+	std::string& CLoadPort::getQTimeFlagDescription(int flag, std::string& strDescription)
+	{
+		switch (flag) {
+		case 1:
+			strDescription = _T("Normal Un-loading");
+			break;
+		case 2:
+			strDescription = _T("Q-Time Over & Un-loading");
+			break;
+		default:
+			strDescription = _T("");
+			break;
+		}
+
+		return strDescription;
+	}
+
+	/*
+	 1: mapping use
+	 2: mapping not use
+	*/
+	std::string& CLoadPort::getCassetteMappingStateDescription(int state, std::string& strDescription)
+	{
+		switch (state) {
+		case 1:
+			strDescription = _T("Mapping use");
+			break;
+		case 2:
+			strDescription = _T("Mapping not use");
+			break;
+		default:
+			strDescription = _T("");
+			break;
+		}
+
+		return strDescription;
+	}
+
+	/*
+	 1: No Cassette Exist
+	 2: Waiting for Cassette Data
+	 3: Waiting for Start Command
+	 4: Waiting for Processing
+	 5: In Processing
+	 6: Process Paused
+	 7: Process Completed
+	*/
+	std::string& CLoadPort::getCassetteStatusDescription(int state, std::string& strDescription)
+	{
+		switch (state) {
+		case 1:
+			strDescription = _T("No Cassette Exist");
+			break;
+		case 2:
+			strDescription = _T("Waiting for Cassette Data");
+			break;
+		case 3:
+			strDescription = _T("Waiting for Start Command");
+			break;
+		case 4:
+			strDescription = _T("Waiting for Processing");
+			break;
+		case 5:
+			strDescription = _T("In Processing");
+			break;
+		case 6:
+			strDescription = _T("Process Paused");
+			break;
+		case 7:
+			strDescription = _T("Process Completed");
 			break;
 		default:
 			strDescription = _T("");
@@ -682,14 +902,194 @@
 		return nRet;
 	}
 
+	int CLoadPort::setPortType(PortType type, ONWRITED onWritedBlock/* = nullptr*/)
+	{
+		static char* pszName[] = { STEP_PORT1_TYPE_CHANGE, STEP_PORT2_TYPE_CHANGE, STEP_PORT3_TYPE_CHANGE, STEP_PORT4_TYPE_CHANGE };
+		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(pszName[m_nIndex]);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		LOGI("<CLoadPort-%d>准备设置Port type<%d>", m_nIndex, (int)type);
+		short value = (short)type;
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_portType = type;
+				LOGI("<CLoadPort-%d>设置Port type成功.", m_nIndex);
+			}
+			else {
+				LOGI("<CLoadPort-%d>设置Port type失败,code:%d", m_nIndex, code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+
+			return 0;
+			});
+
+		return 0;
+	}
+
+	int CLoadPort::eablePort(BOOL bEnable, ONWRITED onWritedBlock/* = nullptr*/)
+	{
+		static char* pszName[] = { STEP_PORT1_ENABLE_MODE_CHANGE, STEP_PORT2_ENABLE_MODE_CHANGE, STEP_PORT3_ENABLE_MODE_CHANGE, STEP_PORT4_ENABLE_MODE_CHANGE };
+		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(pszName[m_nIndex]);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		LOGI("<CLoadPort-%d>准备%s Port", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+		short value = bEnable ? 1 : 2;
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_bEnable = bEnable;
+				LOGI("<CLoadPort-%d>%s Port成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+			}
+			else {
+				LOGI("<CLoadPort-%d>%s  Port失败,code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
+
+		return 0;
+	}
+
+	int CLoadPort::setPortMode(PortMode mode, ONWRITED onWritedBlock/* = nullptr*/)
+	{
+		static char* pszName[] = { STEP_PORT1_MODE_CHANGE, STEP_PORT2_MODE_CHANGE, STEP_PORT3_MODE_CHANGE, STEP_PORT4_MODE_CHANGE };
+		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(pszName[m_nIndex]);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		LOGI("<CLoadPort-%d>准备设置Port mode<%d>", m_nIndex, (int)mode);
+		short value = (short)mode;
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_portMode = mode;
+				LOGI("<CLoadPort-%d>设置Port mode成功.", m_nIndex);
+			}
+			else {
+				LOGI("<CLoadPort-%d>设置Port mode失败,code:%d", m_nIndex, code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
+
+		return 0;
+	}
+
+	int CLoadPort::setCassetteType(CassetteType type, ONWRITED onWritedBlock/* = nullptr*/)
+	{
+		static char* pszName[] = { STEP_PORT1_CASSETTE_TYPE_CHANGE, STEP_PORT2_CASSETTE_TYPE_CHANGE, STEP_PORT3_CASSETTE_TYPE_CHANGE, STEP_PORT4_CASSETTE_TYPE_CHANGE };
+		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(pszName[m_nIndex]);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		LOGI("<CLoadPort-%d>准备设置Cassette Type<%d>", m_nIndex, (int)type);
+		short value = (short)type;
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_cassetteType = type;
+				LOGI("<CLoadPort-%d>设置Cassette Type成功.", m_nIndex);
+			}
+			else {
+				LOGI("<CLoadPort-%d>设置Cassette Type失败,code:%d", m_nIndex, code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
+
+		return 0;
+	}
+
+	int CLoadPort::setTransferMode(TransferMode mode, ONWRITED onWritedBlock/* = nullptr*/)
+	{
+		static char* pszName[] = { STEP_PORT1_TRANSFER_MODE_CHANGE, STEP_PORT2_TRANSFER_MODE_CHANGE, STEP_PORT3_TRANSFER_MODE_CHANGE, STEP_PORT4_TRANSFER_MODE_CHANGE };
+		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(pszName[m_nIndex]);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		LOGI("<CLoadPort-%d>准备设置Transfer mode<%d>", m_nIndex, (int)mode);
+		short value = (short)mode;
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_transferMode = mode;
+				LOGI("<CLoadPort-%d>设置Transfer mode成功.", m_nIndex + 1);
+			}
+			else {
+				LOGI("<CLoadPort-%d>设置Transfer mode失败,code:%d", m_nIndex + 1, code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
+
+		return 0;
+	}
+
+	int CLoadPort::eableAutoChange(BOOL bEnable, ONWRITED onWritedBlock/* = nullptr*/)
+	{
+		static char* pszName[] = { STEP_PORT1_TYPE_AUTO_CHANGE, STEP_PORT2_TYPE_AUTO_CHANGE, STEP_PORT3_TYPE_AUTO_CHANGE, STEP_PORT4_TYPE_AUTO_CHANGE };
+		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(pszName[m_nIndex]);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		LOGI("<CLoadPort-%d>准备%s Auto Change", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+		short value = bEnable ? 1 : 2;
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_bAutoChangeEnable = bEnable;
+				LOGI("<CLoadPort-%d>%s Auto Change成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+			}
+			else {
+				LOGI("<CLoadPort-%d>%s  Auto Change失败,code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
+
+		return 0;
+	}
+
 	/*
 	 * 生成测试用的玻璃列表
 	 */
-	int CLoadPort::testGenerateGlassList(MaterialsType type, int count, const char* pszPrefix, int startSuffix)
+	int CLoadPort::testGenerateGlassList(MaterialsType type, const char* pszPrefix, int startSuffix)
 	{
+		static unsigned short nJobSequenceNo = 0;
+		static unsigned short nCassetteSequenceNo = 0;
+		nCassetteSequenceNo++;
+
+
 		// 如果非空就不生成了
 		Lock();
-		if (!m_glassList.empty()) {
+		if (hasGlass()) {
 			Unlock();
 			return -1;
 		}
@@ -698,13 +1098,19 @@
 
 		char szBuffer[64];
 		int suffix = startSuffix;
-		for (int i = 0; i < count; i++) {
+		for (int i = 0; i < SLOT_MAX; i++) {
+			if (!m_slot[i].isEnable()) continue;
+
 			CJobDataB jb;
 			CJobDataS js;
 
 			sprintf_s(szBuffer, "%s%d", pszPrefix, suffix++);
 			jb.setGlassId(szBuffer);
+			jb.setCassetteSequenceNo(nCassetteSequenceNo);
+			jb.setJobSequenceNo(++nJobSequenceNo);
 			js.setMaterialsType((int)type);
+			js.setCassetteSequenceNo(nCassetteSequenceNo);
+			js.setJobSequenceNo(nJobSequenceNo);
 			if (type == MaterialsType::G1) {
 				js.setGlass1Id(szBuffer);
 			}
@@ -713,11 +1119,13 @@
 			}
 
 			CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+			pGlass->addPath(m_nID, 0);
+			pGlass->processEnd(m_nID, 0);
 			pGlass->setID(szBuffer);
 			pGlass->setJobDataB(&jb);
 			pGlass->setType(type);
 			pGlass->setJobDataS(&js);
-			addGlassToList(pGlass);
+			m_slot[i].setContext(pGlass);
 		}
 
 		return 0;

--
Gitblit v1.9.3