~chenluhua/Bond2.git

			@@ -244,7 +244,7 @@
			{
			// Received Job Report Upstream #1~9
			char szBuffer[256];
			for (int i = 0; i < 1; i++) {
			for (int i = 0; i < 2; i++) {
			CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x8c90 : 0xcc90) + 320 * i, 320 * 2,
			[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
			if (code == ROK && pszData != nullptr && size > 0) {
			@@ -267,13 +267,13 @@
			{
			// Sent Out Job Report Downstream #1~9
			char szBuffer[256];
			for (int i = 0; i < 1; i++) {
			for (int i = 0; i < 2; i++) {
			CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x8000 : 0xc000) + 320 * i, 320 * 2,
			[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
			if (code == ROK && pszData != nullptr && size > 0) {
			int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
			if (port > 0) {
			decodeReceivedJobReport((CStep*)pFrom, port, pszData, size);
			decodeSentOutJobReport((CStep*)pFrom, port, pszData, size);
			}
			}
			return -1;
			@@ -291,7 +291,7 @@
			{
			// Fetched Out Job Report #1~15
			char szBuffer[256];
			for (int i = 0; i < 1; i++) {
			for (int i = 0; i < 2; i++) {
			CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x9c31 : 0xdc31) + 18 * i, 18 * 2,
			[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
			if (code == ROK && pszData != nullptr && size > 0) {
			@@ -315,7 +315,7 @@
			{
			// Stored Job Report #1~15
			char szBuffer[256];
			for (int i = 0; i < 1; i++) {
			for (int i = 0; i < 2; i++) {
			CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x9b23 : 0xdb23) + 18 * i, 18 * 2,
			[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
			if (code == ROK && pszData != nullptr && size > 0) {
			@@ -422,11 +422,13 @@
			m_slot[0].setPosition(m_nID);
			m_slot[0].setNo(1);
			m_slot[0].setName("Slot 1(G2)");
			m_slot[0].setLinkSignalPath(0);
			m_slot[0].setType(MaterialsType::G2);
			m_slot[1].enable();
			m_slot[1].setPosition(m_nID);
			m_slot[1].setNo(2);
			m_slot[1].setName("Slot 2(G1)");
			m_slot[1].setLinkSignalPath(1);
			m_slot[1].setType(MaterialsType::G1);
			}