~chenluhua/Bond2.git

			@@ -272,6 +272,9 @@
			int seed = m_configuration.getPortCassetteSnSeed(i + 1);
			m_master.setPortCassetteSnSeed(i + 1, seed);
			}

			// 按调度模式覆写生产端口配置
			m_master.applySchedulingModePortMapping();
			}

			void CModel::setPortType(unsigned int index, SERVO::PortType type)
			@@ -302,7 +305,7 @@
			m_configuration.getUnitId(strUnitId);

			// 机器型号和软件版本号应从配置中读取，当前先固定值
			CString strModeType = _T("Master");
			CString strModeType = _T("Panel Bonder");
			CString strSoftRev = _T("1.0.2");


			@@ -534,7 +537,7 @@
			m_hsmsPassive.loadEquipmentConstants((LPTSTR)(LPCTSTR)strVarialbleFile);
			setControlState(m_currentControlState);
			refreshDerivedSVs();
			m_hsmsPassive.init(this, "APP", 7000);
			m_hsmsPassive.init(this, "APP", 5000);
			strVarialbleFile.Format(_T("%s\\ReportList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
			m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
			strVarialbleFile.Format(_T("%s\\CollectionEventList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
			@@ -982,6 +985,8 @@
			};
			masterListener.onSVDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
			(void)pMaster;
			// 客户要求暂时关掉SV上报，将来换另一种方式
			/*
			const int eqId = pEquipment ? pEquipment->getID() : 0;

			auto sendSv = [&](const auto& vidMap, const char* evName) {
			@@ -1025,6 +1030,7 @@
			static constexpr std::array<int, 2> vids = { 6600, 6601 };
			sendSv(vids, "MeasurementSVData");
			}
			*/
			};
			masterListener.onProcessDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
			(void)pMaster;
			@@ -1129,6 +1135,7 @@
			m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
			m_master.setCompareMapsBeforeProceeding(m_configuration.isCompareMapsBeforeProceeding());
			m_master.setJobMode(m_configuration.isJobMode());
			m_master.setSchedulingMode((SERVO::SchedulingMode)m_configuration.getSchedulingMode());

			// 加截Job
			strMasterDataFile.Format(_T("%s\\MasterState.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);