From 1e0e0a4401a783651398c2545e152013d6003939 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 29 七月 2025 15:19:27 +0800
Subject: [PATCH] 1.Port编码错位问题修复; 2.调度时的判断条件优化。 3.支持上料下料混合;

---
 SourceCode/Bond/Servo/CEquipment.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 079e4af..28bf252 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;
 

--
Gitblit v1.9.3