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/BoounionPLC/PLC.h | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/PLC.h b/SourceCode/Bond/BoounionPLC/PLC.h
index 2bfc39e..e69e54c 100644
--- a/SourceCode/Bond/BoounionPLC/PLC.h
+++ b/SourceCode/Bond/BoounionPLC/PLC.h
@@ -5,6 +5,8 @@
#pragma comment(lib,"winmm")
+#define ALARM_MONITOR _T("警告信息")
+
typedef std::function<void(void* pFrom, int)> ONPLCSTATECHANGED;
typedef std::function<void(void* pFrom, int)> ONPLCMONITORDATA;
typedef std::function<void(void* pFrom, CAlarm*, int)> ONALARM;
@@ -42,6 +44,7 @@
~CPLC();
public:
+ void setListener(PLCListener& listener);
void setWorkDir(const char* pszDir);
void init();
void term();
@@ -66,15 +69,24 @@
int writeDWord(MC::SOFT_COMPONENT softComponent, unsigned int addr, int value, ONWRITE funOnWrite);
int writeBit(MC::SOFT_COMPONENT softComponent, unsigned int addr, BOOL bValue, ONWRITE funOnWrite);
int writeData(MC::SOFT_COMPONENT softComponent, unsigned int addr, const char* pszData, unsigned int length, ONWRITE funOnWrite);
+ void readPLCDataRegularly();
+public:
+ int getVelocityRatio();
+ double getTackTime();
+ int getDayShiftCapacity();
+ int getNightShiftCapacity();
public:
HANDLE m_hTimeEvent;
private:
+ inline void Lock() { EnterCriticalSection(&m_criticalSection); }
+ inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
void setState(PLCSTATE state);
void monitorReadData(MONITOR& monitor);
CString& dataToHexString(const char* pData, const int size, CString& strOut);
+ int onMonitorData(MONITOR& monitor);
private:
std::string m_strWorkDir;
@@ -87,13 +99,22 @@
unsigned int m_nActionInterval;
unsigned int m_nUnHeartBeat;
std::vector<CComponent*> m_components;
+ char* m_pPlcData;
private:
+ CRITICAL_SECTION m_criticalSection;
std::vector<MONITOR> m_monitors;
HANDLE m_hMcMonitorStop;
HANDLE m_hMcMonitorThreadHandle;
unsigned m_mcMonitorThrdaddr;
MMRESULT m_nTimerId;
bool m_bMute;
+
+private:
+ int m_nVelocityRatio; // 速度比
+ double m_dTactTime; // 周期时间
+ int m_nDayShiftCapacity; // 白班产能
+ int m_nNightShiftCapacity; // 夜班产能
+ bool m_bBlBtnsStates[7]; // PLC View按钮状态
};
--
Gitblit v1.9.3