From 26e26278bb7bf53b961f0414d9848679453349e4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 15 五月 2025 18:01:48 +0800
Subject: [PATCH] 1.在FetchedOutJob时，如果是双玻璃片，即已贴合，则两块一起从列表删除； 2.同上，在StoredJob时，如果是双玻璃片，即已贴合，则两块一起加入列表中；
---
SourceCode/Bond/Servo/CEquipment.h | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 1e6d326..fe6ed40 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -27,6 +27,11 @@
#include <list>
#include "CGlass.h"
#include "CRecipesManager.h"
+#include "CJobDataA.h"
+#include "CJobDataB.h"
+#include "CJobDataC.h"
+#include "CJobDataS.h"
+#include "CProcessData.h"
namespace SERVO {
@@ -74,6 +79,9 @@
virtual const char* getClassName() = 0;
virtual void setListener(EquipmentListener listener);
void setCcLink(CCCLinkIEControl* pCcLink);
+ virtual BOOL isArm() { return FALSE; };
+ void setArm(CEquipment* pEquipment);
+ CEquipment* getArm();
void setBaseAlarmId(int nBaseId);
int getBaseAlarmId();
void setID(int nID);
@@ -110,7 +118,17 @@
virtual BOOL glassWillArrive(CGlass* pGlass);
virtual int outputGlass(int port);
virtual int glassArrived(CGlass* pGlass);
+ virtual int fetchedOutJob(CJobDataB* pJobDataB);
+ virtual int storedJob(CJobDataB* pJobDataB);
+ virtual int onReceivedJob(int port, CJobDataS* pJobDataS);
+ virtual int onSentOutJob(int port, CJobDataS* pJobDataS);
+ virtual BOOL onPreFetchedOutJob(int port, CJobDataB* pJobDataB);
+ virtual int onFetchedOutJob(int port, CJobDataB* pJobDataB);
+ virtual BOOL onPreStoredJob(int port, CJobDataB* pJobDataB);
+ virtual int onStoredJob(int port, CJobDataB* pJobDataB);
+ virtual int onProcessData(CProcessData* pProcessData);
void getGlassList(std::list<CGlass*>& list);
+ CGlass* getGlassFromList(const char* pszId);
CGlass* getFrontGlass();
BOOL removeClass(CGlass* pGlass);
bool isAlarmStep(SERVO::CStep* pStep);
@@ -133,6 +151,15 @@
// unitNo: 0:local; Others:unit No
int masterRecipeListRequest(short unitNo);
+ // 请求配方参数
+ // masterRecipeId: 主配方id
+ // localRecipeId: 本地配方id
+ // unitNo: 0:local; Others:unit No
+ int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);
+
+ public:
+ BOOL isGlassListEmpty();
+
// 以下为从CC-Link读取到的Bit标志位检测函数
public:
@@ -150,7 +177,19 @@
BOOL isBitOn(const char* pszData, size_t size, int index);
inline BOOL equalBool(BOOL b1, BOOL b2);
void addGlassToList(CGlass* pGlass);
- int decodeRecipeListReport(const char* pszData, size_t size);
+ short decodeRecipeListReport(const char* pszData, size_t size);
+ short decodeRecipeParameterReport(const char* pszData, size_t size);
+ int decodeProcessDataReport(CStep* pStep, const char* pszData, size_t size);
+ int decodeReceivedJobReport(CStep* pStep, int port, const char* pszData, size_t size);
+ int decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size);
+ int decodeFetchedOutJobReport(CStep* pStep, int port, const char* pszData, size_t size);
+ int decodeStoredJobReport(CStep* pStep, int port, const char* pszData, size_t size);
+ int addJobDataB(CJobDataB* pJobDataB);
+ int removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
+ CJobDataB* getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
+ int addJobDataS(CJobDataS* pJobDataS);
+ int removeJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);
+ CJobDataS* getJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);
protected:
EquipmentListener m_listener;
@@ -181,6 +220,11 @@
std::map<unsigned int, CStep*> m_mapStep;
int m_nBaseAlarmId;
CRecipesManager m_recipesManager;
+
+ private:
+ CEquipment* m_pArm;
+ std::list<CJobDataS> m_listJobDataS;
+ std::list<CJobDataB> m_listJobDataB;
};
}
--
Gitblit v1.9.3