~chenluhua/Bond2.git

			@@ -756,7 +756,7 @@
			return 0;
			}

			int CEquipment::storedJob(CJobDataB* pJobDataB, short& putSlot)
			int CEquipment::storedJob(CJobDataB* pJobDataB, short putSlot)
			{
			if (m_pArm == nullptr) {
			return -1;
			@@ -770,7 +770,7 @@

			ASSERT(pGlass);
			Lock();
			pGlass->addPath(m_nID);
			pGlass->addPath(m_nID, getSlotUnit(putSlot));
			m_slot[putSlot - 1].setContext(pGlass);
			pGlass->release(); // tempFetchOut需要调用一次release
			Unlock();
			@@ -780,7 +780,7 @@
			CGlass* pBuddy = pGlass->getBuddy();
			if (pBuddy != nullptr) {
			Lock();
			pBuddy->addPath(m_nID);
			pBuddy->addPath(m_nID, 0);
			if (putSlot % 2 == 0) {
			m_slot[putSlot - 2].setContext(pBuddy);
			}
			@@ -1118,7 +1118,7 @@
			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)) continue;
			if (!pGlass->isProcessed(m_nID, 0)) continue;

			return &m_slot[i];
			}
			@@ -1441,10 +1441,6 @@
			int CEquipment::onProcessData(CProcessData* pProcessData)
			{
			LOGI("<CEquipment-%s>onProcessData.", m_strName.c_str());
			CGlass* pGlass = getGlass(pProcessData->getGlassId().c_str());
			if (pGlass != nullptr) {
			pGlass->processEnd(m_nID);
			}

			return 0;
			}