From c743df7d475735b26395c6ed5c17b4be2d972be2 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 28 五月 2025 16:21:12 +0800
Subject: [PATCH] 1.初步去掉GlassList, 替换为Slot,待测；
---
SourceCode/Bond/Servo/CEquipment.h | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 7bdc2b8..b47ea75 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -101,9 +101,6 @@
std::vector<CPin*>& CEquipment::getInputPins();
std::vector<CPin*>& CEquipment::getOutputPins();
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
- 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);
@@ -114,10 +111,6 @@
virtual int onStoredJob(int port, CJobDataB* pJobDataB);
virtual int onProcessData(CProcessData* pProcessData);
virtual int getIndexerOperationModeBaseValue();
- void getGlassList(std::list<CGlass*>& list);
- CGlass* getGlassFromList(const char* pszId);
- CGlass* getFrontGlass();
- BOOL removeClass(CGlass* pGlass);
bool isAlarmStep(SERVO::CStep* pStep);
bool isVcrEventStep(SERVO::CStep* pStep);
bool isCassetteTransferStateStep(SERVO::CStep* pStep);
@@ -152,13 +145,20 @@
CSlot* getAvailableSlot();
// 获取一个指定物料类型(G1,G2,G1&G2)的空槽位
- CSlot* getEmptySlot(MaterialsType type);
+ CSlot* getAvailableSlotForGlass(MaterialsType type);
// 获取一个指定物料类型(G1,G2,G1&G2)的非空槽位
CSlot* getNonEmptySlot(MaterialsType type);
- public:
- BOOL isGlassListEmpty();
+ // 获取玻璃物料
+ CGlass* getGlassFromSlot(int slotNo);
+ CGlass* getAnyGlass();
+
+ // 验证玻璃和槽是否匹配
+ BOOL ValidateGlassSlotMatch();
+
+ // 是否有玻璃
+ BOOL hasGlass();
// 以下为从CC-Link读取到的Bit标志位检测函数
public:
@@ -175,7 +175,6 @@
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
BOOL isBitOn(const char* pszData, size_t size, int index);
inline BOOL equalBool(BOOL b1, BOOL b2);
- void addGlassToList(CGlass* pGlass);
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);
@@ -190,6 +189,7 @@
int addJobDataS(CJobDataS* pJobDataS);
int removeJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);
CJobDataS* getJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);
+ BOOL compareJobDataB(CJobDataB* pJobDataB1, CJobDataB* pJobDataB2);
protected:
EquipmentListener m_listener;
@@ -202,7 +202,6 @@
MemoryBlock m_blockWriteBit;
std::vector<CPin*> m_inputPins;
std::vector<CPin*> m_outputPins;
- std::list<CGlass*> m_glassList;
// 以下为从CC-Link读取到的Bit标志位
--
Gitblit v1.9.3