1.工节数据上报。

chenluhua1980

2026-01-09 03dc81df7fe0ea0e754abcc5af3d329527428853

 SourceCode/Bond/Servo/CMaster.h

@@ -58,8 +58,11 @@
    typedef std::function<void(void* pMaster, CEquipment* pEquipment, int code)> ONEQDATACHANGED;
    typedef std::function<void(void* pMaster, CRobotTask* pTask, int code)> ONROBOTTASKEVENT;
    typedef std::function<void(void* pMaster, CEquipment* pEquipment, short status, __int64 data)> ONLOADPORTSTATUSCHANGED;
    typedef std::function<void(void* pMaster, CEquipment* pEquipment, int slotNo, PROCESS_STATE prevState, PROCESS_STATE state)> ONPROCESSSTATECHANGED;
    typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONPROCESSDATAREPORTEX;
    typedef std::function<void(void* pMaster, int round)> ONCTROUNDEND;
    typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
    typedef std::function<void(void* pMaster)> ONCONTROLJOBCHANGED;
    typedef struct _MasterListener
    {
        ONMASTERSTATECHANGED    onMasterStateChanged;
@@ -70,6 +73,8 @@
        ONEQDATACHANGED         onEqDataChanged;
        ONROBOTTASKEVENT        onRobotTaskEvent;
        ONLOADPORTSTATUSCHANGED   onLoadPortStatusChanged;
        ONPROCESSSTATECHANGED   onProcessStateChanged;
        ONPROCESSDATAREPORTEX   onProcessDataReport;
        ONCTROUNDEND            onCTRoundEnd;
        ONPJSTART               onCjStart;
        ONPJSTART               onCjEnd;
@@ -77,6 +82,7 @@
        ONPJSTART               onPjEnd;
        ONPJSTART               onPanelStart;
        ONPJSTART               onPanelEnd;
        ONCONTROLJOBCHANGED     onControlJobChanged;
    } MasterListener;

    class CMaster : public IResourceView
@@ -139,6 +145,7 @@
        int getPortCassetteSnSeed(int port);
        void setPortCassetteSnSeed(int port, int seed);
        CGlass* getGlass(int scrPort, int scrSlot);
        uint32_t SlotToMid(int eqid, int slot);

    private:
        inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -200,7 +207,7 @@
        bool canCompleteControlJob();
        bool canDeleteControlJob();
        
        // DAQ Bridge鐩稿叧
        // DAQ Bridge 相关
        Collector* getCollector() const { return m_pCollector; }

    private:
@@ -238,10 +245,9 @@
        int m_nLastError;
        std::string m_strLastError;

        // 在开始工艺前是否先需要先比较map
        // 在开始工艺前是否需要先比较 map
        BOOL m_isCompareMapsBeforeProceeding;
        BOOL m_bJobMode;


        // 千传圈数计数
        int m_nContinuousTransferCount;
@@ -249,7 +255,7 @@
        int m_nContinuousWorkingPort;
        int m_nContinuousWorkingSlot;

        // 新增已经开始处理的ProcessJob列表
        // 已经开始处理的 ProcessJob 列表
        std::vector<CProcessJob*> m_inProcesJobs;
        std::vector<CProcessJob*> m_completeProcessJobs;
        std::vector<CGlass*> m_queueGlasses;
@@ -271,4 +277,3 @@
        void CreateDAQBridgeServer();
    };
}