~chenluhua/Bond2.git

			@@ -39,6 +39,7 @@
			STARTING,
			RUNNING,
			RUNNING_CONTINUOUS_TRANSFER,
			RUNNING_BATCH,
			STOPPING,
			MSERROR
			};
			@@ -79,6 +80,7 @@
			int term();
			int start();
			int startContinuousTransfer();
			int startBatch();
			int stop();
			void clearError();
			ULONGLONG getRunTime();
			@@ -154,6 +156,15 @@
			bool slotUsable(const std::string& carrierId, uint16_t slot) const override;
			bool ceidDefined(uint32_t ceid) const override;

			public:
			// 新增函数
			CProcessJob* acquireNextProcessJob();
			CGlass* acquireNextGlass();
			int acquireGlassToQueue();
			bool addGlassToQueue(CGlass* pGlass);
			bool glassFromQueueToInPorcess(CGlass* pGlass);
			bool glassFromInPorcessToComplete(CGlass* pGlass);

			private:
			CRITICAL_SECTION m_criticalSection;
			MasterListener m_listener;
			@@ -162,6 +173,7 @@
			std::string m_strFilepath;
			BOOL m_bDataModify;
			bool m_bContinuousTransfer;
			bool m_bBatch;

			private:
			/* 监控比特位的线程*/
			@@ -197,6 +209,12 @@
			int m_nContinuousTransferCount;
			int m_nContinuousTransferStep;

			// 新增已经开始处理的ProcessJob列表
			std::vector<CProcessJob*> m_inProcesJobs;
			std::vector<CGlass*> m_queueGlasses;
			std::vector<CGlass*> m_inProcesGlasses;
			std::vector<CGlass*> m_completeGlasses;

			private:
			bool m_bEnableEventReport;
			bool m_bEnableAlarmReport;