From 9167ffecc0c63927d56268182e57cb8c52ed1b37 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 28 八月 2025 15:19:25 +0800
Subject: [PATCH] 1.ControlJob工作流程模拟测试，保存工作状态，重启软件还原工作状态等； 2.CJEnd事件上报，EAP模拟测试，数据验证等；
---
SourceCode/Bond/Servo/CEquipment.h | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 079e4af..c2e93cd 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -55,7 +55,7 @@
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 scanMap)> ONPORTINUSE;
+ typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
typedef struct _EquipmentListener
{
ONALIVE onAlive;
@@ -67,7 +67,7 @@
ONPRESTOREDJOB onPreStoredJob;
ONPROCESSSTATE onProcessStateChanged;
ONMAPMISMATCH onMapMismatch;
- ONPORTINUSE onPortInUse;
+ ONPORTSTATUSCHANGED onPortStatusChanged;
} EquipmentListener;
@@ -176,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);
@@ -184,9 +185,10 @@
CSlot* getNonEmptySlot(MaterialsType type);
// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
- CSlot* getProcessedSlot(MaterialsType putSlotType);
+ CSlot* getProcessedSlot(MaterialsType putSlotType, BOOL bJobMode = FALSE);
CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
CSlot* getInspFailSlot();
+ CSlot* getProcessedSlotCt(unsigned int slot);
// 获取玻璃物料
CGlass* getGlassFromSlot(int slotNo);
@@ -288,6 +290,9 @@
private:
CEquipment* m_pArm;
+
+ public:
+ int m_nTestFlag;
};
}
--
Gitblit v1.9.3