From c1c4d51585fd2bf07ecde55224ef241f5b553cfa Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期二, 10 六月 2025 08:42:11 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/CPortStatusReport.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CPortStatusReport.h b/SourceCode/Bond/Servo/CPortStatusReport.h index 21d5048..526c94a 100644 --- a/SourceCode/Bond/Servo/CPortStatusReport.h +++ b/SourceCode/Bond/Servo/CPortStatusReport.h @@ -23,12 +23,17 @@ int serialize(char* pszBuffer, int nBufferSize); int unserialize(const char* pszBuffer, int nBufferSize); void getAttributeVector(CAttributeVector& attrubutes, int beginWeight); - + virtual void serialize(CArchive& ar); + public: bool canPickFromPort(); bool isJobExistenceSlot(); private: + void WriteString(CArchive& ar, std::string& string); + void ReadString(CArchive& ar, std::string& string); + + private: short m_nPortStatus; short m_nCassetteSequenceNo; std::string m_strCassetteID; -- Gitblit v1.9.3