From 4a17d9968a0fd04d672170324a767fa8b224bd52 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 25 六月 2025 14:09:31 +0800
Subject: [PATCH] 1.Reveive信息获取错误，已修正；

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

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 8807f13..1aa5abd 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -43,7 +43,7 @@
 #define SIGNAL_UPSTREAM_TROUBLE	1
 #define SIGNAL_INTERLOCK		2
 #define SIGNAL_SEND_ABLE		3
-#define SIGNAL_RECEIVE_ABLE		4
+#define SIGNAL_RECEIVE_ABLE		3
 
 	typedef std::function<void(int writeCode, int retCode)> ONWRITEDRET;
 
@@ -126,7 +126,7 @@
 		virtual int onStoredJob(int port, CJobDataB* pJobDataB);
 		virtual int onProcessData(CProcessData* pProcessData);
 		virtual int onSendAble();
-		virtual int onRecieveAble();
+		virtual int onReceiveAble();
 		virtual int onProcessStateChanged(PROCESS_STATE state);
 		virtual int getIndexerOperationModeBaseValue();
 		bool isAlarmStep(SERVO::CStep* pStep);
@@ -167,6 +167,7 @@
 
 		// 获取一个指定物料类型(G1,G2,G1&G2)的空槽位
 		CSlot* getAvailableSlotForGlass(MaterialsType type);
+		CSlot* getAvailableSlotForGlassExcludeSignal(MaterialsType type);
 
 		// 在指定的槽列表中，获取一个指定物料类型(G1,G2,G1&G2)的空槽位
 		CSlot* getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates);

--
Gitblit v1.9.3