~chenluhua/Bond2.git

			@@ -55,7 +55,7 @@
			typedef std::function<void(void* pEiuipment, void* pReport)> ONVCREVENTREPORT;
			typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB)> ONPREFETCHEDOUTJOB;
			typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB, short& putSlot)> ONPRESTOREDJOB;
			typedef std::function<void(void* pEiuipment, PROCESS_STATE state)> ONPROCESSSTATE;
			typedef std::function<void(void* pEiuipment, int nSlotNo, PROCESS_STATE state)> ONPROCESSSTATE;
			typedef std::function<void(void* pEiuipment, short scanMap, short downMap)> ONMAPMISMATCH;
			typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;

			@@ -140,7 +140,7 @@
			virtual int onProcessData(CProcessData* pProcessData);
			virtual int onSendAble(int port);
			virtual int onReceiveAble(int port);
			virtual int onProcessStateChanged(PROCESS_STATE state);
			virtual int onProcessStateChanged(int nSlotNo, PROCESS_STATE state);
			virtual int getIndexerOperationModeBaseValue();
			virtual bool isSlotProcessed(int slot) { return true; };
			bool isAlarmStep(SERVO::CStep* pStep);
			@@ -181,6 +181,7 @@

			// 获取指定的Slot
			CSlot* getSlot(int index);
			CSlot* getSlotWithNo(int slotNo);

			// 获取一个可用的槽位
			CSlot* getAvailableSlot();
			@@ -266,7 +267,7 @@
			int decodeJobProcessStartReport(CStep* pStep, const char* pszData, size_t size);
			int decodeJobProcessEndReport(CStep* pStep, const char* pszData, size_t size);
			BOOL compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS);
			void setProcessState(PROCESS_STATE state);
			void setProcessState(int nSlotNo, PROCESS_STATE state);
			float toFloat(const char* pszAddr);

			protected:
			@@ -306,7 +307,7 @@
			int m_nBaseAlarmId;
			CRecipesManager m_recipesManager;
			CSlot m_slot[SLOT_MAX];
			PROCESS_STATE m_processState;
			PROCESS_STATE m_processState[SLOT_MAX] = { PROCESS_STATE::Ready };
			std::vector<SERVO::CSVData> m_svDatas;

			private: