From aabaff9cdcf9bb279b762891aedda5a03571fbb5 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 01 七月 2025 08:55:07 +0800
Subject: [PATCH] 1.修改Glass的JobDataS的更新逻辑，在收到OnReceiveJob时，机器内未保存和管理Glass, 此时Glass在Arm上，应通过Arm来更新JobDataS；
---
SourceCode/Bond/Servo/CPortStatusReport.h | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPortStatusReport.h b/SourceCode/Bond/Servo/CPortStatusReport.h
index 4aede52..4c6fa4b 100644
--- a/SourceCode/Bond/Servo/CPortStatusReport.h
+++ b/SourceCode/Bond/Servo/CPortStatusReport.h
@@ -9,7 +9,7 @@
{
public:
CPortStatusReport();
- ~CPortStatusReport();
+ virtual ~CPortStatusReport();
public:
void copyEx(CPortStatusReport& other);
@@ -23,10 +23,15 @@
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;
@@ -35,7 +40,7 @@
short m_nJobExistenceSlot[12]; // 12 * 16 = 192 个slot是否存在glass
short m_nLoadingCassetteType; // 1: Actual Cassette 2 : Empty Cassette
short m_nQTimeFlag;
- short m_nCassetteMappingState; // 1: mapping use 2: mapping not use
+ short m_nCassetteMappingState; // 1: mapping use, 2: mapping not use
short m_nCassetteStatus;
};
}
--
Gitblit v1.9.3