1.配方列表获取完善；

LAPTOP-SNT8I5JK\Boounion

2025-07-30 90ae1c3db92833354814484e65f8cd2eef1f5f3e

 SourceCode/Bond/Servo/CEquipment.h

@@ -54,6 +54,8 @@
   typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB)> ONPREFETCHEDOUTJOB;
   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 status, __int64 data)> ONPORTSTATUSCHANGED;
   typedef struct _EquipmentListener
   {
      ONALIVE            onAlive;
@@ -64,6 +66,9 @@
      ONPREFETCHEDOUTJOB   onPreFethedOutJob;
      ONPRESTOREDJOB      onPreStoredJob;
      ONPROCESSSTATE      onProcessStateChanged;
      ONMAPMISMATCH      onMapMismatch;
      ONPORTSTATUSCHANGED   onPortStatusChanged;

   } EquipmentListener;


@@ -74,6 +79,8 @@
      virtual ~CEquipment();

   public:
      void SetEnable(BOOL bEnable);
      BOOL IsEnabled() const;
      virtual const char* getClassName() = 0;
      virtual void setListener(EquipmentListener listener);
      void setCcLink(CCCLinkIEControl* pCcLink);
@@ -179,6 +186,7 @@
      // 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
      CSlot* getProcessedSlot(MaterialsType putSlotType);
      CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
      CSlot* getInspFailSlot();

      // 获取玻璃物料
      CGlass* getGlassFromSlot(int slotNo);
@@ -198,6 +206,12 @@

      // 手动移除物料
      int removeGlass(int slotNo);

      // 字符串检测结果转换
      InspResult judgeStringToInspResult(std::string& strJudge);




   // 以下为从CC-Link读取到的Bit标志位检测函数
   public:
@@ -239,6 +253,7 @@
      void setProcessState(PROCESS_STATE state);

   protected:
      BOOL m_bEnable;
      EquipmentListener m_listener;
      int m_nID;
      std::string m_strName;