~chenluhua/Bond2.git

			@@ -26,6 +26,12 @@
			#include <map>
			#include <list>
			#include "CGlass.h"
			#include "CRecipesManager.h"
			#include "CJobDataA.h"
			#include "CJobDataB.h"
			#include "CJobDataC.h"
			#include "CJobDataS.h"
			#include "CProcessData.h"


			namespace SERVO {
			@@ -62,6 +68,11 @@
			BOOL alive;
			} ALIVE;

			enum DISPATCHING_MODE {
			EAS = 1,
			Local = 2
			};

			class CEquipment
			{
			public:
			@@ -73,6 +84,9 @@
			virtual const char* getClassName() = 0;
			virtual void setListener(EquipmentListener listener);
			void setCcLink(CCCLinkIEControl* pCcLink);
			virtual BOOL isArm() { return FALSE; };
			void setArm(CEquipment* pEquipment);
			CEquipment* getArm();
			void setBaseAlarmId(int nBaseId);
			int getBaseAlarmId();
			void setID(int nID);
			@@ -109,7 +123,17 @@
			virtual BOOL glassWillArrive(CGlass* pGlass);
			virtual int outputGlass(int port);
			virtual int glassArrived(CGlass* pGlass);
			virtual int fetchedOutJob(CJobDataB* pJobDataB);
			virtual int storedJob(CJobDataB* pJobDataB);
			virtual int onReceivedJob(int port, CJobDataS* pJobDataS);
			virtual int onSentOutJob(int port, CJobDataS* pJobDataS);
			virtual BOOL onPreFetchedOutJob(int port, CJobDataB* pJobDataB);
			virtual int onFetchedOutJob(int port, CJobDataB* pJobDataB);
			virtual BOOL onPreStoredJob(int port, CJobDataB* pJobDataB);
			virtual int onStoredJob(int port, CJobDataB* pJobDataB);
			virtual int onProcessData(CProcessData* pProcessData);
			void getGlassList(std::list<CGlass*>& list);
			CGlass* getGlassFromList(const char* pszId);
			CGlass* getFrontGlass();
			BOOL removeClass(CGlass* pGlass);
			bool isAlarmStep(SERVO::CStep* pStep);
			@@ -127,10 +151,20 @@
			int setCimMessage(const char* pszMessage, short id, short nTouchPanelNo);
			int clearCimMessage(short id, short nTouchPanelNo);
			int setDateTime(short year, short month, short day, short hour, short minute, short second);

			int setDispatchingMode(DISPATCHING_MODE mode, ONWRITED onWritedBlock = nullptr);

			// 请求主配方列表
			// unitNo: 0:local; Others:unit No
			int masterRecipeListRequest(short unitNo);

			// 请求配方参数
			// masterRecipeId: 主配方id
			// localRecipeId: 本地配方id
			// unitNo: 0:local; Others:unit No
			int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);

			public:
			BOOL isGlassListEmpty();


			// 以下为从CC-Link读取到的Bit标志位检测函数
			@@ -149,6 +183,19 @@
			BOOL isBitOn(const char* pszData, size_t size, int index);
			inline BOOL equalBool(BOOL b1, BOOL b2);
			void addGlassToList(CGlass* pGlass);
			short decodeRecipeListReport(const char* pszData, size_t size);
			short decodeRecipeParameterReport(const char* pszData, size_t size);
			int decodeProcessDataReport(CStep* pStep, const char* pszData, size_t size);
			int decodeReceivedJobReport(CStep* pStep, int port, const char* pszData, size_t size);
			int decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size);
			int decodeFetchedOutJobReport(CStep* pStep, int port, const char* pszData, size_t size);
			int decodeStoredJobReport(CStep* pStep, int port, const char* pszData, size_t size);
			int addJobDataB(CJobDataB* pJobDataB);
			int removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
			CJobDataB* getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
			int addJobDataS(CJobDataS* pJobDataS);
			int removeJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);
			CJobDataS* getJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);

			protected:
			EquipmentListener m_listener;
			@@ -178,6 +225,12 @@
			CCCLinkIEControl* m_pCclink;
			std::map<unsigned int, CStep*> m_mapStep;
			int m_nBaseAlarmId;
			CRecipesManager m_recipesManager;

			private:
			CEquipment* m_pArm;
			std::list<CJobDataS> m_listJobDataS;
			std::list<CJobDataB> m_listJobDataB;
			};
			}