~chenluhua/Bond2.git

			@@ -38,7 +38,12 @@


			namespace SERVO {
			#define SLOT_MAX 12
			#define SLOT_MAX PATH_MAX
			#define SIGNAL_UPSTREAM_INLINE 0
			#define SIGNAL_UPSTREAM_TROUBLE 1
			#define SIGNAL_INTERLOCK 2
			#define SIGNAL_SEND_ABLE 3
			typedef std::function<void(int writeCode, int retCode)> ONWRITEDRET;

			typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
			typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
			@@ -46,6 +51,7 @@
			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<void(void* pEiuipment, PROCESS_STATE state)> ONPROCESSSTATE;
			typedef struct _EquipmentListener
			{
			ONALIVE onAlive;
			@@ -55,6 +61,7 @@
			ONVCREVENTREPORT onVcrEventReport;
			ONPREFETCHEDOUTJOB onPreFethedOutJob;
			ONPRESTOREDJOB onPreStoredJob;
			ONPROCESSSTATE onProcessStateChanged;
			} EquipmentListener;


			@@ -101,12 +108,13 @@
			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; };
			CPin* getPin(char* pszName);
			std::vector<CPin*>& CEquipment::getInputPins();
			std::vector<CPin*>& CEquipment::getOutputPins();
			virtual int recvIntent(CPin* pPin, CIntent* pIntent);
			virtual int fetchedOutJob(CJobDataB* pJobDataB);
			virtual int storedJob(CJobDataB* pJobDataB, short& putSlot);
			virtual int storedJob(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);
			@@ -114,6 +122,8 @@
			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 onProcessStateChanged(PROCESS_STATE state);
			virtual int getIndexerOperationModeBaseValue();
			bool isAlarmStep(SERVO::CStep* pStep);
			bool isVcrEventStep(SERVO::CStep* pStep);
			@@ -131,7 +141,7 @@
			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);
			int indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITED onWritedBlock = nullptr);
			int indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITEDRET onWritedRetBlock);



			@@ -145,14 +155,24 @@
			// unitNo: 0:local; Others:unit No
			int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);

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

			// 获取一个可用的槽位
			CSlot* getAvailableSlot();

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

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

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

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

			// 获取玻璃物料
			CGlass* getGlassFromSlot(int slotNo);
			@@ -164,9 +184,14 @@
			// 是否有玻璃
			BOOL hasGlass();

			// 获取指定ID的glass
			CGlass * getGlass(const char* pszGlassId);

			// 指定槽位是否可以放置玻璃
			BOOL canPlaceGlassInSlot(const short slotIndex);

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

			// 以下为从CC-Link读取到的Bit标志位检测函数
			public:
			@@ -177,6 +202,11 @@
			BOOL isLocalAlarm();
			BOOL isAutoRecipeChange();
			BOOL isVCREnable(unsigned int index);
			BOOL isLinkSignalOn(unsigned int path, unsigned int signal);

			// 只在模拟测试时使用的函数，用于模拟信号
			void setLinkSignal(unsigned int path, unsigned int signal, BOOL bOn);
			void setLinkSignalBlock(unsigned int path, BOOL* pSignal);

			protected:
			inline void Lock() { EnterCriticalSection(&m_criticalSection); }
			@@ -191,13 +221,17 @@
			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 decodeVCREventReport(CStep* pStep, const char* pszData, size_t size);
			int decodePanelDataReport(CStep* pStep, const char* pszData, size_t size);
			int decodeFacDataReport(CStep* pStep, const char* pszData, size_t size);
			int decodePanelDataRequest(CStep* pStep, 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);
			BOOL compareJobDataB(CJobDataB* pJobDataB1, CJobDataB* pJobDataB2);
			BOOL compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS);
			void setProcessState(PROCESS_STATE state);

			protected:
			EquipmentListener m_listener;
			@@ -221,6 +255,7 @@
			BOOL m_bLocalAlarm;
			BOOL m_bAutoRecipeChange;
			BOOL m_bVCREnable[VCR_MAX];
			BOOL m_bLinkSignal[PATH_MAX][SIGNAL_MAX];

			protected:
			CCCLinkIEControl* m_pCclink;
			@@ -228,6 +263,7 @@
			int m_nBaseAlarmId;
			CRecipesManager m_recipesManager;
			CSlot m_slot[SLOT_MAX];
			PROCESS_STATE m_processState;

			private:
			CEquipment* m_pArm;