~chenluhua/Bond2.git

			@@ -35,6 +35,7 @@
			#include "CProcessData.h"
			#include "CPortStatusReport.h"
			#include "CSlot.h"
			#include "CParam.h"


			namespace SERVO {
			@@ -55,7 +56,7 @@
			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 std::function<void(void* pEiuipment, short scanMap)> ONPORTINUSE;
			typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
			typedef struct _EquipmentListener
			{
			ONALIVE onAlive;
			@@ -67,7 +68,7 @@
			ONPRESTOREDJOB onPreStoredJob;
			ONPROCESSSTATE onProcessStateChanged;
			ONMAPMISMATCH onMapMismatch;
			ONPORTINUSE onPortInUse;
			ONPORTSTATUSCHANGED onPortStatusChanged;

			} EquipmentListener;

			@@ -165,7 +166,10 @@
			// masterRecipeId: 主配方id
			// localRecipeId: 本地配方id
			// unitNo: 0:local; Others:unit No
			int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);
			int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo, ONSYNCINGSTATECHANGED block);

			// 解析配方参数列表
			virtual int parsingParams(const char* pszData, size_t size, std::vector<CParam>& parsms) { return 0; };

			// 获取指定的Slot
			CSlot* getSlot(int index);
			@@ -176,6 +180,7 @@
			// 获取一个指定物料类型(G1,G2,G1&G2)的空槽位
			CSlot* getAvailableSlotForGlass(MaterialsType type);
			CSlot* getAvailableSlotForGlassExcludeSignal(MaterialsType type);
			CSlot* isSlotAvailable(unsigned int slot);

			// 在指定的槽列表中，获取一个指定物料类型(G1,G2,G1&G2)的空槽位
			CSlot* getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates);
			@@ -184,9 +189,10 @@
			CSlot* getNonEmptySlot(MaterialsType type);

			// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
			CSlot* getProcessedSlot(MaterialsType putSlotType);
			CSlot* getProcessedSlot(MaterialsType putSlotType, BOOL bJobMode = FALSE);
			CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
			CSlot* getInspFailSlot();
			CSlot* getProcessedSlotCt(unsigned int slot);

			// 获取玻璃物料
			CGlass* getGlassFromSlot(int slotNo);
			@@ -200,6 +206,7 @@

			// 是否有玻璃
			BOOL hasGlass();
			BOOL slotHasGlass(int slotIndex = 0);

			// 指定槽位是否可以放置玻璃
			BOOL canPlaceGlassInSlot(const short slotIndex);
			@@ -251,6 +258,7 @@
			int decodeJobProcessEndReport(CStep* pStep, const char* pszData, size_t size);
			BOOL compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS);
			void setProcessState(PROCESS_STATE state);
			float toFloat(const char* pszAddr);

			protected:
			BOOL m_bEnable;
			@@ -288,6 +296,9 @@

			private:
			CEquipment* m_pArm;

			public:
			int m_nTestFlag;
			};
			}