From 22122fe5fd927ccb8892cded1a2480d796e56ce9 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期二, 26 八月 2025 17:35:33 +0800 Subject: [PATCH] 1.修复加Job模式后,手臂号为0导致不能搬运的问题; --- SourceCode/Bond/Servo/CEquipment.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h index 28bf252..27a448e 100644 --- a/SourceCode/Bond/Servo/CEquipment.h +++ b/SourceCode/Bond/Servo/CEquipment.h @@ -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); -- Gitblit v1.9.3