~chenluhua/Bond2.git

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


			namespace SERVO {
			@@ -53,9 +55,10 @@
			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;

			typedef struct _EquipmentListener
			{
			ONALIVE onAlive;
			@@ -68,7 +71,8 @@
			ONPROCESSSTATE onProcessStateChanged;
			ONMAPMISMATCH onMapMismatch;
			ONPORTSTATUSCHANGED onPortStatusChanged;

			ONVCREVENTREPORT onSVDataReport;
			ONVCREVENTREPORT onPanelDataReport;
			} EquipmentListener;


			@@ -122,6 +126,8 @@
			std::vector<CPin*>& CEquipment::getInputPins();
			std::vector<CPin*>& CEquipment::getOutputPins();
			CRecipeList* getRecipeList(int unitNo);
			bool saveRecipeList(int unitNo, std::string& strFilepath);
			bool readRecipeList(int unitNo, std::string& strFilepath);
			virtual int recvIntent(CPin* pPin, CIntent* pIntent);
			virtual int fetchedOutJob(int port, CJobDataB* pJobDataB);
			virtual int storedJob(int port, CJobDataB* pJobDataB, short putSlot);
			@@ -134,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);
			@@ -155,7 +161,7 @@
			int setDispatchingMode(DISPATCHING_MODE mode, ONWRITED onWritedBlock = nullptr);
			int indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITEDRET onWritedRetBlock);
			void printDebugString001();

			std::vector<SERVO::CSVData>& getSVDatas();

			// 请求主配方列表
			// unitNo: 0:local; Others:unit No
			@@ -165,10 +171,17 @@
			// 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>& params) { return 0; };
			virtual int parsingParams(const char* pszData, size_t size, std::string& strOut);
			virtual int parsingProcessData(const char* pszData, size_t size, std::vector<CParam>& params) { return 0; };
			virtual int parsingSVData(const char* pszData, size_t size, std::vector<CParam>& params) { return 0; };

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

			// 获取一个可用的槽位
			CSlot* getAvailableSlot();
			@@ -185,7 +198,7 @@
			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);
			@@ -195,6 +208,7 @@
			CGlass* getGlassWithCassette(int cassetteSequenceNo, int jobSequenceNo);
			CGlass* getAnyGlass();
			CGlass* getGlass(const char* pszGlassId);
			int getAllGlass(std::vector<CGlass*>& glasses);
			CJobDataS* getJobDataSWithCassette(int cassetteSequenceNo, int jobSequenceNo);

			// 验证玻璃和槽是否匹配
			@@ -202,6 +216,7 @@

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

			// 指定槽位是否可以放置玻璃
			BOOL canPlaceGlassInSlot(const short slotIndex);
			@@ -252,7 +267,13 @@
			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:
			// 部分优化/简化代码、暂实现部分，到时平铺开
			void addFacDataReportStep(int dataDev, int writeSignalDev, int port);


			protected:
			BOOL m_bEnable;
			@@ -286,10 +307,14 @@
			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:
			CEquipment* m_pArm;

			public:
			int m_nTestFlag;
			};
			}