~chenluhua/Bond2.git

			@@ -208,6 +208,21 @@
			return m_strDescription;
			}

			void CEquipment::setCurrentRecipe(const std::string& recipe)
			{
			Lock();
			m_currentRecipe = recipe;
			Unlock();
			}

			std::string CEquipment::getCurrentRecipe()
			{
			Lock();
			std::string out = m_currentRecipe;
			Unlock();
			return out;
			}

			void CEquipment::setStation(int network, int station)
			{
			m_station.nNetNo = network;
			@@ -1608,8 +1623,11 @@
			std::vector<CParam> tempParams;
			this->parsingProcessData((const char*)rawData.data(), rawData.size(), tempParams);
			int n = processData.getTotalParameter();
			std::vector<CParam> params(tempParams.begin(), tempParams.begin() + min(n, (int)tempParams.size()));
			std::vector<CParam> params(tempParams.begin(), tempParams.begin() + (std::min)(n, (int)tempParams.size()));
			pGlass->addParams(params);
			if (m_listener.onProcessDataReport != nullptr) {
			m_listener.onProcessDataReport(this, params);
			}

			// 关联的Glass也要更新
			CGlass* pBuddy = pGlass->getBuddy();
			@@ -1617,6 +1635,9 @@
			if (pBuddy != nullptr) {
			LOGI("<Equipment-%s>decodeProcessDataReport addParams pBuddy=%x %s", getName().c_str(), pBuddy, pGlass->getID().c_str());
			pBuddy->addParams(params);
			if (m_listener.onProcessDataReport != nullptr) {
			m_listener.onProcessDataReport(this, params);
			}
			}

			return nRet;
			@@ -1647,6 +1668,10 @@
			if (nRet < 0) {
			LOGE("<CEquipment-%s>onReceivedJob,更新JobDataS失败，glassUpdateJobDataS返回%d",
			m_strName.c_str(), nRet);
			}

			if (m_listener.onReceivedJob != nullptr) {
			m_listener.onReceivedJob(this, port, pJobDataS);
			}

			return nRet;
			@@ -1864,7 +1889,9 @@
			CSVData svData;
			int nRet = svData.unserialize(&pszData[0], (int)size);
			if (nRet < 0) return nRet;
			Lock();
			m_svDatas.push_back(svData);
			Unlock();

			if (m_listener.onSVDataReport != nullptr) {
			m_listener.onSVDataReport(this, &svData);