From 2a21061d88d5533065dc57cfae0b1f2c1952e06f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 22 八月 2025 16:01:32 +0800
Subject: [PATCH] 1.PorcessJob和Glass关系绑定； 2.对话框显示ProcessJob、Glass等数据；
---
SourceCode/Bond/Servo/CEquipment.h | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index e1a6901..ce75a56 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -54,6 +54,8 @@
typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB)> ONPREFETCHEDOUTJOB;
typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB, short& putSlot)> ONPRESTOREDJOB;
typedef std::function<void(void* pEiuipment, PROCESS_STATE state)> ONPROCESSSTATE;
+ typedef std::function<void(void* pEiuipment, short scanMap, short downMap)> ONMAPMISMATCH;
+ typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
typedef struct _EquipmentListener
{
ONALIVE onAlive;
@@ -64,6 +66,9 @@
ONPREFETCHEDOUTJOB onPreFethedOutJob;
ONPRESTOREDJOB onPreStoredJob;
ONPROCESSSTATE onProcessStateChanged;
+ ONMAPMISMATCH onMapMismatch;
+ ONPORTSTATUSCHANGED onPortStatusChanged;
+
} EquipmentListener;
@@ -74,6 +79,8 @@
virtual ~CEquipment();
public:
+ void SetEnable(BOOL bEnable);
+ BOOL IsEnabled() const;
virtual const char* getClassName() = 0;
virtual void setListener(EquipmentListener listener);
void setCcLink(CCCLinkIEControl* pCcLink);
@@ -110,14 +117,14 @@
virtual void onReceiveLBData(const char* pszData, size_t size);
virtual int onStepEvent(CStep* pStep, int code);
virtual CPin* addPin(PinType type, char* pszName);
- virtual short getSlotUnit(short slot) { return 0; };
+ virtual short getSlotUnit(short slotNo) { return 0; };
CPin* getPin(char* pszName);
std::vector<CPin*>& CEquipment::getInputPins();
std::vector<CPin*>& CEquipment::getOutputPins();
CRecipeList* getRecipeList(int unitNo);
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
virtual int fetchedOutJob(int port, CJobDataB* pJobDataB);
- virtual int storedJob(int port, CJobDataB* pJobDataB);
+ virtual int storedJob(int port, CJobDataB* pJobDataB, short putSlot);
virtual int onReceivedJob(int port, CJobDataS* pJobDataS);
virtual int onSentOutJob(int port, CJobDataS* pJobDataS);
virtual BOOL onPreFetchedOutJob(int port, CJobDataB* pJobDataB);
@@ -125,8 +132,8 @@
virtual BOOL onPreStoredJob(int port, CJobDataB* pJobDataB, short& putSlot);
virtual int onStoredJob(int port, CJobDataB* pJobDataB);
virtual int onProcessData(CProcessData* pProcessData);
- virtual int onSendAble();
- virtual int onReceiveAble();
+ virtual int onSendAble(int port);
+ virtual int onReceiveAble(int port);
virtual int onProcessStateChanged(PROCESS_STATE state);
virtual int getIndexerOperationModeBaseValue();
virtual bool isSlotProcessed(int slot) { return true; };
@@ -169,6 +176,7 @@
// 获取一个指定物料类型(G1,G2,G1&G2)的空槽位
CSlot* getAvailableSlotForGlass(MaterialsType type);
CSlot* getAvailableSlotForGlassExcludeSignal(MaterialsType type);
+ CSlot* isSlotAvailable(unsigned int slot);
// 在指定的槽列表中，获取一个指定物料类型(G1,G2,G1&G2)的空槽位
CSlot* getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates);
@@ -179,6 +187,8 @@
// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
CSlot* getProcessedSlot(MaterialsType putSlotType);
CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
+ CSlot* getInspFailSlot();
+ CSlot* getProcessedSlotCt(unsigned int slot);
// 获取玻璃物料
CGlass* getGlassFromSlot(int slotNo);
@@ -198,6 +208,12 @@
// 手动移除物料
int removeGlass(int slotNo);
+
+ // 字符串检测结果转换
+ InspResult judgeStringToInspResult(std::string& strJudge);
+
+
+
// 以下为从CC-Link读取到的Bit标志位检测函数
public:
@@ -239,6 +255,7 @@
void setProcessState(PROCESS_STATE state);
protected:
+ BOOL m_bEnable;
EquipmentListener m_listener;
int m_nID;
std::string m_strName;
--
Gitblit v1.9.3