From b0184248350b34c0f90f36db8d2ad3b89095e74f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 01 九月 2025 11:15:41 +0800
Subject: [PATCH] 1.调整调度算法逻辑，根据G1G2数量及配对确定取片类型，空闲等； 2.重命名两个和玻璃相关函数：Class修改为Glass

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

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index ce75a56..e23aa10 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -185,7 +185,7 @@
 		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);
@@ -202,6 +202,7 @@
 
 		// 是否有玻璃
 		BOOL hasGlass();
+		BOOL slotHasGlass(int slotIndex = 0);
 
 		// 指定槽位是否可以放置玻璃
 		BOOL canPlaceGlassInSlot(const short slotIndex);
@@ -290,6 +291,9 @@
 
 	private:
 		CEquipment* m_pArm;
+
+	public:
+		int m_nTestFlag;
 	};
 }
 

--
Gitblit v1.9.3