~chenluhua/Bond2.git

			@@ -1,5 +1,6 @@
			#pragma once
			#include <list>
			#include <unordered_set>
			#include "CEquipment.h"
			#include "CEFEM.h"
			#include "CBonder.h"
			@@ -16,6 +17,7 @@
			#include "ProcessJob.h"
			#include "CControlJob.h"
			#include "../DAQBridge/core/Collector.h"
			#include "CJobDataS.h"


			#define CTStep_Unknow 0
			@@ -61,6 +63,7 @@
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, int slotNo, PROCESS_STATE prevState, PROCESS_STATE state)> ONPROCESSSTATECHANGED;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONPROCESSDATAREPORTEX;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONSVDATAREPORT;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, int port, CJobDataS* pJobDataS)> ONJOBRECEIVED;
			typedef std::function<void(void* pMaster, int round)> ONCTROUNDEND;
			typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
			typedef std::function<void(void* pMaster)> ONCONTROLJOBCHANGED;
			@@ -77,6 +80,7 @@
			ONPROCESSSTATECHANGED onProcessStateChanged;
			ONSVDATAREPORT onSVDataReport;
			ONPROCESSDATAREPORTEX onProcessDataReport;
			ONJOBRECEIVED onJobReceived;
			ONCTROUNDEND onCTRoundEnd;
			ONPJSTART onCjStart;
			ONPJSTART onCjEnd;
			@@ -186,6 +190,8 @@
			bool carrierPresent(const std::string& carrierId) const override;
			bool slotUsable(const std::string& carrierId, uint16_t slot) const override;
			bool ceidDefined(uint32_t ceid) const override;
			void setAllowedCeids(const std::vector<unsigned int>& ceids);
			void handleCollectionEvent(uint32_t ceid);

			public:
			int getLastError();
			@@ -273,6 +279,7 @@

			int m_nTestFlag;
			std::list<CGlass*> m_bufGlass;
			std::unordered_set<uint32_t> m_allowedCeids;

			private:
			Collector* m_pCollector = nullptr;