SourceCode/Bond/Servo/CEquipment.h
@@ -55,7 +55,7 @@
   typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB, short& putSlot)> ONPRESTOREDJOB;
   typedef std::function<void(void* pEiuipment, PROCESS_STATE state)> ONPROCESSSTATE;
   typedef std::function<void(void* pEiuipment, short scanMap, short downMap)> ONMAPMISMATCH;
   typedef std::function<void(void* pEiuipment, short scanMap)> ONPORTINUSE;
   typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
   typedef struct _EquipmentListener
   {
      ONALIVE            onAlive;
@@ -67,7 +67,7 @@
      ONPRESTOREDJOB      onPreStoredJob;
      ONPROCESSSTATE      onProcessStateChanged;
      ONMAPMISMATCH      onMapMismatch;
      ONPORTINUSE         onPortInUse;
      ONPORTSTATUSCHANGED   onPortStatusChanged;
   } EquipmentListener;
@@ -176,6 +176,7 @@
      // 获取一个指定物料类型(G1,G2,G1&G2)的空槽位
      CSlot* getAvailableSlotForGlass(MaterialsType type);
      CSlot* getAvailableSlotForGlassExcludeSignal(MaterialsType type);
      CSlot* isSlotAvailable(unsigned int slot);
      // 在指定的槽列表中,获取一个指定物料类型(G1,G2,G1&G2)的空槽位
      CSlot* getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates);
@@ -187,6 +188,7 @@
      CSlot* getProcessedSlot(MaterialsType putSlotType);
      CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
      CSlot* getInspFailSlot();
      CSlot* getProcessedSlotCt(unsigned int slot);
      // 获取玻璃物料
      CGlass* getGlassFromSlot(int slotNo);