From df4d0e875ccfe40add25100a75dedee54e566aaa Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 18 九月 2025 09:06:24 +0800
Subject: [PATCH] 1.CConrolJobManagerDlg临时数据存储。
---
SourceCode/Bond/Servo/CGlass.h | 80 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index 86115ef..72f304b 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -7,9 +7,22 @@
#include "CJobDataC.h"
#include "CJobDataS.h"
#include "ServoCommo.h"
+#include "ProcessJob.h"
+#include "CParam.h"
namespace SERVO {
+ /// PJ 生命周期（贴近 E40 常见状态）
+ enum class GlsState : uint8_t {
+ NoState = 0,
+ Queued,
+ InProcess,
+ Paused,
+ Completed,
+ Aborted,
+ Failed
+ };
+
class CGlass : public CContext
{
public:
@@ -20,22 +33,72 @@
public:
virtual std::string& getClassName();
virtual std::string toString();
- MaterialsType getType();
+ short getCassetteSequenceNo() const { return m_jobDataS.getCassetteSequenceNo(); }
+ short getJobSequenceNo() const { return m_jobDataS.getJobSequenceNo(); }
+ MaterialsType getType() const;
void setType(MaterialsType type);
void setID(const char* pszID);
- std::string& getID();
- CPath* getPathWithEq(unsigned int nEqId, unsigned int nUnit);
+ const std::string& getID() const;
+ void setOriginPort(int port, int slot);
+ void getOrginPort(int& port, int& slot);
+ BOOL isScheduledForProcessing();
+ void setScheduledForProcessing(BOOL bProcessing);
+ CProcessJob* getProcessJob();
+ void setProcessJob(CProcessJob* pProcessJob);
+ CPath* getPathWithEq(unsigned int nEqId, unsigned int nUnit) const;
CPath* getPath();
- void addPath(unsigned int nEqId, unsigned int nUnit);
+ void addPath(unsigned int nEqId, unsigned int nUnit, unsigned int slot);
+ std::string getPathDescription() const;
+ std::string getParamsDescription() const;
void serialize(CArchive& ar);
void setJobDataS(CJobDataS* pJobDataS);
+ void updateJobDataS(CJobDataS* pJobDataS);
CJobDataS* getJobDataS();
BOOL setBuddy(CGlass* pGlass);
BOOL forceSetBuddy(CGlass* pGlass);
CGlass* getBuddy();
- std::string& getBuddyId();
- void processEnd(unsigned int nEqId, unsigned int nUnit);
+ const std::string& getBuddyId() const;
+ void setBuddyId(std::string& strId);
+ int processEnd(unsigned int nEqId, unsigned int nUnit);
BOOL isProcessed(unsigned int nEqId, unsigned int nUnit);
+ int setInspResult(unsigned int nEqId, unsigned int nUnit, InspResult result);
+ InspResult getInspResult(unsigned int nEqId, unsigned int nUnit) const;
+ InspResult getAOIInspResult() const;
+
+ public:
+ // 新增状态
+ GlsState state() const noexcept { return m_state; }
+ std::string getStateText();
+ GlsState m_state{ GlsState::NoState };
+ static void clampString(std::string& s, size_t maxLen);
+ static std::string trimCopy(std::string s);
+ std::string m_failReason;
+
+ // —— 状态机（带守卫）——
+ bool queue(); // NoState -> Queued
+ bool start(); // Queued -> InProcess
+ bool pause(); // InProcess -> Paused
+ bool resume(); // Paused -> InProcess
+ bool complete(); // InProcess -> Completed
+ bool abort(); // Any (未终态) -> Aborted
+ bool fail(std::string reason); // 任意态 -> Failed（记录失败原因）
+
+ // 时间戳
+ std::optional<std::chrono::system_clock::time_point> m_tQueued;
+ std::optional<std::chrono::system_clock::time_point> m_tStart;
+ std::optional<std::chrono::system_clock::time_point> m_tEnd;
+
+ // 时间戳（可用于报表/追溯）
+ std::optional<std::chrono::system_clock::time_point> tQueued() const { return m_tQueued; }
+ std::optional<std::chrono::system_clock::time_point> tStart() const { return m_tStart; }
+ std::optional<std::chrono::system_clock::time_point> tEnd() const { return m_tEnd; }
+ void markQueued();
+ void markStart();
+ void markEnd();
+
+ // 工艺参数
+ void addParams(std::vector<CParam>& params);
+ std::vector<CParam>& getParams();
private:
MaterialsType m_type;
@@ -44,6 +107,11 @@
CJobDataS m_jobDataS;
CGlass* m_pBuddy;
std::string m_strBuddyId;
+ int m_nOriginPort;
+ int m_nOriginSlot;
+ BOOL m_bScheduledForProcessing; /* 是否将加工处理 */
+ CProcessJob* m_pProcessJob;
+ std::vector<CParam> m_params; // 工艺参数
};
}
--
Gitblit v1.9.3