~chenluhua/Bond2.git

			@@ -31,6 +31,7 @@
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, CVcrEventReport* pReport)> ONEQVCREVENTREPORT;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, int code)> ONEQDATACHANGED;
			typedef std::function<void(void* pMaster, CRobotTask* pTask, int code)> ONROBOTTASKEVENT;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, short status, __int64 data)> ONLOADPORTSTATUSCHANGED;
			typedef struct _MasterListener
			{
			ONMASTERSTATECHANGED onMasterStateChanged;
			@@ -40,6 +41,7 @@
			ONEQVCREVENTREPORT onEqVcrEventReport;
			ONEQDATACHANGED onEqDataChanged;
			ONROBOTTASKEVENT onRobotTaskEvent;
			ONLOADPORTSTATUSCHANGED onLoadPortStatusChanged;
			} MasterListener;

			class CMaster
			@@ -70,6 +72,13 @@
			int resendCurrentTask();
			void setPortType(unsigned int index, BOOL enable, int type, int mode,
			int cassetteType, int transferMode, BOOL autoChangeEnable);
			void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
			void setPortEnable(unsigned int index, BOOL bEnable);
			void setCompareMapsBeforeProceeding(BOOL bCompare);
			void datetimeSync(SYSTEMTIME& time);
			void enableEventReport(bool bEnable);
			void enableAlarmReport(bool bEnable);
			bool isAlarmReportEnable();

			private:
			inline void lock() { EnterCriticalSection(&m_criticalSection); }
			@@ -98,7 +107,7 @@
			CRobotTask* createTransferTask_bake_to_cooling(CEquipment* pSrcEq);
			CRobotTask* createTransferTask_bakecooling_to_measurement(CEquipment* pSrcEq, CEquipment* pTarEq);
			CRobotTask* createTransferTask_restore(CEquipment* pEqSrc, CLoadPort** pPorts);


			private:
			CRITICAL_SECTION m_criticalSection;
			MasterListener m_listener;
			@@ -131,6 +140,12 @@
			// 错误代码
			int m_nLastError;
			std::string m_strLastError;

			// 在开始工艺前是否先需要先比较map
			BOOL m_isCompareMapsBeforeProceeding;
			private:
			bool m_bEnableEventReport;
			bool m_bEnableAlarmReport;
			};
			}