~chenluhua/Bond2.git

			@@ -1,5 +1,6 @@
			#pragma once
			#include <list>
			#include <unordered_set>
			#include "CEquipment.h"
			#include "CEFEM.h"
			#include "CBonder.h"
			@@ -16,6 +17,7 @@
			#include "ProcessJob.h"
			#include "CControlJob.h"
			#include "../DAQBridge/core/Collector.h"
			#include "CJobDataS.h"


			#define CTStep_Unknow 0
			@@ -58,8 +60,13 @@
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, int code)> ONEQDATACHANGED;
			typedef std::function<void(void* pMaster, CRobotTask* pTask, int code)> ONROBOTTASKEVENT;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, short status, __int64 data)> ONLOADPORTSTATUSCHANGED;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, int slotNo, PROCESS_STATE prevState, PROCESS_STATE state)> ONPROCESSSTATECHANGED;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONPROCESSDATAREPORTEX;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONSVDATAREPORT;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, int port, CJobDataS* pJobDataS)> ONJOBRECEIVED;
			typedef std::function<void(void* pMaster, int round)> ONCTROUNDEND;
			typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
			typedef std::function<void(void* pMaster)> ONCONTROLJOBCHANGED;
			typedef struct _MasterListener
			{
			ONMASTERSTATECHANGED onMasterStateChanged;
			@@ -70,6 +77,10 @@
			ONEQDATACHANGED onEqDataChanged;
			ONROBOTTASKEVENT onRobotTaskEvent;
			ONLOADPORTSTATUSCHANGED onLoadPortStatusChanged;
			ONPROCESSSTATECHANGED onProcessStateChanged;
			ONSVDATAREPORT onSVDataReport;
			ONPROCESSDATAREPORTEX onProcessDataReport;
			ONJOBRECEIVED onJobReceived;
			ONCTROUNDEND onCTRoundEnd;
			ONPJSTART onCjStart;
			ONPJSTART onCjEnd;
			@@ -77,6 +88,7 @@
			ONPJSTART onPjEnd;
			ONPJSTART onPanelStart;
			ONPJSTART onPanelEnd;
			ONCONTROLJOBCHANGED onControlJobChanged;
			} MasterListener;

			class CMaster : public IResourceView
			@@ -139,6 +151,7 @@
			int getPortCassetteSnSeed(int port);
			void setPortCassetteSnSeed(int port, int seed);
			CGlass* getGlass(int scrPort, int scrSlot);
			uint32_t SlotToMid(int eqid, int slot);

			private:
			inline void lock() { EnterCriticalSection(&m_criticalSection); }
			@@ -177,6 +190,8 @@
			bool carrierPresent(const std::string& carrierId) const override;
			bool slotUsable(const std::string& carrierId, uint16_t slot) const override;
			bool ceidDefined(uint32_t ceid) const override;
			void setAllowedCeids(const std::vector<unsigned int>& ceids);
			void handleCollectionEvent(uint32_t ceid);

			public:
			int getLastError();
			@@ -200,7 +215,7 @@
			bool canCompleteControlJob();
			bool canDeleteControlJob();

			// DAQ Bridge鐩稿叧
			// DAQ Bridge 相关
			Collector* getCollector() const { return m_pCollector; }

			private:
			@@ -238,10 +253,9 @@
			int m_nLastError;
			std::string m_strLastError;

			// 在开始工艺前是否先需要先比较map
			// 在开始工艺前是否需要先比较 map
			BOOL m_isCompareMapsBeforeProceeding;
			BOOL m_bJobMode;


			// 千传圈数计数
			int m_nContinuousTransferCount;
			@@ -249,7 +263,7 @@
			int m_nContinuousWorkingPort;
			int m_nContinuousWorkingSlot;

			// 新增已经开始处理的ProcessJob列表
			// 已经开始处理的 ProcessJob 列表
			std::vector<CProcessJob*> m_inProcesJobs;
			std::vector<CProcessJob*> m_completeProcessJobs;
			std::vector<CGlass*> m_queueGlasses;
			@@ -265,10 +279,10 @@

			int m_nTestFlag;
			std::list<CGlass*> m_bufGlass;
			std::unordered_set<uint32_t> m_allowedCeids;

			private:
			Collector* m_pCollector = nullptr;
			void CreateDAQBridgeServer();
			};
			}