From 334b16b4abb4cbe3d1d4e4f211efd6f4468ae09f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 19 九月 2025 15:12:52 +0800
Subject: [PATCH] 1.ControlJob和ProcessJob的中断操作，强制结批增加字符串描述原因，方便生产跟踪。
---
SourceCode/Bond/Servo/CGlass.h | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index 21aaf34..72f304b 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -8,6 +8,7 @@
#include "CJobDataS.h"
#include "ServoCommo.h"
#include "ProcessJob.h"
+#include "CParam.h"
namespace SERVO {
@@ -32,19 +33,23 @@
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();
+ 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);
+ 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);
@@ -52,11 +57,13 @@
BOOL setBuddy(CGlass* pGlass);
BOOL forceSetBuddy(CGlass* pGlass);
CGlass* getBuddy();
- std::string& getBuddyId();
+ 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);
+ InspResult getInspResult(unsigned int nEqId, unsigned int nUnit) const;
+ InspResult getAOIInspResult() const;
public:
// 新增状态
@@ -89,6 +96,10 @@
void markStart();
void markEnd();
+ // 工艺参数
+ void addParams(std::vector<CParam>& params);
+ std::vector<CParam>& getParams();
+
private:
MaterialsType m_type;
std::string m_strID;
@@ -100,6 +111,7 @@
int m_nOriginSlot;
BOOL m_bScheduledForProcessing; /* 是否将加工处理 */
CProcessJob* m_pProcessJob;
+ std::vector<CParam> m_params; // 工艺参数
};
}
--
Gitblit v1.9.3