~chenluhua/Bond2.git

			@@ -1148,15 +1148,14 @@
			if (m_slot[i].isLock()) continue;
			CGlass* pGlass = (CGlass*)m_slot[i].getContext();
			if (pGlass == nullptr) continue;
			if(!m_bLinkSignal[i][SIGNAL_UPSTREAM_INLINE]
			\|\| m_bLinkSignal[i][SIGNAL_UPSTREAM_TROUBLE]
			\|\| !m_bLinkSignal[i][SIGNAL_INTERLOCK]
			\|\| !m_bLinkSignal[i][SIGNAL_SEND_ABLE] ) continue;
			if(!m_bLinkSignal[0][SIGNAL_UPSTREAM_INLINE]
			\|\| m_bLinkSignal[0][SIGNAL_UPSTREAM_TROUBLE]
			\|\| !m_bLinkSignal[0][SIGNAL_INTERLOCK]
			\|\| !m_bLinkSignal[0][SIGNAL_SEND_ABLE] ) continue;

			MaterialsType glassType = pGlass->getType();
			if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
			if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
			if (!pGlass->isProcessed(m_nID, 0)) continue;

			return &m_slot[i];
			}

			@@ -264,6 +264,24 @@
			}
			else if (nCmd == ID_EQSGRAPHITEM_TEST4) {
			SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
			if (pEquipment != nullptr) {
			pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
			pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, FALSE);
			pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
			pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, TRUE);
			}
			}
			else if (nCmd == ID_EQSGRAPHITEM_TEST5) {
			SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
			if (pEquipment != nullptr) {
			pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
			pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, TRUE);
			pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
			pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, FALSE);
			}
			}
			else if (nCmd == ID_EQSGRAPHITEM_TEST6) {
			SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;


			// 测试下发Cim Message

	SourceCode/Bond/Servo/CEquipment.cpp	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/CPageGraph2.cpp	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/Servo.rc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/resource.h	补丁 \| 查看 \| 原始文档 \| blame \| 历史