From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CPath.h | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPath.h b/SourceCode/Bond/Servo/CPath.h
index 577d07a..61f8955 100644
--- a/SourceCode/Bond/Servo/CPath.h
+++ b/SourceCode/Bond/Servo/CPath.h
@@ -1,4 +1,5 @@
#pragma once
+#include "ServoCommo.h"
namespace SERVO {
@@ -6,11 +7,12 @@
{
public:
CPath();
- CPath(unsigned int nEqId, unsigned int nUnit);
+ CPath(unsigned int nEqId, unsigned int nUnit, unsigned int nSlot);
virtual ~CPath();
public:
void getDescription(std::string& strOut);
+ void getSimpleDescription(std::string& strOut);
void serialize(CArchive& ar);
CPath* getPrev();
CPath* getNext();
@@ -19,18 +21,24 @@
CPath* getHeadPath();
unsigned int getEqID();
unsigned int getUnit();
+ unsigned int getSlot();
+ void setInTime(ULONGLONG time);
ULONGLONG getInTime();
void setOutTime(ULONGLONG time);
ULONGLONG getOutTime();
void processEnd();
BOOL isProcessEnd();
+ void setInspResult(InspResult result);
+ InspResult getInspResult();
private:
unsigned int m_nEqID;
unsigned int m_nUnit;
+ unsigned int m_nSlot;
ULONGLONG m_timeIn;
ULONGLONG m_timeOut;
BOOL m_bProcessed;
+ InspResult m_inspResult;
CPath* m_pPrev;
CPath* m_pNext;
};
--
Gitblit v1.9.3