~chenluhua/Bond2.git

			@@ -43,7 +43,7 @@
			#define SIGNAL_UPSTREAM_TROUBLE 1
			#define SIGNAL_INTERLOCK 2
			#define SIGNAL_SEND_ABLE 3
			#define SIGNAL_RECEIVE_ABLE 4
			#define SIGNAL_RECEIVE_ABLE 3

			typedef std::function<void(int writeCode, int retCode)> ONWRITEDRET;

			@@ -51,9 +51,10 @@
			typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
			typedef std::function<void(void* pEiuipment, int state, int alarmId, int unitId, int level)> ONALARM;
			typedef std::function<void(void* pEiuipment, void* pReport)> ONVCREVENTREPORT;
			typedef std::function<BOOL(void* pEiuipment, CJobDataB* pJobDataB)> ONPREFETCHEDOUTJOB;
			typedef std::function<BOOL(void* pEiuipment, CJobDataB* pJobDataB, short& putSlot)> ONPRESTOREDJOB;
			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, short scanMap, short downMap)> ONMAPMISMATCH;
			typedef struct _EquipmentListener
			{
			ONALIVE onAlive;
			@@ -64,6 +65,7 @@
			ONPREFETCHEDOUTJOB onPreFethedOutJob;
			ONPRESTOREDJOB onPreStoredJob;
			ONPROCESSSTATE onProcessStateChanged;
			ONMAPMISMATCH onMapMismatch;
			} EquipmentListener;


			@@ -110,14 +112,14 @@
			virtual void onReceiveLBData(const char* pszData, size_t size);
			virtual int onStepEvent(CStep* pStep, int code);
			virtual CPin* addPin(PinType type, char* pszName);
			virtual short getSlotUnit(short slot) { return 0; };
			virtual short getSlotUnit(short slotNo) { return 0; };
			CPin* getPin(char* pszName);
			std::vector<CPin*>& CEquipment::getInputPins();
			std::vector<CPin*>& CEquipment::getOutputPins();
			CRecipeList* getRecipeList(int unitNo);
			virtual int recvIntent(CPin* pPin, CIntent* pIntent);
			virtual int fetchedOutJob(CJobDataB* pJobDataB);
			virtual int storedJob(CJobDataB* pJobDataB, short putSlot);
			virtual int fetchedOutJob(int port, CJobDataB* pJobDataB);
			virtual int storedJob(int port, CJobDataB* pJobDataB, short putSlot);
			virtual int onReceivedJob(int port, CJobDataS* pJobDataS);
			virtual int onSentOutJob(int port, CJobDataS* pJobDataS);
			virtual BOOL onPreFetchedOutJob(int port, CJobDataB* pJobDataB);
			@@ -125,10 +127,11 @@
			virtual BOOL onPreStoredJob(int port, CJobDataB* pJobDataB, short& putSlot);
			virtual int onStoredJob(int port, CJobDataB* pJobDataB);
			virtual int onProcessData(CProcessData* pProcessData);
			virtual int onSendAble();
			virtual int onRecieveAble();
			virtual int onSendAble(int port);
			virtual int onReceiveAble(int port);
			virtual int onProcessStateChanged(PROCESS_STATE state);
			virtual int getIndexerOperationModeBaseValue();
			virtual bool isSlotProcessed(int slot) { return true; };
			bool isAlarmStep(SERVO::CStep* pStep);
			bool isVcrEventStep(SERVO::CStep* pStep);
			bool isCassetteTransferStateStep(SERVO::CStep* pStep);
			@@ -167,6 +170,7 @@

			// 获取一个指定物料类型(G1,G2,G1&G2)的空槽位
			CSlot* getAvailableSlotForGlass(MaterialsType type);
			CSlot* getAvailableSlotForGlassExcludeSignal(MaterialsType type);

			// 在指定的槽列表中，获取一个指定物料类型(G1,G2,G1&G2)的空槽位
			CSlot* getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates);
			@@ -177,6 +181,7 @@
			// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
			CSlot* getProcessedSlot(MaterialsType putSlotType);
			CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
			CSlot* getInspFailSlot();

			// 获取玻璃物料
			CGlass* getGlassFromSlot(int slotNo);
			@@ -196,6 +201,12 @@

			// 手动移除物料
			int removeGlass(int slotNo);

			// 字符串检测结果转换
			InspResult judgeStringToInspResult(std::string& strJudge);




			// 以下为从CC-Link读取到的Bit标志位检测函数
			public:
			@@ -231,6 +242,8 @@
			int decodePanelDataReport(CStep* pStep, const char* pszData, size_t size);
			int decodeFacDataReport(CStep* pStep, const char* pszData, size_t size);
			int decodeJobDataRequest(CStep* pStep, const char* pszData, size_t size);
			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);