From 690bbf01bc579aff0ca31b2f326c7a6b5d83604d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 05 六月 2025 10:51:13 +0800
Subject: [PATCH] 1.Slot的部分数据不需要存储，否则影响代码修改Slot布局等信息； 2.Bonder Porcess完成后，合成两片一起搬送的逻辑问题；
---
SourceCode/Bond/Servo/CMaster.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index ba4fd04..7eeffad 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -84,7 +84,10 @@
int readCache();
void serialize(CArchive& ar);
void setState(MASTERSTATE state);
- CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq);
+ CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
+ MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2);
+ CRobotTask* createTransferTask_bonder_to_bakecooling(CEquipment* pSrcEq, CEquipment* pTarEq,
+ MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2);
private:
CRITICAL_SECTION m_criticalSection;
--
Gitblit v1.9.3