From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.h | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index fe5a704..01dc31f 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -1,24 +1,113 @@
#pragma once
#include "Context.h"
#include <string>
+#include "CPath.h"
+#include "CJobDataA.h"
+#include "CJobDataB.h"
+#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:
CGlass();
virtual ~CGlass();
+ void reset();
public:
virtual std::string& getClassName();
virtual std::string toString();
+ short getCassetteSequenceNo() { return m_jobDataS.getCassetteSequenceNo(); }
+ short getJobSequenceNo() { return m_jobDataS.getJobSequenceNo(); }
+ MaterialsType getType();
+ void setType(MaterialsType type);
void setID(const char* pszID);
std::string& getID();
+ 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);
+ CPath* getPath();
+ void addPath(unsigned int nEqId, unsigned int nUnit);
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();
+ 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);
+
+ 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;
std::string m_strID;
+ CPath* m_pPath;
+ 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