~chenluhua/Bond2.git

			@@ -8,6 +8,7 @@
			#include "CGlassPool.h"
			#include "TransferManager.h"
			#include "RecipeManager.h"
			#include "GlassLogDb.h"


			CModel::CModel()
			@@ -48,9 +49,18 @@
			for (int i = 0; i < 4; i++) {
			m_configuration.getPortParms(i, portEnable, portType, portMode,
			cassetteType, transferMode, autoChangeEnable);
			m_master.setPortType(i, portEnable, portType, portMode, cassetteType,
			m_master.setPortTypeEx(i, portEnable, portType, portMode, cassetteType,
			transferMode, autoChangeEnable);

			int seed = m_configuration.getPortCassetteSnSeed(i + 1);
			m_master.setPortCassetteSnSeed(i + 1, seed);
			}
			}

			void CModel::setPortType(unsigned int index, SERVO::PortType type)
			{
			m_master.setPortType(index, (int)type);
			m_configuration.setPortType(index, (int)type);
			}

			void CModel::setPortCassetteType(unsigned int index, SERVO::CassetteType type)
			@@ -246,9 +256,18 @@
			alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
			alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
			alarmData.strEndTime = "";

			alarmData.strDescription = "";

			const AlarmInfo* alarmInfo = alarmManager.getAlarmInfoByID(alarmData.nId);
			alarmData.strDescription = alarmInfo != nullptr ? alarmInfo->strAlarmText : "";
			if (alarmInfo != nullptr) {
			if (alarmInfo->strDescription.empty()) {
			alarmData.strDescription = alarmInfo->strAlarmText;
			}
			else {
			alarmData.strDescription = alarmInfo->strAlarmText + "," + alarmInfo->strDescription + ".";
			}
			}


			int nAlarmEventId = 0;
			bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
			@@ -427,13 +446,19 @@
			m_hsmsPassive.setVariableValue("PJEndID", ((SERVO::CProcessJob*)pj)->id().c_str());
			m_hsmsPassive.requestEventReportSend_PJ_End();
			};
			masterListener.onPanelStart = [&](void* pMaster, void* pj) {
			m_hsmsPassive.setVariableValue("PanelStartID", ((SERVO::CGlass*)pj)->getID().c_str());
			masterListener.onPanelStart = [&](void* pMaster, void* pPanel) {
			m_hsmsPassive.setVariableValue("PanelStartID", ((SERVO::CGlass*)pPanel)->getID().c_str());
			m_hsmsPassive.requestEventReportSend_Panel_Start();
			};
			masterListener.onPanelEnd = [&](void* pMaster, void* pj) {
			m_hsmsPassive.setVariableValue("PanelEndID", ((SERVO::CGlass*)pj)->getID().c_str());
			masterListener.onPanelEnd = [&](void* pMaster, void* pPanel) {
			m_hsmsPassive.setVariableValue("PanelEndID", ((SERVO::CGlass*)pPanel)->getID().c_str());
			m_hsmsPassive.requestEventReportSend_Panel_End();
			auto& db = GlassLogDb::Instance();
			db.insertFromCGlass(((SERVO::CGlass)pPanel));
			SERVO::CGlass* pBuddy = ((SERVO::CGlass*)pPanel)->getBuddy();
			if (pBuddy != nullptr) {
			db.insertFromCGlass(*pBuddy);
			}
			};
			m_master.setListener(masterListener);
			m_master.setContinuousTransferCount(m_configuration.getContinuousTransferCount());
			@@ -449,9 +474,8 @@
			// 加截Job
			strMasterDataFile.Format(_T("%s\\MasterState.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
			std::string strPath = std::string((LPTSTR)(LPCTSTR)strMasterDataFile);
			if (!m_master.loadState(strPath)) {
			LOGE("<Master>加载MasterState.dat文件失败.");
			}
			m_master.setStateFile(strPath);



			// 加载警告信息
			@@ -461,12 +485,21 @@
			alarmManager.readAlarmFile(szBuffer);


			// Glass数据库
			strLogDir.Format(_T("%s\\db\\process.db"), (LPTSTR)(LPCTSTR)m_strWorkDir);
			std::string path((LPTSTR)(LPCTSTR)strLogDir);
			GlassLogDb::Init(path);


			return 0;
			}

			int CModel::term()
			{
			m_configuration.setPortCassetteSnSeed(1, m_master.getPortCassetteSnSeed(1));
			m_configuration.setPortCassetteSnSeed(2, m_master.getPortCassetteSnSeed(2));
			m_configuration.setPortCassetteSnSeed(3, m_master.getPortCassetteSnSeed(3));
			m_configuration.setPortCassetteSnSeed(4, m_master.getPortCassetteSnSeed(4));
			m_hsmsPassive.saveCache();
			m_hsmsPassive.term();
			CLog::GetLog()->SetOnLogCallback(nullptr);