~chenluhua/Bond2.git

			@@ -185,7 +185,7 @@
			CSlot* getNonEmptySlot(MaterialsType type);

			// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
			CSlot* getProcessedSlot(MaterialsType putSlotType);
			CSlot* getProcessedSlot(MaterialsType putSlotType, BOOL bJobMode = FALSE);
			CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
			CSlot* getInspFailSlot();
			CSlot* getProcessedSlotCt(unsigned int slot);
			@@ -290,6 +290,9 @@

			private:
			CEquipment* m_pArm;

			public:
			int m_nTestFlag;
			};
			}