~chenluhua/Bond2.git

			@@ -15,6 +15,7 @@
			#include "CRobotTask.h"
			#include "ProcessJob.h"
			#include "CControlJob.h"
			#include "../DAQBridge/core/Collector.h"


			#define CTStep_Unknow 0
			@@ -107,8 +108,9 @@
			int abortCurrentTask();
			int restoreCurrentTask();
			int resendCurrentTask();
			void setPortType(unsigned int index, BOOL enable, int type, int mode,
			void setPortTypeEx(unsigned int index, BOOL enable, int type, int mode,
			int cassetteType, int transferMode, BOOL autoChangeEnable);
			void setPortType(unsigned int index, int type);
			void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
			void setPortEnable(unsigned int index, BOOL bEnable);
			void setCompareMapsBeforeProceeding(BOOL bCompare);
			@@ -128,13 +130,15 @@
			CControlJob* getControlJob();
			CLoadPort* getPortWithCarrierId(const std::string& carrierId) const;
			bool saveState() const;
			bool loadState(const std::string& path);
			bool loadState();
			void setStateFile(const std::string& path);
			int getWipGlasses(std::vector<CGlass*>& glasses);
			void test();
			bool moveGlassToBuf(int eqid, int slotNo);
			bool moveGlassToSlot(int eqid, int slotNo);
			int getPortCassetteSnSeed(int port);
			void setPortCassetteSnSeed(int port, int seed);
			CGlass* getGlass(int scrPort, int scrSlot);

			private:
			inline void lock() { EnterCriticalSection(&m_criticalSection); }
			@@ -190,7 +194,11 @@
			bool checkAndUpdatePjComplete(CProcessJob* pJob);
			bool checkAndUpdateCjComplete(CControlJob* pJob);
			CProcessJob* getGlassProcessJob(CGlass* pGlass);

			bool completeControlJob();
			bool forceCompleteControlJob(std::string description);
			bool canCreateControlJob();
			bool canCompleteControlJob();
			bool canDeleteControlJob();

			private:
			CRITICAL_SECTION m_criticalSection;
			@@ -235,6 +243,8 @@
			// 千传圈数计数
			int m_nContinuousTransferCount;
			int m_nContinuousTransferStep;
			int m_nContinuousWorkingPort;
			int m_nContinuousWorkingSlot;

			// 新增已经开始处理的ProcessJob列表
			std::vector<CProcessJob*> m_inProcesJobs;
			@@ -252,6 +262,10 @@

			int m_nTestFlag;
			std::list<CGlass*> m_bufGlass;

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