From bea6407b376a4e426f0b120bae569fba6ab867db Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 08 十一月 2025 17:55:47 +0800
Subject: [PATCH] 1.CMaster.cpp 第 1644/1667/1691 行在记录 SV 曲线时通过 getGlassFromSlot(0) 取玻璃，而各设备的 initSlots() 都是从 1 开始编号（例如 CBonder.cpp (line 408)、CVacuumBake.cpp (line 415) 等）。槽位 0 永远不存在，所以 pGlass 始终是 nullptr，pGlass->addSVData(...) 的分支从未执行。结果 SERVO::CGlass::m_svDatas 里没有任何曲线数据，GlassJson::ToPrettyString 生成的 pretty 字符串也就没有 sv_datas，导出 CSV 时自然读不到曲线。 同一段代码还有一个潜在 Bug：虽然判断了 channel - 1 < bonderTypes.size()，但真正索引却用的是 bonderTypes[channel]。索引偏移会导致数据类型错位，最后一个通道甚至可能越界。即使修正了槽位，这里也需要同步改成 bonderTypes[channel - 1]（另外两处 vacuumbakeTypes、coolingTypes 也一样）。
---
SourceCode/Bond/Servo/CEquipment.h | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index ffb7ea9..36a05c9 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -55,7 +55,7 @@
typedef std::function<void(void* pEiuipment, void* pReport)> ONVCREVENTREPORT;
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, int nSlotNo, 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;
@@ -72,6 +72,7 @@
ONMAPMISMATCH onMapMismatch;
ONPORTSTATUSCHANGED onPortStatusChanged;
ONVCREVENTREPORT onSVDataReport;
+ ONVCREVENTREPORT onPanelDataReport;
} EquipmentListener;
@@ -139,7 +140,7 @@
virtual int onProcessData(CProcessData* pProcessData);
virtual int onSendAble(int port);
virtual int onReceiveAble(int port);
- virtual int onProcessStateChanged(PROCESS_STATE state);
+ virtual int onProcessStateChanged(int nSlotNo, PROCESS_STATE state);
virtual int getIndexerOperationModeBaseValue();
virtual bool isSlotProcessed(int slot) { return true; };
bool isAlarmStep(SERVO::CStep* pStep);
@@ -180,6 +181,7 @@
// 获取指定的Slot
CSlot* getSlot(int index);
+ CSlot* getSlotWithNo(int slotNo);
// 获取一个可用的槽位
CSlot* getAvailableSlot();
@@ -206,6 +208,7 @@
CGlass* getGlassWithCassette(int cassetteSequenceNo, int jobSequenceNo);
CGlass* getAnyGlass();
CGlass* getGlass(const char* pszGlassId);
+ int getAllGlass(std::vector<CGlass*>& glasses);
CJobDataS* getJobDataSWithCassette(int cassetteSequenceNo, int jobSequenceNo);
// 验证玻璃和槽是否匹配
@@ -264,7 +267,7 @@
int decodeJobProcessStartReport(CStep* pStep, const char* pszData, size_t size);
int decodeJobProcessEndReport(CStep* pStep, const char* pszData, size_t size);
BOOL compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS);
- void setProcessState(PROCESS_STATE state);
+ void setProcessState(int nSlotNo, PROCESS_STATE state);
float toFloat(const char* pszAddr);
protected:
@@ -304,7 +307,7 @@
int m_nBaseAlarmId;
CRecipesManager m_recipesManager;
CSlot m_slot[SLOT_MAX];
- PROCESS_STATE m_processState;
+ PROCESS_STATE m_processState[SLOT_MAX] = { PROCESS_STATE::Ready };
std::vector<SERVO::CSVData> m_svDatas;
private:
--
Gitblit v1.9.3