~chenluhua/Bond2.git

			@@ -7,9 +7,12 @@

			namespace SERVO {
			static inline std::string trimCopy(std::string s) {
			auto notspace = [](int ch) { return !std::isspace(ch); };
			s.erase(s.begin(), std::find_if(s.begin(), s.end(), notspace));
			s.erase(std::find_if(s.rbegin(), s.rend(), notspace).base(), s.end());
			s.erase(s.begin(),
			std::find_if(s.begin(), s.end(),
			[](char c) { return !std::isspace(static_cast<unsigned char>(c)); }));
			s.erase(std::find_if(s.rbegin(), s.rend(),
			[](char c) { return !std::isspace(static_cast<unsigned char>(c)); }).base(),
			s.end());
			return s;
			}

			@@ -61,7 +64,7 @@
			m_pauseEvents.erase(std::unique(m_pauseEvents.begin(), m_pauseEvents.end()), m_pauseEvents.end());
			}

			const std::vector<CProcessJob::ValidationIssue>& CProcessJob::issues()
			const std::vector<CProcessJob::ValidationIssue>& CProcessJob::issues() const
			{
			return m_issues;
			}
			@@ -278,7 +281,7 @@

			// 配方
			uint8_t recipeType = static_cast<uint8_t>(m_recipeMethod);
			write_pod(os, m_recipeMethod);
			write_pod(os, recipeType);
			write_string(os, m_recipeSpec);

			// 物料（多 Carrier & Slot）
			@@ -399,13 +402,13 @@
			return "InProcess";
			break;
			case SERVO::PJState::Paused:
			return "Queued";
			return "Paused";
			break;
			case SERVO::PJState::Aborting:
			return "Aborting";
			break;
			case SERVO::PJState::Completed:
			return "Queued";
			return "Completed";
			break;
			case SERVO::PJState::Aborted:
			return "Aborted";
			@@ -420,7 +423,7 @@
			return "";
			}

			CarrierSlotInfo* CProcessJob::getCarrier(std::string& strId)
			CarrierSlotInfo* CProcessJob::getCarrier(const std::string& strId)
			{
			for (auto& item : m_carriers) {
			if (item.carrierId.compare(strId) == 0) {